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

* Consistently include the Nixpkgs revision in the NixOS version

Browse Source 
string.

svn path=/nixos/trunk/; revision=33729
This commit is contained in:
Eelco Dolstra 2012-04-10 20:28:06 +00:00
parent f9ac67c67f
commit 871b4bd43a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
release.nix
View File

@ -4,18 +4,20 @@
let
versionSuffix = "pre${toString nixosSrc.rev}-${toString nixpkgs.rev}";
makeIso =
{ module, type, description ? type, maintainers ? ["eelco"] }:
{ officialRelease ? false
, system ? "i686-linux"
, system ? builtins.currentSystem
}:
with import <nixpkgs> {inherit system;};
let
version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
version = builtins.readFile ./VERSION + (lib.optionalString (!officialRelease) versionSuffix);
versionModule =
{ system.nixosVersion = version;
@ -48,12 +50,12 @@ let
makeSystemTarball =
{ module, maintainers ? ["viric"]}:
{ officialRelease ? false
, system ? "i686-linux"
, system ? builtins.currentSystem
}:
with import <nixpkgs> {inherit system;};
let
version = builtins.readFile ./VERSION + (if officialRelease then "" else "pre${toString nixosSrc.rev}");
version = builtins.readFile ./VERSION + (lib.optionalString (!officialRelease) versionSuffix);
versionModule = { system.nixosVersion = version; };
@ -113,7 +115,7 @@ let
src = nixosSrc;
inherit officialRelease;
inherit officialRelease versionSuffix;
buildInputs = [ nixUnstable ];
@ -124,7 +126,7 @@ let
'';
distPhase = ''
releaseName=nixos-$VERSION$VERSION_SUFFIX-${toString nixpkgs.rev}
releaseName=nixos-$VERSION$VERSION_SUFFIX
ensureDir "$out/tarballs"
mkdir ../$releaseName
cp -prd . ../$releaseName/nixos