diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index fe5ae020247b..8fec6f3ce6ce 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -159,3 +159,6 @@ fbdcdde04a7caa007e825a8b822c75fab9adb2d6 # step-cli: format package.nix with nixfmt (#331629) fc7a83f8b62e90de5679e993d4d49ca014ea013d + +# darwin.stdenv: format with nixfmt-rfc-style (#333962) +93c10ac9e561c6594d3baaeaff2341907390d9b8 diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 98e6c9c76039..61f0230724cd 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -201,7 +201,16 @@ let }; }; - meta = (builtins.removeAttrs neovim-unwrapped.meta ["position" "outputsToInstall"]) // { + meta = { + inherit (neovim-unwrapped.meta) + description + longDescription + homepage + mainProgram + license + maintainers + platforms; + # To prevent builds on hydra hydraPlatforms = []; # prefer wrapper over the package diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix index 01703d5b1289..8a608af06b42 100644 --- a/pkgs/by-name/pa/pack/package.nix +++ b/pkgs/by-name/pa/pack/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "pack"; - version = "0.35.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "buildpacks"; repo = "pack"; rev = "v${version}"; - hash = "sha256-Y6weRD3MrWEL/KYBMb/bJd6NKfcRELG+RQAhmh/gsuo="; + hash = "sha256-iQkYtnobhAt73JMRrejk0DkOH1ZW2bqfZx05ZrDG5bA="; }; vendorHash = "sha256-gp6Hd0MZxtUX0yYshFIGwrm6yY2pdSOtUs6xmzXBqc4="; diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix index fa673b20f2fe..5b5ee466a16c 100644 --- a/pkgs/by-name/pr/pragtical/package.nix +++ b/pkgs/by-name/pr/pragtical/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pragtical"; - version = "3.4.1"; + version = "3.4.2"; pluginManagerVersion = "1.2.9"; src = fetchFromGitHub { @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { find subprojects -type d -name .git -prune -execdir rm -r {} + ''; - hash = "sha256-JlVNcNPsn4trO0w5NDtWvZhxgY2jXqVzFaXfjxGg6+s="; + hash = "sha256-mYLYRyyKfjTCD8mi1KrQNLqwd8QX1wgpJtpWASQCLQU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/protoc-gen-es/package.nix b/pkgs/by-name/pr/protoc-gen-es/package.nix index 4b357e470550..fe36c239a8a7 100644 --- a/pkgs/by-name/pr/protoc-gen-es/package.nix +++ b/pkgs/by-name/pr/protoc-gen-es/package.nix @@ -7,20 +7,20 @@ buildNpmPackage rec { pname = "protoc-gen-es"; - version = "1.10.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "protobuf-es"; rev = "refs/tags/v${version}"; - hash = "sha256-bHl8gqNrTm1+Cnj43RWmrLDUz+G11C4gprEiNOpyOdQ="; + hash = "sha256-foPt++AZjBfqKepzi2mKXB7zbpCqjmPftN9wyk5Yk8g="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-ozkkakfSBycu83gTs8Orhm5Tg8kRSrF/vMJxVnPjhIw="; + npmDepsHash = "sha256-4m3xeiid+Ag9l1qNoBH08hu3wawWfNw1aqeniFK0Byc="; npmWorkspace = "packages/protoc-gen-es"; diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index 815b0dc8fe8e..2d937677045d 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -13,15 +13,15 @@ let srcHashes = { # Upstream info: It's intended to stay like this in further releases # https://github.com/NixOS/nixpkgs/pull/326152#discussion_r1679558135 - universal-darwin = "sha256-JfZwHFp0aZtHcbP7tyG7uqFs2w+LWKfnfyuxxpxDJZ8="; - x86_64-linux = "sha256-En5vkTHYtwN6GMgbtyhzsPqknOPRO9KlTqZfbBFaIFQ="; + universal-darwin = "sha256-6b+CNCvrkIA1CvSohSJZq/veZZNsA3lyhVv5SsBlJlw="; + x86_64-linux = "sha256-v8ufnQQEqTT5cr7fq8Fozje/NDlBzaCeKIzE6yU/biE="; }; in stdenv.mkDerivation rec { pname = "protonmail-desktop"; # Upstream info: "v"-prefix got dropped - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = diff --git a/pkgs/by-name/su/sunpaper/package.nix b/pkgs/by-name/su/sunpaper/package.nix index e704cb87f1c6..8aa569922bf9 100644 --- a/pkgs/by-name/su/sunpaper/package.nix +++ b/pkgs/by-name/su/sunpaper/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sunpaper"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "hexive"; repo = "sunpaper"; rev = "v${finalAttrs.version}"; - hash = "sha256-8s7SS79wCS0nRR7IpkshP5QWJqqKEeBu6EtFPDM+2cM="; + hash = "sha256-koCK0ntzRf8OXoUj5DJdPWsFDD8EAMjnGdM1B5oeBBc="; }; buildInputs = [ @@ -23,9 +23,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace sunpaper.sh \ - --replace "sunwait" "${lib.getExe sunwait}" \ - --replace "setwallpaper" "${lib.getExe' wallutils "setwallpaper"}" \ - --replace '$HOME/sunpaper/images/' "$out/share/sunpaper/images/" + --replace-fail "sunwait" "${lib.getExe sunwait}" \ + --replace-fail "setwallpaper" "${lib.getExe' wallutils "setwallpaper"}" \ + --replace-fail '$HOME/sunpaper/images/' "$out/share/sunpaper/images/" \ + --replace-fail '/usr/share' '/etc' ''; installPhase = '' diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index c695571ff1f8..79afcbff17c4 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "openmpi"; - version = "5.0.3"; + version = "5.0.5"; src = fetchurl { url = "https://www.open-mpi.org/software/ompi/v${lib.versions.majorMinor finalAttrs.version}/downloads/openmpi-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-mQWC8gazqzLpOKoxu/B8Y5No5EBdyhlvq+fw927tqQs="; + sha256 = "sha256-ZYjVfApL0pmiQQP04ZYFGynotV+9pJ4R1bPTIDCjJ3Y="; }; postPatch = '' @@ -116,8 +116,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature cudaSupport "mca-dso") (lib.enableFeature fortranSupport "mpi-fortran") (lib.withFeatureAs stdenv.isLinux "libnl" (lib.getDev libnl)) - "--with-pmix=${if stdenv.isLinux then (lib.getDev pmix) else "internal"}" - (lib.withFeatureAs stdenv.isLinux "pmix-libdir" "${lib.getLib pmix}/lib") + "--with-pmix=${lib.getDev pmix}" + "--with-pmix-libdir=${lib.getLib pmix}/lib" # Puts a "default OMPI_PRTERUN" value to mpirun / mpiexec executables (lib.withFeatureAs stdenv.isLinux "prrte" (lib.getBin prrte)) (lib.withFeature enableSGE "sge") @@ -212,7 +212,12 @@ stdenv.mkDerivation (finalAttrs: { ${lib.pipe wrapperDataFileNames [ (lib.mapCartesianProduct ( { part1, part2 }: - '' + # From some reason the Darwin build doesn't include some of these + # wrapperDataSubstitutions strings and even some of the files. Hence + # we currently don't perform these substitutions on other platforms, + # until a Darwin user will care enough about this cross platform + # related substitution. + lib.optionalString stdenv.isLinux '' substituteInPlace "''${!outputDev}/share/openmpi/${part1}${part2}-wrapper-data.txt" \ --replace-fail \ compiler=${lib.elemAt wrapperDataSubstitutions.${part2} 0} \ @@ -263,7 +268,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.open-mpi.org/"; description = "Open source MPI-3 implementation"; longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers."; - maintainers = with lib.maintainers; [ markuskowa ]; + maintainers = with lib.maintainers; [ + markuskowa + doronbehar + ]; license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index 31325bd4ba0a..69e86acfef23 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -1,22 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, perl, autoconf, automake -, removeReferencesTo, libtool, python3, flex, libevent -, targetPackages, makeWrapper -, hwloc, munge, zlib, pandoc, gitMinimal -} : +{ + lib, + stdenv, + fetchFromGitHub, + perl, + autoconf, + automake, + removeReferencesTo, + libtool, + python3, + flex, + libevent, + targetPackages, + makeWrapper, + hwloc, + munge, + zlib, + pandoc, + gitMinimal, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pmix"; version = "5.0.3"; src = fetchFromGitHub { repo = "openpmix"; owner = "openpmix"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-5qBZj4L0Qu/RvNj8meL0OlLCdfGvBP0D916Mr+0XOCQ="; fetchSubmodules = true; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" ] ++ lib.optionals stdenv.isLinux [ "dev" ]; postPatch = '' patchShebangs ./autogen.pl @@ -36,7 +51,12 @@ stdenv.mkDerivation rec { makeWrapper ]; - buildInputs = [ libevent hwloc munge zlib ]; + buildInputs = [ + libevent + hwloc + munge + zlib + ]; configureFlags = [ "--with-libevent=${lib.getDev libevent}" @@ -50,40 +70,47 @@ stdenv.mkDerivation rec { ./autogen.pl ''; - postInstall = '' - find $out/lib/ -name "*.la" -exec rm -f \{} \; + postInstall = + '' + find $out/lib/ -name "*.la" -exec rm -f \{} \; - moveToOutput "bin/pmix_info" "''${!outputDev}" - moveToOutput "bin/pmixcc" "''${!outputDev}" - moveToOutput "share/pmix/pmixcc-wrapper-data.txt" "''${!outputDev}" + moveToOutput "bin/pmix_info" "''${!outputDev}" + moveToOutput "bin/pmixcc" "''${!outputDev}" + moveToOutput "share/pmix/pmixcc-wrapper-data.txt" "''${!outputDev}" + + '' + # From some reason the Darwin build doesn't include this file, so we + # currently disable this substitution for any non-Linux platform, until a + # Darwin user will care enough about this cross platform fix. + + lib.optionalString stdenv.isLinux '' + # Pin the compiler to the current version in a cross compiler friendly way. + # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427). + substituteInPlace "''${!outputDev}"/share/pmix/pmixcc-wrapper-data.txt \ + --replace-fail compiler=gcc \ + compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc + ''; + + postFixup = lib.optionalString (lib.elem "dev" finalAttrs.outputs) '' + # The build info (parameters to ./configure) are hardcoded + # into the library. This clears all references to $dev/include. + remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libpmix.so) # The path to the pmixcc-wrapper-data.txt is hard coded and # points to $out instead of dev. Use wrapper to fix paths. - wrapProgram $dev/bin/pmixcc \ - --set PMIX_INCLUDEDIR $dev/include \ - --set PMIX_PKGDATADIR $dev/share/pmix - ''; - - postFixup = '' - # The build info (parameters to ./configure) are hardcoded - # into the library. This clears all references to $dev/include. - remove-references-to -t $dev $(readlink -f $out/lib/libpmix.so) - - # Pin the compiler to the current version in a cross compiler friendly way. - # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427). - substituteInPlace $dev/share/pmix/pmixcc-wrapper-data.txt \ - --replace-fail compiler=gcc \ - compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc + wrapProgram "''${!outputDev}"/bin/pmixcc \ + --set PMIX_INCLUDEDIR "''${!outputDev}"/include \ + --set PMIX_PKGDATADIR "''${!outputDev}"/share/pmix ''; enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Process Management Interface for HPC environments"; homepage = "https://openpmix.github.io/"; - license = licenses.bsd3; - maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + markuskowa + doronbehar + ]; }; -} - +}) diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index c191d7978cd7..04b45a5961de 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, installShellFiles, php, nix-update-script, @@ -10,34 +9,25 @@ php.buildComposerProject (finalAttrs: { pname = "castor"; - version = "0.14.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; rev = "v${finalAttrs.version}"; - hash = "sha256-sSIkXNW6RR1mx15dKouQLMaHBr5FEkTTc/0QIkWV8sg="; + hash = "sha256-ng32vuGlGffpkzf3hXu0sNbj0PCDu4DpZnMnbDV9pZk="; }; - patches = [ - # Upstream lock is invalid. https://github.com/jolicode/castor/issues/319 - (fetchpatch { - name = "fix-invalid-lock.patch"; - url = "https://github.com/jolicode/castor/commit/5ff0c3ecbdddad20146adbc2f055b83f5aadba0f.patch"; - hash = "sha256-1a3Dpk/UXp92Ugw9zSoLPsbWOJEuP2FBWc/pQ/EKwaM="; - }) - ]; - - vendorHash = "sha256-HfEjwlkozeuT4LDnYwiCu7T0spcf4GLhkd7Kc1VRnro="; + vendorHash = "sha256-E2NMWuUQXQ96NbKrcFnFGlxWR0tkd56MXk1bCL0N/sE="; nativeBuildInputs = [ installShellFiles ]; # install shell completions postInstall = '' installShellCompletion --cmd castor \ - --bash <($out/bin/castor completion bash) \ - --fish <($out/bin/castor completion fish) \ - --zsh <($out/bin/castor completion zsh) + --bash <(php $out/bin/castor completion bash) \ + --fish <(php $out/bin/castor completion fish) \ + --zsh <(php $out/bin/castor completion zsh) ''; passthru = { diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 9fc995c3270a..e23299a769df 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "14.5.0"; + version = "14.5.1"; pyproject = true; src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-/j96nM3vW1HpfaxFMyumIj1IccjUcK6lySuTiKf5kLA="; + hash = "sha256-G01gBwBN3oQ5yvobaLiJYrhjjLfninVjSYuXLsJg1DU="; }; postPatch = '' diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/development/tools/extism-cli/default.nix index d499083b523a..ac577f16a970 100644 --- a/pkgs/development/tools/extism-cli/default.nix +++ b/pkgs/development/tools/extism-cli/default.nix @@ -27,9 +27,9 @@ buildGoModule rec { postInstall = '' local INSTALL="$out/bin/extism" installShellCompletion --cmd extism \ - --bash <($out/bin/containerlab completion bash) \ - --fish <($out/bin/containerlab completion fish) \ - --zsh <($out/bin/containerlab completion zsh) + --bash <($out/bin/extism completion bash) \ + --fish <($out/bin/extism completion fish) \ + --zsh <($out/bin/extism completion zsh) ''; meta = with lib; { diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index 71e9133fcea0..504eabcda0c9 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -21,13 +21,13 @@ let common = rec { - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; rev = version; - hash = "sha256-iB6Hc3kgtsZ360JlAhPqCRWFTf3tawHEKYAeYt7DM4E="; + hash = "sha256-JmDMcxIQ0220O/vWw/9SyB1dH7MSJaPK/CKY44ViVjM="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 39b7f865b669..0519e41b803a 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -181,10 +181,6 @@ while [ "$#" -gt 0 ]; do esac done -if [[ -n "$SUDO_USER" ]]; then - useSudo=1 -fi - # log the given argument to stderr if verbose mode is on logVerbose() { if [ -n "$verboseScript" ]; then diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 198dc671d078..191a8a0bc23b 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.14.3"; + version = "2.14.4"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-9/KtlthI71qrf1QlJ0/WI+H401U+6bnrO1qfQO5TTUU="; + sha256 = "sha256-IV5ZyVuZvr09wQ8SgcHiTBp916B2ZPQvrg9+O8H3xsk="; }; installPhase = '' diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 57e4a9c4987f..13d53ad6e678 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -7,17 +7,19 @@ # See also the top comments of the Linux stdenv `../linux/default.nix` for a good overview of # the bootstrap process and working with it. -{ lib -, localSystem -, crossSystem -, config -, overlays -, crossOverlays ? [ ] +{ + lib, + localSystem, + crossSystem, + config, + overlays, + crossOverlays ? [ ], # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools -, bootstrapFiles ? if localSystem.isAarch64 then - import ./bootstrap-files/aarch64-apple-darwin.nix - else - import ./bootstrap-files/x86_64-apple-darwin.nix + bootstrapFiles ? + if localSystem.isAarch64 then + import ./bootstrap-files/aarch64-apple-darwin.nix + else + import ./bootstrap-files/x86_64-apple-darwin.nix, }: assert crossSystem == localSystem; @@ -34,12 +36,9 @@ let ]; isFromNixpkgs = pkg: !(isFromBootstrapFiles pkg); - isFromBootstrapFiles = - pkg: pkg.passthru.isFromBootstrapFiles or false; - isBuiltByNixpkgsCompiler = - pkg: isFromNixpkgs pkg && isFromNixpkgs pkg.stdenv.cc.cc; - isBuiltByBootstrapFilesCompiler = - pkg: isFromNixpkgs pkg && isFromBootstrapFiles pkg.stdenv.cc.cc; + isFromBootstrapFiles = pkg: pkg.passthru.isFromBootstrapFiles or false; + isBuiltByNixpkgsCompiler = pkg: isFromNixpkgs pkg && isFromNixpkgs pkg.stdenv.cc.cc; + isBuiltByBootstrapFilesCompiler = pkg: isFromNixpkgs pkg && isFromBootstrapFiles pkg.stdenv.cc.cc; commonPreHook = '' export NIX_ENFORCE_NO_NATIVE=''${NIX_ENFORCE_NO_NATIVE-1} @@ -48,84 +47,97 @@ let unset SDKROOT ''; - bootstrapTools = derivation ({ - inherit system; + bootstrapTools = + derivation ( + { + inherit system; - name = "bootstrap-tools"; - builder = "${bootstrapFiles.unpack}/bin/bash"; + name = "bootstrap-tools"; + builder = "${bootstrapFiles.unpack}/bin/bash"; - args = [ - "${bootstrapFiles.unpack}/bootstrap-tools-unpack.sh" - bootstrapFiles.bootstrapTools - ]; - - PATH = lib.makeBinPath [ - (placeholder "out") - bootstrapFiles.unpack - ]; - - __impureHostDeps = commonImpureHostDeps; - } // lib.optionalAttrs config.contentAddressedByDefault { - __contentAddressed = true; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - }) // { passthru.isFromBootstrapFiles = true; }; - - stageFun = prevStage: - { name, overrides ? (self: super: { }), extraNativeBuildInputs ? [ ], extraPreHook ? "" }: - - let - cc = if prevStage.llvmPackages.clang-unwrapped == null - then null else - lib.makeOverridable (import ../../build-support/cc-wrapper) { - name = "${name}-clang-wrapper"; - - nativeTools = false; - nativeLibc = false; - - expand-response-params = lib.optionalString - (prevStage.stdenv.hasCC or false && prevStage.stdenv.cc != "/dev/null") - prevStage.expand-response-params; - - extraPackages = [ - prevStage.llvmPackages.compiler-rt + args = [ + "${bootstrapFiles.unpack}/bootstrap-tools-unpack.sh" + bootstrapFiles.bootstrapTools ]; - extraBuildCommands = - let - inherit (prevStage.llvmPackages) clang-unwrapped compiler-rt release_version; - in - '' - function clangResourceRootIncludePath() { - clangLib="$1/lib/clang" - if (( $(ls "$clangLib" | wc -l) > 1 )); then - echo "Multiple LLVM versions were found at "$clangLib", but there must only be one used when building the stdenv." >&2 - exit 1 - fi - echo "$clangLib/$(ls -1 "$clangLib")/include" - } + PATH = lib.makeBinPath [ + (placeholder "out") + bootstrapFiles.unpack + ]; - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "$(clangResourceRootIncludePath "${clang-unwrapped.lib}")" "$rsrc" - ln -s "${compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${compiler-rt.out}/share" "$rsrc/share" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; + __impureHostDeps = commonImpureHostDeps; + } + // lib.optionalAttrs config.contentAddressedByDefault { + __contentAddressed = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + } + ) + // { + passthru.isFromBootstrapFiles = true; + }; - cc = prevStage.llvmPackages.clang-unwrapped; - bintools = prevStage.darwin.binutils; + stageFun = + prevStage: + { + name, + overrides ? (self: super: { }), + extraNativeBuildInputs ? [ ], + extraPreHook ? "", + }: - isClang = true; - libc = prevStage.darwin.Libsystem; - inherit (prevStage.llvmPackages) libcxx; + let + cc = + if prevStage.llvmPackages.clang-unwrapped == null then + null + else + lib.makeOverridable (import ../../build-support/cc-wrapper) { + name = "${name}-clang-wrapper"; - inherit lib; - inherit (prevStage) coreutils gnugrep; + nativeTools = false; + nativeLibc = false; - stdenvNoCC = prevStage.ccWrapperStdenv; - runtimeShell = prevStage.ccWrapperStdenv.shell; - }; + expand-response-params = lib.optionalString ( + prevStage.stdenv.hasCC or false && prevStage.stdenv.cc != "/dev/null" + ) prevStage.expand-response-params; + + extraPackages = [ prevStage.llvmPackages.compiler-rt ]; + + extraBuildCommands = + let + inherit (prevStage.llvmPackages) clang-unwrapped compiler-rt release_version; + in + '' + function clangResourceRootIncludePath() { + clangLib="$1/lib/clang" + if (( $(ls "$clangLib" | wc -l) > 1 )); then + echo "Multiple LLVM versions were found at "$clangLib", but there must only be one used when building the stdenv." >&2 + exit 1 + fi + echo "$clangLib/$(ls -1 "$clangLib")/include" + } + + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "$(clangResourceRootIncludePath "${clang-unwrapped.lib}")" "$rsrc" + ln -s "${compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${compiler-rt.out}/share" "$rsrc/share" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + ''; + + cc = prevStage.llvmPackages.clang-unwrapped; + bintools = prevStage.darwin.binutils; + + isClang = true; + libc = prevStage.darwin.Libsystem; + inherit (prevStage.llvmPackages) libcxx; + + inherit lib; + inherit (prevStage) coreutils gnugrep; + + stdenvNoCC = prevStage.ccWrapperStdenv; + runtimeShell = prevStage.ccWrapperStdenv.shell; + }; bash = prevStage.bash or bootstrapTools; @@ -139,22 +151,27 @@ let inherit config; extraBuildInputs = [ prevStage.darwin.CF ]; - extraNativeBuildInputs = extraNativeBuildInputs - ++ [ prevStage.darwin.apple_sdk.sdkRoot ]; + extraNativeBuildInputs = extraNativeBuildInputs ++ [ prevStage.darwin.apple_sdk.sdkRoot ]; - preHook = lib.optionalString (!isBuiltByNixpkgsCompiler bash) '' - # Don't patch #!/interpreter because it leads to retained - # dependencies on the bootstrapTools in the final stdenv. - dontPatchShebangs=1 - '' + '' - ${commonPreHook} - ${extraPreHook} - '' + lib.optionalString (prevStage.darwin ? locale) '' - export PATH_LOCALE=${prevStage.darwin.locale}/share/locale - ''; + preHook = + lib.optionalString (!isBuiltByNixpkgsCompiler bash) '' + # Don't patch #!/interpreter because it leads to retained + # dependencies on the bootstrapTools in the final stdenv. + dontPatchShebangs=1 + '' + + '' + ${commonPreHook} + ${extraPreHook} + '' + + lib.optionalString (prevStage.darwin ? locale) '' + export PATH_LOCALE=${prevStage.darwin.locale}/share/locale + ''; shell = bash + "/bin/bash"; - initialPath = [ bash bootstrapTools ]; + initialPath = [ + bash + bootstrapTools + ]; fetchurlBoot = import ../../build-support/fetchurl { inherit lib; @@ -171,11 +188,14 @@ let # Using the bootstrap tools curl for fetchers allows the stdenv bootstrap to avoid # having a dependency on curl, allowing curl to be updated without triggering a # new stdenv bootstrap on Darwin. - overrides = self: super: (overrides self super) // { - fetchurl = thisStdenv.fetchurlBoot; - fetchpatch = super.fetchpatch.override { inherit (self) fetchurl; }; - fetchzip = super.fetchzip.override { inherit (self) fetchurl; }; - }; + overrides = + self: super: + (overrides self super) + // { + fetchurl = thisStdenv.fetchurlBoot; + fetchpatch = super.fetchpatch.override { inherit (self) fetchurl; }; + fetchzip = super.fetchzip.override { inherit (self) fetchurl; }; + }; }; in @@ -184,533 +204,783 @@ let stdenv = thisStdenv; }; in - assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check +assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check [ - ({}: { - __raw = true; + ( + { }: + { + __raw = true; - cctools = true; - ld64 = true; + cctools = true; + ld64 = true; - coreutils = null; - gnugrep = null; + coreutils = null; + gnugrep = null; - pbzx = null; - cpio = null; + pbzx = null; + cpio = null; - darwin = { - apple_sdk.sdkRoot = null; - binutils = null; - binutils-unwrapped = null; - print-reexports = null; - rewrite-tbd = null; - sigtool = null; - CF = null; - Libsystem = null; - }; + darwin = { + apple_sdk.sdkRoot = null; + binutils = null; + binutils-unwrapped = null; + print-reexports = null; + rewrite-tbd = null; + sigtool = null; + CF = null; + Libsystem = null; + }; - llvmPackages = { - clang-unwrapped = null; - libllvm = null; - libcxx = null; - compiler-rt = null; - }; - }) + llvmPackages = { + clang-unwrapped = null; + libllvm = null; + libcxx = null; + compiler-rt = null; + }; + } + ) # Create a stage with the bootstrap tools. This will be used to build the subsequent stages and # build up the standard environment. # # Note: Each stage depends only on the the packages in `prevStage`. If a package is not to be # rebuilt, it should be passed through by inheriting it. - (prevStage: stageFun prevStage { - name = "bootstrap-stage0"; + ( + prevStage: + stageFun prevStage { + name = "bootstrap-stage0"; - overrides = self: super: { - # We thread stage0's stdenv through under this name so downstream stages - # can use it for wrapping gcc too. This way, downstream stages don't need - # to refer to this stage directly, which violates the principle that each - # stage should only access the stage that came before it. - ccWrapperStdenv = self.stdenv; + overrides = self: super: { + # We thread stage0's stdenv through under this name so downstream stages + # can use it for wrapping gcc too. This way, downstream stages don't need + # to refer to this stage directly, which violates the principle that each + # stage should only access the stage that came before it. + ccWrapperStdenv = self.stdenv; - bash = bootstrapTools // { - shellPath = "/bin/bash"; - }; - - coreutils = bootstrapTools; - cpio = bootstrapTools; - gnugrep = bootstrapTools; - pbzx = bootstrapTools; - - cctools = super.stdenv.mkDerivation { - pname = "bootstrap-stage0-cctools"; - version = "boot"; - - buildCommand = '' - declare -a cctools=( - ar - bitcode_strip - check_dylib - checksyms - cmpdylib - codesign_allocate - ctf_insert - depinfo - diagtest - gas - gprof - install_name_tool - libtool - lipo - mtoc - mtor - nm - nmedit - otool - pagestuff - ranlib - redo_prebinding - seg_addr_table - seg_hack - segedit - size - strings - strip - vtool - ) - - mkdir -p "$out/bin" - for tool in "''${cctools[@]}"; do - toolsrc="${bootstrapTools}/bin/$tool" - if [ -e "$toolsrc" ]; then - ln -s "$toolsrc" "$out/bin" - fi - done - - # Copy only the required headers to avoid accidentally linking headers that belong to other packages, - # which can cause problems when building Libsystem in the source-based SDK. - declare -a machohdrs=( - arch.h - fat.h - fixup-chains.h - getsect.h - ldsyms.h - loader.h - nlist.h - ranlib.h - reloc.h - stab.h - swap.h - arm - arm64 - hppa - i386 - i860 - m68k - m88k - ppc - sparc - x86_64 - ) - - mkdir -p "$out/include/mach-o" - for header in "''${machohdrs[@]}"; do - machosrc="${bootstrapTools}/include-Libsystem/mach-o/$header" - if [ -e "$machosrc" ]; then - cp -r "$machosrc" "$out/include/mach-o/$header" - fi - done - ''; - - passthru = { - isFromBootstrapFiles = true; - targetPrefix = ""; - }; - }; - - ld64 = bootstrapTools // { - targetPrefix = ""; - version = "boot"; - }; - - darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { - # Prevent CF from being propagated to the initial stdenv. Packages that require it - # will have to manually add it to their build inputs. - CF = null; - - binutils = super.wrapBintoolsWith { - name = "bootstrap-stage0-binutils-wrapper"; - - nativeTools = false; - nativeLibc = false; - - expand-response-params = ""; - libc = selfDarwin.Libsystem; - - inherit lib; - inherit (self) stdenvNoCC coreutils gnugrep; - runtimeShell = self.stdenvNoCC.shell; - - bintools = selfDarwin.binutils-unwrapped; - - # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly. - # This can be dropped once the bootstrap tools cctools has been updated to 1010.6. - extraBuildCommands = '' - echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook - - export signingUtils=${selfDarwin.signingUtils} - - wrap \ - install_name_tool ${../../build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh} \ - "${selfDarwin.binutils-unwrapped}/bin/install_name_tool" - - wrap \ - strip ${../../build-support/bintools-wrapper/darwin-strip-wrapper.sh} \ - "${selfDarwin.binutils-unwrapped}/bin/strip" - ''; + bash = bootstrapTools // { + shellPath = "/bin/bash"; }; - binutils-unwrapped = (superDarwin.binutils-unwrapped.overrideAttrs (old: { + coreutils = bootstrapTools; + cpio = bootstrapTools; + gnugrep = bootstrapTools; + pbzx = bootstrapTools; + + cctools = super.stdenv.mkDerivation { + pname = "bootstrap-stage0-cctools"; version = "boot"; - passthru = (old.passthru or { }) // { - isFromBootstrapFiles = true; - }; - })).override { enableManpages = false; }; - locale = self.stdenv.mkDerivation { - name = "bootstrap-stage0-locale"; buildCommand = '' - mkdir -p $out/share/locale - ''; - }; + declare -a cctools=( + ar + bitcode_strip + check_dylib + checksyms + cmpdylib + codesign_allocate + ctf_insert + depinfo + diagtest + gas + gprof + install_name_tool + libtool + lipo + mtoc + mtor + nm + nmedit + otool + pagestuff + ranlib + redo_prebinding + seg_addr_table + seg_hack + segedit + size + strings + strip + vtool + ) - print-reexports = bootstrapTools; - - rewrite-tbd = bootstrapTools; - - sigtool = bootstrapTools; - } // lib.optionalAttrs (! useAppleSDKLibs) { - Libsystem = self.stdenv.mkDerivation { - name = "bootstrap-stage0-Libsystem"; - buildCommand = '' - mkdir -p $out - - cp -r ${selfDarwin.darwin-stubs}/usr/lib $out/lib - chmod -R +w $out/lib - substituteInPlace $out/lib/libSystem.B.tbd --replace /usr/lib/system $out/lib/system - - ln -s libSystem.B.tbd $out/lib/libSystem.tbd - - for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do - ln -s libSystem.tbd $out/lib/lib$name.tbd + mkdir -p "$out/bin" + for tool in "''${cctools[@]}"; do + toolsrc="${bootstrapTools}/bin/$tool" + if [ -e "$toolsrc" ]; then + ln -s "$toolsrc" "$out/bin" + fi done - ln -s ${bootstrapTools}/lib/*.o $out/lib + # Copy only the required headers to avoid accidentally linking headers that belong to other packages, + # which can cause problems when building Libsystem in the source-based SDK. + declare -a machohdrs=( + arch.h + fat.h + fixup-chains.h + getsect.h + ldsyms.h + loader.h + nlist.h + ranlib.h + reloc.h + stab.h + swap.h + arm + arm64 + hppa + i386 + i860 + m68k + m88k + ppc + sparc + x86_64 + ) - ln -s ${bootstrapTools}/lib/libresolv.9.dylib $out/lib - ln -s libresolv.9.dylib $out/lib/libresolv.dylib - - ln -s ${bootstrapTools}/include-Libsystem $out/include + mkdir -p "$out/include/mach-o" + for header in "''${machohdrs[@]}"; do + machosrc="${bootstrapTools}/include-Libsystem/mach-o/$header" + if [ -e "$machosrc" ]; then + cp -r "$machosrc" "$out/include/mach-o/$header" + fi + done ''; - passthru.isFromBootstrapFiles = true; + + passthru = { + isFromBootstrapFiles = true; + targetPrefix = ""; + }; }; - }); - llvmPackages = super.llvmPackages // ( - let - tools = super.llvmPackages.tools.extend (selfTools: _: { - libclang = self.stdenv.mkDerivation { - name = "bootstrap-stage0-clang"; - version = "boot"; - outputs = [ "out" "lib" ]; - buildCommand = '' - mkdir -p $out/lib - ln -s $out $lib - ln -s ${bootstrapTools}/bin $out/bin - ln -s ${bootstrapTools}/lib/clang $out/lib - ln -s ${bootstrapTools}/include $out + ld64 = bootstrapTools // { + targetPrefix = ""; + version = "boot"; + }; + + darwin = super.darwin.overrideScope ( + selfDarwin: superDarwin: + { + # Prevent CF from being propagated to the initial stdenv. Packages that require it + # will have to manually add it to their build inputs. + CF = null; + + binutils = super.wrapBintoolsWith { + name = "bootstrap-stage0-binutils-wrapper"; + + nativeTools = false; + nativeLibc = false; + + expand-response-params = ""; + libc = selfDarwin.Libsystem; + + inherit lib; + inherit (self) stdenvNoCC coreutils gnugrep; + runtimeShell = self.stdenvNoCC.shell; + + bintools = selfDarwin.binutils-unwrapped; + + # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly. + # This can be dropped once the bootstrap tools cctools has been updated to 1010.6. + extraBuildCommands = '' + echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook + + export signingUtils=${selfDarwin.signingUtils} + + wrap \ + install_name_tool ${../../build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh} \ + "${selfDarwin.binutils-unwrapped}/bin/install_name_tool" + + wrap \ + strip ${../../build-support/bintools-wrapper/darwin-strip-wrapper.sh} \ + "${selfDarwin.binutils-unwrapped}/bin/strip" ''; - passthru = { - isFromBootstrapFiles = true; - hardeningUnsupportedFlags = [ - "fortify3" - "shadowstack" - "stackclashprotection" - "zerocallusedregs" - ]; - }; }; - libllvm = self.stdenv.mkDerivation { - name = "bootstrap-stage0-llvm"; - outputs = [ "out" "lib" ]; + + binutils-unwrapped = + (superDarwin.binutils-unwrapped.overrideAttrs (old: { + version = "boot"; + passthru = (old.passthru or { }) // { + isFromBootstrapFiles = true; + }; + })).override + { enableManpages = false; }; + + locale = self.stdenv.mkDerivation { + name = "bootstrap-stage0-locale"; buildCommand = '' - mkdir -p $out/bin $out/lib - ln -s $out $lib - for tool in ${toString super.darwin.binutils-unwrapped.llvm_cmds}; do - cctoolsTool=''${tool//-/_} - toolsrc="${bootstrapTools}/bin/$cctoolsTool" - if [ -e "$toolsrc" ]; then - ln -s "$toolsrc" $out/bin/llvm-$tool - fi + mkdir -p $out/share/locale + ''; + }; + + print-reexports = bootstrapTools; + + rewrite-tbd = bootstrapTools; + + sigtool = bootstrapTools; + } + // lib.optionalAttrs (!useAppleSDKLibs) { + Libsystem = self.stdenv.mkDerivation { + name = "bootstrap-stage0-Libsystem"; + buildCommand = '' + mkdir -p $out + + cp -r ${selfDarwin.darwin-stubs}/usr/lib $out/lib + chmod -R +w $out/lib + substituteInPlace $out/lib/libSystem.B.tbd --replace /usr/lib/system $out/lib/system + + ln -s libSystem.B.tbd $out/lib/libSystem.tbd + + for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do + ln -s libSystem.tbd $out/lib/lib$name.tbd done - ln -s ${bootstrapTools}/bin/dsymutil $out/bin/dsymutil - ln -s ${bootstrapTools}/lib/libLLVM* $out/lib - ''; - passthru.isFromBootstrapFiles = true; - }; - }); - libraries = super.llvmPackages.libraries.extend (_: _: { - libcxx = self.stdenv.mkDerivation { - name = "bootstrap-stage0-libcxx"; - buildCommand = '' - mkdir -p $out/lib $out/include - ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib - ln -s ${bootstrapTools}/include/c++ $out/include - ''; - passthru = { - isLLVM = true; - isFromBootstrapFiles = true; - }; - }; - compiler-rt = self.stdenv.mkDerivation { - name = "bootstrap-stage0-compiler-rt"; - buildCommand = '' - mkdir -p $out/lib $out/share - ln -s ${bootstrapTools}/lib/libclang_rt* $out/lib - ln -s ${bootstrapTools}/lib/darwin $out/lib - ''; - passthru.isFromBootstrapFiles = true; - }; - }); - in - { inherit tools libraries; } // tools // libraries - ); - }; - extraPreHook = '' - stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O - ''; - }) + ln -s ${bootstrapTools}/lib/*.o $out/lib + + ln -s ${bootstrapTools}/lib/libresolv.9.dylib $out/lib + ln -s libresolv.9.dylib $out/lib/libresolv.dylib + + ln -s ${bootstrapTools}/include-Libsystem $out/include + ''; + passthru.isFromBootstrapFiles = true; + }; + } + ); + + llvmPackages = + super.llvmPackages + // ( + let + tools = super.llvmPackages.tools.extend ( + selfTools: _: { + libclang = self.stdenv.mkDerivation { + name = "bootstrap-stage0-clang"; + version = "boot"; + outputs = [ + "out" + "lib" + ]; + buildCommand = '' + mkdir -p $out/lib + ln -s $out $lib + ln -s ${bootstrapTools}/bin $out/bin + ln -s ${bootstrapTools}/lib/clang $out/lib + ln -s ${bootstrapTools}/include $out + ''; + passthru = { + isFromBootstrapFiles = true; + hardeningUnsupportedFlags = [ + "fortify3" + "shadowstack" + "stackclashprotection" + "zerocallusedregs" + ]; + }; + }; + libllvm = self.stdenv.mkDerivation { + name = "bootstrap-stage0-llvm"; + outputs = [ + "out" + "lib" + ]; + buildCommand = '' + mkdir -p $out/bin $out/lib + ln -s $out $lib + for tool in ${toString super.darwin.binutils-unwrapped.llvm_cmds}; do + cctoolsTool=''${tool//-/_} + toolsrc="${bootstrapTools}/bin/$cctoolsTool" + if [ -e "$toolsrc" ]; then + ln -s "$toolsrc" $out/bin/llvm-$tool + fi + done + ln -s ${bootstrapTools}/bin/dsymutil $out/bin/dsymutil + ln -s ${bootstrapTools}/lib/libLLVM* $out/lib + ''; + passthru.isFromBootstrapFiles = true; + }; + } + ); + libraries = super.llvmPackages.libraries.extend ( + _: _: { + libcxx = self.stdenv.mkDerivation { + name = "bootstrap-stage0-libcxx"; + buildCommand = '' + mkdir -p $out/lib $out/include + ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib + ln -s ${bootstrapTools}/include/c++ $out/include + ''; + passthru = { + isLLVM = true; + isFromBootstrapFiles = true; + }; + }; + compiler-rt = self.stdenv.mkDerivation { + name = "bootstrap-stage0-compiler-rt"; + buildCommand = '' + mkdir -p $out/lib $out/share + ln -s ${bootstrapTools}/lib/libclang_rt* $out/lib + ln -s ${bootstrapTools}/lib/darwin $out/lib + ''; + passthru.isFromBootstrapFiles = true; + }; + } + ); + in + { inherit tools libraries; } // tools // libraries + ); + }; + + extraPreHook = '' + stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O + ''; + } + ) # This stage is primarily responsible for setting up versions of certain dependencies needed # by the rest of the build process. This stage also builds CF and Libsystem to simplify assertions # and assumptions for later by making sure both packages are present on x86_64-darwin and aarch64-darwin. - (prevStage: + ( + prevStage: # previous stage0 stdenv: assert lib.all isFromBootstrapFiles ( - with prevStage; [ bash cctools coreutils cpio gnugrep ld64 ] ++ lib.optionals useAppleSDKLibs [ pbzx ] + with prevStage; + [ + bash + cctools + coreutils + cpio + gnugrep + ld64 + ] + ++ lib.optionals useAppleSDKLibs [ pbzx ] ); - assert lib.all isFromBootstrapFiles (with prevStage.darwin; [ - binutils-unwrapped print-reexports rewrite-tbd sigtool - ]); + assert lib.all isFromBootstrapFiles ( + with prevStage.darwin; + [ + binutils-unwrapped + print-reexports + rewrite-tbd + sigtool + ] + ); - assert (! useAppleSDKLibs) -> lib.all isFromBootstrapFiles (with prevStage.darwin; [ Libsystem ]); - assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ Libsystem ]); - assert lib.all isFromNixpkgs (with prevStage.darwin; [ dyld launchd xnu ]); - assert (with prevStage.darwin; (! useAppleSDKLibs) -> CF == null); + assert (!useAppleSDKLibs) -> lib.all isFromBootstrapFiles (with prevStage.darwin; [ Libsystem ]); + assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ Libsystem ]); + assert lib.all isFromNixpkgs ( + with prevStage.darwin; + [ + dyld + launchd + xnu + ] + ); + assert (with prevStage.darwin; (!useAppleSDKLibs) -> CF == null); - assert lib.all isFromBootstrapFiles (with prevStage.llvmPackages; [ - clang-unwrapped libclang libllvm llvm compiler-rt libcxx - ]); + assert lib.all isFromBootstrapFiles ( + with prevStage.llvmPackages; + [ + clang-unwrapped + libclang + libllvm + llvm + compiler-rt + libcxx + ] + ); stageFun prevStage { - name = "bootstrap-stage1"; + name = "bootstrap-stage1"; - overrides = self: super: { - inherit (prevStage) ccWrapperStdenv - cctools coreutils gnugrep ld64; + overrides = self: super: { + inherit (prevStage) + ccWrapperStdenv + cctools + coreutils + gnugrep + ld64 + ; - binutils-unwrapped = builtins.throw "nothing in the Darwin bootstrap should depend on GNU binutils"; - curl = builtins.throw "nothing in the Darwin bootstrap can depend on curl"; + binutils-unwrapped = builtins.throw "nothing in the Darwin bootstrap should depend on GNU binutils"; + curl = builtins.throw "nothing in the Darwin bootstrap can depend on curl"; - # Use this stage’s CF to build CMake. It’s required but can’t be included in the stdenv. - cmake = self.cmakeMinimal; - cmakeMinimal = super.cmakeMinimal.overrideAttrs (old: { - buildInputs = old.buildInputs ++ [ self.darwin.CF ]; - }); - - # Disable tests because they use dejagnu, which fails to run. - libffi = super.libffi.override { doCheck = false; }; - - # Use libconvReal to break an infinite recursion. It will be dropped in the next stage. - libiconv = super.libiconvReal; - - # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds. - libxml2 = super.libxml2.override { pythonSupport = false; }; - - ninja = super.ninja.override { buildDocs = false; }; - - # Use this stage’s CF to build Python. It’s required, but it can’t be included in the stdenv. - python3 = self.python3Minimal; - python3Minimal = (super.python3Minimal.override { - self = self.python3Minimal; - }).overrideAttrs (old: { - buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ]; - }); - - scons = super.scons.override { python3Packages = self.python3Minimal.pkgs; }; - - darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { - apple_sdk = superDarwin.apple_sdk // { - inherit (prevStage.darwin.apple_sdk) sdkRoot; - }; - - # Use this stage’s CF to build configd. It’s required, but it can’t be included in the stdenv. - configd = superDarwin.configd.overrideAttrs (old: { - buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ]; + # Use this stage’s CF to build CMake. It’s required but can’t be included in the stdenv. + cmake = self.cmakeMinimal; + cmakeMinimal = super.cmakeMinimal.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ self.darwin.CF ]; }); - signingUtils = prevStage.darwin.signingUtils.override { - inherit (selfDarwin) sigtool; - }; + # Disable tests because they use dejagnu, which fails to run. + libffi = super.libffi.override { doCheck = false; }; - postLinkSignHook = prevStage.darwin.postLinkSignHook.override { - inherit (selfDarwin) sigtool; - }; + # Use libconvReal to break an infinite recursion. It will be dropped in the next stage. + libiconv = super.libiconvReal; - # Rewrap binutils with the real Libsystem - binutils = superDarwin.binutils.override { - inherit (self) coreutils; - bintools = selfDarwin.binutils-unwrapped; - libc = selfDarwin.Libsystem; - # TODO(@sternenseemann): can this be removed? - runtimeShell = "${bootstrapTools}/bin/bash"; + # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds. + libxml2 = super.libxml2.override { pythonSupport = false; }; - # Bootstrap tools cctools needs the hook to make sure things are signed properly. - # This can be dropped once the bootstrap tools cctools has been updated to 1010.6. - extraBuildCommands = '' - echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook + ninja = super.ninja.override { buildDocs = false; }; - export signingUtils=${selfDarwin.signingUtils} + # Use this stage’s CF to build Python. It’s required, but it can’t be included in the stdenv. + python3 = self.python3Minimal; + python3Minimal = + (super.python3Minimal.override { self = self.python3Minimal; }).overrideAttrs + (old: { + buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ]; + }); - wrap \ - install_name_tool ${../../build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh} \ - "${selfDarwin.binutils-unwrapped}/bin/install_name_tool" + scons = super.scons.override { python3Packages = self.python3Minimal.pkgs; }; - wrap \ - strip ${../../build-support/bintools-wrapper/darwin-strip-wrapper.sh} \ - "${selfDarwin.binutils-unwrapped}/bin/strip" - ''; - }; + darwin = super.darwin.overrideScope ( + selfDarwin: superDarwin: { + apple_sdk = superDarwin.apple_sdk // { + inherit (prevStage.darwin.apple_sdk) sdkRoot; + }; - # Avoid building unnecessary Python dependencies due to building LLVM manpages. - binutils-unwrapped = superDarwin.binutils-unwrapped.override { - inherit (self) cctools ld64; - enableManpages = false; - }; - }); + # Use this stage’s CF to build configd. It’s required, but it can’t be included in the stdenv. + configd = superDarwin.configd.overrideAttrs (old: { + buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ]; + }); - llvmPackages = super.llvmPackages // ( - let - tools = super.llvmPackages.tools.extend (_: _: { - inherit (prevStage.llvmPackages) clang-unwrapped libclang libllvm llvm; - }); - libraries = super.llvmPackages.libraries.extend (_: _: { - inherit (prevStage.llvmPackages) compiler-rt libcxx; - }); - in - { inherit tools libraries; inherit (prevStage.llvmPackages) release_version; } // tools // libraries - ); - }; + signingUtils = prevStage.darwin.signingUtils.override { inherit (selfDarwin) sigtool; }; - extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ - prevStage.updateAutotoolsGnuConfigScriptsHook - prevStage.gnu-config - ]; + postLinkSignHook = prevStage.darwin.postLinkSignHook.override { inherit (selfDarwin) sigtool; }; + # Rewrap binutils with the real Libsystem + binutils = superDarwin.binutils.override { + inherit (self) coreutils; + bintools = selfDarwin.binutils-unwrapped; + libc = selfDarwin.Libsystem; + # TODO(@sternenseemann): can this be removed? + runtimeShell = "${bootstrapTools}/bin/bash"; - extraPreHook = '' - stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O - ''; - }) + # Bootstrap tools cctools needs the hook to make sure things are signed properly. + # This can be dropped once the bootstrap tools cctools has been updated to 1010.6. + extraBuildCommands = '' + echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook + + export signingUtils=${selfDarwin.signingUtils} + + wrap \ + install_name_tool ${../../build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh} \ + "${selfDarwin.binutils-unwrapped}/bin/install_name_tool" + + wrap \ + strip ${../../build-support/bintools-wrapper/darwin-strip-wrapper.sh} \ + "${selfDarwin.binutils-unwrapped}/bin/strip" + ''; + }; + + # Avoid building unnecessary Python dependencies due to building LLVM manpages. + binutils-unwrapped = superDarwin.binutils-unwrapped.override { + inherit (self) cctools ld64; + enableManpages = false; + }; + } + ); + + llvmPackages = + super.llvmPackages + // ( + let + tools = super.llvmPackages.tools.extend ( + _: _: { + inherit (prevStage.llvmPackages) + clang-unwrapped + libclang + libllvm + llvm + ; + } + ); + libraries = super.llvmPackages.libraries.extend ( + _: _: { inherit (prevStage.llvmPackages) compiler-rt libcxx; } + ); + in + { + inherit tools libraries; + inherit (prevStage.llvmPackages) release_version; + } + // tools + // libraries + ); + }; + + extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ + prevStage.updateAutotoolsGnuConfigScriptsHook + prevStage.gnu-config + ]; + + extraPreHook = '' + stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O + ''; + } + ) # Build sysctl for use by LLVM’s check phase. It must be built separately to avoid an infinite recursion. - (prevStage: + ( + prevStage: # previous stage1 stdenv: - assert lib.all isFromBootstrapFiles (with prevStage; [ cctools coreutils gnugrep ld64 ]); + assert lib.all isFromBootstrapFiles ( + with prevStage; + [ + cctools + coreutils + gnugrep + ld64 + ] + ); - assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ - autoconf automake bash bison brotli cmake cpio cyrus_sasl db - ed expat flex gettext gmp groff icu libedit libffi libiconv libidn2 libkrb5 libssh2 - libtool libunistring libxml2 m4 ncurses nghttp2 ninja openldap openssh openssl - patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite - subversion texinfo unzip which xz zlib zstd - ]); + assert lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage; + [ + autoconf + automake + bash + bison + brotli + cmake + cpio + cyrus_sasl + db + ed + expat + flex + gettext + gmp + groff + icu + libedit + libffi + libiconv + libidn2 + libkrb5 + libssh2 + libtool + libunistring + libxml2 + m4 + ncurses + nghttp2 + ninja + openldap + openssh + openssl + patchutils + pbzx + perl + pkg-config.pkg-config + python3 + python3Minimal + scons + serf + sqlite + subversion + texinfo + unzip + which + xz + zlib + zstd + ] + ); - assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ - locale print-reexports rewrite-tbd sigtool - ]); + assert lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage.darwin; + [ + locale + print-reexports + rewrite-tbd + sigtool + ] + ); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); - assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); - assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc]); - assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd xnu ]); + assert + (!useAppleSDKLibs) + -> lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage.darwin; + [ + Libsystem + configd + ] + ); + assert (!useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); + assert + useAppleSDKLibs + -> lib.all isFromNixpkgs ( + with prevStage.darwin; + [ + CF + Libsystem + libobjc + ] + ); + assert lib.all isFromNixpkgs ( + with prevStage.darwin; + [ + binutils-unwrapped + dyld + launchd + xnu + ] + ); - assert lib.all isFromBootstrapFiles (with prevStage.llvmPackages; [ - clang-unwrapped libclang libllvm llvm compiler-rt libcxx - ]); + assert lib.all isFromBootstrapFiles ( + with prevStage.llvmPackages; + [ + clang-unwrapped + libclang + libllvm + llvm + compiler-rt + libcxx + ] + ); assert lib.getVersion prevStage.stdenv.cc.bintools.bintools == "boot"; stageFun prevStage { - name = "bootstrap-stage1-sysctl"; + name = "bootstrap-stage1-sysctl"; - overrides = self: super: { - inherit (prevStage) ccWrapperStdenv - autoconf automake bash binutils-unwrapped bison brotli cctools cmake cmakeMinimal - coreutils cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu ld64 - libedit libffi libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 - ncurses nghttp2 ninja openldap openssh openssl patchutils pbzx perl pkg-config - python3Minimal scons sed serf sharutils sqlite subversion texinfo unzip which xz - zlib zstd; + overrides = self: super: { + inherit (prevStage) + ccWrapperStdenv + autoconf + automake + bash + binutils-unwrapped + bison + brotli + cctools + cmake + cmakeMinimal + coreutils + cpio + curl + cyrus_sasl + db + ed + expat + flex + gettext + gmp + gnugrep + groff + icu + ld64 + libedit + libffi + libidn2 + libkrb5 + libssh2 + libtool + libunistring + libxml2 + m4 + ncurses + nghttp2 + ninja + openldap + openssh + openssl + patchutils + pbzx + perl + pkg-config + python3Minimal + scons + sed + serf + sharutils + sqlite + subversion + texinfo + unzip + which + xz + zlib + zstd + ; - # Avoid pulling in openldap just to run Meson’s tests. - meson = super.meson.overrideAttrs { - doInstallCheck = false; - }; + # Avoid pulling in openldap just to run Meson’s tests. + meson = super.meson.overrideAttrs { doInstallCheck = false; }; - # The bootstrap Python needs its own `pythonAttr` to make sure the override works properly. - python3 = self.python3-bootstrap; - python3-bootstrap = super.python3.override { - self = self.python3-bootstrap; - pythonAttr = "python3-bootstrap"; - enableLTO = false; - }; - - darwin = super.darwin.overrideScope (_: superDarwin: { - inherit (prevStage.darwin) - CF sdkRoot Libsystem binutils binutils-unwrapped configd darwin-stubs dtrace dyld - launchd libclosure libdispatch libobjc locale objc4 postLinkSignHook - print-reexports rewrite-tbd signingUtils sigtool; - - apple_sdk = superDarwin.apple_sdk // { - inherit (prevStage.darwin.apple_sdk) sdkRoot; + # The bootstrap Python needs its own `pythonAttr` to make sure the override works properly. + python3 = self.python3-bootstrap; + python3-bootstrap = super.python3.override { + self = self.python3-bootstrap; + pythonAttr = "python3-bootstrap"; + enableLTO = false; }; - }); - llvmPackages = super.llvmPackages // ( - let - tools = super.llvmPackages.tools.extend (_: _: { - inherit (prevStage.llvmPackages) clang-unwrapped libclang libllvm llvm; - clang = prevStage.stdenv.cc; - }); - libraries = super.llvmPackages.libraries.extend (_: _: { - inherit (prevStage.llvmPackages) compiler-rt libcxx; - }); - in - { inherit tools libraries; inherit (prevStage.llvmPackages) release_version; } // tools // libraries - ); - }; + darwin = super.darwin.overrideScope ( + _: superDarwin: { + inherit (prevStage.darwin) + CF + sdkRoot + Libsystem + binutils + binutils-unwrapped + configd + darwin-stubs + dtrace + dyld + launchd + libclosure + libdispatch + libobjc + locale + objc4 + postLinkSignHook + print-reexports + rewrite-tbd + signingUtils + sigtool + ; - extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ - prevStage.updateAutotoolsGnuConfigScriptsHook - prevStage.gnu-config - ]; + apple_sdk = superDarwin.apple_sdk // { + inherit (prevStage.darwin.apple_sdk) sdkRoot; + }; + } + ); - extraPreHook = '' - stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O - ''; - }) + llvmPackages = + super.llvmPackages + // ( + let + tools = super.llvmPackages.tools.extend ( + _: _: { + inherit (prevStage.llvmPackages) + clang-unwrapped + libclang + libllvm + llvm + ; + clang = prevStage.stdenv.cc; + } + ); + libraries = super.llvmPackages.libraries.extend ( + _: _: { inherit (prevStage.llvmPackages) compiler-rt libcxx; } + ); + in + { + inherit tools libraries; + inherit (prevStage.llvmPackages) release_version; + } + // tools + // libraries + ); + }; + + extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ + prevStage.updateAutotoolsGnuConfigScriptsHook + prevStage.gnu-config + ]; + + extraPreHook = '' + stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O + ''; + } + ) # First rebuild of LLVM. While this LLVM is linked to a bunch of junk from the bootstrap tools, # the libc++ and libc++abi it produces are not. The compiler will be rebuilt in a later stage, @@ -720,450 +990,1114 @@ in # # The first build of cctools is deferred until this stage because it depends on LLVM headers # that are not included in the bootstrap tools tarball. - (prevStage: + ( + prevStage: # previous stage-sysctl stdenv: - assert lib.all isFromBootstrapFiles (with prevStage; [ cctools coreutils gnugrep ld64 ]); + assert lib.all isFromBootstrapFiles ( + with prevStage; + [ + cctools + coreutils + gnugrep + ld64 + ] + ); - assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ - atf autoconf automake bash bison brotli cmake cpio cyrus_sasl db - ed expat flex gettext gmp groff icu kyua libedit libffi libiconv libidn2 libkrb5 libssh2 - libtapi libtool libunistring libxml2 m4 meson ncurses nghttp2 ninja openldap openssh openssl - patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite - subversion sysctl.provider texinfo unzip which xz zlib zstd - ]); + assert lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage; + [ + atf + autoconf + automake + bash + bison + brotli + cmake + cpio + cyrus_sasl + db + ed + expat + flex + gettext + gmp + groff + icu + kyua + libedit + libffi + libiconv + libidn2 + libkrb5 + libssh2 + libtapi + libtool + libunistring + libxml2 + m4 + meson + ncurses + nghttp2 + ninja + openldap + openssh + openssl + patchutils + pbzx + perl + pkg-config.pkg-config + python3 + python3Minimal + scons + serf + sqlite + subversion + sysctl.provider + texinfo + unzip + which + xz + zlib + zstd + ] + ); - assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ - locale print-reexports rewrite-tbd sigtool - ]); + assert lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage.darwin; + [ + locale + print-reexports + rewrite-tbd + sigtool + ] + ); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); - assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); - assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); - assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd xnu ]); + assert + (!useAppleSDKLibs) + -> lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage.darwin; + [ + Libsystem + configd + ] + ); + assert (!useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); + assert + useAppleSDKLibs + -> lib.all isFromNixpkgs ( + with prevStage.darwin; + [ + CF + Libsystem + libobjc + ] + ); + assert lib.all isFromNixpkgs ( + with prevStage.darwin; + [ + binutils-unwrapped + dyld + launchd + xnu + ] + ); - assert lib.all isFromBootstrapFiles (with prevStage.llvmPackages; [ - clang-unwrapped libclang libllvm llvm compiler-rt libcxx - ]); + assert lib.all isFromBootstrapFiles ( + with prevStage.llvmPackages; + [ + clang-unwrapped + libclang + libllvm + llvm + compiler-rt + libcxx + ] + ); stageFun prevStage { - name = "bootstrap-stage-xclang"; + name = "bootstrap-stage-xclang"; - overrides = self: super: { - inherit (prevStage) ccWrapperStdenv - atf autoconf automake bash binutils-unwrapped bison brotli cmake cmakeMinimal - cpio curl cyrus_sasl db ed expat flex gettext gmp groff icu kyua libedit libffi libiconv - libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 meson ncurses nghttp2 ninja - openldap openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal - scons sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zlib zstd; + overrides = self: super: { + inherit (prevStage) + ccWrapperStdenv + atf + autoconf + automake + bash + binutils-unwrapped + bison + brotli + cmake + cmakeMinimal + cpio + curl + cyrus_sasl + db + ed + expat + flex + gettext + gmp + groff + icu + kyua + libedit + libffi + libiconv + libidn2 + libkrb5 + libssh2 + libtool + libunistring + libxml2 + m4 + meson + ncurses + nghttp2 + ninja + openldap + openssh + openssl + patchutils + pbzx + perl + pkg-config + python3 + python3Minimal + scons + sed + serf + sharutils + sqlite + subversion + sysctl + texinfo + unzip + which + xz + zlib + zstd + ; - # Disable ld64’s install check phase because the required LTO libraries are not built yet. - ld64 = super.ld64.overrideAttrs { doInstallCheck = false; }; + # Disable ld64’s install check phase because the required LTO libraries are not built yet. + ld64 = super.ld64.overrideAttrs { doInstallCheck = false; }; - darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { - inherit (prevStage.darwin) - CF Libsystem configd darwin-stubs dyld launchd libclosure libdispatch libobjc - locale objc4 postLinkSignHook print-reexports rewrite-tbd signingUtils sigtool; + darwin = super.darwin.overrideScope ( + selfDarwin: superDarwin: { + inherit (prevStage.darwin) + CF + Libsystem + configd + darwin-stubs + dyld + launchd + libclosure + libdispatch + libobjc + locale + objc4 + postLinkSignHook + print-reexports + rewrite-tbd + signingUtils + sigtool + ; - apple_sdk = superDarwin.apple_sdk // { - inherit (prevStage.darwin.apple_sdk) sdkRoot; - }; + apple_sdk = superDarwin.apple_sdk // { + inherit (prevStage.darwin.apple_sdk) sdkRoot; + }; - binutils = superDarwin.binutils.override { - inherit (prevStage) expand-response-params; - libc = selfDarwin.Libsystem; - }; + binutils = superDarwin.binutils.override { + inherit (prevStage) expand-response-params; + libc = selfDarwin.Libsystem; + }; - # Avoid building unnecessary Python dependencies due to building LLVM manpages. - binutils-unwrapped = superDarwin.binutils-unwrapped.override { enableManpages = false; }; - }); + # Avoid building unnecessary Python dependencies due to building LLVM manpages. + binutils-unwrapped = superDarwin.binutils-unwrapped.override { enableManpages = false; }; + } + ); - llvmPackages = super.llvmPackages // ( - let - llvmMajor = lib.versions.major super.llvmPackages.release_version; + llvmPackages = + super.llvmPackages + // ( + let + llvmMajor = lib.versions.major super.llvmPackages.release_version; - # libc++, and libc++abi do not need CoreFoundation. Avoid propagating the CF from prior - # stages to the final stdenv via rpath by dropping it from `extraBuildInputs`. - stdenvNoCF = self.stdenv.override { - extraBuildInputs = [ ]; - }; + # libc++, and libc++abi do not need CoreFoundation. Avoid propagating the CF from prior + # stages to the final stdenv via rpath by dropping it from `extraBuildInputs`. + stdenvNoCF = self.stdenv.override { extraBuildInputs = [ ]; }; - libcxxBootstrapStdenv = self.overrideCC stdenvNoCF (self.llvmPackages.clangNoCompilerRtWithLibc.override { - nixSupport.cc-cflags = [ "-nostdlib" ]; - nixSupport.cc-ldflags = [ "-lSystem" ]; - }); + libcxxBootstrapStdenv = self.overrideCC stdenvNoCF ( + self.llvmPackages.clangNoCompilerRtWithLibc.override { + nixSupport.cc-cflags = [ "-nostdlib" ]; + nixSupport.cc-ldflags = [ "-lSystem" ]; + } + ); - tools = super.llvmPackages.tools.extend (selfTools: superTools: { - # LLVM’s check phase takes a while to run, so disable it in the first LLVM build to speed up the bootstrap. - libllvm = superTools.libllvm.override { doCheck = false; }; - }); + tools = super.llvmPackages.tools.extend ( + selfTools: superTools: { + # LLVM’s check phase takes a while to run, so disable it in the first LLVM build to speed up the bootstrap. + libllvm = superTools.libllvm.override { doCheck = false; }; + } + ); - libraries = super.llvmPackages.libraries.extend (selfLib: superLib: { - compiler-rt = null; - libcxx = superLib.libcxx.override ({ - stdenv = libcxxBootstrapStdenv; - }); - }); - in - { inherit tools libraries; } // tools // libraries - ); - }; + libraries = super.llvmPackages.libraries.extend ( + selfLib: superLib: { + compiler-rt = null; + libcxx = superLib.libcxx.override ({ stdenv = libcxxBootstrapStdenv; }); + } + ); + in + { inherit tools libraries; } // tools // libraries + ); + }; - extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ - prevStage.updateAutotoolsGnuConfigScriptsHook - prevStage.gnu-config - ]; + extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ + prevStage.updateAutotoolsGnuConfigScriptsHook + prevStage.gnu-config + ]; - extraPreHook = '' - stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O - ''; - }) + extraPreHook = '' + stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O + ''; + } + ) # This stage rebuilds Libsystem. It also rebuilds bash, which will be needed in later stages # to use in patched shebangs (e.g., to make sure `icu-config` uses bash from nixpkgs). - (prevStage: + ( + prevStage: # previous stage-xclang stdenv: - assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ - atf autoconf automake bash bison cctools cmake cmakeMinimal coreutils cpio - cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua ld64 libedit libtapi libtool m4 meson ninja - openbsm openldap openpam openssh patchutils pbzx perl pkg-config.pkg-config python3 - python3Minimal scons serf sqlite subversion sysctl.provider texinfo unzip which xz - ]); + assert lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage; + [ + atf + autoconf + automake + bash + bison + cctools + cmake + cmakeMinimal + coreutils + cpio + cyrus_sasl + db + ed + expat + flex + gettext + gmp + gnugrep + groff + icu + kyua + ld64 + libedit + libtapi + libtool + m4 + meson + ninja + openbsm + openldap + openpam + openssh + patchutils + pbzx + perl + pkg-config.pkg-config + python3 + python3Minimal + scons + serf + sqlite + subversion + sysctl.provider + texinfo + unzip + which + xz + ] + ); - assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ - brotli libffi libiconv libidn2 libkrb5 libssh2 libunistring libxml2 ncurses - nghttp2 openssl zlib zstd - ]); + assert lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage; + [ + brotli + libffi + libiconv + libidn2 + libkrb5 + libssh2 + libunistring + libxml2 + ncurses + nghttp2 + openssl + zlib + zstd + ] + ); - assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ - locale print-reexports rewrite-tbd sigtool - ]); + assert lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage.darwin; + [ + locale + print-reexports + rewrite-tbd + sigtool + ] + ); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]); - assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); - assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); - assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd libclosure libdispatch xnu ]); + assert + (!useAppleSDKLibs) + -> lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage.darwin; + [ + Libsystem + configd + ] + ); + assert (!useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); + assert + useAppleSDKLibs + -> lib.all isFromNixpkgs ( + with prevStage.darwin; + [ + CF + Libsystem + libobjc + ] + ); + assert lib.all isFromNixpkgs ( + with prevStage.darwin; + [ + binutils-unwrapped + dyld + launchd + libclosure + libdispatch + xnu + ] + ); - assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.llvmPackages; [ - clang-unwrapped libclang libllvm llvm - ]); + assert lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage.llvmPackages; + [ + clang-unwrapped + libclang + libllvm + llvm + ] + ); assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ libcxx ]); assert prevStage.llvmPackages.compiler-rt == null; stageFun prevStage { - name = "bootstrap-stage2"; + name = "bootstrap-stage2"; - overrides = self: super: { - inherit (prevStage) ccWrapperStdenv - atf autoconf automake binutils-unwrapped bison brotli cctools cmake cmakeMinimal coreutils - cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua ld64 libedit libffi - libiconv libidn2 libkrb5 libssh2 libtapi libtool libunistring libxml2 m4 meson ncurses nghttp2 - ninja openbsm openldap openpam openssh openssl patchutils pbzx perl pkg-config - python3 python3Minimal scons serf sqlite subversion sysctl texinfo unzip which xz - zlib zstd; + overrides = self: super: { + inherit (prevStage) + ccWrapperStdenv + atf + autoconf + automake + binutils-unwrapped + bison + brotli + cctools + cmake + cmakeMinimal + coreutils + cpio + curl + cyrus_sasl + db + ed + expat + flex + gettext + gmp + gnugrep + groff + icu + kyua + ld64 + libedit + libffi + libiconv + libidn2 + libkrb5 + libssh2 + libtapi + libtool + libunistring + libxml2 + m4 + meson + ncurses + nghttp2 + ninja + openbsm + openldap + openpam + openssh + openssl + patchutils + pbzx + perl + pkg-config + python3 + python3Minimal + scons + serf + sqlite + subversion + sysctl + texinfo + unzip + which + xz + zlib + zstd + ; - # Bash must be linked against the system CoreFoundation instead of the open-source one. - # Otherwise, there will be a dependency cycle: bash -> CF -> icu -> bash (for icu^dev). - bash = super.bash.overrideAttrs (super: { - buildInputs = super.buildInputs ++ [ self.darwin.apple_sdk.frameworks.CoreFoundation ]; - }); - - darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { - inherit (prevStage.darwin) - binutils-unwrapped configd darwin-stubs launchd locale postLinkSignHook - print-reexports rewrite-tbd signingUtils sigtool; - - apple_sdk = superDarwin.apple_sdk // { - inherit (prevStage.darwin.apple_sdk) sdkRoot; - }; - - # Rewrap binutils so it uses the rebuilt Libsystem. - binutils = superDarwin.binutils.override { - inherit (prevStage) expand-response-params; - libc = selfDarwin.Libsystem; - } // { - passthru = { inherit (prevStage.bintools.passthru) isFromBootstrapFiles; }; - }; - }); - - llvmPackages = super.llvmPackages // ( - let - tools = super.llvmPackages.tools.extend (_: _: { - inherit (prevStage.llvmPackages) clang-unwrapped clangNoCompilerRtWithLibc libclang lld libllvm llvm; - }); - - libraries = super.llvmPackages.libraries.extend (selfLib: superLib: { - inherit (prevStage.llvmPackages) libcxx; - - # Make sure compiler-rt is linked against the CF from this stage, which can be - # propagated to the final stdenv. CF is required by ASAN. - compiler-rt = superLib.compiler-rt.override ({ - inherit (self.llvmPackages) libllvm; - stdenv = self.stdenv.override { - extraBuildInputs = [ self.darwin.CF ]; - }; - }); - }); - in - { inherit tools libraries; inherit (prevStage.llvmPackages) release_version; } // tools // libraries - ); - - # Don’t link anything in this stage against CF to prevent propagating CF from prior stages to - # the final stdenv, which happens because of the rpath hook. - stdenv = - let - stdenvNoCF = super.stdenv.override { - extraBuildInputs = [ ]; - }; - in - self.overrideCC stdenvNoCF (self.llvmPackages.clangNoCompilerRtWithLibc.override { - inherit (self.llvmPackages) libcxx; + # Bash must be linked against the system CoreFoundation instead of the open-source one. + # Otherwise, there will be a dependency cycle: bash -> CF -> icu -> bash (for icu^dev). + bash = super.bash.overrideAttrs (super: { + buildInputs = super.buildInputs ++ [ self.darwin.apple_sdk.frameworks.CoreFoundation ]; }); - }; - extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ - prevStage.updateAutotoolsGnuConfigScriptsHook - prevStage.gnu-config - ]; + darwin = super.darwin.overrideScope ( + selfDarwin: superDarwin: { + inherit (prevStage.darwin) + binutils-unwrapped + configd + darwin-stubs + launchd + locale + postLinkSignHook + print-reexports + rewrite-tbd + signingUtils + sigtool + ; - extraPreHook = '' - stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O - ''; - }) + apple_sdk = superDarwin.apple_sdk // { + inherit (prevStage.darwin.apple_sdk) sdkRoot; + }; + + # Rewrap binutils so it uses the rebuilt Libsystem. + binutils = + superDarwin.binutils.override { + inherit (prevStage) expand-response-params; + libc = selfDarwin.Libsystem; + } + // { + passthru = { + inherit (prevStage.bintools.passthru) isFromBootstrapFiles; + }; + }; + } + ); + + llvmPackages = + super.llvmPackages + // ( + let + tools = super.llvmPackages.tools.extend ( + _: _: { + inherit (prevStage.llvmPackages) + clang-unwrapped + clangNoCompilerRtWithLibc + libclang + lld + libllvm + llvm + ; + } + ); + + libraries = super.llvmPackages.libraries.extend ( + selfLib: superLib: { + inherit (prevStage.llvmPackages) libcxx; + + # Make sure compiler-rt is linked against the CF from this stage, which can be + # propagated to the final stdenv. CF is required by ASAN. + compiler-rt = superLib.compiler-rt.override ({ + inherit (self.llvmPackages) libllvm; + stdenv = self.stdenv.override { extraBuildInputs = [ self.darwin.CF ]; }; + }); + } + ); + in + { + inherit tools libraries; + inherit (prevStage.llvmPackages) release_version; + } + // tools + // libraries + ); + + # Don’t link anything in this stage against CF to prevent propagating CF from prior stages to + # the final stdenv, which happens because of the rpath hook. + stdenv = + let + stdenvNoCF = super.stdenv.override { extraBuildInputs = [ ]; }; + in + self.overrideCC stdenvNoCF ( + self.llvmPackages.clangNoCompilerRtWithLibc.override { inherit (self.llvmPackages) libcxx; } + ); + }; + + extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ + prevStage.updateAutotoolsGnuConfigScriptsHook + prevStage.gnu-config + ]; + + extraPreHook = '' + stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O + ''; + } + ) # Rebuild LLVM with LLVM. This stage also rebuilds certain dependencies needed by LLVM. # # LLVM requires: libcxx libffi libiconv libxml2 ncurses python3 zlib - (prevStage: + ( + prevStage: # previous stage2 stdenv: - assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ - autoconf automake bison brotli cctools cmake cmakeMinimal coreutils cpio cyrus_sasl - db ed expat flex gettext gmp gnugrep groff icu ld64 libedit libffi libiconv libidn2 libkrb5 libssh2 libtool - libtapi libunistring libxml2 m4 meson ncurses nghttp2 ninja openbsm openldap openpam openssh openssl - patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite - subversion sysctl.provider texinfo unzip which xz zstd zlib - ]); + assert lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage; + [ + autoconf + automake + bison + brotli + cctools + cmake + cmakeMinimal + coreutils + cpio + cyrus_sasl + db + ed + expat + flex + gettext + gmp + gnugrep + groff + icu + ld64 + libedit + libffi + libiconv + libidn2 + libkrb5 + libssh2 + libtool + libtapi + libunistring + libxml2 + m4 + meson + ncurses + nghttp2 + ninja + openbsm + openldap + openpam + openssh + openssl + patchutils + pbzx + perl + pkg-config.pkg-config + python3 + python3Minimal + scons + serf + sqlite + subversion + sysctl.provider + texinfo + unzip + which + xz + zstd + zlib + ] + ); assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ bash ]); - assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ - locale print-reexports rewrite-tbd sigtool - ]); + assert lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage.darwin; + [ + locale + print-reexports + rewrite-tbd + sigtool + ] + ); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); - assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); - assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); - assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd libclosure libdispatch xnu ]); + assert + (!useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); + assert + (!useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); + assert (!useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); + assert + useAppleSDKLibs + -> lib.all isFromNixpkgs ( + with prevStage.darwin; + [ + CF + Libsystem + libobjc + ] + ); + assert lib.all isFromNixpkgs ( + with prevStage.darwin; + [ + binutils-unwrapped + dyld + launchd + libclosure + libdispatch + xnu + ] + ); - assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.llvmPackages; [ - clang-unwrapped libclang libllvm llvm - ]); + assert lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage.llvmPackages; + [ + clang-unwrapped + libclang + libllvm + llvm + ] + ); assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ libcxx ]); stageFun prevStage { - name = "bootstrap-stage3"; + name = "bootstrap-stage3"; - overrides = self: super: { - inherit (prevStage) ccWrapperStdenv - autoconf automake bash binutils-unwrapped bison brotli cmake cmakeMinimal - coreutils cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff libedit - libidn2 libkrb5 libssh2 libtool libunistring m4 meson nghttp2 ninja openbsm openldap - openpam openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons - sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zstd; + overrides = self: super: { + inherit (prevStage) + ccWrapperStdenv + autoconf + automake + bash + binutils-unwrapped + bison + brotli + cmake + cmakeMinimal + coreutils + cpio + curl + cyrus_sasl + db + ed + expat + flex + gettext + gmp + gnugrep + groff + libedit + libidn2 + libkrb5 + libssh2 + libtool + libunistring + m4 + meson + nghttp2 + ninja + openbsm + openldap + openpam + openssh + openssl + patchutils + pbzx + perl + pkg-config + python3 + python3Minimal + scons + sed + serf + sharutils + sqlite + subversion + sysctl + texinfo + unzip + which + xz + zstd + ; - # Disable tests because they use dejagnu, which fails to run. - libffi = super.libffi.override { doCheck = false; }; + # Disable tests because they use dejagnu, which fails to run. + libffi = super.libffi.override { doCheck = false; }; - # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds. - libxml2 = super.libxml2.override { pythonSupport = false; }; + # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds. + libxml2 = super.libxml2.override { pythonSupport = false; }; - darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { - inherit (prevStage.darwin) - CF Libsystem binutils binutils-unwrapped configd - darwin-stubs dyld launchd libclosure libdispatch libobjc locale objc4 - postLinkSignHook print-reexports rewrite-tbd signingUtils sigtool; + darwin = super.darwin.overrideScope ( + selfDarwin: superDarwin: { + inherit (prevStage.darwin) + CF + Libsystem + binutils + binutils-unwrapped + configd + darwin-stubs + dyld + launchd + libclosure + libdispatch + libobjc + locale + objc4 + postLinkSignHook + print-reexports + rewrite-tbd + signingUtils + sigtool + ; - apple_sdk = superDarwin.apple_sdk // { - inherit (prevStage.darwin.apple_sdk) sdkRoot; - }; - }); + apple_sdk = superDarwin.apple_sdk // { + inherit (prevStage.darwin.apple_sdk) sdkRoot; + }; + } + ); - llvmPackages = super.llvmPackages // ( - let - libraries = super.llvmPackages.libraries.extend (_: _: { - inherit (prevStage.llvmPackages) compiler-rt libcxx; - }); - in - { inherit libraries; } // libraries - ); - }; + llvmPackages = + super.llvmPackages + // ( + let + libraries = super.llvmPackages.libraries.extend ( + _: _: { inherit (prevStage.llvmPackages) compiler-rt libcxx; } + ); + in + { inherit libraries; } // libraries + ); + }; - extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ - prevStage.updateAutotoolsGnuConfigScriptsHook - prevStage.gnu-config - ]; + extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ + prevStage.updateAutotoolsGnuConfigScriptsHook + prevStage.gnu-config + ]; - extraPreHook = '' - stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O - ''; - }) + extraPreHook = '' + stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O + ''; + } + ) # Construct a standard environment with the new clang. Also use the new compiler to rebuild # everything that will be part of the final stdenv and isn’t required by it, CF, or Libsystem. - (prevStage: + ( + prevStage: # previous stage3 stdenv: - assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ - autoconf automake bison brotli cmake cmakeMinimal coreutils cpio cyrus_sasl - db ed expat flex gettext gmp gnugrep groff libedit libidn2 libkrb5 libssh2 libtool - libunistring m4 meson nghttp2 ninja openbsm openldap openpam openssh openssl patchutils pbzx - perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite subversion - sysctl.provider texinfo unzip which xz zstd - ]); + assert lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage; + [ + autoconf + automake + bison + brotli + cmake + cmakeMinimal + coreutils + cpio + cyrus_sasl + db + ed + expat + flex + gettext + gmp + gnugrep + groff + libedit + libidn2 + libkrb5 + libssh2 + libtool + libunistring + m4 + meson + nghttp2 + ninja + openbsm + openldap + openpam + openssh + openssl + patchutils + pbzx + perl + pkg-config.pkg-config + python3 + python3Minimal + scons + serf + sqlite + subversion + sysctl.provider + texinfo + unzip + which + xz + zstd + ] + ); - assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ - bash cctools icu ld64 libtapi libffi libiconv libxml2 zlib - ]); + assert lib.all isBuiltByNixpkgsCompiler ( + with prevStage; + [ + bash + cctools + icu + ld64 + libtapi + libffi + libiconv + libxml2 + zlib + ] + ); - assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ - locale print-reexports rewrite-tbd sigtool - ]); + assert lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage.darwin; + [ + locale + print-reexports + rewrite-tbd + sigtool + ] + ); - assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); - assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); - assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); - assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); - assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd libclosure libdispatch xnu ]); + assert + (!useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]); + assert + (!useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]); + assert (!useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); + assert + useAppleSDKLibs + -> lib.all isFromNixpkgs ( + with prevStage.darwin; + [ + CF + Libsystem + libobjc + ] + ); + assert lib.all isFromNixpkgs ( + with prevStage.darwin; + [ + binutils-unwrapped + dyld + launchd + libclosure + libdispatch + xnu + ] + ); - assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ - clang-unwrapped libclang libllvm llvm compiler-rt libcxx - ]); + assert lib.all isBuiltByNixpkgsCompiler ( + with prevStage.llvmPackages; + [ + clang-unwrapped + libclang + libllvm + llvm + compiler-rt + libcxx + ] + ); stageFun prevStage { - name = "bootstrap-stage4"; + name = "bootstrap-stage4"; - overrides = self: super: { - inherit (prevStage) ccWrapperStdenv - autoconf automake bash binutils-unwrapped bison cmake cmakeMinimal curl cyrus_sasl db expat flex groff - libedit libtool m4 meson ninja openldap openssh patchutils perl pkg-config python3 python3Minimal scons - serf sqlite subversion sysctl texinfo unzip which + overrides = self: super: { + inherit (prevStage) + ccWrapperStdenv + autoconf + automake + bash + binutils-unwrapped + bison + cmake + cmakeMinimal + curl + cyrus_sasl + db + expat + flex + groff + libedit + libtool + m4 + meson + ninja + openldap + openssh + patchutils + perl + pkg-config + python3 + python3Minimal + scons + serf + sqlite + subversion + sysctl + texinfo + unzip + which - # CF dependencies - don’t rebuild them. - icu - - # LLVM dependencies - don’t rebuild them. - libffi libiconv libiconv-darwin libxml2 ncurses zlib; - - darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { - inherit (prevStage.darwin) dyld CF Libsystem darwin-stubs # CF dependencies - don’t rebuild them. - libobjc objc4; + icu - apple_sdk = superDarwin.apple_sdk // { - inherit (prevStage.darwin.apple_sdk) sdkRoot; - }; + # LLVM dependencies - don’t rebuild them. + libffi + libiconv + libiconv-darwin + libxml2 + ncurses + zlib + ; - signingUtils = superDarwin.signingUtils.override { - inherit (selfDarwin) sigtool; - }; + darwin = super.darwin.overrideScope ( + selfDarwin: superDarwin: { + inherit (prevStage.darwin) + dyld + CF + Libsystem + darwin-stubs + # CF dependencies - don’t rebuild them. + libobjc + objc4 + ; - binutils = superDarwin.binutils.override { - inherit (prevStage) expand-response-params; + apple_sdk = superDarwin.apple_sdk // { + inherit (prevStage.darwin.apple_sdk) sdkRoot; + }; - bintools = selfDarwin.binutils-unwrapped; - libc = selfDarwin.Libsystem; - }; - - # binutils-unwrapped needs to build the LLVM man pages, which requires a lot of Python stuff - # that ultimately ends up depending on git. Fortunately, the git dependency is only for check - # inputs. The following set of overrides allow the LLVM documentation to be built without - # pulling curl (and other packages like ffmpeg) into the stdenv bootstrap. - binutils-unwrapped = superDarwin.binutils-unwrapped.override (old: { - llvm-manpages = super.llvmPackages.llvm-manpages.override { - python3Packages = self.python3.pkgs.overrideScope (_: superPython: { - hatch-vcs = superPython.hatch-vcs.overrideAttrs { - doInstallCheck = false; - }; - markdown-it-py = superPython.markdown-it-py.overrideAttrs { - doInstallCheck = false; - }; - mdit-py-plugins = superPython.mdit-py-plugins.overrideAttrs { - doInstallCheck = false; - }; - myst-parser = superPython.myst-parser.overrideAttrs { - doInstallCheck = false; - }; - }); - }; - }); - }); - - llvmPackages = super.llvmPackages // ( - let - tools = super.llvmPackages.tools.extend (_: _: { - inherit (prevStage.llvmPackages) clang-unwrapped libclang libllvm llvm; - libcxxClang = lib.makeOverridable (import ../../build-support/cc-wrapper) { - nativeTools = false; - nativeLibc = false; + signingUtils = superDarwin.signingUtils.override { inherit (selfDarwin) sigtool; }; + binutils = superDarwin.binutils.override { inherit (prevStage) expand-response-params; - extraPackages = [ - self.llvmPackages.compiler-rt - ]; - - extraBuildCommands = - let - inherit (self.llvmPackages) clang-unwrapped compiler-rt release_version; - - # Clang 16+ uses only the major version in resource-root, but older versions use the complete one. - clangResourceRootIncludePath = clangLib: clangRelease: - let - clangVersion = - if lib.versionAtLeast clangRelease "16" - then lib.versions.major clangRelease - else clangRelease; - in - "${clangLib}/lib/clang/${clangVersion}/include"; - in - '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${clangResourceRootIncludePath clang-unwrapped.lib release_version}" "$rsrc" - ln -s "${compiler-rt.out}/lib" "$rsrc/lib" - ln -s "${compiler-rt.out}/share" "$rsrc/share" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ''; - - cc = self.llvmPackages.clang-unwrapped; - bintools = self.darwin.binutils; - - isClang = true; - libc = self.darwin.Libsystem; - inherit (self.llvmPackages) libcxx; - - inherit lib; - inherit (self) stdenvNoCC coreutils gnugrep runtimeShell; + bintools = selfDarwin.binutils-unwrapped; + libc = selfDarwin.Libsystem; }; - }); - libraries = super.llvmPackages.libraries.extend (_: _:{ - inherit (prevStage.llvmPackages) compiler-rt libcxx; - }); - in - { inherit tools libraries; } // tools // libraries - ); - }; - extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ - prevStage.updateAutotoolsGnuConfigScriptsHook - prevStage.gnu-config - ]; + # binutils-unwrapped needs to build the LLVM man pages, which requires a lot of Python stuff + # that ultimately ends up depending on git. Fortunately, the git dependency is only for check + # inputs. The following set of overrides allow the LLVM documentation to be built without + # pulling curl (and other packages like ffmpeg) into the stdenv bootstrap. + binutils-unwrapped = superDarwin.binutils-unwrapped.override (old: { + llvm-manpages = super.llvmPackages.llvm-manpages.override { + python3Packages = self.python3.pkgs.overrideScope ( + _: superPython: { + hatch-vcs = superPython.hatch-vcs.overrideAttrs { doInstallCheck = false; }; + markdown-it-py = superPython.markdown-it-py.overrideAttrs { doInstallCheck = false; }; + mdit-py-plugins = superPython.mdit-py-plugins.overrideAttrs { doInstallCheck = false; }; + myst-parser = superPython.myst-parser.overrideAttrs { doInstallCheck = false; }; + } + ); + }; + }); + } + ); - extraPreHook = '' - stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O - ''; - }) + llvmPackages = + super.llvmPackages + // ( + let + tools = super.llvmPackages.tools.extend ( + _: _: { + inherit (prevStage.llvmPackages) + clang-unwrapped + libclang + libllvm + llvm + ; + libcxxClang = lib.makeOverridable (import ../../build-support/cc-wrapper) { + nativeTools = false; + nativeLibc = false; + + inherit (prevStage) expand-response-params; + + extraPackages = [ self.llvmPackages.compiler-rt ]; + + extraBuildCommands = + let + inherit (self.llvmPackages) clang-unwrapped compiler-rt release_version; + + # Clang 16+ uses only the major version in resource-root, but older versions use the complete one. + clangResourceRootIncludePath = + clangLib: clangRelease: + let + clangVersion = + if lib.versionAtLeast clangRelease "16" then lib.versions.major clangRelease else clangRelease; + in + "${clangLib}/lib/clang/${clangVersion}/include"; + in + '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${clangResourceRootIncludePath clang-unwrapped.lib release_version}" "$rsrc" + ln -s "${compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${compiler-rt.out}/share" "$rsrc/share" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + ''; + + cc = self.llvmPackages.clang-unwrapped; + bintools = self.darwin.binutils; + + isClang = true; + libc = self.darwin.Libsystem; + inherit (self.llvmPackages) libcxx; + + inherit lib; + inherit (self) + stdenvNoCC + coreutils + gnugrep + runtimeShell + ; + }; + } + ); + libraries = super.llvmPackages.libraries.extend ( + _: _: { inherit (prevStage.llvmPackages) compiler-rt libcxx; } + ); + in + { inherit tools libraries; } // tools // libraries + ); + }; + + extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ + prevStage.updateAutotoolsGnuConfigScriptsHook + prevStage.gnu-config + ]; + + extraPreHook = '' + stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O + ''; + } + ) # Construct the final stdenv. The version of LLVM provided should match the one defined in # `all-packages.nix` for Darwin. Nothing should depend on the bootstrap tools or originate from @@ -1171,189 +2105,371 @@ in # # When updating the Darwin stdenv, make sure that the result has no dependency (`nix-store -qR`) # on `bootstrapTools` or the binutils built in stage 1. - (prevStage: + ( + prevStage: # previous stage4 stdenv: - assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ - bash brotli bzip2 cctools cpio diffutils ed file findutils gawk - gettext gmp gnugrep gnumake gnused gnutar gzip icu ld64 libffi libiconv libidn2 libkrb5 - libssh2 libtapi libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch - pbzx pcre xar xz zlib zstd - ]); - - assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ locale print-reexports rewrite-tbd sigtool ]); - - assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem configd ]); - assert (! useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); - assert useAppleSDKLibs -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]); - assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped dyld launchd libclosure libdispatch xnu ]); - - assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ - clang-unwrapped libclang libllvm llvm compiler-rt libcxx - ]); - - assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [ - autoconf automake bison cmake cmakeMinimal cyrus_sasl db expat flex groff libedit - libtool m4 meson ninja openldap openssh patchutils perl pkg-config.pkg-config python3 python3Minimal scons - serf sqlite subversion sysctl.provider texinfo unzip which - ]); - - let - cc = prevStage.llvmPackages.clang; - in - { - inherit config overlays; - stdenv = import ../generic { - name = "stdenv-darwin"; - - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; - - inherit config; - - preHook = '' - ${commonPreHook} - stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O - export PATH_LOCALE=${prevStage.darwin.locale}/share/locale - ''; - - initialPath = ((import ../generic/common-path.nix) { pkgs = prevStage; }); - - extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [ - prevStage.updateAutotoolsGnuConfigScriptsHook - ] ++ [ prevStage.darwin.apple_sdk.sdkRoot ]; - - extraBuildInputs = [ prevStage.darwin.CF ]; - - inherit cc; - - shell = cc.shell; - - inherit (prevStage.stdenv) fetchurlBoot; - - extraAttrs = { - inherit bootstrapTools; - libc = prevStage.darwin.Libsystem; - shellPackage = prevStage.bash; - } // lib.optionalAttrs useAppleSDKLibs { - # This objc4 will be propagated to all builds using the final stdenv, - # and we shouldn't mix different builds, because they would be - # conflicting LLVM modules. Export it here so we can grab it later. - inherit (prevStage.darwin) objc4; - }; - - disallowedRequisites = [ bootstrapTools.out ]; - - allowedRequisites = (with prevStage; [ + assert lib.all isBuiltByNixpkgsCompiler ( + with prevStage; + [ bash - bzip2.bin - bzip2.out - cc.expand-response-params + brotli + bzip2 cctools - ld64.out - ld64.lib - libtapi.out - coreutils - darwin.binutils - darwin.binutils.bintools + cpio diffutils ed file findutils gawk gettext - gmp.out + gmp gnugrep - gnugrep.pcre2.out gnumake gnused gnutar gzip - icu.out - libffi.out + icu + ld64 + libffi libiconv - libunistring.out - libxml2.out - ncurses.dev - ncurses.man - ncurses.out + libidn2 + libkrb5 + libssh2 + libtapi + libunistring + libxml2 + libyaml + ncurses + nghttp2 openbsm openpam - openssl.out + openssl patch + pbzx + pcre xar - xz.bin - xz.out - zlib.dev - zlib.out - ]) - ++ lib.optionals localSystem.isAarch64 [ - prevStage.updateAutotoolsGnuConfigScriptsHook - prevStage.gnu-config + xz + zlib + zstd ] - ++ (with prevStage.llvmPackages; [ - bintools-unwrapped - clang-unwrapped - clang-unwrapped.lib - compiler-rt - compiler-rt.dev - libcxx - libcxx.dev - lld - llvm - llvm.lib - ]) - ++ (with prevStage.darwin; [ - CF - Libsystem - dyld + ); + + assert lib.all isBuiltByNixpkgsCompiler ( + with prevStage.darwin; + [ locale - apple_sdk.sdkRoot + print-reexports + rewrite-tbd + sigtool ] - ++ lib.optionals useAppleSDKLibs [ objc4 ]); + ); - __stdenvImpureHostDeps = commonImpureHostDeps; - __extraImpureHostDeps = commonImpureHostDeps; + assert + (!useAppleSDKLibs) + -> lib.all isBuiltByNixpkgsCompiler ( + with prevStage.darwin; + [ + Libsystem + configd + ] + ); + assert (!useAppleSDKLibs) -> lib.all isFromNixpkgs (with prevStage.darwin; [ CF ]); + assert + useAppleSDKLibs + -> lib.all isFromNixpkgs ( + with prevStage.darwin; + [ + CF + Libsystem + libobjc + ] + ); + assert lib.all isFromNixpkgs ( + with prevStage.darwin; + [ + binutils-unwrapped + dyld + launchd + libclosure + libdispatch + xnu + ] + ); - overrides = self: super: { - inherit (prevStage) - bash brotli bzip2 coreutils cpio diffutils ed file findutils gawk - gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libiconv-darwin - libidn2 libssh2 libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam - openssl patch pbzx pcre python3Minimal xar xz zlib zstd; + assert lib.all isBuiltByNixpkgsCompiler ( + with prevStage.llvmPackages; + [ + clang-unwrapped + libclang + libllvm + llvm + compiler-rt + libcxx + ] + ); - darwin = super.darwin.overrideScope (_: superDarwin: { - inherit (prevStage.darwin) - CF Libsystem darwin-stubs dyld locale libobjc rewrite-tbd xnu; + assert lib.all isBuiltByBootstrapFilesCompiler ( + with prevStage; + [ + autoconf + automake + bison + cmake + cmakeMinimal + cyrus_sasl + db + expat + flex + groff + libedit + libtool + m4 + meson + ninja + openldap + openssh + patchutils + perl + pkg-config.pkg-config + python3 + python3Minimal + scons + serf + sqlite + subversion + sysctl.provider + texinfo + unzip + which + ] + ); - apple_sdk = superDarwin.apple_sdk // { - inherit (prevStage.darwin.apple_sdk) sdkRoot; + let + cc = prevStage.llvmPackages.clang; + in + { + inherit config overlays; + stdenv = import ../generic { + name = "stdenv-darwin"; + + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + + inherit config; + + preHook = '' + ${commonPreHook} + stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O + export PATH_LOCALE=${prevStage.darwin.locale}/share/locale + ''; + + initialPath = ((import ../generic/common-path.nix) { pkgs = prevStage; }); + + extraNativeBuildInputs = + lib.optionals localSystem.isAarch64 [ prevStage.updateAutotoolsGnuConfigScriptsHook ] + ++ [ prevStage.darwin.apple_sdk.sdkRoot ]; + + extraBuildInputs = [ prevStage.darwin.CF ]; + + inherit cc; + + shell = cc.shell; + + inherit (prevStage.stdenv) fetchurlBoot; + + extraAttrs = + { + inherit bootstrapTools; + libc = prevStage.darwin.Libsystem; + shellPackage = prevStage.bash; + } + // lib.optionalAttrs useAppleSDKLibs { + # This objc4 will be propagated to all builds using the final stdenv, + # and we shouldn't mix different builds, because they would be + # conflicting LLVM modules. Export it here so we can grab it later. + inherit (prevStage.darwin) objc4; }; - } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { - inherit (prevStage.darwin) binutils binutils-unwrapped; - }); - } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { - inherit (prevStage) cctools ld64 libtapi; - inherit (prevStage.llvmPackages) clang llvm; - # Need to get rid of these when cross-compiling. - llvmPackages = super.llvmPackages // ( - let - tools = super.llvmPackages.tools.extend (_: _: { - inherit (prevStage.llvmPackages) clang clang-unwrapped libclang libllvm llvm; - }); - libraries = super.llvmPackages.libraries.extend (_: _: { - inherit (prevStage.llvmPackages) compiler-rt libcxx; - }); - in - { inherit tools libraries; } // tools // libraries - ); + disallowedRequisites = [ bootstrapTools.out ]; + + allowedRequisites = + (with prevStage; [ + bash + bzip2.bin + bzip2.out + cc.expand-response-params + cctools + ld64.out + ld64.lib + libtapi.out + coreutils + darwin.binutils + darwin.binutils.bintools + diffutils + ed + file + findutils + gawk + gettext + gmp.out + gnugrep + gnugrep.pcre2.out + gnumake + gnused + gnutar + gzip + icu.out + libffi.out + libiconv + libunistring.out + libxml2.out + ncurses.dev + ncurses.man + ncurses.out + openbsm + openpam + openssl.out + patch + xar + xz.bin + xz.out + zlib.dev + zlib.out + ]) + ++ lib.optionals localSystem.isAarch64 [ + prevStage.updateAutotoolsGnuConfigScriptsHook + prevStage.gnu-config + ] + ++ (with prevStage.llvmPackages; [ + bintools-unwrapped + clang-unwrapped + clang-unwrapped.lib + compiler-rt + compiler-rt.dev + libcxx + libcxx.dev + lld + llvm + llvm.lib + ]) + ++ ( + with prevStage.darwin; + [ + CF + Libsystem + dyld + locale + apple_sdk.sdkRoot + ] + ++ lib.optionals useAppleSDKLibs [ objc4 ] + ); + + __stdenvImpureHostDeps = commonImpureHostDeps; + __extraImpureHostDeps = commonImpureHostDeps; + + overrides = + self: super: + { + inherit (prevStage) + bash + brotli + bzip2 + coreutils + cpio + diffutils + ed + file + findutils + gawk + gettext + gmp + gnugrep + gnumake + gnused + gnutar + gzip + icu + libffi + libiconv + libiconv-darwin + libidn2 + libssh2 + libunistring + libxml2 + libyaml + ncurses + nghttp2 + openbsm + openpam + openssl + patch + pbzx + pcre + python3Minimal + xar + xz + zlib + zstd + ; + + darwin = super.darwin.overrideScope ( + _: superDarwin: + { + inherit (prevStage.darwin) + CF + Libsystem + darwin-stubs + dyld + locale + libobjc + rewrite-tbd + xnu + ; + + apple_sdk = superDarwin.apple_sdk // { + inherit (prevStage.darwin.apple_sdk) sdkRoot; + }; + } + // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { + inherit (prevStage.darwin) binutils binutils-unwrapped; + } + ); + } + // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { + inherit (prevStage) cctools ld64 libtapi; + inherit (prevStage.llvmPackages) clang llvm; + + # Need to get rid of these when cross-compiling. + llvmPackages = + super.llvmPackages + // ( + let + tools = super.llvmPackages.tools.extend ( + _: _: { + inherit (prevStage.llvmPackages) + clang + clang-unwrapped + libclang + libllvm + llvm + ; + } + ); + libraries = super.llvmPackages.libraries.extend ( + _: _: { inherit (prevStage.llvmPackages) compiler-rt libcxx; } + ); + in + { inherit tools libraries; } // tools // libraries + ); + }; }; - }; - }) + } + ) # This "no-op" stage is just a place to put the assertions about the final stage. - (prevStage: + ( + prevStage: # previous final stage stdenv: assert isBuiltByNixpkgsCompiler prevStage.cctools; assert isBuiltByNixpkgsCompiler prevStage.ld64; @@ -1361,9 +2477,9 @@ in assert isBuiltByNixpkgsCompiler prevStage.darwin.print-reexports; assert isBuiltByNixpkgsCompiler prevStage.darwin.rewrite-tbd; - assert isFromNixpkgs prevStage.darwin.CF; - assert isFromNixpkgs prevStage.darwin.Libsystem; - assert isFromNixpkgs prevStage.darwin.binutils-unwrapped; + assert isFromNixpkgs prevStage.darwin.CF; + assert isFromNixpkgs prevStage.darwin.Libsystem; + assert isFromNixpkgs prevStage.darwin.binutils-unwrapped; assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.clang-unwrapped; assert isBuiltByNixpkgsCompiler prevStage.llvmPackages.libllvm; @@ -1372,8 +2488,11 @@ in # Make sure these evaluate since they were disabled explicitly in the bootstrap. assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped; - assert isFromNixpkgs prevStage.binutils-unwrapped.src; + assert isFromNixpkgs prevStage.binutils-unwrapped.src; assert isBuiltByNixpkgsCompiler prevStage.curl; - { inherit (prevStage) config overlays stdenv; }) + { + inherit (prevStage) config overlays stdenv; + } + ) ] diff --git a/pkgs/tools/networking/ivpn/default.nix b/pkgs/tools/networking/ivpn/default.nix index 62ac14812aad..cdc3035e57a6 100644 --- a/pkgs/tools/networking/ivpn/default.nix +++ b/pkgs/tools/networking/ivpn/default.nix @@ -69,7 +69,7 @@ builtins.mapAttrs (pname: attrs: buildGoModule (attrs // rec { substituteInPlace daemon/service/platform/platform_linux_release.go \ --replace 'installDir := "/opt/ivpn"' "installDir := \"$out\"" \ --replace 'obfsproxyStartScript = path.Join(installDir, "obfsproxy/obfs4proxy")' \ - 'obfsproxyStartScript = "${obfs4}/bin/obfs4proxy"' \ + 'obfsproxyStartScript = "${lib.getExe obfs4}"' \ --replace 'wgBinaryPath = path.Join(installDir, "wireguard-tools/wg-quick")' \ 'wgBinaryPath = "${wireguard-tools}/bin/wg-quick"' \ --replace 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \ diff --git a/pkgs/tools/text/asciigraph/default.nix b/pkgs/tools/text/asciigraph/default.nix index 0da6b7e87297..46166d8c6370 100644 --- a/pkgs/tools/text/asciigraph/default.nix +++ b/pkgs/tools/text/asciigraph/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "asciigraph"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "guptarohit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pCfjk8ViMY2iAus2/hibSZXgKY9YBFRH3vsD19MTJ+8="; + sha256 = "sha256-Y+RRFFCeuDjzTznpfC7Wn3j96ZCFSOzvb8ND/ATW+JI="; }; vendorHash = null; diff --git a/pkgs/tools/text/percollate/default.nix b/pkgs/tools/text/percollate/default.nix index 3d4e8f4b5bd6..1b9923acc39c 100644 --- a/pkgs/tools/text/percollate/default.nix +++ b/pkgs/tools/text/percollate/default.nix @@ -2,21 +2,21 @@ buildNpmPackage rec { pname = "percollate"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "danburzo"; repo = pname; rev = "v${version}"; - hash = "sha256-zvvgK0LJ8EK6ANqRmJI96RgMkRAlSD7yIAoe0kxG5gU="; + hash = "sha256-JpdSEockALXtuuMMi5mgD5AXcayojyK0qMMWF+XFfZE="; }; - npmDepsHash = "sha256-xvck+IEWaPOuXU4k8keCPHiWfylAffe1eDgN/GpxW7g="; + npmDepsHash = "sha256-qWu1YYi4ddpAUtbDxF4YA8OO6BLZ6gfeb4pw0n9BaZw="; dontNpmBuild = true; # Dev dependencies include an unnecessary Java dependency (epubchecker) - # https://github.com/danburzo/percollate/blob/v4.2.2/package.json#L40 + # https://github.com/danburzo/percollate/blob/v4.2.3/package.json#L40 npmInstallFlags = [ "--omit=dev" ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/video/recyclarr/default.nix b/pkgs/tools/video/recyclarr/default.nix index 9dcdfd799b87..3c2d528a9ae7 100644 --- a/pkgs/tools/video/recyclarr/default.nix +++ b/pkgs/tools/video/recyclarr/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { updateScript = ./update.sh; tests.version = testers.testVersion { package = recyclarr; + version = "v${version}"; }; };