b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
John Ericson 2017-03-23 19:18:43 -04:00
parent 213d29f6b7
commit b477851f34
5 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/top-level/release-cross.nix
View file

@ -1,4 +1,3 @@
{ # The platforms for which we build Nixpkgs. { # The platforms for which we build Nixpkgs.
supportedSystems ? [ builtins.currentSystem ] supportedSystems ? [ builtins.currentSystem ]
, # Strip most of attributes when evaluating to spare memory usage , # Strip most of attributes when evaluating to spare memory usage
@ -8,8 +7,6 @@
with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
let let
inherit (pkgs) lib;
nativePlatforms = linux; nativePlatforms = linux;
/* Basic list of packages to cross-build */ /* Basic list of packages to cross-build */

5
pkgs/top-level/release-lib.nix
View file

@ -3,7 +3,9 @@
, scrubJobs ? true , scrubJobs ? true
}: }:
with import ../../lib; let
lib = import ../../lib;
in with lib;
rec { rec {
@ -14,6 +16,7 @@ rec {
}); });
pkgs = pkgsFor "x86_64-linux"; pkgs = pkgsFor "x86_64-linux";
inherit lib;
hydraJob' = if scrubJobs then hydraJob else id; hydraJob' = if scrubJobs then hydraJob else id;

4
pkgs/top-level/release-python.nix
View file

@ -3,14 +3,14 @@
$ hydra-eval-jobs pkgs/top-level/release-python.nix $ hydra-eval-jobs pkgs/top-level/release-python.nix
*/ */
{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
, officialRelease ? false , officialRelease ? false
, # The platforms for which we build Nixpkgs. , # The platforms for which we build Nixpkgs.
supportedSystems ? [ "x86_64-linux" ] supportedSystems ? [ "x86_64-linux" ]
}: }:
with import ../../lib;
with import ./release-lib.nix {inherit supportedSystems; }; with import ./release-lib.nix {inherit supportedSystems; };
with lib;
let let
packagePython = mapAttrs (name: value: packagePython = mapAttrs (name: value:

2
pkgs/top-level/release-small.nix
View file

@ -1,7 +1,7 @@
/* A small release file, with few packages to be built. The aim is to reduce /* A small release file, with few packages to be built. The aim is to reduce
the load on Hydra when testing the `stdenv-updates' branch. */ the load on Hydra when testing the `stdenv-updates' branch. */
{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] , supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
}: }:

5
pkgs/top-level/release.nix
View file

@ -9,7 +9,7 @@
$ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
*/ */
{ nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
, officialRelease ? false , officialRelease ? false
, # The platforms for which we build Nixpkgs. , # The platforms for which we build Nixpkgs.
supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
@ -20,9 +20,6 @@
with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
let let
lib = pkgs.lib;
jobs = jobs =
{ tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; };