public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Grmbl

This commit is contained in:
Eelco Dolstra 2013-03-26 14:44:24 +01:00
parent f235cc2884
commit 2f5576b539
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
release-combined.nix
View File

@ -1,17 +1,20 @@
{ nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; } { nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; }
, nixpkgsSrc ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; } , nixpkgs ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
, officialRelease ? false , officialRelease ? false
}: }:
let nixpkgs' = nixpkgs; in # urgh
rec { rec {
nixos = import ./release.nix { nixos = import ./release.nix {
inherit nixosSrc nixpkgsSrc officialRelease; inherit nixosSrc officialRelease;
nixpkgs = nixpkgs';
}; };
nixpkgs = import <nixpkgs/pkgs/top-level/release.nix> { nixpkgs = import <nixpkgs/pkgs/top-level/release.nix> {
inherit officialRelease; inherit officialRelease;
nixpkgs = nixpkgsSrc; nixpkgs = nixpkgs';
# Only do Linux builds. # Only do Linux builds.
supportedSystems = [ "x86_64-linux" "i686-linux" ]; supportedSystems = [ "x86_64-linux" "i686-linux" ];
}; };

6
release.nix
View File

@ -1,12 +1,12 @@
{ nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; } { nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; }
, nixpkgsSrc ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; } , nixpkgs ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
, officialRelease ? false , officialRelease ? false
}: }:
let let
version = builtins.readFile ./.version; 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" ]; systems = [ "x86_64-linux" "i686-linux" ];
@ -115,7 +115,7 @@ in {
ensureDir "$out/tarballs" ensureDir "$out/tarballs"
mkdir ../$releaseName mkdir ../$releaseName
cp -prd . ../$releaseName/nixos cp -prd . ../$releaseName/nixos
cp -prd ${nixpkgsSrc} ../$releaseName/nixpkgs cp -prd ${nixpkgs} ../$releaseName/nixpkgs
echo "$expr" > ../$releaseName/default.nix echo "$expr" > ../$releaseName/default.nix
NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
cd .. cd ..