From 9c77c62e731e3fb9b1a87414c5b2d7a52932a507 Mon Sep 17 00:00:00 2001
From: Jade Lovelace <lix@jade.fyi>
Date: Thu, 6 Jun 2024 11:35:03 -0700
Subject: Move version to a JSON file so we can have release names

Change-Id: I5ff3396a302565ee5ee6c2db97e048e403779076
---
 flake.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index d0b674464..fd8b7995e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,7 +59,6 @@
       # Set to true to build the release notes for the next release.
       buildUnreleasedNotes = true;
 
-      version = lib.fileContents ./.version + versionSuffix;
       versionSuffix =
         if officialRelease then
           ""
@@ -149,8 +148,7 @@
         }
       );
 
-      binaryTarball =
-        nix: pkgs: pkgs.callPackage ./nix-support/binary-tarball.nix { inherit nix version; };
+      binaryTarball = nix: pkgs: pkgs.callPackage ./nix-support/binary-tarball.nix { inherit nix; };
 
       overlayFor =
         getStdenv: final: prev:
@@ -330,10 +328,10 @@
                 pkgs = nixpkgsFor.${system}.native;
                 image = import ./docker.nix {
                   inherit pkgs;
-                  tag = version;
+                  tag = pkgs.nix.version;
                 };
               in
-              pkgs.runCommand "docker-image-tarball-${version}"
+              pkgs.runCommand "docker-image-tarball-${pkgs.nix.version}"
                 { meta.description = "Docker image with Lix for ${system}"; }
                 ''
                   mkdir -p $out/nix-support
-- 
cgit v1.2.3