commit 6ada30eca4f5df9a61abe5e2c9c2de6a00f50252 · pyrox.dev/nixpkgs

+4 -1

nixos/tests/all-tests.nix

···

       1037
       1037
        
         nix-config = runTest ./nix-config.nix;

     

       1038
       1038
        
         nix-ld = runTest ./nix-ld.nix;

     

       1039
       1039
        
         nix-misc = handleTest ./nix/misc.nix { };

     

       1040
       1040
       -
         nix-upgrade = handleTest ./nix/upgrade.nix { inherit (pkgs) nixVersions; };

     

       1040
       1040
       +
         nix-upgrade = handleTest ./nix/upgrade.nix {

     

       1041
       1041
       +
           inherit (pkgs) nixVersions;

     

       1042
       1042
       +
           inherit system;

     

       1043
       1043
       +
         };

     

       1041
       1044
        
         nix-required-mounts = runTest ./nix-required-mounts;

     

       1042
       1045
        
         nix-serve = runTest ./nix-serve.nix;

     

       1043
       1046
        
         nix-serve-ssh = runTest ./nix-serve-ssh.nix;

+9 -4

nixos/tests/nix/upgrade.nix

···

       1
       1
       -
       { pkgs, nixVersions, ... }:

     

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         nixVersions,

     

       4
       4
       +
         system,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       2
       7
        
       let

     

       3
       8
        
         lib = pkgs.lib;

     

       4
       9
        
       

     

       5
       10
        
         fallback-paths-external = pkgs.writeTextDir "fallback-paths.nix" ''

     

       6
       11
        
           {

     

       7
       7
       -
             ${pkgs.system} = "${nixVersions.latest}";

     

       12
       12
       +
             ${system} = "${nixVersions.latest}";

     

       8
       13
        
           }'';

     

       9
       14
        
       

     

       10
       15
        
         nixos-module = builtins.toFile "nixos-module.nix" ''

     
···

       71
       76
        
               if not match: raise Exception("Couldn't find new version in output: " + result)

     

       72
       77
        
       

     

       73
       78
        
           with subtest("nix-build-with-mismatch-daemon"):

     

       74
       74
       -
               machine.succeed("runuser -u alice -- nix build --expr 'derivation {name =\"test\"; system = \"${pkgs.system}\";builder = \"/bin/sh\"; args = [\"-c\" \"echo test > $out\"];}' --print-out-paths")

     

       79
       79
       +
               machine.succeed("runuser -u alice -- nix build --expr 'derivation {name =\"test\"; system = \"${system}\";builder = \"/bin/sh\"; args = [\"-c\" \"echo test > $out\"];}' --print-out-paths")

     

       75
       80
        
       

     

       76
       81
        
       

     

       77
       82
        
           with subtest("remove-new-nix"):

     
···

       94
       99
        
               if not match: raise Exception("Couldn't find new version in output: " + result)

     

       95
       100
        
       

     

       96
       101
        
           with subtest("nix-build-with-new-daemon"):

     

       97
       97
       -
               machine.succeed("runuser -u alice -- nix build --expr 'derivation {name =\"test-new\"; system = \"${pkgs.system}\";builder = \"/bin/sh\"; args = [\"-c\" \"echo test > $out\"];}' --print-out-paths")

     

       102
       102
       +
               machine.succeed("runuser -u alice -- nix build --expr 'derivation {name =\"test-new\"; system = \"${system}\";builder = \"/bin/sh\"; args = [\"-c\" \"echo test > $out\"];}' --print-out-paths")

     

       98
       103
        
       

     

       99
       104
        
           with subtest("nix-collect-garbage-with-old-nix"):

     

       100
       105
        
               machine.succeed("${nixVersions.stable}/bin/nix-collect-garbage")

+12 -6

pkgs/by-name/bm/bmake/package.nix

···

       57
       57
        
         # * opt-keep-going-indirect: not yet known

     

       58
       58
        
         # * varmod-localtime: musl doesn't support TZDIR and this test relies on

     

       59
       59
        
         #   impure, implicit paths

     

       60
       60
       -
         env.BROKEN_TESTS = builtins.concatStringsSep " " [

     

       61
       61
       -
           "directive-export"

     

       62
       62
       -
           "directive-export-gmake"

     

       63
       63
       -
           "opt-keep-going-indirect"

     

       64
       64
       -
           "varmod-localtime"

     

       65
       65
       -
         ];

     

       60
       60
       +
         # * interrupt-compat (fails on x86_64-linux building for i686-linux)

     

       61
       61
       +
         env.BROKEN_TESTS = lib.concatStringsSep " " (

     

       62
       62
       +
           [

     

       63
       63
       +
             "directive-export"

     

       64
       64
       +
             "directive-export-gmake"

     

       65
       65
       +
             "opt-keep-going-indirect"

     

       66
       66
       +
             "varmod-localtime"

     

       67
       67
       +
           ]

     

       68
       68
       +
           ++ lib.optionals stdenv.targetPlatform.is32bit [

     

       69
       69
       +
             "interrupt-compat"

     

       70
       70
       +
           ]

     

       71
       71
       +
         );

     

       66
       72
        
       

     

       67
       73
        
         strictDeps = true;

     

       68
       74

