From dc9bb48a736709dba46a9be54cdd826376214cd6 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Tue, 4 Dec 2018 01:20:02 +0200
Subject: loop: cleanup

---
 pkgs/tools/misc/loop/default.nix          | 11 +++++++----
 pkgs/tools/misc/loop/fix_cargo_toml.patch | 18 ------------------
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/tools/misc/loop/fix_cargo_toml.patch

(limited to 'pkgs/tools/misc/loop')

diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
index f86f3041aba2..acb88d9773c8 100644
--- a/pkgs/tools/misc/loop/default.nix
+++ b/pkgs/tools/misc/loop/default.nix
@@ -1,19 +1,22 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   name = "loop-unstable-2018-10-02";
-  version = "d6ef3c5a0ecd4f533908abee5e481419a1a6eeae";
 
   src = fetchFromGitHub {
     owner = "Miserlou";
     repo  = "Loop";
-    rev   = version;
+    rev   = "d6ef3c5a0ecd4f533908abee5e481419a1a6eeae";
     sha256 = "1fhihm32v77rj6r3scwmnvzsivky50g7a1644qrn8pafpjs4zwx5";
   };
 
   cargoSha256 = "1ccf8dkswwdbwf9diy0l4vc4i2g05ynhi3w1jg3b2ldrvj0j9m9s";
 
-  cargoPatches = [ ./fix_cargo_toml.patch ./fix_cargo_lock.patch ]; # Cargo.lock and Cargo.toml are not aligned
+  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";
diff --git a/pkgs/tools/misc/loop/fix_cargo_toml.patch b/pkgs/tools/misc/loop/fix_cargo_toml.patch
deleted file mode 100644
index b95afac470f5..000000000000
--- a/pkgs/tools/misc/loop/fix_cargo_toml.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -15,9 +15,9 @@ license = "MIT"
--structopt = "0.2" 
-+structopt = "0.2.10" 
- humantime = "1.1.1"
--atty = "0.2"
-+atty = "0.2.11"
--regex = "1.0.0"
-+regex = "1.0.5"
--subprocess = "0.1.12"
-+subprocess = "0.1.14"
--tempfile = "3.0.3"
-+tempfile = "3.0.4"
- 
- [[bin]]
- name = "loop"
-- 
cgit 1.4.1