From 1db04a815b709540f93532600cedbe1b1c3a2b82 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 29 Jun 2023 18:15:46 +0200 Subject: [PATCH 01/22] rekor-cli, rekor-server: 1.2.1 -> 1.2.2 https://github.com/sigstore/rekor/releases/tag/v1.2.2 --- pkgs/tools/security/rekor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index 62de3da17449..2820f473c11b 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -4,13 +4,13 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - hash = "sha256-tPiojtSCpqJjLGRZ1rNno7TKhmZ3jBtdb4dWLfRmh14="; + hash = "sha256-U7KxkPYVAy3/olXsEgPMX/kzg0KvYMovLO4LWw8guE4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -23,7 +23,7 @@ let ''; }; - vendorHash = "sha256-AIXoq/sYQRCR1pllwBhflAnanUD0aGo54drBOsaxiDQ="; + vendorHash = "sha256-hZyoVlNrPKE6ub94jVEOLGvxWoXKxFYcsEZyRrZuNkQ="; nativeBuildInputs = [ installShellFiles ]; From df7941dc4ea49d65fe182715adf9a2761ab097ca Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 8 Jul 2023 04:55:55 +0200 Subject: [PATCH 02/22] ulogd: support postgresql, mysql and sqlite as databases The binary weighs ~100KiB more, this is acceptable given that it is very useful to log to proper RDBMS which we do support anyway. --- pkgs/os-specific/linux/ulogd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/ulogd/default.nix b/pkgs/os-specific/linux/ulogd/default.nix index cb48d20043fd..a79a38389e4a 100644 --- a/pkgs/os-specific/linux/ulogd/default.nix +++ b/pkgs/os-specific/linux/ulogd/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, gnumake, libnetfilter_acct, libnetfilter_conntrack , libnetfilter_log, libmnl, libnfnetlink, automake, autoconf, autogen, libtool +, postgresql, libmysqlclient, sqlite , pkg-config, libpcap, linuxdoc-tools, autoreconfHook, nixosTests }: stdenv.mkDerivation rec { @@ -37,6 +38,9 @@ stdenv.mkDerivation rec { libmnl libnfnetlink libpcap + postgresql + libmysqlclient + sqlite ]; nativeBuildInputs = [ From d00aea8ae5a73cb23a3cf62f7441c645db4bc5f2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 3 Aug 2023 04:20:00 +0000 Subject: [PATCH 03/22] buildkit: 0.12.0 -> 0.12.1 Diff: https://github.com/moby/buildkit/compare/v0.12.0...v0.12.1 --- pkgs/development/tools/buildkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index d5b880ebb9ca..93b8b38ec9c2 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-sV5X3+evRDS6Ryi0UKLlPlzmzRE0NXERoVlQ8S5o/4I="; + hash = "sha256-Fee/XuxtNP9+T8kRd3yeEhFvpfaIgMkqfSaZCpaYEdM="; }; vendorHash = null; From 22b8748c42d503772557c8b346caf13057918f5c Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 29 Jul 2023 21:45:57 -0700 Subject: [PATCH 04/22] python3.pkgs.hydra-core: fix tests with setuptools 67.5.0+ --- pkgs/development/python-modules/hydra-core/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix index 5bf37b45394b..5cade60d0e38 100644 --- a/pkgs/development/python-modules/hydra-core/default.nix +++ b/pkgs/development/python-modules/hydra-core/default.nix @@ -4,6 +4,7 @@ , antlr4-python3-runtime , buildPythonPackage , fetchFromGitHub +, fetchpatch , importlib-resources , jre_headless , omegaconf @@ -32,6 +33,12 @@ buildPythonPackage rec { src = ./antlr4.patch; antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar"; }) + # https://github.com/facebookresearch/hydra/pull/2731 + (fetchpatch { + name = "setuptools-67.5.0-test-compatibility.patch"; + url = "https://github.com/facebookresearch/hydra/commit/25873841ed8159ab25a0c652781c75cc4a9d6e08.patch"; + hash = "sha256-oUfHlJP653o3RDtknfb8HaaF4fpebdR/OcbKHzJFK/Q="; + }) ]; postPatch = '' From 53797ef1febdf868c3e27b430b193f5f24a6b604 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 3 Aug 2023 15:10:17 +0800 Subject: [PATCH 05/22] pop: 0.1.0 -> 0.2.0 --- pkgs/applications/misc/pop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pop/default.nix b/pkgs/applications/misc/pop/default.nix index 52329034a077..02ebcaa2fb96 100644 --- a/pkgs/applications/misc/pop/default.nix +++ b/pkgs/applications/misc/pop/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pop"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "pop"; rev = "v${version}"; - sha256 = "VzSPQZfapB44hzGumy8JKe+v+n6af9fRSlAq1F7olCo="; + hash = "sha256-ZGJkpa1EIw3tt1Ww2HFFoYsnnmnSAiv86XEB5TPf4/k="; }; - vendorSha256 = "VowqYygRKxpDJPfesJXBp00sBiHb57UMR/ZV//v7+90="; + vendorHash = "sha256-8YcJXvR0cdL9PlP74Qh6uN2XZoN16sz/yeeZlBsk5N8="; GOWORK = "off"; From 2c5ccde5ac80d15edc20e9e6d8109a63e3558597 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 3 Aug 2023 12:38:48 +0200 Subject: [PATCH 06/22] dayon: 11.0.7 -> 12.0.1 Diff: https://github.com/RetGal/dayon/compare/v11.0.7...v12.0.1 --- pkgs/applications/networking/remote/dayon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/dayon/default.nix b/pkgs/applications/networking/remote/dayon/default.nix index d96ab8713640..8af457c7d4c2 100644 --- a/pkgs/applications/networking/remote/dayon/default.nix +++ b/pkgs/applications/networking/remote/dayon/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "dayon"; - version = "11.0.7"; + version = "12.0.1"; src = fetchFromGitHub { owner = "RetGal"; repo = "dayon"; rev = "v${version}"; - hash = "sha256-3TbJVM5po4aUAOsY7JJs/b5tUzH3WGnca/H83IeMQ2s="; + hash = "sha256-SCInonMTvBXtiDxWlN8QWNS+8MFB52vloonqfLcAEis="; }; # https://github.com/RetGal/Dayon/pull/66 From 5852f26bdcdca4a33b37d1631cfb3897bcc36fcc Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 25 Jul 2023 13:27:31 +0000 Subject: [PATCH 07/22] treewide: noop: refer to `src.name` or similar in `sourceRoot` where appropriate, part 1: trivial cases --- pkgs/applications/audio/alsa-scarlett-gui/default.nix | 2 +- pkgs/applications/audio/miniaudicle/default.nix | 2 +- pkgs/applications/audio/muse/default.nix | 2 +- pkgs/applications/audio/picoloop/default.nix | 2 +- pkgs/applications/audio/soundkonverter/default.nix | 2 +- pkgs/applications/audio/speech-denoiser/default.nix | 2 +- pkgs/applications/audio/tagutil/default.nix | 2 +- pkgs/applications/audio/yoshimi/default.nix | 2 +- .../emacs/elisp-packages/manual-packages/tsc/default.nix | 4 ++-- .../emacs/elisp-packages/manual-packages/tsc/update.py | 4 ++-- pkgs/applications/emulators/basiliskii/default.nix | 4 ++-- pkgs/applications/file-managers/xplorer/default.nix | 2 +- pkgs/applications/graphics/djv/default.nix | 2 +- pkgs/applications/graphics/imgbrd-grabber/default.nix | 2 +- pkgs/applications/graphics/pixelnuke/default.nix | 4 ++-- pkgs/applications/graphics/synfigstudio/default.nix | 6 +++--- pkgs/applications/graphics/vpv/default.nix | 2 +- pkgs/applications/misc/candle/default.nix | 2 +- pkgs/applications/misc/openbangla-keyboard/default.nix | 2 +- pkgs/applications/misc/pot/default.nix | 2 +- pkgs/applications/misc/qsudo/default.nix | 2 +- pkgs/applications/misc/spacenav-cube-example/default.nix | 6 ++---- pkgs/applications/misc/subsurface/default.nix | 2 +- pkgs/applications/misc/yubioath-flutter/helper.nix | 2 +- pkgs/applications/networking/browsers/browsh/default.nix | 2 +- .../applications/networking/browsers/ladybird/default.nix | 4 ++-- pkgs/applications/networking/filebrowser/default.nix | 2 +- pkgs/applications/networking/geph/default.nix | 4 ++-- .../instant-messengers/element/seshat/default.nix | 2 +- .../networking/instant-messengers/jami/default.nix | 2 +- .../pidgin-plugins/pidgin-opensteamworks/default.nix | 2 +- .../networking/kubo-migrator/all-migrations.nix | 2 +- pkgs/applications/networking/kubo-migrator/unwrapped.nix | 2 +- pkgs/applications/networking/mullvad/libwg.nix | 2 +- .../owncloud-client/libre-graph-api-cpp-qt-client.nix | 2 +- pkgs/applications/office/paperwork/openpaperwork-core.nix | 2 +- pkgs/applications/office/paperwork/openpaperwork-gtk.nix | 2 +- pkgs/applications/office/paperwork/paperwork-backend.nix | 2 +- pkgs/applications/office/paperwork/paperwork-gtk.nix | 2 +- pkgs/applications/office/paperwork/paperwork-shell.nix | 2 +- pkgs/applications/radio/ubertooth/default.nix | 2 +- pkgs/applications/science/biology/muscle/default.nix | 2 +- pkgs/applications/science/biology/star/default.nix | 2 +- .../science/biology/tandem-aligner/default.nix | 2 +- .../science/chemistry/autodock-vina/python-bindings.nix | 2 +- pkgs/applications/science/logic/z3/tptp.nix | 2 +- .../gitlab/gitlab-workhorse/default.nix | 2 +- pkgs/applications/version-management/gitlint/default.nix | 2 +- pkgs/applications/version-management/sapling/default.nix | 2 +- pkgs/applications/version-management/sourcehut/builds.nix | 2 +- pkgs/applications/video/epgstation/default.nix | 2 +- pkgs/applications/video/frigate/web.nix | 2 +- pkgs/applications/window-managers/tinywl/default.nix | 2 +- pkgs/applications/window-managers/wmderlandc/default.nix | 4 ++-- pkgs/data/themes/catppuccin-plymouth/default.nix | 2 +- pkgs/desktops/lumina/lumina-calculator/default.nix | 2 +- pkgs/desktops/lumina/lumina-pdf/default.nix | 2 +- pkgs/development/compilers/llvm/13/clang/default.nix | 2 +- .../development/compilers/llvm/13/compiler-rt/default.nix | 2 +- pkgs/development/compilers/llvm/13/libcxx/default.nix | 2 +- pkgs/development/compilers/llvm/13/libcxxabi/default.nix | 2 +- pkgs/development/compilers/llvm/13/libunwind/default.nix | 2 +- pkgs/development/compilers/llvm/13/lld/default.nix | 2 +- pkgs/development/compilers/llvm/13/llvm/default.nix | 2 +- pkgs/development/compilers/llvm/13/openmp/default.nix | 2 +- pkgs/development/coq-modules/metalib/default.nix | 8 ++++---- pkgs/development/embedded/fpga/tinyprog/default.nix | 2 +- pkgs/development/interpreters/kerf/default.nix | 2 +- pkgs/development/interpreters/wamr/default.nix | 2 +- pkgs/development/libraries/clfft/default.nix | 2 +- pkgs/development/libraries/clipper2/default.nix | 2 +- pkgs/development/libraries/cxxtest/default.nix | 2 +- pkgs/development/libraries/dab_lib/default.nix | 4 ++-- pkgs/development/libraries/fuzzylite/default.nix | 2 +- pkgs/development/libraries/herqq/default.nix | 2 +- pkgs/development/libraries/libclc/default.nix | 2 +- pkgs/development/libraries/libgeotiff/default.nix | 2 +- pkgs/development/libraries/libvmaf/default.nix | 2 +- pkgs/development/libraries/octomap/default.nix | 2 +- pkgs/development/libraries/orocos-kdl/default.nix | 2 +- pkgs/development/libraries/pico-sdk/default.nix | 2 +- pkgs/development/libraries/proj-datumgrid/default.nix | 2 +- pkgs/development/libraries/qrcodegen/default.nix | 4 +--- .../libraries/qtstyleplugin-kvantum-qt4/default.nix | 2 +- .../libraries/qtstyleplugin-kvantum/default.nix | 2 +- pkgs/development/libraries/rocfft/default.nix | 6 +++--- pkgs/development/php-packages/snuffleupagus/default.nix | 2 +- pkgs/development/python-modules/aardwolf/default.nix | 2 +- pkgs/development/python-modules/acme/default.nix | 2 +- .../python-modules/antlr4-python3-runtime/default.nix | 2 +- pkgs/development/python-modules/apache-beam/default.nix | 2 +- pkgs/development/python-modules/basemap-data/default.nix | 2 +- pkgs/development/python-modules/basemap/default.nix | 2 +- pkgs/development/python-modules/capstone/default.nix | 2 +- .../python-modules/certbot-dns-cloudflare/default.nix | 2 +- .../python-modules/certbot-dns-google/default.nix | 2 +- .../python-modules/certbot-dns-rfc2136/default.nix | 2 +- .../python-modules/certbot-dns-route53/default.nix | 2 +- pkgs/development/python-modules/certbot/default.nix | 2 +- pkgs/development/python-modules/chart-studio/default.nix | 2 +- .../development/python-modules/chirpstack-api/default.nix | 2 +- pkgs/development/python-modules/cirq-aqt/default.nix | 2 +- pkgs/development/python-modules/cirq-core/default.nix | 2 +- pkgs/development/python-modules/cirq-google/default.nix | 2 +- pkgs/development/python-modules/cirq-ionq/default.nix | 2 +- pkgs/development/python-modules/cirq-pasqal/default.nix | 2 +- pkgs/development/python-modules/cirq-rigetti/default.nix | 2 +- pkgs/development/python-modules/cirq-web/default.nix | 2 +- pkgs/development/python-modules/ctranslate2/default.nix | 2 +- pkgs/development/python-modules/dask-gateway/default.nix | 2 +- pkgs/development/python-modules/edlib/default.nix | 2 +- pkgs/development/python-modules/extractcode/7z.nix | 2 +- .../development/python-modules/extractcode/libarchive.nix | 2 +- pkgs/development/python-modules/flatbuffers/default.nix | 2 +- pkgs/development/python-modules/gb-io/default.nix | 2 +- pkgs/development/python-modules/gremlinpython/default.nix | 2 +- pkgs/development/python-modules/hexdump/default.nix | 3 ++- pkgs/development/python-modules/libcst/default.nix | 2 +- pkgs/development/python-modules/openrazer/pylib.nix | 2 +- pkgs/development/python-modules/protobuf/default.nix | 2 +- pkgs/development/python-modules/pykdl/default.nix | 2 +- pkgs/development/python-modules/python-csxcad/default.nix | 2 +- pkgs/development/python-modules/python-olm/default.nix | 2 +- .../development/python-modules/python-openems/default.nix | 2 +- pkgs/development/python-modules/safetensors/default.nix | 4 ++-- pkgs/development/python-modules/sentencepiece/default.nix | 2 +- pkgs/development/python-modules/simpleitk/default.nix | 2 +- pkgs/development/python-modules/tokenizers/default.nix | 2 +- pkgs/development/python-modules/typecode/libmagic.nix | 2 +- pkgs/development/python-modules/unicorn/default.nix | 2 +- pkgs/development/python-modules/zxing_cpp/default.nix | 2 +- pkgs/development/tools/analysis/spin/default.nix | 2 +- pkgs/development/tools/devpi-server/default.nix | 2 +- pkgs/development/tools/elkhound/default.nix | 2 +- pkgs/development/tools/kustomize/3.nix | 2 +- .../tools/literate-programming/noweb/default.nix | 2 +- pkgs/development/tools/loganalyzer/default.nix | 2 +- pkgs/development/tools/minizinc/ide.nix | 2 +- pkgs/development/tools/misc/grpc-tools/default.nix | 2 +- pkgs/development/tools/misc/licenseclassifier/default.nix | 2 +- pkgs/development/tools/misc/micronucleus/default.nix | 2 +- pkgs/development/tools/misc/unixbench/default.nix | 2 +- pkgs/development/tools/misc/xxdiff/default.nix | 2 +- pkgs/development/tools/oh-my-posh/default.nix | 2 +- pkgs/development/tools/parsing/antlr/4.nix | 2 +- pkgs/development/tools/protoc-gen-dart/default.nix | 2 +- pkgs/development/tools/protoc-gen-grpc-web/default.nix | 2 +- pkgs/development/tools/rust/cargo-insta/default.nix | 2 +- pkgs/development/tools/rust/cargo-raze/default.nix | 2 +- pkgs/development/tools/rust/cargo-tauri/default.nix | 2 +- pkgs/development/tools/rust/crate2nix/default.nix | 2 +- pkgs/development/tools/rust/tauri-mobile/default.nix | 2 +- pkgs/development/web/ihp-new/default.nix | 2 +- pkgs/games/doom-ports/prboom-plus/default.nix | 2 +- pkgs/games/iortcw/default.nix | 4 ++-- pkgs/games/iortcw/sp.nix | 2 +- pkgs/games/keeperrl/default.nix | 2 +- pkgs/games/quakespasm/vulkan.nix | 2 +- pkgs/games/sauerbraten/default.nix | 2 +- pkgs/games/sil-q/default.nix | 2 +- pkgs/games/sil/default.nix | 2 +- pkgs/games/vvvvvv/default.nix | 2 +- pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix | 2 +- pkgs/os-specific/darwin/libtapi/default.nix | 4 ++-- pkgs/os-specific/linux/akvcam/default.nix | 2 +- pkgs/os-specific/linux/aseq2json/default.nix | 4 ++-- .../linux/firmware/ipu6-camera-bins/default.nix | 4 ++-- pkgs/os-specific/linux/fwts/module.nix | 2 +- pkgs/os-specific/linux/gasket/default.nix | 2 +- pkgs/os-specific/linux/gt/default.nix | 4 ++-- pkgs/os-specific/linux/kvmfr/default.nix | 2 +- pkgs/os-specific/linux/lenovo-legion/app.nix | 2 +- pkgs/os-specific/linux/lenovo-legion/default.nix | 2 +- pkgs/os-specific/linux/ultrablue-server/default.nix | 4 ++-- pkgs/os-specific/linux/unstick/default.nix | 2 +- pkgs/os-specific/linux/wiringpi/default.nix | 2 +- pkgs/servers/authelia/web.nix | 2 +- pkgs/servers/baserow/default.nix | 4 ++-- pkgs/servers/klipper/default.nix | 2 +- pkgs/servers/ldap/389/default.nix | 2 +- pkgs/servers/misc/navidrome/default.nix | 2 +- pkgs/servers/misc/oven-media-engine/default.nix | 2 +- pkgs/servers/nosql/influxdb/default.nix | 4 ++-- pkgs/servers/nosql/influxdb2/default.nix | 2 +- pkgs/servers/photofield/default.nix | 2 +- pkgs/servers/search/quickwit/default.nix | 4 ++-- pkgs/servers/search/zincsearch/default.nix | 2 +- pkgs/servers/unpfs/default.nix | 2 +- pkgs/servers/web-apps/kavita/default.nix | 2 +- pkgs/servers/windmill/default.nix | 2 +- pkgs/tools/admin/gam/default.nix | 2 +- pkgs/tools/archivers/ctrtool/default.nix | 2 +- pkgs/tools/audio/picotts/default.nix | 6 ++---- pkgs/tools/audio/piper/default.nix | 4 ++-- pkgs/tools/audio/piper/train.nix | 2 +- pkgs/tools/audio/yabridgectl/default.nix | 2 +- pkgs/tools/backup/hpe-ltfs/default.nix | 2 +- pkgs/tools/filesystems/blobfuse/default.nix | 2 +- pkgs/tools/filesystems/cpcfs/default.nix | 2 +- pkgs/tools/filesystems/tar2ext4/default.nix | 2 +- pkgs/tools/graphics/pdftoipe/default.nix | 2 +- pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix | 2 +- pkgs/tools/misc/opentelemetry-collector/contrib.nix | 2 +- pkgs/tools/misc/opentelemetry-collector/default.nix | 2 +- pkgs/tools/misc/trdl-client/default.nix | 2 +- pkgs/tools/misc/usbimager/default.nix | 2 +- pkgs/tools/misc/wimboot/default.nix | 2 +- pkgs/tools/networking/bitmask-vpn/default.nix | 2 +- pkgs/tools/networking/dd-agent/integrations-core.nix | 2 +- pkgs/tools/networking/gnirehtet/default.nix | 4 ++-- pkgs/tools/networking/mqttmultimeter/default.nix | 2 +- pkgs/tools/networking/pykms/default.nix | 2 +- pkgs/tools/networking/ratman/default.nix | 2 +- pkgs/tools/networking/reaver-wps-t6x/default.nix | 2 +- pkgs/tools/networking/sleep-on-lan/default.nix | 2 +- pkgs/tools/networking/wireguard-tools/default.nix | 2 +- pkgs/tools/security/b2sum/default.nix | 2 +- pkgs/tools/security/bitwarden/default.nix | 2 +- pkgs/tools/security/donkey/default.nix | 2 +- pkgs/tools/security/hashcat-utils/default.nix | 2 +- pkgs/tools/security/jwx/default.nix | 2 +- pkgs/tools/security/lesspass-cli/default.nix | 2 +- pkgs/tools/typesetting/xmlroff/default.nix | 2 +- 223 files changed, 253 insertions(+), 258 deletions(-) diff --git a/pkgs/applications/audio/alsa-scarlett-gui/default.nix b/pkgs/applications/audio/alsa-scarlett-gui/default.nix index fec5cd304476..9740c2f71861 100644 --- a/pkgs/applications/audio/alsa-scarlett-gui/default.nix +++ b/pkgs/applications/audio/alsa-scarlett-gui/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; makeFlags = [ "DESTDIR=\${out}" "PREFIX=''" ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ gtk4 alsa-lib ]; postInstall = '' diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix index 832bd59c4da6..2ff8accecb24 100644 --- a/pkgs/applications/audio/miniaudicle/default.nix +++ b/pkgs/applications/audio/miniaudicle/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; - sourceRoot = "source/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' echo '#define GIT_REVISION "${finalAttrs.version}-NixOS"' > git-rev.h diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index 5663070d7dfe..01940bfc4f32 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1rasp2v1ds2aw296lbf27rzw0l9fjl0cvbvw85d5ycvh6wkm301p"; }; - sourceRoot = "source/muse3"; + sourceRoot = "${src.name}/muse3"; patches = [ ./fix-parallel-building.patch ]; diff --git a/pkgs/applications/audio/picoloop/default.nix b/pkgs/applications/audio/picoloop/default.nix index 8f11ec809c3a..e92319127d7d 100644 --- a/pkgs/applications/audio/picoloop/default.nix +++ b/pkgs/applications/audio/picoloop/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libjack2 ]; - sourceRoot = "source/picoloop"; + sourceRoot = "${src.name}/picoloop"; makeFlags = [ "-f Makefile.PatternPlayer_debian_RtAudio_sdl20" ]; diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index d85367626416..95fe9c5880d1 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -68,7 +68,7 @@ mkDerivation rec { buildInputs = [ taglib ] ++ runtimeDeps; # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5 cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; # add runt-time deps to PATH postInstall = '' wrapProgram $out/bin/soundkonverter --prefix PATH : ${lib.makeBinPath runtimeDeps } diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index 8bce5c83a691..415bf352cae9 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -12,7 +12,7 @@ let pname = "rnnoise-nu"; version = "unstable-07-10-2019"; src = speech-denoiser-src; - sourceRoot = "source/rnnoise"; + sourceRoot = "${speech-denoiser-src.name}/rnnoise"; nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--disable-examples" "--disable-doc" "--disable-shared" "--enable-static" ]; installTargets = [ "install-rnnoise-nu" ]; diff --git a/pkgs/applications/audio/tagutil/default.nix b/pkgs/applications/audio/tagutil/default.nix index e5076188301a..9cd9946be60d 100644 --- a/pkgs/applications/audio/tagutil/default.nix +++ b/pkgs/applications/audio/tagutil/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-oY1aGl5CKVtpOfh8Wskio/huWYMiPuxWPqxlooTutcw="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 5e00a016334f..63ecd18e4641 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { hash = "sha256-zFwfKy8CVecGhgr48T+eDNHfMdctfrNGenc/XJctyw8="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; postPatch = '' substituteInPlace Misc/Config.cpp --replace /usr $out diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix index 3fa9f1b4f974..a81f5827027f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix @@ -28,7 +28,7 @@ let pname = "tsc"; commit = version; - sourceRoot = "source/core"; + sourceRoot = "${src.name}/core"; recipe = writeText "recipe" '' (tsc @@ -44,7 +44,7 @@ let pname = "tsc-dyn"; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - sourceRoot = "source/core"; + sourceRoot = "${src.name}/core"; postInstall = '' LIB=($out/lib/libtsc_dyn.*) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py index a144cb77be92..77ef632ded6e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py @@ -96,12 +96,12 @@ if __name__ == "__main__": drv_path = eval_drv( nixpkgs, """ - rustPlatform.buildRustPackage { + rustPlatform.buildRustPackage rec { pname = "tsc-dyn"; version = "%s"; nativeBuildInputs = [ clang ]; src = fetchFromGitHub (lib.importJSON %s); - sourceRoot = "source/core"; + sourceRoot = "${src.name}/core"; cargoHash = lib.fakeHash; } """ diff --git a/pkgs/applications/emulators/basiliskii/default.nix b/pkgs/applications/emulators/basiliskii/default.nix index 8a58dd24555f..2f03984f3df3 100644 --- a/pkgs/applications/emulators/basiliskii/default.nix +++ b/pkgs/applications/emulators/basiliskii/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, pkg-config, SDL2, gtk2, mpfr }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "basiliskii"; version = "unstable-2022-09-30"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { rev = "2fa17a0783cf36ae60b77b5ed930cda4dc1824af"; sha256 = "+jkns6H2YjlewbUzgoteGSQYWJL+OWVu178aM+BtABM="; }; - sourceRoot = "source/BasiliskII/src/Unix"; + sourceRoot = "${src.name}/BasiliskII/src/Unix"; patches = [ ./remove-redhat-6-workaround-for-scsi-sg.h.patch ]; nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ SDL2 gtk2 mpfr ]; diff --git a/pkgs/applications/file-managers/xplorer/default.nix b/pkgs/applications/file-managers/xplorer/default.nix index 0e82fbfa655b..b4681ab697b2 100644 --- a/pkgs/applications/file-managers/xplorer/default.nix +++ b/pkgs/applications/file-managers/xplorer/default.nix @@ -51,7 +51,7 @@ in rustPlatform.buildRustPackage { inherit version src pname; - sourceRoot = "source/src-tauri"; + sourceRoot = "${src.name}/src-tauri"; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/applications/graphics/djv/default.nix b/pkgs/applications/graphics/djv/default.nix index 250ff2b32efa..8e36e5b70db1 100644 --- a/pkgs/applications/graphics/djv/default.nix +++ b/pkgs/applications/graphics/djv/default.nix @@ -56,7 +56,7 @@ let src = djvSrc; - sourceRoot = "source/etc/SuperBuild"; + sourceRoot = "${src.name}/etc/SuperBuild"; nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index e37539ceeec5..0fa08c31c0a6 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ln -s $out/share/Grabber/Grabber-cli $out/bin/Grabber-cli ''; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; meta = with lib; { description = "Very customizable imageboard/booru downloader with powerful filenaming features"; diff --git a/pkgs/applications/graphics/pixelnuke/default.nix b/pkgs/applications/graphics/pixelnuke/default.nix index 4cb2440cb8ee..905e99a1c231 100644 --- a/pkgs/applications/graphics/pixelnuke/default.nix +++ b/pkgs/applications/graphics/pixelnuke/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, libevent, glew, glfw }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pixelnuke"; version = "unstable-2019-05-19"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "03dp0p00chy00njl4w02ahxqiwqpjsrvwg8j4yi4dgckkc3gbh40"; }; - sourceRoot = "source/pixelnuke"; + sourceRoot = "${src.name}/pixelnuke"; buildInputs = [ libevent glew glfw ]; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 52c3fa3bae4e..61fcb3a24bc6 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -39,7 +39,7 @@ let pname = "ETL"; inherit version src; - sourceRoot = "source/ETL"; + sourceRoot = "${src.name}/ETL"; nativeBuildInputs = [ pkg-config @@ -54,7 +54,7 @@ let pname = "synfig"; inherit version src; - sourceRoot = "source/synfig-core"; + sourceRoot = "${src.name}/synfig-core"; configureFlags = [ "--with-boost=${boost.dev}" @@ -89,7 +89,7 @@ stdenv.mkDerivation { pname = "synfigstudio"; inherit version src; - sourceRoot = "source/synfig-studio"; + sourceRoot = "${src.name}/synfig-studio"; postPatch = '' patchShebangs images/splash_screen_development.sh diff --git a/pkgs/applications/graphics/vpv/default.nix b/pkgs/applications/graphics/vpv/default.nix index b02d35f93ad9..27957a5fa86f 100644 --- a/pkgs/applications/graphics/vpv/default.nix +++ b/pkgs/applications/graphics/vpv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "src/fuzzy-finder"; cargoDeps = rustPlatform.fetchCargoTarball { src = finalAttrs.src; - sourceRoot = "source/src/fuzzy-finder"; + sourceRoot = "${finalAttrs.src.name}/src/fuzzy-finder"; hash = "sha256-CDKlmwA2Wj78xPaSiYPmIJ7xmiE5Co+oGGejZU3v1zI="; }; diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix index 8df75b0cbd19..3f9f2ec678b5 100644 --- a/pkgs/applications/misc/candle/default.nix +++ b/pkgs/applications/misc/candle/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix index 45e9c381c7cf..4ce864bfdeb0 100644 --- a/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { postPatch = '' cp ${./Cargo.lock} Cargo.lock ''; - sourceRoot = "source/${cargoRoot}"; + sourceRoot = "${src.name}/${cargoRoot}"; sha256 = "sha256-01MWuUUirsgpoprMArRp3qxKNayPHTkYWk31nXcIC34="; }; diff --git a/pkgs/applications/misc/pot/default.nix b/pkgs/applications/misc/pot/default.nix index 04570fa2d7ca..941796315c71 100644 --- a/pkgs/applications/misc/pot/default.nix +++ b/pkgs/applications/misc/pot/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { hash = "sha256-v5yx8pE8+m+5CDy7X3CwitYhFQMX8Ynt8Y2k1lEZKpg="; }; - sourceRoot = "source/src-tauri"; + sourceRoot = "${src.name}/src-tauri"; postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ diff --git a/pkgs/applications/misc/qsudo/default.nix b/pkgs/applications/misc/qsudo/default.nix index 5f9958f2d5d6..d73c3793871a 100644 --- a/pkgs/applications/misc/qsudo/default.nix +++ b/pkgs/applications/misc/qsudo/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { sha256 = "06kg057vwkvafnk69m9rar4wih3vq4h36wbzwbfc2kndsnn47lfl"; }; - sourceRoot = "source/src-qt5"; + sourceRoot = "${src.name}/src-qt5"; nativeBuildInputs = [ qmake diff --git a/pkgs/applications/misc/spacenav-cube-example/default.nix b/pkgs/applications/misc/spacenav-cube-example/default.nix index 990aedbc71ec..0073c4a0f81e 100644 --- a/pkgs/applications/misc/spacenav-cube-example/default.nix +++ b/pkgs/applications/misc/spacenav-cube-example/default.nix @@ -2,11 +2,9 @@ stdenv.mkDerivation { pname = "spacenav-cube-example"; - version = libspnav.version; + inherit (libspnav) version src; - src = libspnav.src; - - sourceRoot = "source/examples/cube"; + sourceRoot = "${libspnav.src.name}/examples/cube"; buildInputs = [ libX11 mesa_glu libspnav ]; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 1bc2c2b6c976..6831cea6c4f3 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -44,7 +44,7 @@ let src = subsurfaceSrc; - sourceRoot = "source/libdivecomputer"; + sourceRoot = "${subsurfaceSrc.name}/libdivecomputer"; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix index 2c188d833af6..e40f6a78c862 100644 --- a/pkgs/applications/misc/yubioath-flutter/helper.nix +++ b/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -16,7 +16,7 @@ buildPythonApplication { pname = "yubioath-flutter-helper"; inherit src version meta; - sourceRoot = "source/helper"; + sourceRoot = "${src.name}/helper"; format = "pyproject"; postPatch = '' diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index 225e7a0e8676..ee04f9ed04dc 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { pname = "browsh"; - sourceRoot = "source/interfacer"; + sourceRoot = "${src.name}/interfacer"; src = fetchFromGitHub { owner = "browsh-org"; diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 1af17ad7aaaa..cf544b07db28 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,7 +10,7 @@ , nixosTests }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ladybird"; version = "unstable-2023-01-17"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { hash = "sha256-n2mLg9wNfdMGsJuGj+ukjto9qYjGOIz4cZjgvMGQUrY="; }; - sourceRoot = "source/Ladybird"; + sourceRoot = "${src.name}/Ladybird"; postPatch = '' substituteInPlace CMakeLists.txt \ diff --git a/pkgs/applications/networking/filebrowser/default.nix b/pkgs/applications/networking/filebrowser/default.nix index 265e8236be69..153cc791cbf9 100644 --- a/pkgs/applications/networking/filebrowser/default.nix +++ b/pkgs/applications/networking/filebrowser/default.nix @@ -12,7 +12,7 @@ let hash = "sha256-xhBIJcEtxDdMXSgQtLAV0UWzPtrvKEil0WV76K5ycBc="; }; - sourceRoot = "source/frontend"; + sourceRoot = "${src.name}/frontend"; npmDepsHash = "sha256-acNIMKHc4q7eiFLPBtKZBNweEsrt+//0VR6dqwXHTvA="; diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix index 2b7987fa1e46..36de704dbc71 100644 --- a/pkgs/applications/networking/geph/default.nix +++ b/pkgs/applications/networking/geph/default.nix @@ -59,7 +59,7 @@ in pname = "gephgui"; inherit version src; - sourceRoot = "source/gephgui-wry/gephgui"; + sourceRoot = "${src.name}/gephgui-wry/gephgui"; postPatch = "ln -s ${./package-lock.json} ./package-lock.json"; @@ -79,7 +79,7 @@ in pname = "gephgui-wry"; inherit version src; - sourceRoot = "source/gephgui-wry"; + sourceRoot = "${src.name}/gephgui-wry"; cargoHash = "sha256-lidlUUfHXKPUlICdaVv/SFlyyWsZ7cYHyTJ3kkMn3L4="; diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index 5d7535c5289b..b24b0d7b71ba 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -14,7 +14,7 @@ in rustPlatform.buildRustPackage rec { hash = pinData.srcHash; }; - sourceRoot = "source/seshat-node/native"; + sourceRoot = "${src.name}/seshat-node/native"; nativeBuildInputs = [ nodejs python3 yarn ]; buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices; diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 1b0185447ac0..87f65e6d05aa 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { daemon = stdenv.mkDerivation { pname = "jami-daemon"; inherit src version meta; - sourceRoot = "source/daemon"; + sourceRoot = "${src.name}/daemon"; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix index a396e9acc0ce..ceeac0acd0c3 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-VWsoyFG+Ro+Y6ngSTMQ7yBYf6awCMNOc6U0WqNeg/jU="; }; - sourceRoot = "source/steam-mobile"; + sourceRoot = "${src.name}/steam-mobile"; installFlags = [ "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2" diff --git a/pkgs/applications/networking/kubo-migrator/all-migrations.nix b/pkgs/applications/networking/kubo-migrator/all-migrations.nix index ecfddcf64915..39a9f141c7a4 100644 --- a/pkgs/applications/networking/kubo-migrator/all-migrations.nix +++ b/pkgs/applications/networking/kubo-migrator/all-migrations.nix @@ -13,7 +13,7 @@ let fs-repo-common = pname: version: buildGoModule { inherit pname version; inherit (kubo-migrator-unwrapped) src; - sourceRoot = "source/${pname}"; + sourceRoot = "${kubo-migrator-unwrapped.src.name}/${pname}"; vendorSha256 = null; # Fix build on Go 1.17 and later: panic: qtls.ClientHelloInfo doesn't match # See https://github.com/ipfs/fs-repo-migrations/pull/163 diff --git a/pkgs/applications/networking/kubo-migrator/unwrapped.nix b/pkgs/applications/networking/kubo-migrator/unwrapped.nix index b5531851641a..d5dc1421a58a 100644 --- a/pkgs/applications/networking/kubo-migrator/unwrapped.nix +++ b/pkgs/applications/networking/kubo-migrator/unwrapped.nix @@ -19,7 +19,7 @@ buildGoModule rec { hash = "sha256-y0IYSKKZlFbPrTUC6XqYKhS3a79rieNGBL58teWMlC4="; }; - sourceRoot = "source/fs-repo-migrations"; + sourceRoot = "${src.name}/fs-repo-migrations"; vendorHash = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk="; diff --git a/pkgs/applications/networking/mullvad/libwg.nix b/pkgs/applications/networking/mullvad/libwg.nix index 287797fd8e67..0ed9599963ef 100644 --- a/pkgs/applications/networking/mullvad/libwg.nix +++ b/pkgs/applications/networking/mullvad/libwg.nix @@ -11,7 +11,7 @@ buildGoModule { src ; - sourceRoot = "source/wireguard/libwg"; + sourceRoot = "${mullvad.src.name}/wireguard/libwg"; vendorSha256 = "QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU="; diff --git a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix b/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix index 0f0bdb5a3d98..31412e72ec98 100644 --- a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix +++ b/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { hash = "sha256-wbdamPi2XSLWeprrYZtBUDH1A2gdp6/5geFZv+ZqSWk="; }; - sourceRoot = "source/client"; + sourceRoot = "${src.name}/client"; nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase ]; diff --git a/pkgs/applications/office/paperwork/openpaperwork-core.nix b/pkgs/applications/office/paperwork/openpaperwork-core.nix index 8f08b56d4d5b..ee4fe040bfa2 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "openpaperwork-core"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; - sourceRoot = "source/openpaperwork-core"; + sourceRoot = "${src.name}/openpaperwork-core"; # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index f1eb43dbdbc8..9566a6010635 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "openpaperwork-gtk"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; - sourceRoot = "source/openpaperwork-gtk"; + sourceRoot = "${src.name}/openpaperwork-gtk"; # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index c7ddfa09e234..cbb57496427c 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "paperwork-backend"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; - sourceRoot = "source/paperwork-backend"; + sourceRoot = "${src.name}/paperwork-backend"; patches = [ # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 36d3b0056b4a..d4ae3070d9af 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { src = sample_documents; }; - sourceRoot = "source/paperwork-gtk"; + sourceRoot = "${src.name}/paperwork-gtk"; # Patch out a few paths that assume that we're using the FHS: postPatch = '' diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index ca6cab2c1e4f..56d84e1039c1 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "paperwork-shell"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; - sourceRoot = "source/paperwork-shell"; + sourceRoot = "${src.name}/paperwork-shell"; # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; diff --git a/pkgs/applications/radio/ubertooth/default.nix b/pkgs/applications/radio/ubertooth/default.nix index 2f6eed575b4d..62e645fb6df8 100644 --- a/pkgs/applications/radio/ubertooth/default.nix +++ b/pkgs/applications/radio/ubertooth/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "11r5ag2l5xn4pr7ycicm30w9c3ldn9yiqj1sqnjc79csxl2vrcfw"; }; - sourceRoot = "source/host"; + sourceRoot = "${src.name}/host"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libbtbb libpcap libusb1 bluez ]; diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index 7696acefd7b2..366d0278227d 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; installPhase = '' install -m755 -D Linux/muscle $out/bin/muscle diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index e1a21cba0da2..3383a78e1d38 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-58Y4lzqXwBhRlXcionUg2IhAg5znNUuyr/FsuNZd+5Q="; }; - sourceRoot = "source/source"; + sourceRoot = "${src.name}/source"; postPatch = '' substituteInPlace Makefile --replace "/bin/rm" "rm" diff --git a/pkgs/applications/science/biology/tandem-aligner/default.nix b/pkgs/applications/science/biology/tandem-aligner/default.nix index 5f197bd7f79c..0b3f2520d82b 100644 --- a/pkgs/applications/science/biology/tandem-aligner/default.nix +++ b/pkgs/applications/science/biology/tandem-aligner/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - sourceRoot = "source/tandem_aligner"; + sourceRoot = "${finalAttrs.src.name}/tandem_aligner"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix b/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix index 99d132912e2f..fb7fd1ece0e6 100644 --- a/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix +++ b/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix @@ -12,7 +12,7 @@ buildPythonPackage { format = "pyproject"; - sourceRoot = "source/build/python"; + sourceRoot = "${autodock-vina.src.name}/build/python"; postPatch = '' # wildcards are not allowed diff --git a/pkgs/applications/science/logic/z3/tptp.nix b/pkgs/applications/science/logic/z3/tptp.nix index 23136ddf7a70..15f6770404ef 100644 --- a/pkgs/applications/science/logic/z3/tptp.nix +++ b/pkgs/applications/science/logic/z3/tptp.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = z3.src; - sourceRoot = "source/examples/tptp"; + sourceRoot = "${src.name}/examples/tptp"; nativeBuildInputs = [cmake]; buildInputs = [z3]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 8a9ae2080365..9b19ec2aec61 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = data.repo_hash; }; - sourceRoot = "source/workhorse"; + sourceRoot = "${src.name}/workhorse"; vendorSha256 = "sha256-lKl/V2fti0eqrEoeJNNwvJbZO7z7v+5HlES+dyxxcP4="; buildInputs = [ git ]; diff --git a/pkgs/applications/version-management/gitlint/default.nix b/pkgs/applications/version-management/gitlint/default.nix index f03de4589058..575cf96826d4 100644 --- a/pkgs/applications/version-management/gitlint/default.nix +++ b/pkgs/applications/version-management/gitlint/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { # Upstream splitted the project into gitlint and gitlint-core to # simplify the dependency handling - sourceRoot = "source/gitlint-core"; + sourceRoot = "${src.name}/gitlint-core"; nativeBuildInputs = with python3.pkgs; [ hatch-vcs diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 796d76cc6ef8..85a4e4d901f2 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -96,7 +96,7 @@ python3Packages.buildPythonApplication { pname = "sapling"; inherit src version; - sourceRoot = "source/eden/scm"; + sourceRoot = "${src.name}/eden/scm"; # Upstream does not commit Cargo.lock cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 20d4d463a093..0af4b1ceee29 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -30,7 +30,7 @@ let buildsrht-worker = buildGoModule { inherit src version; - sourceRoot = "source/worker"; + sourceRoot = "${src.name}/worker"; pname = "buildsrht-worker"; vendorHash = "sha256-y5RFPbtaGmgPpiV2Q3njeWORGZF1TJRjAbY6VgC1hek="; }; diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index b5f5ba9e733c..49d2dedbb0c3 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -49,7 +49,7 @@ buildNpmPackage rec { npmDepsHash = "sha256-a/cDPABWI4lPxvSOI4D90O71A9lm8icPMak/g6DPYQY="; npmRootPath = ""; - sourceRoot = "source/client"; + sourceRoot = "${src.name}/client"; NODE_OPTIONS = "--openssl-legacy-provider"; }; diff --git a/pkgs/applications/video/frigate/web.nix b/pkgs/applications/video/frigate/web.nix index 08b9cef19ee7..01a3e70b436f 100644 --- a/pkgs/applications/video/frigate/web.nix +++ b/pkgs/applications/video/frigate/web.nix @@ -7,7 +7,7 @@ buildNpmPackage { pname = "frigate-web"; inherit version src; - sourceRoot = "source/web"; + sourceRoot = "${src.name}/web"; postPatch = '' substituteInPlace package.json \ diff --git a/pkgs/applications/window-managers/tinywl/default.nix b/pkgs/applications/window-managers/tinywl/default.nix index b89d9dafd900..84defaa98bed 100644 --- a/pkgs/applications/window-managers/tinywl/default.nix +++ b/pkgs/applications/window-managers/tinywl/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "tinywl"; inherit (wlroots) version src; - sourceRoot = "source/tinywl"; + sourceRoot = "${wlroots.src.name}/tinywl"; nativeBuildInputs = [ pkg-config wayland-scanner ]; buildInputs = [ libxkbcommon pixman udev wayland wayland-protocols wlroots ]; diff --git a/pkgs/applications/window-managers/wmderlandc/default.nix b/pkgs/applications/window-managers/wmderlandc/default.nix index 24690eeaa468..340ce6e27d30 100644 --- a/pkgs/applications/window-managers/wmderlandc/default.nix +++ b/pkgs/applications/window-managers/wmderlandc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, libX11, xorgproto }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "wmderlandc"; version = "unstable-2020-07-17"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0npmlnybblp82mfpinjbz7dhwqgpdqc1s63wc1zs8mlcs19pdh98"; }; - sourceRoot = "source/ipc-client"; + sourceRoot = "${src.name}/ipc-client"; nativeBuildInputs = [ cmake diff --git a/pkgs/data/themes/catppuccin-plymouth/default.nix b/pkgs/data/themes/catppuccin-plymouth/default.nix index 69a07f46d0df..994c5ed0df2c 100644 --- a/pkgs/data/themes/catppuccin-plymouth/default.nix +++ b/pkgs/data/themes/catppuccin-plymouth/default.nix @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE="; }; - sourceRoot = "source/themes/catppuccin-${variant}"; + sourceRoot = "${src.name}/themes/catppuccin-${variant}"; installPhase = '' runHook preInstall diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix index 1c9a87b64aab..a8769e3d26ee 100644 --- a/pkgs/desktops/lumina/lumina-calculator/default.nix +++ b/pkgs/desktops/lumina/lumina-calculator/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "1238d1m0mjkwkdpgq165a4ql9aql0aji5f41rzdzny6m7ws9nm2y"; }; - sourceRoot = "source/src-qt5"; + sourceRoot = "${src.name}/src-qt5"; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix index c102e20e7993..0464287b9674 100644 --- a/pkgs/desktops/lumina/lumina-pdf/default.nix +++ b/pkgs/desktops/lumina/lumina-pdf/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "08caj4nashp79fbvj94rabn0iaa1hymifqmb782x03nb2vkn38r6"; }; - sourceRoot = "source/src-qt5"; + sourceRoot = "${src.name}/src-qt5"; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/development/compilers/llvm/13/clang/default.nix b/pkgs/development/compilers/llvm/13/clang/default.nix index f1a3e74fa6bc..5e06e85c02a9 100644 --- a/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/pkgs/development/compilers/llvm/13/clang/default.nix @@ -10,7 +10,7 @@ let inherit version; inherit src; - sourceRoot = "source/clang"; + sourceRoot = "${src.name}/clang"; nativeBuildInputs = [ cmake python3 ] ++ lib.optional enableManpages python3.pkgs.sphinx diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index faa123312bd7..18be4499d0fd 100644 --- a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { inherit version; inherit src; - sourceRoot = "source/compiler-rt"; + sourceRoot = "${src.name}/compiler-rt"; nativeBuildInputs = [ cmake python3 libllvm.dev ] ++ lib.optional stdenv.isDarwin xcbuild.xcrun; diff --git a/pkgs/development/compilers/llvm/13/libcxx/default.nix b/pkgs/development/compilers/llvm/13/libcxx/default.nix index b18c9da18ffd..994ec7dd5a56 100644 --- a/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/libcxx"; + sourceRoot = "${src.name}/libcxx"; outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; diff --git a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix index 06137ab06734..b1b57b3050ad 100644 --- a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/compilers/llvm/13/libunwind/default.nix b/pkgs/development/compilers/llvm/13/libunwind/default.nix index b6017e741728..d837bc60de37 100644 --- a/pkgs/development/compilers/llvm/13/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/13/libunwind/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/13/lld/default.nix b/pkgs/development/compilers/llvm/13/lld/default.nix index c8c3e0b448bd..d506f396f65c 100644 --- a/pkgs/development/compilers/llvm/13/lld/default.nix +++ b/pkgs/development/compilers/llvm/13/lld/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 59c3edb9e2db..827e528581cf 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation (rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "lib" "dev" "python" ]; diff --git a/pkgs/development/compilers/llvm/13/openmp/default.nix b/pkgs/development/compilers/llvm/13/openmp/default.nix index 71362be1fdc6..8eca980d601c 100644 --- a/pkgs/development/compilers/llvm/13/openmp/default.nix +++ b/pkgs/development/compilers/llvm/13/openmp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit version; inherit src; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index e0197db71b94..19a36c9692a9 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, version ? null }: -mkCoqDerivation { +(mkCoqDerivation { pname = "metalib"; owner = "plclub"; inherit version; @@ -12,10 +12,10 @@ mkCoqDerivation { release."8.15".sha256 = "0wbp058zwa4bkdjj38aysy2g1avf9nrh8q23a3dil0q00qczi616"; release."8.10".sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; - sourceRoot = "source/Metalib"; - meta = with lib; { license = licenses.mit; maintainers = [ maintainers.jwiegley ]; }; -} +}).overrideAttrs (oldAttrs: { + sourceRoot = "${oldAttrs.src.name}/Metalib"; +}) diff --git a/pkgs/development/embedded/fpga/tinyprog/default.nix b/pkgs/development/embedded/fpga/tinyprog/default.nix index 06a8c3e98712..4872111b811c 100644 --- a/pkgs/development/embedded/fpga/tinyprog/default.nix +++ b/pkgs/development/embedded/fpga/tinyprog/default.nix @@ -15,7 +15,7 @@ with python3Packages; buildPythonApplication rec { sha256 = "0zbrvvb957z2lwbfd39ixqdsnd2w4wfjirwkqdrqm27bjz308731"; }; - sourceRoot = "source/programmer"; + sourceRoot = "${src.name}/programmer"; propagatedBuildInputs = [ pyserial diff --git a/pkgs/development/interpreters/kerf/default.nix b/pkgs/development/interpreters/kerf/default.nix index 0987205f59d9..99d9bb8710e4 100644 --- a/pkgs/development/interpreters/kerf/default.nix +++ b/pkgs/development/interpreters/kerf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-0sU2zOk5I69lQyrn1g0qsae7S/IBT6eA/911qp0GNkk="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; buildInputs = [ libedit zlib ncurses ] ++ lib.optionals stdenv.isDarwin ([ Accelerate diff --git a/pkgs/development/interpreters/wamr/default.nix b/pkgs/development/interpreters/wamr/default.nix index 8506871e6e2c..41c688c3a4d0 100644 --- a/pkgs/development/interpreters/wamr/default.nix +++ b/pkgs/development/interpreters/wamr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - sourceRoot = "source/product-mini/platforms/linux"; + sourceRoot = "${finalAttrs.src.name}/product-mini/platforms/linux"; meta = with lib; { description = "WebAssembly Micro Runtime"; diff --git a/pkgs/development/libraries/clfft/default.nix b/pkgs/development/libraries/clfft/default.nix index 8af7a57e6555..824449b0fafc 100644 --- a/pkgs/development/libraries/clfft/default.nix +++ b/pkgs/development/libraries/clfft/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hash = "sha256-yp7u6qhpPYQpBw3d+VLg0GgMyZONVII8BsBCEoRZm4w="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; postPatch = '' sed -i '/-m64/d;/-m32/d' CMakeLists.txt diff --git a/pkgs/development/libraries/clipper2/default.nix b/pkgs/development/libraries/clipper2/default.nix index 7d9437da7a53..f7bb635e63d0 100644 --- a/pkgs/development/libraries/clipper2/default.nix +++ b/pkgs/development/libraries/clipper2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-u/4GG1A2PAlk8VEWgJX8+EnZ5hpGhu1QbvHwct58sF4="; }; - sourceRoot = "source/CPP"; + sourceRoot = "${src.name}/CPP"; nativeBuildInputs = [ cmake diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index 273bfef3190c..4228a3cb5876 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "19w92kipfhp5wvs47l0qpibn3x49sbmvkk91yxw6nwk6fafcdl17"; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; nativeCheckInputs = [ python3Packages.ply ]; diff --git a/pkgs/development/libraries/dab_lib/default.nix b/pkgs/development/libraries/dab_lib/default.nix index f90c6633d7c7..f643e5c7d49c 100644 --- a/pkgs/development/libraries/dab_lib/default.nix +++ b/pkgs/development/libraries/dab_lib/default.nix @@ -2,7 +2,7 @@ , faad2, fftwFloat, zlib }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "dab_lib"; version = "unstable-2023-03-02"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { hash = "sha256-KSkOg0a5iq+13kClQqj+TaEP/PsLUrm8bMmiJEAZ+C4="; }; - sourceRoot = "source/library/"; + sourceRoot = "${src.name}/library/"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ faad2 fftwFloat zlib ]; diff --git a/pkgs/development/libraries/fuzzylite/default.nix b/pkgs/development/libraries/fuzzylite/default.nix index b6c7767a8d6f..a3f70c062e86 100644 --- a/pkgs/development/libraries/fuzzylite/default.nix +++ b/pkgs/development/libraries/fuzzylite/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; hash = "sha256-i1txeUE/ZSRggwLDtpS8dd4uuZfHX9w3zRH0gBgGXnk="; }; - sourceRoot = "source/fuzzylite"; + sourceRoot = "${src.name}/fuzzylite"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index 65eacd7fffe3..3e84432cd507 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -9,7 +9,7 @@ mkDerivation rec { outputs = [ "out" "dev" ]; - sourceRoot = "source/herqq"; + sourceRoot = "${src.name}/herqq"; src = fetchFromGitHub { owner = "ThomArmax"; repo = "HUPnP"; diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index a0b8cb8efa08..9148deeee6f4 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { rev = "llvmorg-${version}"; hash = "sha256-paWwnoU3XMqreRgh9JbT1tDMTwq/ZL0ss3SJTteEGL0="; }; - sourceRoot = "source/libclc"; + sourceRoot = "${src.name}/libclc"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 628f4dca8c56..6b5e395efba6 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - sourceRoot = "source/libgeotiff"; + sourceRoot = "${src.name}/libgeotiff"; configureFlags = [ "--with-jpeg=${libjpeg.dev}" diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index 55a08d59ed80..79b2e2ec2951 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-TkMy2tEdG1FPPWfH/wPnVbs5kocqe4Y0jU4yvbiRZ9k="; }; - sourceRoot = "source/libvmaf"; + sourceRoot = "${src.name}/libvmaf"; patches = [ # Backport fix for non-Linux, non-Darwin platforms. diff --git a/pkgs/development/libraries/octomap/default.nix b/pkgs/development/libraries/octomap/default.nix index 40e81e195aa1..6b1816d8addc 100644 --- a/pkgs/development/libraries/octomap/default.nix +++ b/pkgs/development/libraries/octomap/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-qE5i4dGugm7tR5tgDCpbla/R7hYR/PI8BzrZQ4y6Yz8="; }; - sourceRoot = "source/octomap"; + sourceRoot = "${src.name}/octomap"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/orocos-kdl/default.nix b/pkgs/development/libraries/orocos-kdl/default.nix index c60d79fd492f..05a3cefaeceb 100644 --- a/pkgs/development/libraries/orocos-kdl/default.nix +++ b/pkgs/development/libraries/orocos-kdl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - sourceRoot = "source/orocos_kdl"; + sourceRoot = "${src.name}/orocos_kdl"; nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ eigen ]; diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix index e04b79c16ddb..12b4cb021c1f 100644 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # SDK contains libraries and build-system to develop projects for RP2040 chip # We only need to compile pioasm binary - sourceRoot = "source/tools/pioasm"; + sourceRoot = "${src.name}/tools/pioasm"; installPhase = '' runHook preInstall diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix index 2593c04fa158..2fa5a4d268cc 100644 --- a/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/pkgs/development/libraries/proj-datumgrid/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "132wp77fszx33wann0fjkmi1isxvsb0v9iw0gd9sxapa9h6hf3am"; }; - sourceRoot = "source/scripts"; + sourceRoot = "${src.name}/scripts"; buildPhase = '' $CC nad2bin.c -o nad2bin diff --git a/pkgs/development/libraries/qrcodegen/default.nix b/pkgs/development/libraries/qrcodegen/default.nix index e5c4f036ffc3..53ed6eeb80ec 100644 --- a/pkgs/development/libraries/qrcodegen/default.nix +++ b/pkgs/development/libraries/qrcodegen/default.nix @@ -14,9 +14,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-aci5SFBRNRrSub4XVJ2luHNZ2pAUegjgQ6pD9kpkaTY="; }; - preBuild = '' - cd c - ''; + sourceRoot = "${finalAttrs.src.name}/c"; nativeBuildInputs = lib.optionals stdenv.cc.isClang [ stdenv.cc.cc.libllvm.out diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 6198a0593458..b91449542958 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; buildInputs = [ qt4 libX11 libXext ]; - sourceRoot = "source/Kvantum"; + sourceRoot = "${src.name}/Kvantum"; buildPhase = '' runHook preBuild diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index af4f194efc80..0d9d1d42c0fb 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (lib.versionOlder qtbase.version "6") [ qtx11extras kwindowsystem ] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; - sourceRoot = "source/Kvantum"; + sourceRoot = "${src.name}/Kvantum"; patches = [ (fetchpatch { diff --git a/pkgs/development/libraries/rocfft/default.nix b/pkgs/development/libraries/rocfft/default.nix index 325de9151b4b..d1136d4be8e6 100644 --- a/pkgs/development/libraries/rocfft/default.nix +++ b/pkgs/development/libraries/rocfft/default.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "${finalAttrs.pname}-test"; inherit (finalAttrs) version src; - sourceRoot = "source/clients/tests"; + sourceRoot = "${finalAttrs.src.name}/clients/tests"; nativeBuildInputs = [ cmake @@ -164,7 +164,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "${finalAttrs.pname}-benchmark"; inherit (finalAttrs) version src; - sourceRoot = "source/clients/rider"; + sourceRoot = "${finalAttrs.src.name}/clients/rider"; nativeBuildInputs = [ cmake @@ -197,7 +197,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "${finalAttrs.pname}-samples"; inherit (finalAttrs) version src; - sourceRoot = "source/clients/samples"; + sourceRoot = "${finalAttrs.src.name}/clients/samples"; nativeBuildInputs = [ cmake diff --git a/pkgs/development/php-packages/snuffleupagus/default.nix b/pkgs/development/php-packages/snuffleupagus/default.nix index 264df9fddb29..fd0f56924fd0 100644 --- a/pkgs/development/php-packages/snuffleupagus/default.nix +++ b/pkgs/development/php-packages/snuffleupagus/default.nix @@ -31,7 +31,7 @@ buildPecl rec { session ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; configureFlags = [ "--enable-snuffleupagus" diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index 83db24896cbc..3b92fc06a915 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sourceRoot = "source/aardwolf/utils/rlers"; + sourceRoot = "${src.name}/aardwolf/utils/rlers"; name = "${pname}-${version}"; hash = "sha256-JGXTCCyC20EuUX0pP3xSZG3qFB5jRL7+wW2YRC3EiCc="; }; diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix index 97e725bb7119..531ed8ae8d9b 100644 --- a/pkgs/development/python-modules/acme/default.nix +++ b/pkgs/development/python-modules/acme/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "acme" ]; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; meta = certbot.meta // { description = "ACME protocol implementation in Python"; diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix index 4f5f25d0159b..39fef995bf98 100644 --- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix +++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { inherit (antlr4.runtime.cpp) version src; disabled = python.pythonOlder "3.6"; - sourceRoot = "source/runtime/Python3"; + sourceRoot = "${src.name}/runtime/Python3"; # in 4.9, test was renamed to tests checkPhase = '' diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index ecae25b067f9..c8bd56469702 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { "pyarrow" ]; - sourceRoot = "source/sdks/python"; + sourceRoot = "${src.name}/sdks/python"; nativeBuildInputs = [ cython diff --git a/pkgs/development/python-modules/basemap-data/default.nix b/pkgs/development/python-modules/basemap-data/default.nix index ebdbbe4d1594..158c3f3f19c4 100644 --- a/pkgs/development/python-modules/basemap-data/default.nix +++ b/pkgs/development/python-modules/basemap-data/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "basemap-data"; inherit (basemap) version src; - sourceRoot = "source/packages/basemap_data"; + sourceRoot = "${src.name}/packages/basemap_data"; # no tests doCheck = false; diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index 8db89a43266b..578fd84db77c 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-oWKCUARTMCiXDp4SCOOrOUQLUDU4DIzwsmUXCXoDvx0="; }; - sourceRoot = "source/packages/basemap"; + sourceRoot = "${src.name}/packages/basemap"; nativeBuildInputs = [ cython diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index f1a37fb70a0f..6846ed86f6f8 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = lib.getVersion capstone; src = capstone.src; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; postPatch = '' ln -s ${capstone}/lib/libcapstone${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/ diff --git a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix index fc6a645ade63..d60e1e60d974 100644 --- a/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix +++ b/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; - sourceRoot = "source/certbot-dns-cloudflare"; + sourceRoot = "${src.name}/certbot-dns-cloudflare"; meta = certbot.meta // { description = "Cloudflare DNS Authenticator plugin for Certbot"; diff --git a/pkgs/development/python-modules/certbot-dns-google/default.nix b/pkgs/development/python-modules/certbot-dns-google/default.nix index 6a320209ecf1..6ceaac115ff7 100644 --- a/pkgs/development/python-modules/certbot-dns-google/default.nix +++ b/pkgs/development/python-modules/certbot-dns-google/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; - sourceRoot = "source/certbot-dns-google"; + sourceRoot = "${src.name}/certbot-dns-google"; meta = certbot.meta // { description = "Google Cloud DNS Authenticator plugin for Certbot"; diff --git a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix index 18765f12d233..58319625b1e7 100644 --- a/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix +++ b/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; - sourceRoot = "source/certbot-dns-rfc2136"; + sourceRoot = "${src.name}/certbot-dns-rfc2136"; meta = certbot.meta // { description = "RFC 2136 DNS Authenticator plugin for Certbot"; diff --git a/pkgs/development/python-modules/certbot-dns-route53/default.nix b/pkgs/development/python-modules/certbot-dns-route53/default.nix index 20df82303a44..db923f1a1926 100644 --- a/pkgs/development/python-modules/certbot-dns-route53/default.nix +++ b/pkgs/development/python-modules/certbot-dns-route53/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-o cache_dir=$(mktemp -d)" ]; - sourceRoot = "source/certbot-dns-route53"; + sourceRoot = "${src.name}/certbot-dns-route53"; meta = certbot.meta // { description = "Route53 DNS Authenticator plugin for Certbot"; diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index ad3600b2eaba..369879878bb2 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { hash = "sha256-BQsdhlYABZtz5+SORiCVnWMZdMmiWGM9W1YLqObyFo8="; }; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; propagatedBuildInputs = [ configargparse diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index e587c281c038..5bcc3050497a 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-H+p2fPBXn+VqrW63KkdmPn2xqxC9uAOzQUV1ruKEUSs="; }; - sourceRoot = "source/packages/python/chart-studio"; + sourceRoot = "${src.name}/packages/python/chart-studio"; propagatedBuildInputs = [ plotly diff --git a/pkgs/development/python-modules/chirpstack-api/default.nix b/pkgs/development/python-modules/chirpstack-api/default.nix index c939022a29bb..141a5f349b70 100644 --- a/pkgs/development/python-modules/chirpstack-api/default.nix +++ b/pkgs/development/python-modules/chirpstack-api/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-69encHMk0eXE2Av87ysKvxoiXog5o68qCUlOx/lgHFU="; }; - sourceRoot = "source/python/src"; + sourceRoot = "${src.name}/python/src"; propagatedBuildInputs = [ google-api-core diff --git a/pkgs/development/python-modules/cirq-aqt/default.nix b/pkgs/development/python-modules/cirq-aqt/default.nix index ae53a5eef6bd..f8e6fb4a2bf2 100644 --- a/pkgs/development/python-modules/cirq-aqt/default.nix +++ b/pkgs/development/python-modules/cirq-aqt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cirq-aqt"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index 4c69172fdd4c..39e3cf9d47be 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { hash = "sha256-5j4hbG95KRfRQTyyZgoNp/eHIcy0FphyEhbYnzyUMO4="; }; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; patches = [ # https://github.com/quantumlib/Cirq/pull/5991 diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix index c636897fc6a2..491caa5f9293 100644 --- a/pkgs/development/python-modules/cirq-google/default.nix +++ b/pkgs/development/python-modules/cirq-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cirq-google"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/pkgs/development/python-modules/cirq-ionq/default.nix b/pkgs/development/python-modules/cirq-ionq/default.nix index bf96d35b5318..b1f66e25ced2 100644 --- a/pkgs/development/python-modules/cirq-ionq/default.nix +++ b/pkgs/development/python-modules/cirq-ionq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cirq-ionq"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/pkgs/development/python-modules/cirq-pasqal/default.nix b/pkgs/development/python-modules/cirq-pasqal/default.nix index 5066455e294a..4d755266180b 100644 --- a/pkgs/development/python-modules/cirq-pasqal/default.nix +++ b/pkgs/development/python-modules/cirq-pasqal/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cirq-pasqal"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix index b3bd2d3a0549..f09f7ce04539 100644 --- a/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; postPatch = '' substituteInPlace requirements.txt \ diff --git a/pkgs/development/python-modules/cirq-web/default.nix b/pkgs/development/python-modules/cirq-web/default.nix index 3488ab56586c..ca1c67ad1218 100644 --- a/pkgs/development/python-modules/cirq-web/default.nix +++ b/pkgs/development/python-modules/cirq-web/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "cirq-web"; inherit (cirq-core) version src meta; - sourceRoot = "source/${pname}"; + sourceRoot = "${src.name}/${pname}"; propagatedBuildInputs = [ cirq-core diff --git a/pkgs/development/python-modules/ctranslate2/default.nix b/pkgs/development/python-modules/ctranslate2/default.nix index 4cbf0ecd7124..bfb8c31a48a8 100644 --- a/pkgs/development/python-modules/ctranslate2/default.nix +++ b/pkgs/development/python-modules/ctranslate2/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { format = "setuptools"; # https://github.com/OpenNMT/CTranslate2/tree/master/python - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; nativeBuildInputs = [ pybind11 diff --git a/pkgs/development/python-modules/dask-gateway/default.nix b/pkgs/development/python-modules/dask-gateway/default.nix index ec014c5460a1..270999b55070 100644 --- a/pkgs/development/python-modules/dask-gateway/default.nix +++ b/pkgs/development/python-modules/dask-gateway/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-+YCHIfNq8E2rXO8b91Q1D21dVzNWnJZIKZeY4AETa7s="; }; - sourceRoot = "source/dask-gateway"; + sourceRoot = "${src.name}/dask-gateway"; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/edlib/default.nix b/pkgs/development/python-modules/edlib/default.nix index 30c3f8fb3b42..357db8d2b8e8 100644 --- a/pkgs/development/python-modules/edlib/default.nix +++ b/pkgs/development/python-modules/edlib/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { disabled = pythonOlder "3.6"; - sourceRoot = "source/bindings/python"; + sourceRoot = "${edlib.src.name}/bindings/python"; preBuild = '' ln -s ${edlib.src}/edlib . diff --git a/pkgs/development/python-modules/extractcode/7z.nix b/pkgs/development/python-modules/extractcode/7z.nix index 895253d5a458..89a0bd110d4b 100644 --- a/pkgs/development/python-modules/extractcode/7z.nix +++ b/pkgs/development/python-modules/extractcode/7z.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "02qinla281fc6pmg5xzsrmqnf9js76f2qcbf98zq7m2dkn70as4w"; }; - sourceRoot = "source/builtins/extractcode_7z-linux"; + sourceRoot = "${src.name}/builtins/extractcode_7z-linux"; propagatedBuildInputs = [ plugincode diff --git a/pkgs/development/python-modules/extractcode/libarchive.nix b/pkgs/development/python-modules/extractcode/libarchive.nix index f1dd6f12959c..0031c7a27941 100644 --- a/pkgs/development/python-modules/extractcode/libarchive.nix +++ b/pkgs/development/python-modules/extractcode/libarchive.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "02qinla281fc6pmg5xzsrmqnf9js76f2qcbf98zq7m2dkn70as4w"; }; - sourceRoot = "source/builtins/extractcode_libarchive-linux"; + sourceRoot = "${src.name}/builtins/extractcode_libarchive-linux"; preBuild = '' pushd src/extractcode_libarchive/lib diff --git a/pkgs/development/python-modules/flatbuffers/default.nix b/pkgs/development/python-modules/flatbuffers/default.nix index f477a1446a6e..ae5c7e309cd1 100644 --- a/pkgs/development/python-modules/flatbuffers/default.nix +++ b/pkgs/development/python-modules/flatbuffers/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { inherit (flatbuffers) pname version src; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; # flatbuffers needs VERSION environment variable for setting the correct # version, otherwise it uses the current date. diff --git a/pkgs/development/python-modules/gb-io/default.nix b/pkgs/development/python-modules/gb-io/default.nix index 930aafc5ebf3..46c98cfc78c8 100644 --- a/pkgs/development/python-modules/gb-io/default.nix +++ b/pkgs/development/python-modules/gb-io/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-lPnOFbEJgcaPPl9bTngugubhW//AUFp9RAjyiFHxC70="; }; - sourceRoot = "source"; + sourceRoot = src.name; nativeBuildInputs = [ setuptools-rust diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index 2d84cd87e08e..de5e03d61321 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { hash = "sha256-SQ+LcHeHDB1Hd5wXGDJBZmBG4KEZ3NsV4+4X9WgPb9E="; }; - sourceRoot = "source/gremlin-python/src/main/python"; + sourceRoot = "${src.name}/gremlin-python/src/main/python"; postPatch = '' sed -i '/pytest-runner/d' setup.py diff --git a/pkgs/development/python-modules/hexdump/default.nix b/pkgs/development/python-modules/hexdump/default.nix index 9b8487ffa8e7..c00d7d5b4680 100644 --- a/pkgs/development/python-modules/hexdump/default.nix +++ b/pkgs/development/python-modules/hexdump/default.nix @@ -11,7 +11,6 @@ buildPythonPackage rec { }; # the source zip has no prefix, so everything gets unpacked to /build otherwise - sourceRoot = "source"; unpackPhase = '' runHook preUnpack mkdir source @@ -21,6 +20,8 @@ buildPythonPackage rec { runHook postUnpack ''; + sourceRoot = "source"; + pythonImportsCheck = [ "hexdump" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index ca88e6dee4e4..991a51203d72 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sourceRoot = "source/${cargoRoot}"; + sourceRoot = "${src.name}/${cargoRoot}"; name = "${pname}-${version}"; hash = "sha256-rPB3bAMdvjgsT3jkEDoWatW8LPwgIaFSbFPqiqANtBY="; }; diff --git a/pkgs/development/python-modules/openrazer/pylib.nix b/pkgs/development/python-modules/openrazer/pylib.nix index 257fb589ba7b..13e7a870b00c 100644 --- a/pkgs/development/python-modules/openrazer/pylib.nix +++ b/pkgs/development/python-modules/openrazer/pylib.nix @@ -12,7 +12,7 @@ in buildPythonPackage (common // { pname = "openrazer"; - sourceRoot = "source/pylib"; + sourceRoot = "${common.src.name}/pylib"; propagatedBuildInputs = [ dbus-python diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 0012633d0ebb..f2615499f7ba 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -23,7 +23,7 @@ buildPythonPackage { then "${toString (lib.toInt versionMajor + 1)}.${versionMinor}.${versionPatch}" else protobuf.version; - sourceRoot = "source/python"; + sourceRoot = "${protobuf.src.name}/python"; patches = lib.optionals (pythonAtLeast "3.11") [ (fetchpatch { diff --git a/pkgs/development/python-modules/pykdl/default.nix b/pkgs/development/python-modules/pykdl/default.nix index 0d7e82be63f3..cc92086747e4 100644 --- a/pkgs/development/python-modules/pykdl/default.nix +++ b/pkgs/development/python-modules/pykdl/default.nix @@ -4,7 +4,7 @@ toPythonModule (stdenv.mkDerivation { pname = "pykdl"; inherit (orocos-kdl) version src; - sourceRoot = "source/python_orocos_kdl"; + sourceRoot = "${orocos-kdl.src.name}/python_orocos_kdl"; # Fix hardcoded installation path postPatch = '' diff --git a/pkgs/development/python-modules/python-csxcad/default.nix b/pkgs/development/python-modules/python-csxcad/default.nix index 66c1939c7edc..1044fe0a2748 100644 --- a/pkgs/development/python-modules/python-csxcad/default.nix +++ b/pkgs/development/python-modules/python-csxcad/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "072s765jyzpdq8qqysdy0dld17m6sr9zfcs0ip2zk8c4imxaysnb"; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; nativeBuildInputs = [ cython diff --git a/pkgs/development/python-modules/python-olm/default.nix b/pkgs/development/python-modules/python-olm/default.nix index 39cd201c9655..e255a9b8915c 100644 --- a/pkgs/development/python-modules/python-olm/default.nix +++ b/pkgs/development/python-modules/python-olm/default.nix @@ -12,7 +12,7 @@ buildPythonPackage { disabled = !isPy3k; - sourceRoot = "source/python"; + sourceRoot = "${olm.src.name}/python"; buildInputs = [ olm ]; preBuild = '' diff --git a/pkgs/development/python-modules/python-openems/default.nix b/pkgs/development/python-modules/python-openems/default.nix index 348f10b3aeed..7a186276dfc7 100644 --- a/pkgs/development/python-modules/python-openems/default.nix +++ b/pkgs/development/python-modules/python-openems/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "1dca6b6ccy771irxzsj075zvpa3dlzv4mjb8xyg9d889dqlgyl45"; }; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; nativeBuildInputs = [ cython diff --git a/pkgs/development/python-modules/safetensors/default.nix b/pkgs/development/python-modules/safetensors/default.nix index 4d30e553c930..06a2c3966a2d 100644 --- a/pkgs/development/python-modules/safetensors/default.nix +++ b/pkgs/development/python-modules/safetensors/default.nix @@ -30,11 +30,11 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; hash = "sha256-tC0XawmKWNGCaByHQfJEfmHM3m/qgTuIpcRaEFJC6dM"; }; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; nativeBuildInputs = [ setuptools-rust diff --git a/pkgs/development/python-modules/sentencepiece/default.nix b/pkgs/development/python-modules/sentencepiece/default.nix index c1ad64b3f5e4..dc7335b351f8 100644 --- a/pkgs/development/python-modules/sentencepiece/default.nix +++ b/pkgs/development/python-modules/sentencepiece/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ sentencepiece.dev ]; - sourceRoot = "source/python"; + sourceRoot = "${src.name}/python"; # sentencepiece installs 'bin' output. meta = builtins.removeAttrs sentencepiece.meta [ "outputsToInstall" ]; diff --git a/pkgs/development/python-modules/simpleitk/default.nix b/pkgs/development/python-modules/simpleitk/default.nix index cc138695e3fd..aa8a970364d8 100644 --- a/pkgs/development/python-modules/simpleitk/default.nix +++ b/pkgs/development/python-modules/simpleitk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { format = "pyproject"; disabled = pythonOlder "3.8"; - sourceRoot = "source/Wrapping/Python"; + sourceRoot = "${src.name}/Wrapping/Python"; preBuild = '' make ''; diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index a94a1205e123..fd6153b940af 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { lockFile = ./Cargo.lock; }; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/python-modules/typecode/libmagic.nix b/pkgs/development/python-modules/typecode/libmagic.nix index 5110e5e2a5cf..1c9144226bc2 100644 --- a/pkgs/development/python-modules/typecode/libmagic.nix +++ b/pkgs/development/python-modules/typecode/libmagic.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "xnUGDMS34iMVMGo/nZwRarGzzbj3X4Rt+YHvvKpmy6A="; }; - sourceRoot = "source/builtins/typecode_libmagic-linux"; + sourceRoot = "${src.name}/builtins/typecode_libmagic-linux"; propagatedBuildInputs = [ plugincode diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index 74780c7e0320..c1f17ce880a6 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = unicorn-emu.src; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; prePatch = '' ln -s ${unicorn-emu}/lib/libunicorn.* prebuilt/ diff --git a/pkgs/development/python-modules/zxing_cpp/default.nix b/pkgs/development/python-modules/zxing_cpp/default.nix index 9c43844888c9..2427e1256998 100644 --- a/pkgs/development/python-modules/zxing_cpp/default.nix +++ b/pkgs/development/python-modules/zxing_cpp/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zxing_cpp"; inherit (zxing-cpp) src version; - sourceRoot = "source/wrappers/python"; + sourceRoot = "${src.name}/wrappers/python"; patches = [ ./use-nixpkgs-pybind11.patch ]; diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 6cf84434cdec..6c0f359fff5d 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bison ]; - sourceRoot = "source/Src"; + sourceRoot = "${src.name}/Src"; preBuild = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index d9de1b09c214..f3de63782314 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -36,7 +36,7 @@ buildPythonApplication rec { hash = "sha256-tevQ/Ocusz2PythGnedP6r4xARgetVosAc8uTD49H3M="; }; - sourceRoot = "source/server"; + sourceRoot = "${src.name}/server"; postPatch = '' substituteInPlace tox.ini \ diff --git a/pkgs/development/tools/elkhound/default.nix b/pkgs/development/tools/elkhound/default.nix index 5c29b10a6139..19bb3b7005a5 100644 --- a/pkgs/development/tools/elkhound/default.nix +++ b/pkgs/development/tools/elkhound/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patchShebangs scripts ''; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ bison cmake flex perl ]; diff --git a/pkgs/development/tools/kustomize/3.nix b/pkgs/development/tools/kustomize/3.nix index d9eb6ce298ec..c7c3eb229e39 100644 --- a/pkgs/development/tools/kustomize/3.nix +++ b/pkgs/development/tools/kustomize/3.nix @@ -22,7 +22,7 @@ buildGoModule rec { doCheck = true; # avoid finding test and development commands - sourceRoot = "source/kustomize"; + sourceRoot = "${src.name}/kustomize"; vendorSha256 = "sha256-xLeetcmzvpILLLMhMx7oahWLxguFjG3qbYpeeWpFUlw="; diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 4add6e5bae3a..6b4452a39189 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: rec { sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95"; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; patches = [ # Remove FAQ diff --git a/pkgs/development/tools/loganalyzer/default.nix b/pkgs/development/tools/loganalyzer/default.nix index d8368df1e44c..d992b539dafd 100644 --- a/pkgs/development/tools/loganalyzer/default.nix +++ b/pkgs/development/tools/loganalyzer/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; buildPhase = '' runHook preBuild diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index f89f067d2038..bacd769271e4 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -15,7 +15,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtwebengine qtwebkit ]; - sourceRoot = "source/MiniZincIDE"; + sourceRoot = "${src.name}/MiniZincIDE"; dontWrapQtApps = true; diff --git a/pkgs/development/tools/misc/grpc-tools/default.nix b/pkgs/development/tools/misc/grpc-tools/default.nix index 96bdce6d0ef6..8a44d484ddde 100644 --- a/pkgs/development/tools/misc/grpc-tools/default.nix +++ b/pkgs/development/tools/misc/grpc-tools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - sourceRoot = "source/packages/grpc-tools"; + sourceRoot = "${src.name}/packages/grpc-tools"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/misc/licenseclassifier/default.nix b/pkgs/development/tools/misc/licenseclassifier/default.nix index 11d8f8a390a2..05a858130b39 100644 --- a/pkgs/development/tools/misc/licenseclassifier/default.nix +++ b/pkgs/development/tools/misc/licenseclassifier/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { }; # The new and improved "License Classifier v2" is hidden in a subdirectory. - sourceRoot = "source/v2"; + sourceRoot = "${src.name}/v2"; vendorHash = "sha256-u0VR8DCmbZS0MF26Y4HfqtLaGyX2n2INdAidVNbnXPE="; diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/development/tools/misc/micronucleus/default.nix index d3bca0b684c7..560cfa0c0dce 100644 --- a/pkgs/development/tools/misc/micronucleus/default.nix +++ b/pkgs/development/tools/misc/micronucleus/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "micronucleus"; version = "2.04"; - sourceRoot = "source/commandline"; + sourceRoot = "${src.name}/commandline"; src = fetchFromGitHub { owner = "micronucleus"; diff --git a/pkgs/development/tools/misc/unixbench/default.nix b/pkgs/development/tools/misc/unixbench/default.nix index 3d1b424ab0b8..9f4546248e5e 100644 --- a/pkgs/development/tools/misc/unixbench/default.nix +++ b/pkgs/development/tools/misc/unixbench/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patchFlags = [ "-p2" ]; - sourceRoot = "source/UnixBench"; + sourceRoot = "${src.name}/UnixBench"; postPatch = '' substituteInPlace Makefile \ diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index abc4265a1ce7..8f30a165df3c 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { # c++11 and above is needed for building with Qt 5.9+ env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; postPatch = '' substituteInPlace xxdiff.pro --replace ../bin ./bin diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index bf1787e23ae8..6c2a95ec26a7 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { vendorHash = "sha256-cATGMi/nL8dvlsR+cuvKH6Y9eR3UqcVjvZAj35Ydn2c="; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/parsing/antlr/4.nix b/pkgs/development/tools/parsing/antlr/4.nix index 94ca0fee523e..512732d06279 100644 --- a/pkgs/development/tools/parsing/antlr/4.nix +++ b/pkgs/development/tools/parsing/antlr/4.nix @@ -81,7 +81,7 @@ let pname = "antlr-runtime-cpp"; inherit version; src = source; - sourceRoot = "source/runtime/Cpp"; + sourceRoot = "${source.name}/runtime/Cpp"; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/tools/protoc-gen-dart/default.nix b/pkgs/development/tools/protoc-gen-dart/default.nix index 03e626ab7814..1df865b8292c 100644 --- a/pkgs/development/tools/protoc-gen-dart/default.nix +++ b/pkgs/development/tools/protoc-gen-dart/default.nix @@ -13,7 +13,7 @@ buildDartApplication rec { rev = "protobuf-v${version}"; sha256 = "sha256-uBQ8s1NBSWm88mpLfZwobTe/BDDT6UymSra88oUuPIA="; }; - sourceRoot = "source/protoc_plugin"; + sourceRoot = "${src.name}/protoc_plugin"; pubspecLockFile = ./pubspec.lock; vendorHash = "sha256-jyhHZ1OUFo6ce3C5jEQPqmtRL4hr2nTfgVMR0k6AXtM="; diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix index 15d2e9ec0cae..28a83a07d818 100644 --- a/pkgs/development/tools/protoc-gen-grpc-web/default.nix +++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-OetDAZ6zC8r7e82FILpQQnM+JHG9eludwhEuPaklrnw="; }; - sourceRoot = "source/javascript/net/grpc/web/generator"; + sourceRoot = "${finalAttrs.src.name}/javascript/net/grpc/web/generator"; enableParallelBuilding = true; strictDeps = true; diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index 0d8bfffdf9b6..2fd9eaeb3852 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-hQaVUBw8X60DW1Ox4GzO+OCWMHmVYuCkjH5x/sMULiE="; }; - sourceRoot = "source/cargo-insta"; + sourceRoot = "${src.name}/cargo-insta"; cargoHash = "sha256-q6Ups4SDGjT5Zc9ujhRpRdh3uWq99lizgA7gpPVSl+A="; diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix index 12d8ac1b5ad8..295ac413fe3e 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; hash = "sha256-ip0WuBn1b7uN/pAhOl5tfmToK73ZSHK7rucdtufsbCQ="; }; - sourceRoot = "source/impl"; + sourceRoot = "${src.name}/impl"; cargoHash = "sha256-hNZgQwhm4UPqmANplZGxG0DYHa31tu06nmqYaCA7Vdg="; diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index fa3e03d41512..a8d959db555d 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 - sourceRoot = "source/tooling/cli"; + sourceRoot = "${src.name}/tooling/cli"; cargoHash = "sha256-ErUzhmPA2M1H4B4SrEt4FRWHcWLA1UzQqVA1gkrmdJQ="; diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix index b3a12c5e10aa..cba3b4b3dd7d 100644 --- a/pkgs/development/tools/rust/crate2nix/default.nix +++ b/pkgs/development/tools/rust/crate2nix/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-JaF9/H3m4Wrc5MtXcONkOAgKVkswLVw0yZe0dBr2e4Y="; }; - sourceRoot = "source/crate2nix"; + sourceRoot = "${src.name}/crate2nix"; cargoSha256 = "sha256-PD7R1vcb3FKd4hfpViKyvfCExJ5H1Xo2HPYden5zpxQ="; diff --git a/pkgs/development/tools/rust/tauri-mobile/default.nix b/pkgs/development/tools/rust/tauri-mobile/default.nix index 7870a440d1d5..7bdf412ebe79 100644 --- a/pkgs/development/tools/rust/tauri-mobile/default.nix +++ b/pkgs/development/tools/rust/tauri-mobile/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 - # sourceRoot = "source/tooling/cli"; + # sourceRoot = "${src.name}/tooling/cli"; cargoHash = "sha256-MtLfcDJcLVhsIGD6pjpomuu9GYGqa7L8xnaQ++f+0H4="; diff --git a/pkgs/development/web/ihp-new/default.nix b/pkgs/development/web/ihp-new/default.nix index 10dd7950f96b..614dd83df77f 100644 --- a/pkgs/development/web/ihp-new/default.nix +++ b/pkgs/development/web/ihp-new/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; dontConfigure = true; - sourceRoot = "source/ProjectGenerator"; + sourceRoot = "${src.name}/ProjectGenerator"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/games/doom-ports/prboom-plus/default.nix b/pkgs/games/doom-ports/prboom-plus/default.nix index 15875296fff8..2d9be1073fa3 100644 --- a/pkgs/games/doom-ports/prboom-plus/default.nix +++ b/pkgs/games/doom-ports/prboom-plus/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-moU/bZ2mS1QfKPP6HaAwWP1nRNZ4Ue5DFl9zBBrJiHw="; }; - sourceRoot = "source/prboom2"; + sourceRoot = "${src.name}/prboom2"; nativeBuildInputs = [ cmake diff --git a/pkgs/games/iortcw/default.nix b/pkgs/games/iortcw/default.nix index 9da055acc218..44a554b9e7d6 100644 --- a/pkgs/games/iortcw/default.nix +++ b/pkgs/games/iortcw/default.nix @@ -2,8 +2,8 @@ let sp = callPackage ./sp.nix {}; - mp = sp.overrideAttrs (oldAttrs: rec { - sourceRoot = "source/MP"; + mp = sp.overrideAttrs (oldAttrs: { + sourceRoot = "${oldAttrs.src.name}/MP"; }); in buildEnv { name = "iortcw"; diff --git a/pkgs/games/iortcw/sp.nix b/pkgs/games/iortcw/sp.nix index 7f78f89b036e..66944c49ddd4 100644 --- a/pkgs/games/iortcw/sp.nix +++ b/pkgs/games/iortcw/sp.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - sourceRoot = "source/SP"; + sourceRoot = "${src.name}/SP"; makeFlags = [ "USE_INTERNAL_LIBS=0" diff --git a/pkgs/games/keeperrl/default.nix b/pkgs/games/keeperrl/default.nix index ba2783fb2b25..8fb6d563329b 100644 --- a/pkgs/games/keeperrl/default.nix +++ b/pkgs/games/keeperrl/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nlll"; } else null; - sourceRoot = "source"; + sourceRoot = free-src.name; srcs = [ free-src ] ++ lib.optional unfree_assets assets; diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 8b63b546cf69..50862be46bd3 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-+8DU1QT3Lgqf1AIReVnXQ2Lq6R6eBb8VjdkJfAn/Rtc="; }; - sourceRoot = "source/Quake"; + sourceRoot = "${src.name}/Quake"; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index 934c590138d9..0e9a782403c6 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { zlib ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; enableParallelBuilding = true; diff --git a/pkgs/games/sil-q/default.nix b/pkgs/games/sil-q/default.nix index 6d7fe884ed5d..9127d4e9afc0 100644 --- a/pkgs/games/sil-q/default.nix +++ b/pkgs/games/sil-q/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ncurses libX11 ]; # Makefile(s) and config are not top-level - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; postPatch = '' # allow usage of ANGBAND_PATH diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix index a6bc83315952..0c6a11f47981 100644 --- a/pkgs/games/sil/default.nix +++ b/pkgs/games/sil/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ ncurses libX11 libXaw libXt libXext libXmu ]; - sourceRoot = "source/Sil/src"; + sourceRoot = "${src.name}/Sil/src"; makefile = "Makefile.std"; diff --git a/pkgs/games/vvvvvv/default.nix b/pkgs/games/vvvvvv/default.nix index 563ed5d7db3b..6fc3ab6ecef5 100644 --- a/pkgs/games/vvvvvv/default.nix +++ b/pkgs/games/vvvvvv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { rev = version; sha256 = "sha256-sLNO4vkmlirsqJmCV9YWpyNnIiigU1KMls7rOgWgSmQ="; }; - sourceRoot = "source/desktop_version"; + sourceRoot = "${src.name}/desktop_version"; dataZip = fetchurl { url = "https://thelettervsixtim.es/makeandplay/data.zip"; name = "data.zip"; diff --git a/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix b/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix index 3c3dcb6d5d67..b6dab0d8bdfc 100644 --- a/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix +++ b/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = freebsd.ports; - sourceRoot = "source/devel/evdev-proto"; + sourceRoot = "${freebsd.ports.name}/devel/evdev-proto"; useTempPrefix = true; diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix index 79c159e0635c..351708216ee2 100644 --- a/pkgs/os-specific/darwin/libtapi/default.nix +++ b/pkgs/os-specific/darwin/libtapi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkgsBuildBuild, cmake, python3, ncurses }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libtapi"; version = "1100.0.11"; # determined by looking at VERSION.txt @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1y1yl46msabfy14z0rln333a06087bk14f5h7q1cdawn8nmvbdbr"; }; - sourceRoot = "source/src/llvm"; + sourceRoot = "${src.name}/src/llvm"; # Backported from newer llvm, fixes configure error when cross compiling. # Also means we don't have to manually fix the result with install_name_tool. diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index 6d916e0ff7fc..f2ea933bd5c5 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { rev = version; sha256 = "1f0vjia2d7zj3y5c63lx1r537bdjx6821yxy29ilbrvsbjq2szj8"; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = kernel.moduleBuildDependencies; makeFlags = kernel.makeFlags ++ [ diff --git a/pkgs/os-specific/linux/aseq2json/default.nix b/pkgs/os-specific/linux/aseq2json/default.nix index 646e9f7b7b91..81feb40eb989 100644 --- a/pkgs/os-specific/linux/aseq2json/default.nix +++ b/pkgs/os-specific/linux/aseq2json/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkg-config, alsa-lib, glib, json-glib }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "aseq2json"; version = "unstable-2018-04-28"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ stdenv.mkDerivation { rev = "8572e6313a0d7ec95492dcab04a46c5dd30ef33a"; sha256 = "LQ9LLVumi3GN6c9tuMSOd1Bs2pgrwrLLQbs5XF+NZeA="; }; - sourceRoot = "source/aseq2json"; + sourceRoot = "${src.name}/aseq2json"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib glib json-glib ]; diff --git a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix index 7e0fb379107d..d1ab4fd55b39 100644 --- a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix +++ b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix @@ -11,7 +11,7 @@ , ipuVersion ? "ipu6" }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "${ipuVersion}-camera-bin"; version = "unstable-2023-02-08"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { hash = "sha256-QnedM2UBbGyd2wIF762Mi+VkDZYtC6MifK4XGGxlUzw="; }; - sourceRoot = "source/${ipuVersion}"; + sourceRoot = "${src.name}/${ipuVersion}"; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix index 72f25aa800eb..a4083d275465 100644 --- a/pkgs/os-specific/linux/fwts/module.nix +++ b/pkgs/os-specific/linux/fwts/module.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { inherit (fwts) src; - sourceRoot = "source/efi_runtime"; + sourceRoot = "${src.name}/efi_runtime"; postPatch = '' substituteInPlace Makefile --replace \ diff --git a/pkgs/os-specific/linux/gasket/default.nix b/pkgs/os-specific/linux/gasket/default.nix index 1f9d60ad7b60..c0790ae6a278 100644 --- a/pkgs/os-specific/linux/gasket/default.nix +++ b/pkgs/os-specific/linux/gasket/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; installTargets = [ "modules_install" ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; hardeningDisable = [ "pic" "format" ]; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/gt/default.nix b/pkgs/os-specific/linux/gt/default.nix index e227b6b6bc91..72fe277ca9c4 100644 --- a/pkgs/os-specific/linux/gt/default.nix +++ b/pkgs/os-specific/linux/gt/default.nix @@ -2,7 +2,7 @@ , asciidoc , libusbgx }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gt"; version = "unstable-2022-05-08"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "sha256-km4U+t4Id2AZx6GpH24p2WNmvV5RVjJ14sy8tWLCQsk="; }; - sourceRoot = "source/source"; + sourceRoot = "${src.name}/source"; preConfigure = '' cmakeFlagsArray+=("-DBASH_COMPLETION_COMPLETIONSDIR=$out/share/bash-completions/completions") diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix index 67d4d8af2eb8..a77d1290ca80 100644 --- a/pkgs/os-specific/linux/kvmfr/default.nix +++ b/pkgs/os-specific/linux/kvmfr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = looking-glass-client.version; src = looking-glass-client.src; - sourceRoot = "source/module"; + sourceRoot = "${looking-glass-client.src.name}/module"; patches = lib.optional (kernel.kernelAtLeast "6.4") [ ./linux-6-4-compat.patch ]; diff --git a/pkgs/os-specific/linux/lenovo-legion/app.nix b/pkgs/os-specific/linux/lenovo-legion/app.nix index ba189767bca6..4f4c3c937254 100644 --- a/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/pkgs/os-specific/linux/lenovo-legion/app.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-s4JFFmawokdC4qoqNvZDhuJSinhQ3YKSIfAYi79VTTA="; }; - sourceRoot = "source/python/legion_linux"; + sourceRoot = "${src.name}/python/legion_linux"; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/pkgs/os-specific/linux/lenovo-legion/default.nix b/pkgs/os-specific/linux/lenovo-legion/default.nix index 375b835ac47d..527f1852f1e0 100644 --- a/pkgs/os-specific/linux/lenovo-legion/default.nix +++ b/pkgs/os-specific/linux/lenovo-legion/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { pname = "lenovo-legion-module"; inherit (lenovo-legion) version src; - sourceRoot = "source/kernel_module"; + sourceRoot = "${lenovo-legion.src.name}/kernel_module"; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/ultrablue-server/default.nix b/pkgs/os-specific/linux/ultrablue-server/default.nix index 74a7fe9cfbcd..620189af361d 100644 --- a/pkgs/os-specific/linux/ultrablue-server/default.nix +++ b/pkgs/os-specific/linux/ultrablue-server/default.nix @@ -3,7 +3,7 @@ , buildGoModule }: -buildGoModule { +buildGoModule rec { pname = "ultrablue-server"; version = "unstable-fosdem2023"; @@ -16,7 +16,7 @@ buildGoModule { # rev = "6de04af6e353e38c030539c5678e5918f64be37e"; }; - sourceRoot = "source/server"; + sourceRoot = "${src.name}/server"; vendorSha256 = "sha256-249LWguTHIF0HNIo8CsE/HWpAtBw4P46VPvlTARLTpw="; doCheck = false; diff --git a/pkgs/os-specific/linux/unstick/default.nix b/pkgs/os-specific/linux/unstick/default.nix index 7856456a3c36..ee82679de4ea 100644 --- a/pkgs/os-specific/linux/unstick/default.nix +++ b/pkgs/os-specific/linux/unstick/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "08la3jmmzlf4pm48bf9zx4cqj9gbqalpqy0s57bh5vfsdk74nnhv"; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libseccomp ]; diff --git a/pkgs/os-specific/linux/wiringpi/default.nix b/pkgs/os-specific/linux/wiringpi/default.nix index eed71188eb07..e2412b37aab5 100644 --- a/pkgs/os-specific/linux/wiringpi/default.nix +++ b/pkgs/os-specific/linux/wiringpi/default.nix @@ -18,7 +18,7 @@ let }: stdenv.mkDerivation rec { pname = "wiringpi-${subprj}"; inherit version src; - sourceRoot = "source/${subprj}"; + sourceRoot = "${src.name}/${subprj}"; inherit buildInputs; # Remove (meant for other OSs) lines from Makefiles preInstall = '' diff --git a/pkgs/servers/authelia/web.nix b/pkgs/servers/authelia/web.nix index e28df798fd0a..0153358ea07f 100644 --- a/pkgs/servers/authelia/web.nix +++ b/pkgs/servers/authelia/web.nix @@ -7,7 +7,7 @@ buildNpmPackage { pname = "${pname}-web"; inherit src version npmDepsHash; - sourceRoot = "source/web"; + sourceRoot = "${src.name}/web"; patches = [ ./change-web-out-dir.patch diff --git a/pkgs/servers/baserow/default.nix b/pkgs/servers/baserow/default.nix index 92007bd6ee44..702676dfc942 100644 --- a/pkgs/servers/baserow/default.nix +++ b/pkgs/servers/baserow/default.nix @@ -25,7 +25,7 @@ let hash = "sha256-zT2afl3QNE2dO3JXjsZXqSmm1lv3EorG3mYZLQQMQ2Q="; }; - sourceRoot = "source/premium/backend"; + sourceRoot = "${src.name}/premium/backend"; doCheck = false; }; @@ -45,7 +45,7 @@ with python.pkgs; buildPythonApplication rec { hash = "sha256-zT2afl3QNE2dO3JXjsZXqSmm1lv3EorG3mYZLQQMQ2Q="; }; - sourceRoot = "source/backend"; + sourceRoot = "${src.name}/backend"; postPatch = '' # remove dependency constraints diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 26c66a0b2172..224d02cf7fa5 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-bGJSeWq2TN7ukStu+oiYboGnm/RHbO6N0NdZC81IQ8k="; }; - sourceRoot = "source/klippy"; + sourceRoot = "${src.name}/klippy"; # NB: This is needed for the postBuild step nativeBuildInputs = [ diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index f5404856599e..c25d402d9cb0 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; name = "${pname}-${version}"; hash = "sha256-972tJ8aKNxC3O8VxbAau7OSej873IBXsP3isMXAXKcU="; }; diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 412f76aaec73..732f145cc5a0 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { npmDeps = fetchNpmDeps { inherit src; - sourceRoot = "source/ui"; + sourceRoot = "${src.name}/ui"; hash = "sha256-qxwTiXLmZnTnmTSBmWPjeFCP7qzvTFN0xXp5lFkWFog="; }; diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 85a5f90edeac..cd9e12377f5a 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-pLLnk0FXJ6gb0WSdWGEzJSEbKdOpjdWECIRzrHvi8HQ="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; makeFlags = [ "release" "CONFIG_LIBRARY_PATHS=" "CONFIG_PKG_PATHS=" "GLOBAL_CC=$(CC)" "GLOBAL_CXX=$(CXX)" "GLOBAL_LD=$(CXX)" "SHELL=${stdenv.shell}" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 85cc8b97608f..b63ac095d2a5 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -4,7 +4,7 @@ let libflux_version = "0.170.1"; # This is copied from influxdb2 with flux version matching the needed by thi - flux = rustPlatform.buildRustPackage { + flux = rustPlatform.buildRustPackage rec { pname = "libflux"; version = "v${libflux_version}"; src = fetchFromGitHub { @@ -23,7 +23,7 @@ let sha256 = "sha256-Fb4CuH9ZvrPha249dmLLI8MqSNQRKqKPxPbw2pjqwfY="; }) ]; - sourceRoot = "source/libflux"; + sourceRoot = "${src.name}/libflux"; cargoSha256 = "sha256-kYiZ5ZRiFHRf1RQeeUGjIhnEkTvhNSZ0t4tidpRIDyk="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index b5352909cab5..a5cfa5ee55be 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -39,7 +39,7 @@ let rev = "v${libflux_version}"; sha256 = "sha256-Xmh7V/o1Gje62kcnTeB9h/fySljhfu+tjbyvryvIGRc="; }; - sourceRoot = "source/libflux"; + sourceRoot = "${src.name}/libflux"; cargoSha256 = "sha256-9rPW0lgi3lXJARa1KXgSY8LVJsoFjppok5ODGlqYeYw="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/servers/photofield/default.nix b/pkgs/servers/photofield/default.nix index d5862cd38af8..ca7dd9588286 100644 --- a/pkgs/servers/photofield/default.nix +++ b/pkgs/servers/photofield/default.nix @@ -22,7 +22,7 @@ let inherit src version; pname = "photofield-ui"; - sourceRoot = "source/ui"; + sourceRoot = "${src.name}/ui"; npmDepsHash = "sha256-YVyaZsFh5bolDzMd5rXWrbbXQZBeEIV6Fh/kwN+rvPk="; diff --git a/pkgs/servers/search/quickwit/default.nix b/pkgs/servers/search/quickwit/default.nix index fb4e6d66f2fe..e3eaf86c16e5 100644 --- a/pkgs/servers/search/quickwit/default.nix +++ b/pkgs/servers/search/quickwit/default.nix @@ -11,7 +11,7 @@ let pname = "quickwit"; version = "0.6.2"; in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { inherit pname version; src = fetchFromGitHub { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage { --replace '&[]' '&["."]' ''; - sourceRoot = "source/quickwit"; + sourceRoot = "${src.name}/quickwit"; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/servers/search/zincsearch/default.nix b/pkgs/servers/search/zincsearch/default.nix index 20f48867bdc2..b9316756b193 100644 --- a/pkgs/servers/search/zincsearch/default.nix +++ b/pkgs/servers/search/zincsearch/default.nix @@ -17,7 +17,7 @@ let inherit src version; pname = "zinc-ui"; - sourceRoot = "source/web"; + sourceRoot = "${src.name}/web"; npmDepsHash = "sha256-2AjUaEOn2Tj+X4f42SvNq1kX07WxkB1sl5KtGdCjbdw="; diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix index 106d52479bc5..f71263469744 100644 --- a/pkgs/servers/unpfs/default.nix +++ b/pkgs/servers/unpfs/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-zyDkUb+bFsVnxAE4UODbnRtDim7gqUNuY22vuxMsLZM="; }; - sourceRoot = "source/example/unpfs"; + sourceRoot = "${src.name}/example/unpfs"; cargoSha256 = "sha256-v8hbxKuxux0oYglEIK5dM9q0oBQzjyYDP1JB1cYR/T0="; diff --git a/pkgs/servers/web-apps/kavita/default.nix b/pkgs/servers/web-apps/kavita/default.nix index c7d6e7b9567c..eb9783413b4a 100644 --- a/pkgs/servers/web-apps/kavita/default.nix +++ b/pkgs/servers/web-apps/kavita/default.nix @@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "kavita-frontend"; inherit (finalAttrs) version src; - sourceRoot = "source/UI/Web"; + sourceRoot = "${finalAttrs.src.name}/UI/Web"; npmBuildScript = "prod"; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/servers/windmill/default.nix b/pkgs/servers/windmill/default.nix index db154ec8ffba..f26d1592c7cb 100644 --- a/pkgs/servers/windmill/default.nix +++ b/pkgs/servers/windmill/default.nix @@ -40,7 +40,7 @@ let pname = "windmill-ui"; src = fullSrc; - sourceRoot = "source/frontend"; + sourceRoot = "${fullSrc.name}/frontend"; npmDepsHash = "sha256-nRx/UQ7GU1iwhddTotCTG08RoOmdbP66zGKYsEp9XOE="; diff --git a/pkgs/tools/admin/gam/default.nix b/pkgs/tools/admin/gam/default.nix index 1b90de1d4674..6ea2b6c3da37 100644 --- a/pkgs/tools/admin/gam/default.nix +++ b/pkgs/tools/admin/gam/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-/VmBFMjCkd1xhudlcjYGGv+6tgEsyY/xqQoGdupJvOg="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; patches = [ # Also disables update check diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/pkgs/tools/archivers/ctrtool/default.nix index 4743f7ded3e8..2408f3cf6d6a 100644 --- a/pkgs/tools/archivers/ctrtool/default.nix +++ b/pkgs/tools/archivers/ctrtool/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "07aayck82w5xcp3si35d7ghybmrbqw91fqqvmbpjrjcixc6m42z7"; }; - sourceRoot = "source/ctrtool"; + sourceRoot = "${src.name}/ctrtool"; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++"]; enableParallelBuilding = true; diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/tools/audio/picotts/default.nix index 5c995f407a7b..d2ab0e09d3cf 100644 --- a/pkgs/tools/audio/picotts/default.nix +++ b/pkgs/tools/audio/picotts/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "picotts"; version = "unstable-2018-10-19"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoconf automake ]; buildInputs = [ libtool popt ]; - sourceRoot = "source/pico"; + sourceRoot = "${src.name}/pico"; preConfigure = "./autogen.sh"; meta = { description = "Text to speech voice sinthesizer from SVox"; @@ -22,5 +22,3 @@ stdenv.mkDerivation { platforms = lib.platforms.linux; }; } - - diff --git a/pkgs/tools/audio/piper/default.nix b/pkgs/tools/audio/piper/default.nix index 29fdb0705fec..ed70eb4848fc 100644 --- a/pkgs/tools/audio/piper/default.nix +++ b/pkgs/tools/audio/piper/default.nix @@ -20,7 +20,7 @@ let pname = "piper"; version = "1.2.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { inherit pname version; src = fetchFromGitHub { @@ -30,7 +30,7 @@ stdenv.mkDerivation { hash = "sha256-6WNWqJt0PO86vnf+3iHaRRg2KwBOEj4aicmB+P2phlk="; }; - sourceRoot = "source/src/cpp"; + sourceRoot = "${src.name}/src/cpp"; nativeBuildInputs = [ cmake diff --git a/pkgs/tools/audio/piper/train.nix b/pkgs/tools/audio/piper/train.nix index a385ebb85ad6..2cab1ba4ba04 100644 --- a/pkgs/tools/audio/piper/train.nix +++ b/pkgs/tools/audio/piper/train.nix @@ -15,7 +15,7 @@ python.pkgs.buildPythonPackage { pname = "piper-train"; format = "setuptools"; - sourceRoot = "source/src/python"; + sourceRoot = "${piper-tts.src.name}/src/python"; nativeBuildInputs = with python.pkgs; [ cython diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix index c57a5dbd0495..06bca00fc5b0 100644 --- a/pkgs/tools/audio/yabridgectl/default.nix +++ b/pkgs/tools/audio/yabridgectl/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { version = yabridge.version; src = yabridge.src; - sourceRoot = "source/tools/yabridgectl"; + sourceRoot = "${yabridge.src.name}/tools/yabridgectl"; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/tools/backup/hpe-ltfs/default.nix index 5ce6b287e932..017df9a80073 100644 --- a/pkgs/tools/backup/hpe-ltfs/default.nix +++ b/pkgs/tools/backup/hpe-ltfs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "193593hsc8nf5dn1fkxhzs1z4fpjh64hdkc8q6n9fgplrpxdlr4s"; }; - sourceRoot = "source/ltfs"; + sourceRoot = "${src.name}/ltfs"; # include sys/sysctl.h is deprecated in glibc. The sysctl calls are only used # for Apple to determine the kernel version. Because this build only targets diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix index a74d182fb356..64edc17a89f6 100644 --- a/pkgs/tools/filesystems/blobfuse/default.nix +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -12,7 +12,7 @@ let pname = "cpplite"; inherit version src; - sourceRoot = "source/cpplite"; + sourceRoot = "${src.name}/cpplite"; patches = [ ./install-adls.patch ]; cmakeFlags = [ "-DBUILD_ADLS=ON" "-DUSE_OPENSSL=OFF" ]; diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/tools/filesystems/cpcfs/default.nix index a439e29358f7..93bfdd8d23fa 100644 --- a/pkgs/tools/filesystems/cpcfs/default.nix +++ b/pkgs/tools/filesystems/cpcfs/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0rfbry0qy8mv746mzk9zdfffkdgq4w7invgb5cszjma2cp83q3i2"; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ makeWrapper ncurses readline ronn ]; diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix index b41d5b2c6994..6f33735f58f2 100644 --- a/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/pkgs/tools/filesystems/tar2ext4/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-+GhYeQ27uwg9JOv1qbf1+UbMd+vPXJ05nsXZD9OakzI="; }; - sourceRoot = "source/cmd/tar2ext4"; + sourceRoot = "${src.name}/cmd/tar2ext4"; vendorHash = null; meta = with lib; { diff --git a/pkgs/tools/graphics/pdftoipe/default.nix b/pkgs/tools/graphics/pdftoipe/default.nix index fc4e0d964fdc..d7e757e679bf 100644 --- a/pkgs/tools/graphics/pdftoipe/default.nix +++ b/pkgs/tools/graphics/pdftoipe/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { }) ]; - sourceRoot = "source/pdftoipe"; + sourceRoot = "${src.name}/pdftoipe"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ poppler ]; diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix index 20401cd092c6..05cb130467a7 100644 --- a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix +++ b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "sha256-eLAIlOl1sUxijeVPFG+NscZGxDdtrQqVkMuxhegESHk="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; models = fetchzip { # Choose the newst release from https://github.com/xinntao/Real-ESRGAN/releases to update diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 66967b9213c7..d5cddeb6e245 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -21,7 +21,7 @@ buildGoModule rec { vendorHash = "sha256-ABaRedZXPr2q2AmslVNIJUvONZa4tv7OkxBLR9GuBRE="; # there is a nested go.mod - sourceRoot = "source/cmd/otelcontribcol"; + sourceRoot = "${src.name}/cmd/otelcontribcol"; # upstream strongly recommends disabling CGO # additionally dependencies have had issues when GCO was enabled that weren't caught upstream diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 76f43acf138d..1c387462a609 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-yywmnJUTigDYeiAuK0f2511vh6sS4oD4hJLPozAlWz4="; }; # there is a nested go.mod - sourceRoot = "source/cmd/otelcorecol"; + sourceRoot = "${src.name}/cmd/otelcorecol"; vendorHash = "sha256-BNIQ0pTHGgwWw1cy7au6hUeECC8oGsSkxaX5BUCRG9Y="; # upstream strongly recommends disabling CGO diff --git a/pkgs/tools/misc/trdl-client/default.nix b/pkgs/tools/misc/trdl-client/default.nix index b5f4405e64df..3748f1755d18 100644 --- a/pkgs/tools/misc/trdl-client/default.nix +++ b/pkgs/tools/misc/trdl-client/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { hash = "sha256-jJwRIfxmjlhfS/0+IN2IdQPlO9FkTb64PWUiLwkarfM="; }; - sourceRoot = "source/client"; + sourceRoot = "${src.name}/client"; vendorHash = "sha256-f7FPeR+us3WvwqzcSQLbkKv905CCIAAm+HNV2FFF8OY="; diff --git a/pkgs/tools/misc/usbimager/default.nix b/pkgs/tools/misc/usbimager/default.nix index 41ae07f1775b..533f61a9c7d1 100644 --- a/pkgs/tools/misc/usbimager/default.nix +++ b/pkgs/tools/misc/usbimager/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-CEGUXJXqXmD8uT93T9dg49Lf5vTpAzQjdnhYmbR5zTI="; }; - sourceRoot = "source/src/"; + sourceRoot = "${src.name}/src/"; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = lib.optionals withUdisks [ udisks glib ] diff --git a/pkgs/tools/misc/wimboot/default.nix b/pkgs/tools/misc/wimboot/default.nix index 5499cac9a8a1..244dccce6bb0 100644 --- a/pkgs/tools/misc/wimboot/default.nix +++ b/pkgs/tools/misc/wimboot/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-rbJONP3ge+2+WzCIpTUZeieQz9Q/MZfEUmQVbZ+9Dro="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; buildInputs = [ libbfd zlib libiberty ]; makeFlags = [ "wimboot.x86_64.efi" ]; diff --git a/pkgs/tools/networking/bitmask-vpn/default.nix b/pkgs/tools/networking/bitmask-vpn/default.nix index 8924924448e4..7d0c09107d6e 100644 --- a/pkgs/tools/networking/bitmask-vpn/default.nix +++ b/pkgs/tools/networking/bitmask-vpn/default.nix @@ -39,7 +39,7 @@ let # and may one day be replaced by pkg/helper bitmask-root = mkDerivation { inherit src version; - sourceRoot = "source/helpers"; + sourceRoot = "${src.name}/helpers"; pname = "bitmask-root"; nativeBuildInputs = [ python3Packages.wrapPython ]; postPatch = '' diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix index 8e0ed84e8a06..e4ecdd2ad850 100644 --- a/pkgs/tools/networking/dd-agent/integrations-core.nix +++ b/pkgs/tools/networking/dd-agent/integrations-core.nix @@ -51,7 +51,7 @@ let inherit src version; name = "datadog-integration-${pname}-${version}"; - sourceRoot = "source/${args.sourceRoot or pname}"; + sourceRoot = "${src.name}/${args.sourceRoot or pname}"; doCheck = false; }); diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index 5f6e0db6d581..be511c756587 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -21,7 +21,7 @@ apk = stdenv.mkDerivation { ''; }; in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "gnirehtet"; inherit version; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage { inherit apk; }; - sourceRoot = "source/relay-rust"; + sourceRoot = "${src.name}/relay-rust"; cargoHash = "sha256-3oVWFMFzYsuCec1wxZiHXW6O45qbdL1npqYrg/m4SPc="; diff --git a/pkgs/tools/networking/mqttmultimeter/default.nix b/pkgs/tools/networking/mqttmultimeter/default.nix index ddc04bab78b9..1edb48a62cbb 100644 --- a/pkgs/tools/networking/mqttmultimeter/default.nix +++ b/pkgs/tools/networking/mqttmultimeter/default.nix @@ -41,7 +41,7 @@ buildDotnetModule rec { hash = "sha256-/XQ5HD0dBfFn3ERlLwHknS9Fyd3YMpKHBXuvMwRXcQ8="; }; - sourceRoot = "source/Source"; + sourceRoot = "${src.name}/Source"; projectFile = [ "mqttMultimeter.sln" ]; nugetDeps = ./deps.nix; diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index fac532110d2f..a8dcbbebe141 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -43,7 +43,7 @@ pypkgs.buildPythonApplication rec { hash = "sha256-9KiMbS0uKTbWSZVIv5ziIeR9c8+EKfKd20yPmjCX7GQ="; }; - sourceRoot = "source/py-kms"; + sourceRoot = "${src.name}/py-kms"; propagatedBuildInputs = with pypkgs; [ systemd pytz tzlocal dnspython ]; diff --git a/pkgs/tools/networking/ratman/default.nix b/pkgs/tools/networking/ratman/default.nix index 5ddab7850fae..ce017731bd4a 100644 --- a/pkgs/tools/networking/ratman/default.nix +++ b/pkgs/tools/networking/ratman/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { dashboard = stdenv.mkDerivation rec { pname = "ratman-dashboard"; inherit version src; - sourceRoot = "source/ratman/dashboard"; + sourceRoot = "${src.name}/ratman/dashboard"; yarnDeps = fetchYarnDeps { yarnLock = src + "/ratman/dashboard/yarn.lock"; diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix index cd3d1bfed694..83479a6d88ed 100644 --- a/pkgs/tools/networking/reaver-wps-t6x/default.nix +++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpcap pixiewps ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; meta = with lib; { description = "Online and offline brute force attack against WPS"; diff --git a/pkgs/tools/networking/sleep-on-lan/default.nix b/pkgs/tools/networking/sleep-on-lan/default.nix index 96a9b63e9129..98f4cfb44481 100644 --- a/pkgs/tools/networking/sleep-on-lan/default.nix +++ b/pkgs/tools/networking/sleep-on-lan/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-WooFGIdXIIoJPMqmPpnT+bc+P+IARMSxa3CvXY9++mw="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; vendorSha256 = "sha256-JqDDG53khtDdMLVOscwqi0oGviF+3DMkv5tkHvp1gJc="; ldflags = [ diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 6d19aea8040d..08ef1fdae272 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index 2b08da598fa3..1f0f2a2bf0cb 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "FILES=b2sum.c ../sse/" "#FILES=b2sum.c ../sse/" ''; - sourceRoot = "source/b2sum"; + sourceRoot = "${finalAttrs.src.name}/b2sum"; buildInputs = [ openmp ]; diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index db618f4ec4c3..a9b902f80d3b 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -41,7 +41,7 @@ let desktop-native = rustPlatform.buildRustPackage { pname = "bitwarden-desktop-native"; inherit src version; - sourceRoot = "source-patched/apps/desktop/desktop_native"; + sourceRoot = "${src.name}/apps/desktop/desktop_native"; cargoSha256 = "sha256-8U4E5q2OSZGXy2ZRn0y4Skm5Y+FiOJVU1mtzObO9UqY="; nativeBuildInputs = [ diff --git a/pkgs/tools/security/donkey/default.nix b/pkgs/tools/security/donkey/default.nix index 8244d7f0c298..514df406f3b9 100644 --- a/pkgs/tools/security/donkey/default.nix +++ b/pkgs/tools/security/donkey/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { rev = "tags/release/${version}"; hash = "sha256-2xgb9l0Eko39HJVROAWEIP3qLg5t/5h/rm2MoXoKnJI="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; buildInputs = [ libmd ]; diff --git a/pkgs/tools/security/hashcat-utils/default.nix b/pkgs/tools/security/hashcat-utils/default.nix index ccd6230b06f2..f252c7eedce7 100644 --- a/pkgs/tools/security/hashcat-utils/default.nix +++ b/pkgs/tools/security/hashcat-utils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0wgc6wv7i6cs95rgzzx3zqm14xxbjyajvcqylz8w97d8kk4x4wjr"; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; installPhase = '' runHook preInstall diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/tools/security/jwx/default.nix index da39777074c6..fb5c2c59f11e 100644 --- a/pkgs/tools/security/jwx/default.nix +++ b/pkgs/tools/security/jwx/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorHash = "sha256-RyAQh1uXw3bEZ6vuh8+mEf8T4l3ZIFAaFJ6dGMoANys="; - sourceRoot = "source/cmd/jwx"; + sourceRoot = "${src.name}/cmd/jwx"; meta = with lib; { description = " Implementation of various JWx (Javascript Object Signing and Encryption/JOSE) technologies"; diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/tools/security/lesspass-cli/default.nix index a7b266c34ece..34d36f93b5fb 100644 --- a/pkgs/tools/security/lesspass-cli/default.nix +++ b/pkgs/tools/security/lesspass-cli/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { rev = version; sha256 = "126zk248s9r72qk9b8j27yvb8gglw49kazwz0sd69b5kkxvhz2dh"; }; - sourceRoot = "source/cli"; + sourceRoot = "${src.name}/cli"; # some tests are designed to run against code in the source directory - adapt to run against # *installed* code diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index cd1a97c2da60..69c48120b061 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { popt ]; - sourceRoot = "source/xmlroff/"; + sourceRoot = "${src.name}/xmlroff/"; enableParallelBuilding = true; From d8f7f6a5cee067b81bfaaa3aa079adb94ed7c01e Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 25 Jul 2023 13:29:10 +0000 Subject: [PATCH 08/22] treewide: noop: refer to `src.name` or similar in `sourceRoot` where appropriate, part 2: the non-trivial cases --- .../misc/johnny-reborn/with-data.nix | 40 +++++----- .../version-management/gitqlient/default.nix | 80 ++++++++++--------- pkgs/data/themes/mojave/default.nix | 43 +++++----- .../configuration-tensorflow.nix | 2 +- pkgs/games/endgame-singularity/default.nix | 34 ++++---- pkgs/games/koboredux/default.nix | 53 ++++++------ 6 files changed, 133 insertions(+), 119 deletions(-) diff --git a/pkgs/applications/misc/johnny-reborn/with-data.nix b/pkgs/applications/misc/johnny-reborn/with-data.nix index 1e53edaa5b85..04300524665e 100644 --- a/pkgs/applications/misc/johnny-reborn/with-data.nix +++ b/pkgs/applications/misc/johnny-reborn/with-data.nix @@ -6,34 +6,32 @@ , makeWrapper }: + +let + sounds = fetchFromGitHub { + owner = "nivs1978"; + repo = "Johnny-Castaway-Open-Source"; + rev = "be6afefd43a3334acc66fc9d777c162c8bfb9558"; + hash = "sha256-rtZVCn4KbEBVwaSQ4HZhMoDEI5Q9IPj9SZywgAx0MPY="; + }; + + resources = fetchzip { + name = "scrantic-source"; + url = "https://archive.org/download/johnny-castaway-screensaver/scrantic-run.zip"; + hash = "sha256-Q9chCYReOQEmkTyIkYo+D+OXYUqxPNOOEEmiFh8yaw4="; + stripRoot = false; + }; +in + stdenvNoCC.mkDerivation { pname = "johnny-reborn"; inherit (johnny-reborn-engine) version; - srcs = - let - sounds = fetchFromGitHub { - owner = "nivs1978"; - repo = "Johnny-Castaway-Open-Source"; - rev = "be6afefd43a3334acc66fc9d777c162c8bfb9558"; - hash = "sha256-rtZVCn4KbEBVwaSQ4HZhMoDEI5Q9IPj9SZywgAx0MPY="; - }; - - resources = fetchzip { - name = "scrantic-source"; - url = "https://archive.org/download/johnny-castaway-screensaver/scrantic-run.zip"; - hash = "sha256-Q9chCYReOQEmkTyIkYo+D+OXYUqxPNOOEEmiFh8yaw4="; - stripRoot = false; - }; - in - [ - sounds - resources - ]; + srcs = [ sounds resources ]; nativeBuildInputs = [ makeWrapper ]; - sourceRoot = "source"; + sourceRoot = sounds.name; dontConfigure = true; dontBuild = true; diff --git a/pkgs/applications/version-management/gitqlient/default.nix b/pkgs/applications/version-management/gitqlient/default.nix index a1c4ec5c6949..622c0f045135 100644 --- a/pkgs/applications/version-management/gitqlient/default.nix +++ b/pkgs/applications/version-management/gitqlient/default.nix @@ -6,48 +6,52 @@ , gitUpdater }: -mkDerivation rec { +let pname = "gitqlient"; version = "1.5.0"; - srcs = [ - (fetchFromGitHub { - owner = "francescmm"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Mq29HbmPABrRIJjWC5AAKIOKbGngeJdkZkWeJw8BFuw="; - }) - (fetchFromGitHub rec { - owner = "francescmm"; - repo = "AuxiliarCustomWidgets"; - rev = "835f538b4a79e4d6bb70eef37a32103e7b2a1fd1"; - sha256 = "sha256-b1gb/7UcLS6lI92dBfTenGXA064t4dZufs3S9lu/lQA="; - name = repo; - }) - (fetchFromGitHub rec { - owner = "francescmm"; - repo = "QLogger"; - rev = "d1ed24e080521a239d5d5e2c2347fe211f0f3e4f"; - sha256 = "sha256-NVlFYmm7IIkf8LhQrAYXil9kH6DFq1XjOEHQiIWmER4="; - name = repo; - }) - (fetchFromGitHub rec { - owner = "francescmm"; - repo = "QPinnableTabWidget"; - rev = "cc937794e910d0452f0c07b4961c6014a7358831"; - sha256 = "sha256-2KzzBv/s2t665axeBxWrn8aCMQQArQLlUBOAlVhU+wE="; - name = repo; - }) - (fetchFromGitHub rec { - owner = "francescmm"; - repo = "git"; - rev = "b62750f4da4b133faff49e6f53950d659b18c948"; - sha256 = "sha256-4FqA+kkHd0TqD6ZuB4CbJ+IhOtQG9uWN+qhSAT0dXGs="; - name = repo; - }) - ]; + main_src = fetchFromGitHub { + owner = "francescmm"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Mq29HbmPABrRIJjWC5AAKIOKbGngeJdkZkWeJw8BFuw="; + }; + aux_src = fetchFromGitHub rec { + owner = "francescmm"; + repo = "AuxiliarCustomWidgets"; + rev = "835f538b4a79e4d6bb70eef37a32103e7b2a1fd1"; + sha256 = "sha256-b1gb/7UcLS6lI92dBfTenGXA064t4dZufs3S9lu/lQA="; + name = repo; + }; + qlogger_src = fetchFromGitHub rec { + owner = "francescmm"; + repo = "QLogger"; + rev = "d1ed24e080521a239d5d5e2c2347fe211f0f3e4f"; + sha256 = "sha256-NVlFYmm7IIkf8LhQrAYXil9kH6DFq1XjOEHQiIWmER4="; + name = repo; + }; + qpinnabletab_src = fetchFromGitHub rec { + owner = "francescmm"; + repo = "QPinnableTabWidget"; + rev = "cc937794e910d0452f0c07b4961c6014a7358831"; + sha256 = "sha256-2KzzBv/s2t665axeBxWrn8aCMQQArQLlUBOAlVhU+wE="; + name = repo; + }; + git_src = fetchFromGitHub rec { + owner = "francescmm"; + repo = "git"; + rev = "b62750f4da4b133faff49e6f53950d659b18c948"; + sha256 = "sha256-4FqA+kkHd0TqD6ZuB4CbJ+IhOtQG9uWN+qhSAT0dXGs="; + name = repo; + }; +in - sourceRoot = "source"; +mkDerivation rec { + inherit pname version; + + srcs = [ main_src aux_src qlogger_src qpinnabletab_src git_src ]; + + sourceRoot = main_src.name; nativeBuildInputs = [ qmake diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index a39790686253..0e4bbdbe5aae 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -21,8 +21,27 @@ }: let + pname = "mojave-gtk-theme"; + version = "2023-06-13"; + + main_src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + hash = "sha256-0jb/VQ6Z0BGaEka57BWM0pBweP08cr4jfPRdEN/BJ1M="; + }; + + wallpapers_src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = "0c4ae6ddff7e3fab4959469461c4d4042deb1b2f"; + hash = "sha256-7LSZSsRt6zTVPLWzuBgwRC1q1MHp5pN/pMl3x2wR8Ow="; + name = "wallpapers"; + }; + in + lib.checkListOfEnum "${pname}: button size variants" [ "standard" "small" ] buttonSizeVariants lib.checkListOfEnum "${pname}: button variants" [ "standard" "alt" ] buttonVariants lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants @@ -30,29 +49,11 @@ lib.checkListOfEnum "${pname}: opacity variants" [ "standard" "solid" ] opacityV lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants stdenvNoCC.mkDerivation rec { - inherit pname; - version = "2023-06-13"; + inherit pname version; - srcs = [ - (fetchFromGitHub { - owner = "vinceliuice"; - repo = pname; - rev = version; - hash = "sha256-0jb/VQ6Z0BGaEka57BWM0pBweP08cr4jfPRdEN/BJ1M="; - }) - ] - ++ - lib.optional wallpapers - (fetchFromGitHub { - owner = "vinceliuice"; - repo = pname; - rev = "0c4ae6ddff7e3fab4959469461c4d4042deb1b2f"; - hash = "sha256-7LSZSsRt6zTVPLWzuBgwRC1q1MHp5pN/pMl3x2wR8Ow="; - name = "wallpapers"; - }) - ; + srcs = [ main_src ] ++ lib.optional wallpapers wallpapers_src; - sourceRoot = "source"; + sourceRoot = main_src.name; nativeBuildInputs = [ glib diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix index 3f9dc1643275..634f521e5aa4 100644 --- a/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -18,7 +18,7 @@ let setTensorflowSourceRoot = dir: drv: (overrideCabal (drv: { src = tensorflow-haskell; }) drv) - .overrideAttrs (_oldAttrs: {sourceRoot = "source/${dir}";}); + .overrideAttrs (_oldAttrs: { sourceRoot = "${tensorflow-haskell.name}/${dir}"; }); in { tensorflow-proto = doJailbreak (setTensorflowSourceRoot "tensorflow-proto" super.tensorflow-proto); diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix index e0cd581af823..ceb3d74816a0 100644 --- a/pkgs/games/endgame-singularity/default.nix +++ b/pkgs/games/endgame-singularity/default.nix @@ -6,24 +6,28 @@ , enableDefaultMusicPack ? true }: -python3.pkgs.buildPythonApplication rec { +let pname = "endgame-singularity"; version = "1.00"; - srcs = [ - (fetchFromGitHub { - owner = "singularity"; - repo = "singularity"; - rev = "v${version}"; - sha256 = "0ndrnxwii8lag6vrjpwpf5n36hhv223bb46d431l9gsigbizv0hl"; - }) - ] ++ lib.optional enableDefaultMusicPack ( - fetchurl { - url = "http://www.emhsoft.com/singularity/endgame-singularity-music-007.zip"; - sha256 = "0vf2qaf66jh56728pq1zbnw50yckjz6pf6c6qw6dl7vk60kkqnpb"; - } - ); - sourceRoot = "source"; + main_src = fetchFromGitHub { + owner = "singularity"; + repo = "singularity"; + rev = "v${version}"; + sha256 = "0ndrnxwii8lag6vrjpwpf5n36hhv223bb46d431l9gsigbizv0hl"; + }; + + music_src = fetchurl { + url = "http://www.emhsoft.com/singularity/endgame-singularity-music-007.zip"; + sha256 = "0vf2qaf66jh56728pq1zbnw50yckjz6pf6c6qw6dl7vk60kkqnpb"; + }; +in + +python3.pkgs.buildPythonApplication rec { + inherit pname version; + + srcs = [ main_src ] ++ lib.optional enableDefaultMusicPack music_src; + sourceRoot = main_src.name; nativeBuildInputs = [ unzip ]; # The music is zipped propagatedBuildInputs = with python3.pkgs; [ pygame numpy polib ]; diff --git a/pkgs/games/koboredux/default.nix b/pkgs/games/koboredux/default.nix index 622dd2de50e3..91981fc85fba 100644 --- a/pkgs/games/koboredux/default.nix +++ b/pkgs/games/koboredux/default.nix @@ -11,36 +11,43 @@ }: with lib; -stdenv.mkDerivation rec { + +let pname = "koboredux"; version = "0.7.5.1"; - src = - [(fetchFromGitHub { - owner = "olofson"; - repo = "koboredux"; - rev = "v${version}"; - sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig"; - })] - ++ - (optional useProprietaryAssets (requireFile { - name = "koboredux-${version}-Linux.tar.bz2"; - sha256 = "11bmicx9i11m4c3dp19jsql0zy4rjf5a28x4hd2wl8h3bf8cdgav"; - message = '' - Please purchase the game on https://olofson.itch.io/kobo-redux - and download the Linux build. + main_src = fetchFromGitHub { + owner = "olofson"; + repo = pname; + rev = "v${version}"; + sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig"; + }; - Once you have downloaded the file, please use the following command - and re-run the installation: + assets_src = requireFile { + name = "koboredux-${version}-Linux.tar.bz2"; + sha256 = "11bmicx9i11m4c3dp19jsql0zy4rjf5a28x4hd2wl8h3bf8cdgav"; + message = '' + Please purchase the game on https://olofson.itch.io/kobo-redux + and download the Linux build. - nix-prefetch-url file://\$PWD/koboredux-${version}-Linux.tar.bz2 + Once you have downloaded the file, please use the following command + and re-run the installation: - Alternatively, install the "koboredux-free" package, which replaces the - proprietary assets with a placeholder theme. - ''; - })); + nix-prefetch-url file://\$PWD/koboredux-${version}-Linux.tar.bz2 - sourceRoot = "source"; # needed when we have the assets source + Alternatively, install the "koboredux-free" package, which replaces the + proprietary assets with a placeholder theme. + ''; + }; + +in + +stdenv.mkDerivation rec { + inherit pname version; + + src = [ main_src ] ++ optional useProprietaryAssets assets_src; + + sourceRoot = main_src.name; # Fix clang build patches = [(fetchpatch { From ccbb065c88080966e14872ea9e0ac577f753d902 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 25 Jul 2023 13:29:56 +0000 Subject: [PATCH 09/22] doc: make `sourceRoot` and `setSourceRoot` documentation match the implementation, fix examples --- doc/languages-frameworks/rust.section.md | 2 +- doc/stdenv/stdenv.chapter.md | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 2f65afc796c5..08738026447a 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -558,7 +558,7 @@ buildPythonPackage rec { hash = "sha256-miW//pnOmww2i6SOGbkrAIdc/JMDT4FJLqdMFojZeoY="; }; - sourceRoot = "source/bindings/python"; + sourceRoot = "${src.name}/bindings/python"; nativeBuildInputs = [ cargo diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index a0f81b97f6bc..4e8559467f52 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -614,14 +614,19 @@ The list of source files or directories to be unpacked or copied. One of these m ##### `sourceRoot` {#var-stdenv-sourceRoot} -After running `unpackPhase`, the generic builder changes the current directory to the directory created by unpacking the sources. If there are multiple source directories, you should set `sourceRoot` to the name of the intended directory. Set `sourceRoot = ".";` if you use `srcs` and control the unpack phase yourself. +After unpacking all of `src` and `srcs`, if neither of `sourceRoot` and `setSourceRoot` are set, `unpackPhase` of the generic builder checks that the unpacking produced a single directory and moves the current working directory into it. -By default the `sourceRoot` is set to `"source"`. If you want to point to a sub-directory inside your project, you therefore need to set `sourceRoot = "source/my-sub-directory"`. +If `unpackPhase` produces multiple source directories, you should set `sourceRoot` to the name of the intended directory. +You can also set `sourceRoot = ".";` if you want to control it yourself in a later phase. + +For example, if your want your build to start in a sub-directory inside your sources, and you are using `fetchzip`-derived `src` (like `fetchFromGitHub` or similar), you need to set `sourceRoot = "${src.name}/my-sub-directory"`. ##### `setSourceRoot` {#var-stdenv-setSourceRoot} Alternatively to setting `sourceRoot`, you can set `setSourceRoot` to a shell command to be evaluated by the unpack phase after the sources have been unpacked. This command must set `sourceRoot`. +For example, if you are using `fetchurl` on an archive file that gets unpacked into a single directory the name of which changes between package versions, and you want your build to start in its sub-directory, you need to set `setSourceRoot = "sourceRoot=$(echo */my-sub-directory)";`, or in the case of multiple sources, you could use something more specific, like `setSourceRoot = "sourceRoot=$(echo ${pname}-*/my-sub-directory)";`. + ##### `preUnpack` {#var-stdenv-preUnpack} Hook executed at the start of the unpack phase. From 775f21b9fdc1f2bb46518a575339fac8ff867959 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 25 Jul 2023 13:30:01 +0000 Subject: [PATCH 10/22] doc: add a release note about proper `sourceRoot` usage --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 85a6d4599fbc..4e8bd3642813 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -162,6 +162,8 @@ The module update takes care of the new config syntax and the data itself (user ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals} +- The use of `sourceRoot = "source";`, `sourceRoot = "source/subdir";`, and similar lines in package derivations using the default `unpackPhase` is deprecated as it requires `unpackPhase` to always produce a directory named "source". Use `sourceRoot = src.name`, `sourceRoot = "${src.name}/subdir";`, or `setSourceRoot = "sourceRoot=$(echo */subdir)";` or similar instead. + - The `qemu-vm.nix` module by default now identifies block devices via persistent names available in `/dev/disk/by-*`. Because the rootDevice is identfied by its filesystem label, it needs to be formatted before the VM is From a0a909fa9ecd2b74ef3933a6f9309d3922b37463 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 2 Aug 2023 13:09:30 +0000 Subject: [PATCH 11/22] treewide: noop: replace every newly introduced `stdenv.mkDerivation rec` with a fixpoint over `finalAttrs` --- pkgs/applications/emulators/basiliskii/default.nix | 6 +++--- pkgs/applications/graphics/pixelnuke/default.nix | 6 +++--- .../networking/browsers/ladybird/default.nix | 6 +++--- .../window-managers/wmderlandc/default.nix | 6 +++--- pkgs/development/libraries/dab_lib/default.nix | 6 +++--- pkgs/os-specific/darwin/libtapi/default.nix | 6 +++--- pkgs/os-specific/linux/aseq2json/default.nix | 6 +++--- .../linux/firmware/ipu6-camera-bins/default.nix | 6 +++--- pkgs/os-specific/linux/gt/default.nix | 6 +++--- pkgs/tools/audio/picotts/default.nix | 6 +++--- pkgs/tools/audio/piper/default.nix | 13 +++++-------- 11 files changed, 35 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/emulators/basiliskii/default.nix b/pkgs/applications/emulators/basiliskii/default.nix index 2f03984f3df3..8546b9c4087f 100644 --- a/pkgs/applications/emulators/basiliskii/default.nix +++ b/pkgs/applications/emulators/basiliskii/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, pkg-config, SDL2, gtk2, mpfr }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "basiliskii"; version = "unstable-2022-09-30"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "2fa17a0783cf36ae60b77b5ed930cda4dc1824af"; sha256 = "+jkns6H2YjlewbUzgoteGSQYWJL+OWVu178aM+BtABM="; }; - sourceRoot = "${src.name}/BasiliskII/src/Unix"; + sourceRoot = "${finalAttrs.src.name}/BasiliskII/src/Unix"; patches = [ ./remove-redhat-6-workaround-for-scsi-sg.h.patch ]; nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ SDL2 gtk2 mpfr ]; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ quag ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/graphics/pixelnuke/default.nix b/pkgs/applications/graphics/pixelnuke/default.nix index 905e99a1c231..0666501120e6 100644 --- a/pkgs/applications/graphics/pixelnuke/default.nix +++ b/pkgs/applications/graphics/pixelnuke/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, libevent, glew, glfw }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pixelnuke"; version = "unstable-2019-05-19"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "03dp0p00chy00njl4w02ahxqiwqpjsrvwg8j4yi4dgckkc3gbh40"; }; - sourceRoot = "${src.name}/pixelnuke"; + sourceRoot = "${finalAttrs.src.name}/pixelnuke"; buildInputs = [ libevent glew glfw ]; @@ -26,4 +26,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ mrVanDalo ]; }; -} +}) diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index cf544b07db28..c29400c32fdf 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,7 +10,7 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; version = "unstable-2023-01-17"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { hash = "sha256-n2mLg9wNfdMGsJuGj+ukjto9qYjGOIz4cZjgvMGQUrY="; }; - sourceRoot = "${src.name}/Ladybird"; + sourceRoot = "${finalAttrs.src.name}/Ladybird"; postPatch = '' substituteInPlace CMakeLists.txt \ @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/applications/window-managers/wmderlandc/default.nix b/pkgs/applications/window-managers/wmderlandc/default.nix index 340ce6e27d30..f439833e547a 100644 --- a/pkgs/applications/window-managers/wmderlandc/default.nix +++ b/pkgs/applications/window-managers/wmderlandc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, libX11, xorgproto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wmderlandc"; version = "unstable-2020-07-17"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0npmlnybblp82mfpinjbz7dhwqgpdqc1s63wc1zs8mlcs19pdh98"; }; - sourceRoot = "${src.name}/ipc-client"; + sourceRoot = "${finalAttrs.src.name}/ipc-client"; nativeBuildInputs = [ cmake @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ takagiy ]; }; -} +}) diff --git a/pkgs/development/libraries/dab_lib/default.nix b/pkgs/development/libraries/dab_lib/default.nix index f643e5c7d49c..0d236c36aa3c 100644 --- a/pkgs/development/libraries/dab_lib/default.nix +++ b/pkgs/development/libraries/dab_lib/default.nix @@ -2,7 +2,7 @@ , faad2, fftwFloat, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dab_lib"; version = "unstable-2023-03-02"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hash = "sha256-KSkOg0a5iq+13kClQqj+TaEP/PsLUrm8bMmiJEAZ+C4="; }; - sourceRoot = "${src.name}/library/"; + sourceRoot = "${finalAttrs.src.name}/library/"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ faad2 fftwFloat zlib ]; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ alexwinter ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix index 351708216ee2..5a72225eec30 100644 --- a/pkgs/os-specific/darwin/libtapi/default.nix +++ b/pkgs/os-specific/darwin/libtapi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkgsBuildBuild, cmake, python3, ncurses }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libtapi"; version = "1100.0.11"; # determined by looking at VERSION.txt @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1y1yl46msabfy14z0rln333a06087bk14f5h7q1cdawn8nmvbdbr"; }; - sourceRoot = "${src.name}/src/llvm"; + sourceRoot = "${finalAttrs.src.name}/src/llvm"; # Backported from newer llvm, fixes configure error when cross compiling. # Also means we don't have to manually fix the result with install_name_tool. @@ -74,4 +74,4 @@ stdenv.mkDerivation rec { license = licenses.ncsa; maintainers = with maintainers; [ matthewbauer ]; }; -} +}) diff --git a/pkgs/os-specific/linux/aseq2json/default.nix b/pkgs/os-specific/linux/aseq2json/default.nix index 81feb40eb989..ac1a8220d564 100644 --- a/pkgs/os-specific/linux/aseq2json/default.nix +++ b/pkgs/os-specific/linux/aseq2json/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkg-config, alsa-lib, glib, json-glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aseq2json"; version = "unstable-2018-04-28"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "8572e6313a0d7ec95492dcab04a46c5dd30ef33a"; sha256 = "LQ9LLVumi3GN6c9tuMSOd1Bs2pgrwrLLQbs5XF+NZeA="; }; - sourceRoot = "${src.name}/aseq2json"; + sourceRoot = "${finalAttrs.src.name}/aseq2json"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib glib json-glib ]; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.queezle ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix index d1ab4fd55b39..a4bbd6d2bb6b 100644 --- a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix +++ b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix @@ -11,7 +11,7 @@ , ipuVersion ? "ipu6" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "${ipuVersion}-camera-bin"; version = "unstable-2023-02-08"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hash = "sha256-QnedM2UBbGyd2wIF762Mi+VkDZYtC6MifK4XGGxlUzw="; }; - sourceRoot = "${src.name}/${ipuVersion}"; + sourceRoot = "${finalAttrs.src.name}/${ipuVersion}"; nativeBuildInputs = [ autoPatchelfHook @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/os-specific/linux/gt/default.nix b/pkgs/os-specific/linux/gt/default.nix index 72fe277ca9c4..85897b72585e 100644 --- a/pkgs/os-specific/linux/gt/default.nix +++ b/pkgs/os-specific/linux/gt/default.nix @@ -2,7 +2,7 @@ , asciidoc , libusbgx }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gt"; version = "unstable-2022-05-08"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-km4U+t4Id2AZx6GpH24p2WNmvV5RVjJ14sy8tWLCQsk="; }; - sourceRoot = "${src.name}/source"; + sourceRoot = "${finalAttrs.src.name}/source"; preConfigure = '' cmakeFlagsArray+=("-DBASH_COMPLETION_COMPLETIONSDIR=$out/share/bash-completions/completions") @@ -29,4 +29,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ lheckemann ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/tools/audio/picotts/default.nix index d2ab0e09d3cf..137fa838c629 100644 --- a/pkgs/tools/audio/picotts/default.nix +++ b/pkgs/tools/audio/picotts/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "picotts"; version = "unstable-2018-10-19"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoconf automake ]; buildInputs = [ libtool popt ]; - sourceRoot = "${src.name}/pico"; + sourceRoot = "${finalAttrs.src.name}/pico"; preConfigure = "./autogen.sh"; meta = { description = "Text to speech voice sinthesizer from SVox"; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.canndrew ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/tools/audio/piper/default.nix b/pkgs/tools/audio/piper/default.nix index ed70eb4848fc..d753d7bb3e1e 100644 --- a/pkgs/tools/audio/piper/default.nix +++ b/pkgs/tools/audio/piper/default.nix @@ -16,21 +16,18 @@ , piper-train }: -let +stdenv.mkDerivation (finalAttrs: { pname = "piper"; version = "1.2.0"; -in -stdenv.mkDerivation rec { - inherit pname version; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-6WNWqJt0PO86vnf+3iHaRRg2KwBOEj4aicmB+P2phlk="; }; - sourceRoot = "${src.name}/src/cpp"; + sourceRoot = "${finalAttrs.src.name}/src/cpp"; nativeBuildInputs = [ cmake @@ -63,10 +60,10 @@ stdenv.mkDerivation rec { }; meta = with lib; { - changelog = "https://github.com/rhasspy/piper/releases/tag/v${version}"; + changelog = "https://github.com/rhasspy/piper/releases/tag/v${finalAttrs.version}"; description = "A fast, local neural text to speech system"; homepage = "https://github.com/rhasspy/piper"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; -} +}) From 7c8d1368b00a5bfb9fb3d351dfec1ea5c280ecea Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Thu, 3 Aug 2023 14:40:44 +0200 Subject: [PATCH 12/22] rtx: 1.34.1 -> 1.35.8 --- pkgs/tools/misc/rtx/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/rtx/default.nix b/pkgs/tools/misc/rtx/default.nix index fce442da8a7a..3aa751e28d5e 100644 --- a/pkgs/tools/misc/rtx/default.nix +++ b/pkgs/tools/misc/rtx/default.nix @@ -6,25 +6,27 @@ , stdenv , coreutils , bash +, pkg-config +, openssl , direnv , Security }: rustPlatform.buildRustPackage rec { pname = "rtx"; - version = "1.34.1"; + version = "1.35.8"; src = fetchFromGitHub { owner = "jdxcode"; repo = "rtx"; rev = "v${version}"; - sha256 = "sha256-yzfiYhWZsoqqWhVBXgV0QQOe8Xcfp71e0t81+UBqiQI="; + hash = "sha256-oofbnZAB1a/Het5fqwDVx8Fl2aZcOhtb2/sKIF3KDFA="; }; - cargoSha256 = "sha256-4Ac5NUADyI24TkLH5AwlGxEWHjYP8ye+D89QF1ToU4A="; + cargoHash = "sha256-hcDHFA20jQgUnrdvqKSNCE17yVsH7B/WUKAVZN4Ck2o="; - nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; postPatch = '' patchShebangs --build ./test/data/plugins/**/bin/* ./src/fake_asdf.rs ./src/cli/reshim.rs From 2ff4c5e736d12ab03bda72b76684e35692d0fba6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 19:41:02 +0200 Subject: [PATCH 13/22] smpeg: unbreak on darwin --- pkgs/development/libraries/smpeg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 5c72d653278d..f25ac14df864 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; - buildInputs = [ SDL gtk2 libGLU libGL ]; + buildInputs = [ SDL ] ++ lib.optionals (!stdenv.isDarwin) [ gtk2 libGLU libGL ]; outputs = [ "out" "dev" ]; From 8914a3e1437957825d9f2f78e3007e054532f721 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 19:42:27 +0200 Subject: [PATCH 14/22] guile-lib: support more platforms --- pkgs/development/guile-modules/guile-lib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index b5c358373fd2..6d6a88808e38 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -6,8 +6,6 @@ , texinfo }: -assert stdenv ? cc && stdenv.cc.isGNU; - stdenv.mkDerivation rec { pname = "guile-lib"; version = "0.2.7"; @@ -25,6 +23,8 @@ stdenv.mkDerivation rec { texinfo ]; + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + doCheck = true; preCheck = '' @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.gnu ++ platforms.linux; + platforms = guile.meta.platforms; }; } From ff6e7e426fd816535ac018a5ccc7117d37a088c3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 19:42:42 +0200 Subject: [PATCH 15/22] guile-ncurses: support more platforms --- pkgs/development/guile-modules/guile-ncurses/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 1e6418b0c3c7..abfa144ee57c 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -36,6 +36,9 @@ stdenv.mkDerivation rec { done ''; + # Undefined symbols for architecture arm64: "_u32_conv_from_encoding" + env.NIX_LDFLAGS = "-lunistring"; + # XXX: 1 of 65 tests failed. doCheck = false; @@ -50,6 +53,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.gnu ++ platforms.linux; + platforms = guile.meta.platforms; }; } From c9bf244993082014380e42fa502f6796a873d1cd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 19:42:49 +0200 Subject: [PATCH 16/22] guile-reader: support more platforms --- pkgs/development/guile-modules/guile-reader/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index 1675ac0e333a..7387dbc20876 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , gperf , guile , guile-lib @@ -46,6 +45,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.gnu; + platforms = guile.meta.platforms; }; } From 55134f4c5268bf95157a8af9dd381576dd8509e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Aug 2023 20:20:49 +0200 Subject: [PATCH 17/22] home-assistant: pin pyasn1 at 0.4.8 Fixes the brother integration test. --- pkgs/servers/home-assistant/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d8aa8a5bc4ea..07c4e2adaebf 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -162,6 +162,15 @@ let }; }); + pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec { + version = "0.4.8"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-rvd8n7lKOsWI6HhBIIvexGRHHZhxvVBQoofMmkdc0Lo="; + }; + }); + # Pinned due to API changes >0.3.5.3 pyatag = super.pyatag.overridePythonAttrs (oldAttrs: rec { version = "0.3.5.3"; From 9b6a0be49620c937c59fbeb00983628dfa1195e0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 21:22:09 +0200 Subject: [PATCH 18/22] haunt: fix build on darwin --- pkgs/applications/misc/haunt/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/applications/misc/haunt/default.nix b/pkgs/applications/misc/haunt/default.nix index 885c68f64daa..5d2156c91497 100644 --- a/pkgs/applications/misc/haunt/default.nix +++ b/pkgs/applications/misc/haunt/default.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchurl +, fetchpatch +, autoreconfHook , guile , guile-commonmark , guile-reader @@ -17,7 +19,24 @@ stdenv.mkDerivation rec { hash = "sha256-vPKLQ9hDJdimEAXwIBGgRRlefM8/77xFQoI+0J/lkNs="; }; + # Symbol not found: inotify_init + patches = [ + (fetchpatch { + url = "https://git.dthompson.us/haunt.git/patch/?id=ab0b722b0719e3370a21359e4d511af9c4f14e60"; + hash = "sha256-TPNJKGlbDkV9RpdN274qMLoN3HlwfH/yHpxlpqOPw58="; + }) + (fetchpatch { + url = "https://git.dthompson.us/haunt.git/patch/?id=7d0b71f6a3f0e714da5a5c43e52408e27f44c383"; + hash = "sha256-CW/h8CqsALKDuKRoN1bd/WEtFTvFj0VxtgmpatyrLm8="; + }) + (fetchpatch { + url = "https://git.dthompson.us/haunt.git/patch/?id=1a91f3d0568fc095d8b0875c6553ef15b76efa4c"; + hash = "sha256-+3wUlTuzbyGibAsCiYWKvzPqUrFs7VwdhnADjnPuWIY="; + }) + ]; + nativeBuildInputs = [ + autoreconfHook makeWrapper pkg-config ]; From 0271120180bfabe01bad1dc4163102e9204ea878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?= Date: Wed, 2 Aug 2023 00:42:10 +0200 Subject: [PATCH 19/22] postgresqlPackages.postgis: enable address_standardizer, fix docs installation --- pkgs/servers/sql/postgresql/ext/postgis.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 9afad9a9d5ab..328f2f64eba7 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -11,6 +11,7 @@ , file , protobufc , libiconv +, pcre2 , nixosTests }: stdenv.mkDerivation rec { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-dOs1bj+F8UIzeRATNgiBtnSPeAgcxoj/nW8PZzp2LRM="; }; - buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] + buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc pcre2.dev ] ++ lib.optional stdenv.isDarwin libiconv; nativeBuildInputs = [ perl pkg-config ] ++ lib.optional postgresql.jitSupport postgresql.llvm; dontDisableStatic = true; @@ -34,9 +35,9 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" + configureFlags="--datadir=$out/share/postgresql --datarootdir=$out/share/postgresql --bindir=$out/bin --docdir=$doc/share/doc/${pname} --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" - makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin" + makeFlags="PERL=${perl}/bin/perl datadir=$out/share/postgresql pkglibdir=$out/lib bindir=$out/bin docdir=$doc/share/doc/${pname}" ''; postConfigure = '' sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; From 8bde04060ae8baf4103ba25f5d8a50a13051b2c9 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 3 Jun 2023 17:52:34 -0400 Subject: [PATCH 20/22] doctest: fix build with clang 16 Clang 16 adds a buffer hardening mode as a new warning. doctest enables all warnings and promotes them to errors, which causes the build to fail with clang 16. The upstream PR suppresses these warnings on clang 16. Background: https://discourse.llvm.org/t/rfc-c-buffer-hardening/65734 --- pkgs/development/libraries/doctest/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index 7595eae7d47d..642cfa3052f7 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, installShellFiles, cmake }: stdenv.mkDerivation rec { pname = "doctest"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-hotO6QVpPn8unYTaQHFgi40A3oLUd++I3aTe293e4Aw="; }; + patches = [ + # Suppress unsafe buffer usage warnings with clang 16, which are treated as errors due to `-Werror`. + # https://github.com//doctest/doctest/pull/768 + (fetchpatch { + url = "https://github.com/doctest/doctest/commit/9336c9bd86e3fc2e0c36456cad8be3b4e8829a22.patch"; + hash = "sha256-ZFCVk5qvgfixRm7ZFr7hyNCSEvrT6nB01G/CBshq53o="; + }) + ]; + nativeBuildInputs = [ cmake ]; doCheck = true; From d813fcfeff0a7d3866e5eebcfd67d5ec01848118 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 22:39:54 +0200 Subject: [PATCH 21/22] treewide: mark packages broken on darwin --- pkgs/games/hheretic/default.nix | 1 + pkgs/games/hhexen/default.nix | 1 + pkgs/games/lgames/barrage/default.nix | 1 + pkgs/games/lgames/ltris/default.nix | 1 + pkgs/games/powermanga/default.nix | 1 + pkgs/games/tecnoballz/default.nix | 1 + 6 files changed, 6 insertions(+) diff --git a/pkgs/games/hheretic/default.nix b/pkgs/games/hheretic/default.nix index 73adca8928cd..6e4be6bd54b7 100644 --- a/pkgs/games/hheretic/default.nix +++ b/pkgs/games/hheretic/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "hheretic-gl"; maintainers = with lib.maintainers; [ moody ]; inherit (SDL.meta) platforms; + broken = stdenv.isDarwin; }; }) diff --git a/pkgs/games/hhexen/default.nix b/pkgs/games/hhexen/default.nix index 075aae69978b..0e5345e85a7d 100644 --- a/pkgs/games/hhexen/default.nix +++ b/pkgs/games/hhexen/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ moody djanatyn ]; mainProgram = "hhexen-gl"; inherit (SDL.meta) platforms; + broken = stdenv.isDarwin; }; }) diff --git a/pkgs/games/lgames/barrage/default.nix b/pkgs/games/lgames/barrage/default.nix index b0710ad4b650..822ec04f1d45 100644 --- a/pkgs/games/lgames/barrage/default.nix +++ b/pkgs/games/lgames/barrage/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; inherit (SDL.meta) platforms; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/lgames/ltris/default.nix b/pkgs/games/lgames/ltris/default.nix index 30fbbdf4d78e..aaa4a7c34e94 100644 --- a/pkgs/games/lgames/ltris/default.nix +++ b/pkgs/games/lgames/ltris/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ciil ]; inherit (SDL.meta) platforms; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/powermanga/default.nix b/pkgs/games/powermanga/default.nix index ce3f5b9bf557..25a1df5211a3 100644 --- a/pkgs/games/powermanga/default.nix +++ b/pkgs/games/powermanga/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/games/tecnoballz/default.nix b/pkgs/games/tecnoballz/default.nix index d13468b78e00..6366e0ab06a5 100644 --- a/pkgs/games/tecnoballz/default.nix +++ b/pkgs/games/tecnoballz/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; } From 7079aa85667b29f0ff476133c2ae7335d1f46477 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Fri, 28 Apr 2023 17:01:32 +1000 Subject: [PATCH 22/22] wasmserve: init at 1.0.0 --- pkgs/development/tools/wasmserve/default.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/wasmserve/default.nix diff --git a/pkgs/development/tools/wasmserve/default.nix b/pkgs/development/tools/wasmserve/default.nix new file mode 100644 index 000000000000..3248082e2a4c --- /dev/null +++ b/pkgs/development/tools/wasmserve/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, lib +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "wasmserve"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "hajimehoshi"; + repo = "wasmserve"; + rev = "v${version}"; + hash = "sha256-KlCbUre6yIorE1ZM++Rto8vgwVGsC1wZj1xCd3AwQy0="; + }; + + vendorHash = null; + + meta = with lib; { + description = "An HTTP server for testing Wasm"; + homepage = "https://github.com/hajimehoshi/wasmserve"; + license = licenses.asl20; + maintainers = with maintainers; [ kirillrdy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f396085da5ad..16300bd0a748 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14162,6 +14162,8 @@ with pkgs; wasmi = callPackage ../development/tools/wasmi { }; + wasmserve = callPackage ../development/tools/wasmserve {}; + welkin = callPackage ../tools/graphics/welkin { }; wemux = callPackage ../tools/misc/wemux { };