+14

pkgs/tools/package-management/nix/default.nix

···

       164
       164
        
       

     

       165
       165
        
             nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything;

     

       166
       166
        
       

     

       167
       167
       +
             nixComponents_2_31 = nixDependencies.callPackage ./modular/packages.nix rec {

     

       168
       168
       +
               version = "2.31.0";

     

       169
       169
       +
               inherit (self.nix_2_30.meta) maintainers teams;

     

       170
       170
       +
               otherSplices = generateSplicesForNixComponents "nixComponents_2_31";

     

       171
       171
       +
               src = fetchFromGitHub {

     

       172
       172
       +
                 owner = "NixOS";

     

       173
       173
       +
                 repo = "nix";

     

       174
       174
       +
                 tag = version;

     

       175
       175
       +
                 hash = "sha256-5JYyijH2q/uQCDIZCCyQEBsZ0VPNP2SS1wgZ4+qeIWM=";

     

       176
       176
       +
               };

     

       177
       177
       +
             };

     

       178
       178
       +
       

     

       179
       179
       +
             nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything;

     

       180
       180
       +
       

     

       167
       181
        
             nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {

     

       168
       182
        
               version = "2.31pre20250712_${lib.substring 0 8 src.rev}";

     

       169
       183
        
               inherit maintainers teams;

+14 -1

pkgs/tools/package-management/nix/dependencies.nix

···

       8
       8
        
       

     

       9
       9
        
       {

     

       10
       10
        
         scopeFunction = scope: {

     

       11
       11
       -
           boehmgc = regular.boehmgc.override { enableLargeConfig = true; };

     

       11
       11
       +
           boehmgc =

     

       12
       12
       +
             (regular.boehmgc.override {

     

       13
       13
       +
               enableLargeConfig = true;

     

       14
       14
       +
             }).overrideAttrs

     

       15
       15
       +
               (attrs: {

     

       16
       16
       +
                 # Increase the initial mark stack size to avoid stack

     

       17
       17
       +
                 # overflows, since these inhibit parallel marking (see

     

       18
       18
       +
                 # GC_mark_some()). To check whether the mark stack is too

     

       19
       19
       +
                 # small, run Nix with GC_PRINT_STATS=1 and look for messages

     

       20
       20
       +
                 # such as `Mark stack overflow`, `No room to copy back mark

     

       21
       21
       +
                 # stack`, and `Grew mark stack to ... frames`.

     

       22
       22
       +
                 NIX_CFLAGS_COMPILE = "-DINITIAL_MARK_STACK_SIZE=1048576";

     

       23
       23
       +
               });

     

       24
       24
       +
       

     

       12
       25
        
           aws-sdk-cpp =

     

       13
       26
        
             (regular.aws-sdk-cpp.override {

     

       14
       27
        
               apis = [

+7 -11

pkgs/tools/package-management/nix/modular/src/libfetchers-tests/package.nix

···

       3
       3
        
         buildPackages,

     

       4
       4
        
         stdenv,

     

       5
       5
        
         mkMesonExecutable,

     

       6
       6
       +
         writableTmpDirAsHomeHook,

     

       6
       7
        
       

     

       7
       8
        
         nix-fetchers,

     

       8
       9
        
         nix-fetchers-c,

     
···

       47
       48
        
               runCommand "${finalAttrs.pname}-run"

     

       48
       49
        
                 {

     

       49
       50
        
                   meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages;

     

       51
       51
       +
                   buildInputs = [ writableTmpDirAsHomeHook ];

     

       50
       52
        
                 }

     

       51
       51
       -
                 (

     

       52
       52
       -
                   lib.optionalString stdenv.hostPlatform.isWindows ''

     

       53
       53
       -
                     export HOME="$PWD/home-dir"

     

       54
       54
       -
                     mkdir -p "$HOME"

     

       55
       55
       -
                   ''

     

       56
       56
       -
                   + ''

     

       57
       57
       -
                     export _NIX_TEST_UNIT_DATA=${resolvePath ./data}

     

       58
       58
       -
                     ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage}

     

       59
       59
       -
                     touch $out

     

       60
       60
       -
                   ''

     

       61
       61
       -
                 );

     

       53
       53
       +
                 ''

     

       54
       54
       +
                   export _NIX_TEST_UNIT_DATA=${resolvePath ./data}

     

       55
       55
       +
                   ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage}

     

       56
       56
       +
                   touch $out

     

       57
       57
       +
                 '';

     

       62
       58
        
           };

     

       63
       59
        
         };

     

       64
       60

+8 -12

pkgs/tools/package-management/nix/modular/src/libflake-tests/package.nix

···

       3
       3
        
         buildPackages,

     

       4
       4
        
         stdenv,

     

       5
       5
        
         mkMesonExecutable,

     

       6
       6
       +
         writableTmpDirAsHomeHook,

     

       6
       7
        
       

     

       7
       8
        
         nix-flake,

     

       8
       9
        
         nix-flake-c,

     
···

       41
       42
        
               runCommand "${finalAttrs.pname}-run"

     

       42
       43
        
                 {

     

       43
       44
        
                   meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages;

     

       45
       45
       +
                   buildInputs = [ writableTmpDirAsHomeHook ];

     

       44
       46
        
                 }

     

       45
       45
       -
                 (

     

       46
       46
       -
                   lib.optionalString stdenv.hostPlatform.isWindows ''

     

       47
       47
       -
                     export HOME="$PWD/home-dir"

     

       48
       48
       -
                     mkdir -p "$HOME"

     

       49
       49
       -
                   ''

     

       50
       50
       -
                   + ''

     

       51
       51
       -
                     export _NIX_TEST_UNIT_DATA=${resolvePath ./data}

     

       52
       52
       -
                     export NIX_CONFIG="extra-experimental-features = flakes"

     

       53
       53
       -
                     ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage}

     

       54
       54
       -
                     touch $out

     

       55
       55
       -
                   ''

     

       56
       56
       -
                 );

     

       47
       47
       +
                 (''

     

       48
       48
       +
                   export _NIX_TEST_UNIT_DATA=${resolvePath ./data}

     

       49
       49
       +
                   export NIX_CONFIG="extra-experimental-features = flakes"

     

       50
       50
       +
                   ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage}

     

       51
       51
       +
                   touch $out

     

       52
       52
       +
                 '');

     

       57
       53
        
           };

     

       58
       54
        
         };

     

       59
       55

