diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-26 14:44:24 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-26 14:44:24 +0100 |
| commit | 2f5576b5392b407b909db871f1308c9af85f2df9 (patch) | |
| tree | 687d990bc80e2874475e42cc41114b2b2aa81fd0 /release-combined.nix | |
| parent | f235cc2884e282cf1cfb49d9b2ce1f493c850c50 (diff) | |
| download | nixpkgs-2f5576b5392b407b909db871f1308c9af85f2df9.tar nixpkgs-2f5576b5392b407b909db871f1308c9af85f2df9.tar.gz nixpkgs-2f5576b5392b407b909db871f1308c9af85f2df9.tar.bz2 nixpkgs-2f5576b5392b407b909db871f1308c9af85f2df9.tar.lz nixpkgs-2f5576b5392b407b909db871f1308c9af85f2df9.tar.xz nixpkgs-2f5576b5392b407b909db871f1308c9af85f2df9.tar.zst nixpkgs-2f5576b5392b407b909db871f1308c9af85f2df9.zip | |
Grmbl
Diffstat (limited to 'release-combined.nix')
| -rw-r--r-- | release-combined.nix | 9 |
1 files changed, 6 insertions, 3 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" ]; }; |