From f13aa788e10846c1e9b5a0cf5c6b09ef9a16f5a6 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 1 Nov 2021 13:37:56 +0100 Subject: [PATCH] elan: 1.2.0 -> 1.3.0 --- .../elan/0001-dynamically-patchelf-binaries.patch | 10 +++++----- pkgs/applications/science/logic/elan/default.nix | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch index b382e6f9e754..48b1263e7961 100644 --- a/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch +++ b/pkgs/applications/science/logic/elan/0001-dynamically-patchelf-binaries.patch @@ -1,11 +1,11 @@ diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/component/package.rs -index fd9fe74..0fefa39 100644 +index c51e76d..d0a26d7 100644 --- a/src/elan-dist/src/component/package.rs +++ b/src/elan-dist/src/component/package.rs -@@ -50,11 +50,35 @@ fn unpack_without_first_dir(archive: &mut tar::Archive, path: &Path) - }; - - try!(entry.unpack(&full_path).chain_err(|| ErrorKind::ExtractingPackage)); +@@ -56,11 +56,35 @@ fn unpack_without_first_dir(archive: &mut tar::Archive, path: &Path) + entry + .unpack(&full_path) + .chain_err(|| ErrorKind::ExtractingPackage)?; + nix_patchelf_if_needed(&full_path); } diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 5dc54fd27747..fb636da0ec41 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -7,16 +7,16 @@ in rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "0q3gay0j45c6cmykbis14gmc7xm89d0gqyz7lnysl0pgr5k20j6b"; + sha256 = "0gql015zb3y95v68kmv2dscz7fnh89x1shrqxxqk5a0jhd2z93n1"; }; - cargoSha256 = "1cklpi40fbiwz8m9p0cknmslpj0vwpr0x8j02vam6sng9dsb50i9"; + cargoSha256 = "sha256-rL++3RstCSBMYFj9BeOo6gepfId/sje4ES3Wm+Mb4cQ="; nativeBuildInputs = [ pkg-config makeWrapper ];