+13 -11

pkgs/tools/package-management/nix/modular/src/libstore-tests/package.nix

···

       3
       3
        
         buildPackages,

     

       4
       4
        
         stdenv,

     

       5
       5
        
         mkMesonExecutable,

     

       6
       6
       +
         writableTmpDirAsHomeHook,

     

       6
       7
        
       

     

       7
       8
        
         nix-store,

     

       8
       9
        
         nix-store-c,

     
···

       41
       42
        
         mesonFlags = [

     

       42
       43
        
         ];

     

       43
       44
        
       

     

       45
       45
       +
         excludedTestPatterns = lib.optionals (lib.versionOlder finalAttrs.version "2.31") [

     

       46
       46
       +
           "nix_api_util_context.nix_store_real_path_binary_cache"

     

       47
       47
       +
         ];

     

       48
       48
       +
       

     

       44
       49
        
         passthru = {

     

       45
       50
        
           tests = {

     

       46
       51
        
             run =

     
···

       58
       63
        
               runCommand "${finalAttrs.pname}-run"

     

       59
       64
        
                 {

     

       60
       65
        
                   meta.broken = !stdenv.hostPlatform.emulatorAvailable buildPackages;

     

       66
       66
       +
                   buildInputs = [ writableTmpDirAsHomeHook ];

     

       61
       67
        
                 }

     

       62
       62
       -
                 (

     

       63
       63
       -
                   lib.optionalString stdenv.hostPlatform.isWindows ''

     

       64
       64
       -
                     export HOME="$PWD/home-dir"

     

       65
       65
       -
                     mkdir -p "$HOME"

     

       66
       66
       -
                   ''

     

       67
       67
       -
                   + ''

     

       68
       68
       -
                     export _NIX_TEST_UNIT_DATA=${data + "/src/libstore-tests/data"}

     

       69
       69
       -
                     ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage}

     

       70
       70
       -
                     touch $out

     

       71
       71
       -
                   ''

     

       72
       72
       -
                 );

     

       68
       68
       +
                 (''

     

       69
       69
       +
                   export _NIX_TEST_UNIT_DATA=${data + "/src/libstore-tests/data"}

     

       70
       70
       +
                   export NIX_REMOTE=$HOME/store

     

       71
       71
       +
                   ${stdenv.hostPlatform.emulator buildPackages} ${lib.getExe finalAttrs.finalPackage} \

     

       72
       72
       +
                     --gtest_filter=-${lib.concatStringsSep ":" finalAttrs.excludedTestPatterns}

     

       73
       73
       +
                   touch $out

     

       74
       74
       +
                 '');

     

       73
       75
        
           };

     

       74
       76
        
         };

     

       75
       77