diff options
| -rw-r--r-- | release-combined.nix | 9 | ||||
| -rw-r--r-- | release.nix | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/release-combined.nix b/release-combined.nix index b26a2184ddb..3a378123d2c 100644 --- a/release-combined.nix +++ b/release-combined.nix @@ -1,17 +1,20 @@ { nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; } -, nixpkgsSrc ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; } +, nixpkgs ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; } , officialRelease ? false }: +let nixpkgs' = nixpkgs; in # urgh + rec { nixos = import ./release.nix { - inherit nixosSrc nixpkgsSrc officialRelease; + inherit nixosSrc officialRelease; + nixpkgs = nixpkgs'; }; nixpkgs = import <nixpkgs/pkgs/top-level/release.nix> { inherit officialRelease; - nixpkgs = nixpkgsSrc; + nixpkgs = nixpkgs'; # Only do Linux builds. supportedSystems = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/release.nix b/release.nix index c8f144b74b2..ffaef1f0279 100644 --- a/release.nix +++ b/release.nix @@ -1,12 +1,12 @@ { nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; } -, nixpkgsSrc ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; } +, nixpkgs ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; } , officialRelease ? false }: let version = builtins.readFile ./.version; - versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgsSrc.shortRev}"; + versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgs.shortRev}"; systems = [ "x86_64-linux" "i686-linux" ]; @@ -115,7 +115,7 @@ in { ensureDir "$out/tarballs" mkdir ../$releaseName cp -prd . ../$releaseName/nixos - cp -prd ${nixpkgsSrc} ../$releaseName/nixpkgs + cp -prd ${nixpkgs} ../$releaseName/nixpkgs echo "$expr" > ../$releaseName/default.nix NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null cd .. |