aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2022-12-07 17:02:18 +0100
committerGitHub <noreply@github.com>2022-12-07 17:02:18 +0100
commit5dce1a5af6ffd911657ee1be2403a4f694c67477 (patch)
tree106bfbb36b5459fa91340e0411881f952e891e78
parentd602762dc7ad7f8b52a39415a032859aaf4fc388 (diff)
parentaf8136afd4440bbabb4ea214bfd3dc15ffebf469 (diff)
Merge pull request #7414 from hercules-ci/version-newline
.version: Add newline
-rw-r--r--.version2
-rw-r--r--flake.nix6
2 files changed, 4 insertions, 4 deletions
diff --git a/.version b/.version
index a3ebb9f51..fb2c0766b 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.13.0 \ No newline at end of file
+2.13.0
diff --git a/flake.nix b/flake.nix
index d9d01da10..5127ee2a3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,14 +9,14 @@
let
- version = builtins.readFile ./.version + versionSuffix;
+ officialRelease = false;
+
+ version = nixpkgs.lib.fileContents ./.version + versionSuffix;
versionSuffix =
if officialRelease
then ""
else "pre${builtins.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}_${self.shortRev or "dirty"}";
- officialRelease = false;
-
linux64BitSystems = [ "x86_64-linux" "aarch64-linux" ];
linuxSystems = linux64BitSystems ++ [ "i686-linux" ];
systems = linuxSystems ++ [ "x86_64-darwin" "aarch64-darwin" ];