diff --git a/artiq/pkgs/artiq-version.nix b/artiq/pkgs/artiq-version.nix index 9715fd5..2a21317 100644 --- a/artiq/pkgs/artiq-version.nix +++ b/artiq/pkgs/artiq-version.nix @@ -5,10 +5,11 @@ let src = import ./artiq-src.nix { inherit fetchgit; }; buildPhase = '' REV=`${git}/bin/git rev-parse HEAD` - COMMITCOUNT=`${git}/bin/git rev-list --count HEAD` + MAJOR_VERSION=`cat MAJOR_VERSION` + COMMIT_COUNT=`${git}/bin/git rev-list --count HEAD` ''; installPhase = '' - echo -n 5.$COMMITCOUNT.`cut -c1-8 <<< $REV`.beta > $out + echo -n $MAJOR_VERSION.$COMMIT_COUNT.`cut -c1-8 <<< $REV`.beta > $out ''; }; in diff --git a/main.nix b/main.nix index 3771722..f8e7553 100644 --- a/main.nix +++ b/main.nix @@ -5,7 +5,8 @@ let '' cp --no-preserve=mode,ownership -R ${./artiq} $out REV=`git --git-dir ${artiqSrc}/.git rev-parse HEAD` - COMMITCOUNT=`git --git-dir ${artiqSrc}/.git rev-list --count HEAD` + MAJOR_VERSION=`cat ${artiqSrc}/MAJOR_VERSION` + COMMIT_COUNT=`git --git-dir ${artiqSrc}/.git rev-list --count HEAD` TIMESTAMP=`git --git-dir ${artiqSrc}/.git log -1 --format=%ct` ARTIQ_SRC_CLEAN=`mktemp -d` cp -a ${artiqSrc}/. $ARTIQ_SRC_CLEAN @@ -21,7 +22,7 @@ let sha256 = "$HASH"; } EOF - echo "{ stdenv, git, fetchgit }: \"5.$COMMITCOUNT.`cut -c1-8 <<< $REV`.beta\"" > $out/pkgs/artiq-version.nix + echo "{ stdenv, git, fetchgit }: \"$MAJOR_VERSION.$COMMIT_COUNT.`cut -c1-8 <<< $REV`.beta\"" > $out/pkgs/artiq-version.nix echo "{ stdenv, git, fetchgit }: \"$TIMESTAMP\"" > $out/pkgs/artiq-timestamp.nix ''; generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; }