commit d45df036c3aac928c84b2512ddb11d1a78335fed · pyrox.dev/nixpkgs

+3 -5

pkgs/top-level/release-lib.nix

···

       1
       1
        
       { supportedSystems

     

       2
       2
        
       , packageSet ? (import ../..)

     

       3
       3
        
       , scrubJobs ? true

     

       4
       4
       +
       , # Attributes passed to nixpkgs. Don't build packages marked as unfree.

     

       5
       5
       +
         nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }

     

       4
       6
        
       }:

     

       5
       7
        
       

     

       6
       8
        
       with import ../../lib;

     

       7
       9
        
       

     

       8
       10
        
       rec {

     

       9
       11
        
       

     

       10
       10
       -
         # Ensure that we don't build packages marked as unfree.

     

       11
       11
       -
         allPackages = args: packageSet (args // {

     

       12
       12
       -
           config.allowUnfree = false;

     

       13
       13
       -
           config.inHydra = true;

     

       14
       14
       -
         });

     

       12
       12
       +
         allPackages = args: packageSet (args // nixpkgsArgs);

     

       15
       13
        
       

     

       16
       14
        
         pkgs = pkgsFor "x86_64-linux";

     

       17
       15

+3 -1

pkgs/top-level/release.nix

···

       15
       15
        
         supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]

     

       16
       16
        
       , # Strip most of attributes when evaluating to spare memory usage

     

       17
       17
        
         scrubJobs ? true

     

       18
       18
       +
       , # Attributes passed to nixpkgs. Don't build packages marked as unfree.

     

       19
       19
       +
         nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }

     

       18
       20
        
       }:

     

       19
       21
        
       

     

       20
       20
       -
       with import ./release-lib.nix { inherit supportedSystems scrubJobs; };

     

       22
       22
       +
       with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; };

     

       21
       23
        
       

     

       22
       24
        
       let

     

       23
       25