From 8638849d26e17198db5d2e78c019172982deed09 Mon Sep 17 00:00:00 2001 From: John Mager Date: Mon, 28 Jun 2021 19:35:54 -0400 Subject: [PATCH] [ fix ] Nix uses proper version --- flake.nix | 5 ++++- nix/package.nix | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index f08940fac..30a4f9ddb 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,10 @@ let idris2-version = "0.4.0"; in flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; - idris2Pkg = pkgs.callPackage ./nix/package.nix { inherit idris2-version; }; + idris2Pkg = pkgs.callPackage ./nix/package.nix { + inherit idris2-version; + srcRev = self.shortRev or "dirty"; + }; text-editor = import ./nix/text-editor.nix { inherit pkgs idris-emacs-src idris2Pkg; }; buildIdrisPkg = { projectName, src, idrisLibraries }: pkgs.callPackage ./nix/buildIdris.nix diff --git a/nix/package.nix b/nix/package.nix index d8c1c1208..92463806e 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -6,6 +6,7 @@ , fetchFromGitHub , makeWrapper , idris2-version +, srcRev , racket , gambit , nodejs @@ -24,8 +25,10 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin [ zsh ]; buildInputs = [ chez gmp ]; - prePatch = '' + prePatch = let match = "$\{GIT_SHA1}"; in + '' patchShebangs --build tests + sed 's/${match}/${srcRev}/' -i Makefile ''; makeFlags = [ "PREFIX=$(out)" ]