pyrox.dev
Merge pull request #141126 from gebner/elan110
elan: 1.0.7 -> 1.1.0
authored by
Gabriel Ebner
and committed by
GitHub
5ba6178d
2a49e940
+10
-4
pkgs/applications/science/logic/elan/default.nix
+10
-4
pkgs/applications/science/logic/elan/default.nix
···
1
{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl
2
, openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }:
3
4
let
···
7
8
rustPlatform.buildRustPackage rec {
9
pname = "elan";
10
-
version = "1.0.7";
11
12
src = fetchFromGitHub {
13
owner = "leanprover";
14
repo = "elan";
15
rev = "v${version}";
16
-
sha256 = "sha256-SFY9RbUHoaOXCaK+uIqhnKbzSkbtWiS6os/JvsggagI=";
17
};
18
19
-
cargoSha256 = "sha256-6TFionZw76V4htYQrz8eLX7ioW7Fbgd63rtz53s0TLU=";
20
21
nativeBuildInputs = [ pkg-config makeWrapper ];
22
···
40
--subst-var dynamicLinker \
41
--subst-var libPath
42
'')
43
];
44
45
postInstall = ''
46
pushd $out/bin
47
mv elan-init elan
48
-
for link in lean leanpkg leanchecker leanc leanmake; do
49
ln -s elan $link
50
done
51
popd
···
1
{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl
2
+
, fetchpatch
3
, openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }:
4
5
let
···
8
9
rustPlatform.buildRustPackage rec {
10
pname = "elan";
11
+
version = "1.1.0";
12
13
src = fetchFromGitHub {
14
owner = "leanprover";
15
repo = "elan";
16
rev = "v${version}";
17
+
sha256 = "0xmml81krr0i18b14dymfdq43szpzws7qj8k404qab51lkqxyxsb";
18
};
19
20
+
cargoSha256 = "sha256-xjJ39hoSDn0VUH0YcL+mQBXbzFcIvZ38dPjBxV/yVNc=";
21
22
nativeBuildInputs = [ pkg-config makeWrapper ];
23
···
41
--subst-var dynamicLinker \
42
--subst-var libPath
43
'')
44
+
# fix build, will be included in 1.1.1
45
+
(fetchpatch {
46
+
url = "https://github.com/leanprover/elan/commit/8d1dec09d67b2ac1768b111d24f1a1cabdd563fa.patch";
47
+
sha256 = "sha256-yMdnXqycu4VF9EKavZ85EuspvAqvzDSIm5894SB+3+A=";
48
+
})
49
];
50
51
postInstall = ''
52
pushd $out/bin
53
mv elan-init elan
54
+
for link in lean leanpkg leanchecker leanc leanmake lake; do
55
ln -s elan $link
56
done
57
popd