lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

top-level: Less indirection for lib in release*.nix

+8 -11
-3
pkgs/top-level/release-cross.nix
··· 1 - 2 1 { # The platforms for which we build Nixpkgs. 3 2 supportedSystems ? [ builtins.currentSystem ] 4 3 , # Strip most of attributes when evaluating to spare memory usage ··· 8 7 with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; 9 8 10 9 let 11 - inherit (pkgs) lib; 12 - 13 10 nativePlatforms = linux; 14 11 15 12 /* Basic list of packages to cross-build */
+4 -1
pkgs/top-level/release-lib.nix
··· 3 3 , scrubJobs ? true 4 4 }: 5 5 6 - with import ../../lib; 6 + let 7 + lib = import ../../lib; 8 + in with lib; 7 9 8 10 rec { 9 11 ··· 14 16 }); 15 17 16 18 pkgs = pkgsFor "x86_64-linux"; 19 + inherit lib; 17 20 18 21 19 22 hydraJob' = if scrubJobs then hydraJob else id;
+2 -2
pkgs/top-level/release-python.nix
··· 3 3 $ hydra-eval-jobs pkgs/top-level/release-python.nix 4 4 */ 5 5 6 - { nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } 6 + { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } 7 7 , officialRelease ? false 8 8 , # The platforms for which we build Nixpkgs. 9 9 supportedSystems ? [ "x86_64-linux" ] 10 10 }: 11 11 12 - with import ../../lib; 13 12 with import ./release-lib.nix {inherit supportedSystems; }; 13 + with lib; 14 14 15 15 let 16 16 packagePython = mapAttrs (name: value:
+1 -1
pkgs/top-level/release-small.nix
··· 1 1 /* A small release file, with few packages to be built. The aim is to reduce 2 2 the load on Hydra when testing the `stdenv-updates' branch. */ 3 3 4 - { nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } 4 + { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } 5 5 , supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] 6 6 }: 7 7
+1 -4
pkgs/top-level/release.nix
··· 9 9 $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux 10 10 */ 11 11 12 - { nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } 12 + { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } 13 13 , officialRelease ? false 14 14 , # The platforms for which we build Nixpkgs. 15 15 supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] ··· 20 20 with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; 21 21 22 22 let 23 - 24 - lib = pkgs.lib; 25 - 26 23 jobs = 27 24 { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; 28 25