commit 9e84e5f8f36ef5320497e79f8aca6e811b066d2f · pyrox.dev/nixpkgs

+20 -4

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

···

       231
       231
        
           inherit storeDir stateDir confDir;

     

       232
       232
        
         });

     

       233
       233
        
       

     

       234
       234
       +
         nix_2_4 = callPackage common (rec {

     

       235
       235
       +
           pname = "nix";

     

       236
       236
       +
           version = "2.4pre-rc1";

     

       237
       237
       +
       

     

       238
       238
       +
           src = fetchFromGitHub {

     

       239
       239
       +
             owner = "NixOS";

     

       240
       240
       +
             repo = "nix";

     

       241
       241
       +
             rev = version;

     

       242
       242
       +
             sha256 = "sha256-KOb8etMm5LksvT2l+CkvqzMO1bgmo9tJmyaNh0LvaR8=";

     

       243
       243
       +
           };

     

       244
       244
       +
       

     

       245
       245
       +
           boehmgc = boehmgc_nixUnstable;

     

       246
       246
       +
       

     

       247
       247
       +
           inherit storeDir stateDir confDir;

     

       248
       248
       +
         });

     

       249
       249
       +
       

     

       234
       250
        
         nixUnstable = lib.lowPrio (callPackage common rec {

     

       235
       251
        
           pname = "nix";

     

       236
       236
       -
           version = "2.4${suffix}";

     

       237
       237
       -
           suffix = "pre20211006_${lib.substring 0 7 src.rev}";

     

       252
       252
       +
           version = "2.5${suffix}";

     

       253
       253
       +
           suffix = "pre20211007_${lib.substring 0 7 src.rev}";

     

       238
       254
        
       

     

       239
       255
        
           src = fetchFromGitHub {

     

       240
       256
        
             owner = "NixOS";

     

       241
       257
        
             repo = "nix";

     

       242
       242
       -
             rev = "53e479428958b39a126ce15de85d7397fdcfe2e1";

     

       243
       243
       -
             sha256 = "18mm3f0n964msj5bha6wpnwckg5lwjwdm6r7frrwdj75v10jiyb7";

     

       258
       258
       +
             rev = "844dd901a7debe8b03ec93a7f717b6c4038dc572";

     

       259
       259
       +
             sha256 = "sha256-fe1B4lXkS6/UfpO0rJHwLC06zhOPrdSh4s9PmQ1JgPo=";

     

       244
       260
        
           };

     

       245
       261
        
       

     

       246
       262
        
           boehmgc = boehmgc_nixUnstable;

pkgs/top-level/all-packages.nix

···

       31874
       31874
        
             })

     

       31875
       31875
        
           nix

     

       31876
       31876
        
           nixStable

     

       31877
       31877
       +
           nix_2_4

     

       31877
       31878
        
           nixUnstable;

     

       31878
       31879
        
       

     

       31879
       31880
        
         nixStatic = pkgsStatic.nix;