Merge pull request #214207 from Artturin/ssytemdbuildbash1


authored by Artturi and committed by GitHub fa169bb2 938a52f6

+12 -3
+12 -3
pkgs/os-specific/linux/systemd/default.nix
··· 3 { stdenv 4 , lib 5 , nixosTests 6 , fetchFromGitHub 7 , fetchpatch 8 , fetchzip ··· 63 , withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexec-tools 64 , kexec-tools 65 , bashInteractive 66 , libmicrohttpd 67 , libfido2 68 , p11-kit ··· 139 # jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime' 140 releaseTimestamp = "1667246393"; 141 in 142 - stdenv.mkDerivation { 143 inherit pname version; 144 145 # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly ··· 339 # when cross-compiling. 340 + '' 341 shopt -s extglob 342 - patchShebangs tools test src/!(rpm) 343 ''; 344 345 outputs = [ "out" "man" "dev" ]; ··· 362 docbook_xsl 363 docbook_xml_dtd_42 364 docbook_xml_dtd_45 365 (buildPackages.python3Packages.python.withPackages (ps: with ps; [ lxml jinja2 ])) 366 ] 367 ++ lib.optionals withLibBPF [ ··· 382 libuuid 383 linuxHeaders 384 pam 385 ] 386 387 ++ lib.optionals wantGcrypt [ libgcrypt libgpg-error ] ··· 694 mv $out/dont-strip-me $out/lib/systemd/boot/efi 695 ''; 696 697 passthru = { 698 # The interface version prevents NixOS from switching to an 699 # incompatible systemd at runtime. (Switching across reboots is ··· 707 708 tests = { 709 inherit (nixosTests) switchTest; 710 }; 711 }; 712 ··· 721 priority = 10; 722 maintainers = with maintainers; [ flokli kloenk mic92 ]; 723 }; 724 - }
··· 3 { stdenv 4 , lib 5 , nixosTests 6 + , pkgsCross 7 , fetchFromGitHub 8 , fetchpatch 9 , fetchzip ··· 64 , withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexec-tools 65 , kexec-tools 66 , bashInteractive 67 + , bash 68 , libmicrohttpd 69 , libfido2 70 , p11-kit ··· 141 # jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime' 142 releaseTimestamp = "1667246393"; 143 in 144 + stdenv.mkDerivation (finalAttrs: { 145 inherit pname version; 146 147 # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly ··· 341 # when cross-compiling. 342 + '' 343 shopt -s extglob 344 + patchShebangs tools test src/!(rpm|kernel-install) src/kernel-install/test-kernel-install.sh 345 ''; 346 347 outputs = [ "out" "man" "dev" ]; ··· 364 docbook_xsl 365 docbook_xml_dtd_42 366 docbook_xml_dtd_45 367 + bash 368 (buildPackages.python3Packages.python.withPackages (ps: with ps; [ lxml jinja2 ])) 369 ] 370 ++ lib.optionals withLibBPF [ ··· 385 libuuid 386 linuxHeaders 387 pam 388 + bashInteractive # for patch shebangs 389 ] 390 391 ++ lib.optionals wantGcrypt [ libgcrypt libgpg-error ] ··· 698 mv $out/dont-strip-me $out/lib/systemd/boot/efi 699 ''; 700 701 + disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) 702 + # 'or p' is for manually specified buildPackages as they dont have __spliced 703 + (builtins.map (p: p.__spliced.buildHost or p) finalAttrs.nativeBuildInputs); 704 + 705 passthru = { 706 # The interface version prevents NixOS from switching to an 707 # incompatible systemd at runtime. (Switching across reboots is ··· 715 716 tests = { 717 inherit (nixosTests) switchTest; 718 + cross = pkgsCross.aarch64-multiplatform.systemd; 719 }; 720 }; 721 ··· 730 priority = 10; 731 maintainers = with maintainers; [ flokli kloenk mic92 ]; 732 }; 733 + })