BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #141126 from gebner/elan110

Browse source 
elan: 1.0.7 -> 1.1.0
This commit is contained in:
Gabriel Ebner 2021-10-09 21:00:19 +02:00 committed by GitHub
commit 5ba6178d08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/science/logic/elan/default.nix
View file

@ -1,4 +1,5 @@
{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl { stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl
, fetchpatch
, openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }: , openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }:
let let
@ -7,16 +8,16 @@ in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "elan"; pname = "elan";
version = "1.0.7"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "leanprover"; owner = "leanprover";
repo = "elan"; repo = "elan";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-SFY9RbUHoaOXCaK+uIqhnKbzSkbtWiS6os/JvsggagI="; sha256 = "0xmml81krr0i18b14dymfdq43szpzws7qj8k404qab51lkqxyxsb";
}; };
cargoSha256 = "sha256-6TFionZw76V4htYQrz8eLX7ioW7Fbgd63rtz53s0TLU="; cargoSha256 = "sha256-xjJ39hoSDn0VUH0YcL+mQBXbzFcIvZ38dPjBxV/yVNc=";
nativeBuildInputs = [ pkg-config makeWrapper ]; nativeBuildInputs = [ pkg-config makeWrapper ];
@ -40,12 +41,17 @@ rustPlatform.buildRustPackage rec {
--subst-var dynamicLinker \ --subst-var dynamicLinker \
--subst-var libPath --subst-var libPath
'') '')
# fix build, will be included in 1.1.1
(fetchpatch {
url = "https://github.com/leanprover/elan/commit/8d1dec09d67b2ac1768b111d24f1a1cabdd563fa.patch";
sha256 = "sha256-yMdnXqycu4VF9EKavZ85EuspvAqvzDSIm5894SB+3+A=";
})
]; ];
postInstall = '' postInstall = ''
pushd $out/bin pushd $out/bin
mv elan-init elan mv elan-init elan
for link in lean leanpkg leanchecker leanc leanmake; do for link in lean leanpkg leanchecker leanc leanmake lake; do
ln -s elan $link ln -s elan $link
done done
popd popd