diff options
author | Gabriel Ebner <gebner@gebner.org> | 2020-02-20 09:53:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-20 09:53:49 +0100 |
commit | f098b0dd2cdc008711938272b3d622cb55131706 (patch) | |
tree | bb4a7fa0b0d3396ae08bae3f14d730f240d3fa60 | |
parent | 5f711b6b7e32f1109ffe50159bf55c47c848cce2 (diff) | |
parent | ed85c9981a9c64f21974af3fc1d9aa9bc35a8e07 (diff) | |
download | nixpkgs-f098b0dd2cdc008711938272b3d622cb55131706.tar nixpkgs-f098b0dd2cdc008711938272b3d622cb55131706.tar.gz nixpkgs-f098b0dd2cdc008711938272b3d622cb55131706.tar.bz2 nixpkgs-f098b0dd2cdc008711938272b3d622cb55131706.tar.lz nixpkgs-f098b0dd2cdc008711938272b3d622cb55131706.tar.xz nixpkgs-f098b0dd2cdc008711938272b3d622cb55131706.tar.zst nixpkgs-f098b0dd2cdc008711938272b3d622cb55131706.zip |
Merge pull request #80576 from bhipple/u/rust-cargo-elan
elan: upgrade cargo fetcher and cargoSha256
-rw-r--r-- | pkgs/applications/science/logic/elan/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 2ac7c208a5f..b77f5110521 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,14 +1,9 @@ -{ stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: +{ lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "elan"; version = "0.7.5"; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "0q0xlvyyf88dbz43r7kk9v8rrp6hj0nl5i2i9mg6ibk2gphgdv6v"; - src = fetchFromGitHub { owner = "kha"; repo = "elan"; @@ -16,6 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "1147f3lzr6lgvf580ppspn20bdwnf6l8idh1h5ana0p0lf5a0dn1"; }; + cargoSha256 = "0vja1cq6z7jlr4nzfdzn4gl8l31yld82zmgzwihnalif13q3fcps"; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl zlib openssl ]; @@ -38,7 +35,7 @@ rustPlatform.buildRustPackage rec { $out/bin/elan completions zsh > "$out/share/zsh/site-functions/_elan" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Small tool to manage your installations of the Lean theorem prover"; homepage = "https://github.com/Kha/elan"; license = with licenses; [ asl20 /* or */ mit ]; |