diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-04-17 17:28:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-17 17:28:01 -0400 |
| commit | f0b634c7e838cdd65ac6f73933c99af3f38d0fa8 (patch) | |
| tree | d2c2909fc40eb2e631a6f88ee3bec58c9493035e /pkgs/top-level/release.nix | |
| parent | 37e5e71fdf098a45471537e9961672592ef6f72a (diff) | |
| parent | 3efc661a1de6a2ce9b98aa39283e68914297b8d7 (diff) | |
| download | nixlib-f0b634c7e838cdd65ac6f73933c99af3f38d0fa8.tar nixlib-f0b634c7e838cdd65ac6f73933c99af3f38d0fa8.tar.gz nixlib-f0b634c7e838cdd65ac6f73933c99af3f38d0fa8.tar.bz2 nixlib-f0b634c7e838cdd65ac6f73933c99af3f38d0fa8.tar.lz nixlib-f0b634c7e838cdd65ac6f73933c99af3f38d0fa8.tar.xz nixlib-f0b634c7e838cdd65ac6f73933c99af3f38d0fa8.tar.zst nixlib-f0b634c7e838cdd65ac6f73933c99af3f38d0fa8.zip | |
Merge pull request #24610 from Ericson2314/platform-normalization
Platform normalization
Diffstat (limited to 'pkgs/top-level/release.nix')
| -rw-r--r-- | pkgs/top-level/release.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 66ff9a9e6b98..cf4d54fe0496 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -9,7 +9,7 @@ $ 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 , # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ] @@ -22,16 +22,13 @@ with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; }; let - - lib = pkgs.lib; - jobs = { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; manual = import ../../doc; - lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; }; + lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs supportedSystems scrubJobs; }; darwin-tested = pkgs.releaseTools.aggregate { name = "nixpkgs-darwin-${jobs.tarball.version}"; @@ -55,7 +52,6 @@ let [ jobs.tarball jobs.metrics jobs.manual - jobs.lib-tests jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux jobs.stdenv.x86_64-darwin @@ -82,7 +78,8 @@ let jobs.git.x86_64-darwin jobs.mysql.x86_64-darwin jobs.vim.x86_64-darwin - ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools; + ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools + ++ lib.collect lib.isDerivation jobs.lib-tests; }; } // (lib.optionalAttrs (builtins.elem "i686-linux" supportedSystems) { stdenvBootstrapTools.i686-linux = |