philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Unify the Nixpkgs and NixOS version numbers

gstqt5
Eelco Dolstra 2013-10-01 13:45:14 +02:00
parent 3293421dd3
commit 041da5a6f9
8 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.version Normal file
View File

@ -0,0 +1 @@
13.10

1
VERSION
View File

@ -1 +0,0 @@
1.0

2
doc/manual.xml
View File

@ -5,7 +5,7 @@
<title>Nixpkgs Manual</title>
<subtitle>Draft (Version <xi:include href="../VERSION"
<subtitle>Draft (Version <xi:include href="../.version"
parse="text" />)</subtitle>
<author>

1
nixos/.version
View File

@ -1 +0,0 @@
13.09

13
nixos/modules/installer/tools/get-version-suffix
View File

@ -14,16 +14,9 @@ getVersion() {
fi
}
if nixos=$(nix-instantiate --find-file nixos "$@"); then
getVersion $nixos
if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then
getVersion $nixpkgs
if [ -n "$rev" ]; then
suffix="pre-$rev"
if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then
getVersion $nixpkgs
if [ -n "$rev" ]; then
suffix+="-$rev"
fi
fi
echo $suffix
echo "pre-$rev"
fi
fi

4
nixos/modules/misc/version.nix
View File

@ -26,10 +26,10 @@ with pkgs.lib;
config = {
system.nixosVersion =
mkDefault (builtins.readFile ../../.version + config.system.nixosVersionSuffix);
mkDefault (builtins.readFile ../../../.version + config.system.nixosVersionSuffix);
system.nixosVersionSuffix =
mkDefault (if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-git");
mkDefault (if builtins.pathExists ../../../.version-suffix then builtins.readFile ../../../.version-suffix else "pre-git");
# Note: code names must only increase in alphabetical order.
system.nixosCodeName = "Aardvark";

4
nixos/release.nix
View File

@ -5,8 +5,8 @@
let
version = builtins.readFile ./.version;
versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgs.shortRev}";
version = builtins.readFile ../.version;
versionSuffix = "pre${toString nixpkgs.revCount}_${nixpkgs.shortRev}";
systems = [ "x86_64-linux" "i686-linux" ];

14
pkgs/top-level/make-tarball.nix
View File

@ -1,4 +1,4 @@
/* Hydra job to build a tarball for Nixpkgs from a SVN checkout. It
/* Hydra job to build a tarball for Nixpkgs from a Git checkout. It
also builds the documentation and tests whether the Nix expressions
evaluate correctly. */
@ -6,13 +6,13 @@
with import nixpkgs.outPath {};
releaseTools.sourceTarball {
releaseTools.sourceTarball rec {
name = "nixpkgs-tarball";
src = nixpkgs;
inherit officialRelease;
version = builtins.readFile ../../VERSION;
versionSuffix = if officialRelease then "" else "pre${toString nixpkgs.revCount}_${nixpkgs.shortRev}";
inherit officialRelease;
version = builtins.readFile ../../.version;
versionSuffix = "pre${toString nixpkgs.revCount}_${nixpkgs.shortRev}";
buildInputs = [
lzma
@ -26,8 +26,8 @@ releaseTools.sourceTarball {
configurePhase = ''
eval "$preConfigure"
releaseName=nixpkgs-$VERSION$VERSION_SUFFIX
echo -n $VERSION_SUFFIX > .version-suffix
echo "release name is $releaseName"
echo $releaseName > relname
'';
dontBuild = false;
@ -47,7 +47,7 @@ releaseTools.sourceTarball {
nix-store --init
# Run the regression tests in `lib'.
res="$(nix-instantiate --eval-only --strict --show-trace pkgs/lib/tests.nix)"
res="$(nix-instantiate --eval-only --strict --show-trace lib/tests.nix)"
if test "$res" != "[ ]"; then
echo "regression tests for lib failed, got: $res"
exit 1