From b56bba188bb4a3deab64f00a89c646a748db4fdf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 15 Apr 2022 12:18:17 +0200 Subject: [PATCH] eva: 0.2.7 -> 0.3.0 Changes: https://github.com/nerdypepper/eva/compare/v0.2.7...v0.3.0 I ha to go back to using `fetchFromGitHub` because `0.3.0` is not published on crates.io (cc @NerdyPepper). --- pkgs/tools/misc/eva/default.nix | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index f589d39f35ef..038ecc7bf228 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -1,29 +1,17 @@ -{ lib, rustPlatform, fetchCrate, fetchpatch }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "eva"; - version = "0.2.7"; + version = "0.3.0"; - src = fetchCrate { - inherit pname version; - sha256 = "sha256-4rmFvu6G4h8Pl592NlldSCkqZBbnTcXrs98ljIJmTXo="; + src = fetchFromGitHub { + owner = "nerdypepper"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-INXKjjHW9HZ1NWx1CQOerTBUy0rYFLNJMuRgKQfQwdc="; }; - cargoSha256 = "sha256-BG/W8lG/47kyA7assS6efEO+DRkpSFcZQhlSIozlonA="; - - patches = [ - # to fix the test suite (can be removed as soon as #33 is merged). - (fetchpatch { - url = "https://github.com/NerdyPepper/eva/commit/cacf51dbb9748b1dbe97b35f3c593a0a272bd4db.patch"; - sha256 = "11q7dkz2x1888f3awnlr1nbbxzzfjrr46kd0kk6sgjdkyfh50cvv"; - }) - - # to fix `cargo test -- --test-threads $NIX_BUILD_CORES` - (fetchpatch { - url = "https://github.com/NerdyPepper/eva/commit/ccfb3d327567dbaf03b2283c7e684477e2e84590.patch"; - sha256 = "003yxqlyi8jna0rf05q2a006r2pkz6pcwwfl3dv8zb6p83kk1kgj"; - }) - ]; + cargoSha256 = "sha256-4l9y2qmS7G1PvxF8/51F7fx/sDuYHWDkcyOin2sYHdk="; meta = with lib; { description = "A calculator REPL, similar to bc";