From 925ab444c96020343f265a0e7531e991158234f8 Mon Sep 17 00:00:00 2001
From: Smaug123 <patrick+github@patrickstevens.co.uk>
Date: Sun, 31 Oct 2021 21:13:03 +0000
Subject: [PATCH] elan: 1.1.0 -> 1.2.0

The move to 1.1.0 broke Darwin: the patch introduced during that move
is also required on Darwin, but is hidden behind a Linux-specific
optional. The patch has since made it upstream, so the easiest fix
is simply to upgrade Elan.
---
 pkgs/applications/science/logic/elan/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index 987068d9bbb6..5dc54fd27747 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -1,5 +1,4 @@
 { stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl
-, fetchpatch
 , openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }:
 
 let
@@ -8,16 +7,16 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "elan";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "leanprover";
     repo = "elan";
     rev = "v${version}";
-    sha256 = "0xmml81krr0i18b14dymfdq43szpzws7qj8k404qab51lkqxyxsb";
+    sha256 = "0q3gay0j45c6cmykbis14gmc7xm89d0gqyz7lnysl0pgr5k20j6b";
   };
 
-  cargoSha256 = "sha256-xjJ39hoSDn0VUH0YcL+mQBXbzFcIvZ38dPjBxV/yVNc=";
+  cargoSha256 = "1cklpi40fbiwz8m9p0cknmslpj0vwpr0x8j02vam6sng9dsb50i9";
 
   nativeBuildInputs = [ pkg-config makeWrapper ];
 
@@ -41,11 +40,6 @@ rustPlatform.buildRustPackage rec {
        --subst-var dynamicLinker \
        --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 = ''