From 01a7fa88139b5da9d6ad8920486f756176d2b34a Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 5 Dec 2018 00:19:33 +0100 Subject: [PATCH] loop: unstable-2018-10-02 -> unstable-2018-12-04 --- pkgs/tools/misc/loop/default.nix | 12 +++--------- pkgs/tools/misc/loop/fix_cargo_lock.patch | 12 ------------ 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 pkgs/tools/misc/loop/fix_cargo_lock.patch diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index acb88d9773c8..501ab664f83f 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -1,23 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage { - name = "loop-unstable-2018-10-02"; + name = "loop-unstable-2018-12-04"; src = fetchFromGitHub { owner = "Miserlou"; repo = "Loop"; - rev = "d6ef3c5a0ecd4f533908abee5e481419a1a6eeae"; - sha256 = "1fhihm32v77rj6r3scwmnvzsivky50g7a1644qrn8pafpjs4zwx5"; + rev = "598ccc8e52bb13b8aff78b61cfe5b10ff576cecf"; + sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4"; }; cargoSha256 = "1ccf8dkswwdbwf9diy0l4vc4i2g05ynhi3w1jg3b2ldrvj0j9m9s"; - cargoPatches = [ - # Upstream includes mismatched Cargo.lock file. - # See https://github.com/Miserlou/Loop/pull/40 - ./fix_cargo_lock.patch - ]; - meta = with stdenv.lib; { description = "UNIX's missing `loop` command"; homepage = https://github.com/Miserlou/Loop; diff --git a/pkgs/tools/misc/loop/fix_cargo_lock.patch b/pkgs/tools/misc/loop/fix_cargo_lock.patch deleted file mode 100644 index f991a604f336..000000000000 --- a/pkgs/tools/misc/loop/fix_cargo_lock.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -107,7 +107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "loop-rs" --version = "0.3.5" -+version = "0.4.0" - dependencies = [ - "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",