mirror of
https://github.com/idris-lang/Idris2.git
synced 2024-09-11 21:37:48 +03:00
[ fix ] Nix uses proper version
This commit is contained in:
parent
f5bcc81115
commit
8638849d26
@ -11,7 +11,10 @@
|
|||||||
let idris2-version = "0.4.0";
|
let idris2-version = "0.4.0";
|
||||||
in flake-utils.lib.eachDefaultSystem (system:
|
in flake-utils.lib.eachDefaultSystem (system:
|
||||||
let pkgs = import nixpkgs { inherit 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; };
|
text-editor = import ./nix/text-editor.nix { inherit pkgs idris-emacs-src idris2Pkg; };
|
||||||
buildIdrisPkg = { projectName, src, idrisLibraries }:
|
buildIdrisPkg = { projectName, src, idrisLibraries }:
|
||||||
pkgs.callPackage ./nix/buildIdris.nix
|
pkgs.callPackage ./nix/buildIdris.nix
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, idris2-version
|
, idris2-version
|
||||||
|
, srcRev
|
||||||
, racket
|
, racket
|
||||||
, gambit
|
, gambit
|
||||||
, nodejs
|
, nodejs
|
||||||
@ -24,8 +25,10 @@ stdenv.mkDerivation rec {
|
|||||||
++ lib.optional stdenv.isDarwin [ zsh ];
|
++ lib.optional stdenv.isDarwin [ zsh ];
|
||||||
buildInputs = [ chez gmp ];
|
buildInputs = [ chez gmp ];
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = let match = "$\{GIT_SHA1}"; in
|
||||||
|
''
|
||||||
patchShebangs --build tests
|
patchShebangs --build tests
|
||||||
|
sed 's/${match}/${srcRev}/' -i Makefile
|
||||||
'';
|
'';
|
||||||
|
|
||||||
makeFlags = [ "PREFIX=$(out)" ]
|
makeFlags = [ "PREFIX=$(out)" ]
|
||||||
|
Loading…
Reference in New Issue
Block a user