From 35f6d1cda44842e07373824041feb2f27b3fa373 Mon Sep 17 00:00:00 2001
From: koral <chahine.moreau@gmail.com>
Date: Sat, 1 Dec 2018 19:51:49 +0100
Subject: [PATCH 1/2] loop: init at unstable-2018-10-02

---
 pkgs/tools/misc/loop/default.nix          | 24 +++++++++++++++++++++++
 pkgs/tools/misc/loop/fix_cargo_lock.patch | 12 ++++++++++++
 pkgs/tools/misc/loop/fix_cargo_toml.patch | 18 +++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 4 files changed, 56 insertions(+)
 create mode 100644 pkgs/tools/misc/loop/default.nix
 create mode 100644 pkgs/tools/misc/loop/fix_cargo_lock.patch
 create mode 100644 pkgs/tools/misc/loop/fix_cargo_toml.patch

diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
new file mode 100644
index 00000000000..f86f3041aba
--- /dev/null
+++ b/pkgs/tools/misc/loop/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name = "loop-unstable-2018-10-02";
+  version = "d6ef3c5a0ecd4f533908abee5e481419a1a6eeae";
+
+  src = fetchFromGitHub {
+    owner = "Miserlou";
+    repo  = "Loop";
+    rev   = version;
+    sha256 = "1fhihm32v77rj6r3scwmnvzsivky50g7a1644qrn8pafpjs4zwx5";
+  };
+
+  cargoSha256 = "1ccf8dkswwdbwf9diy0l4vc4i2g05ynhi3w1jg3b2ldrvj0j9m9s";
+
+  cargoPatches = [ ./fix_cargo_toml.patch ./fix_cargo_lock.patch ]; # Cargo.lock and Cargo.toml are not aligned
+
+  meta = with stdenv.lib; {
+    description = "UNIX's missing `loop` command";
+    homepage = https://github.com/Miserlou/Loop;
+    maintainers = with maintainers; [ koral ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/tools/misc/loop/fix_cargo_lock.patch b/pkgs/tools/misc/loop/fix_cargo_lock.patch
new file mode 100644
index 00000000000..f991a604f33
--- /dev/null
+++ b/pkgs/tools/misc/loop/fix_cargo_lock.patch
@@ -0,0 +1,12 @@
+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)",
diff --git a/pkgs/tools/misc/loop/fix_cargo_toml.patch b/pkgs/tools/misc/loop/fix_cargo_toml.patch
new file mode 100644
index 00000000000..b95afac470f
--- /dev/null
+++ b/pkgs/tools/misc/loop/fix_cargo_toml.patch
@@ -0,0 +1,18 @@
+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"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 719ff9a5d6b..ca4312349ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22118,6 +22118,8 @@ with pkgs;
 
   openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
 
+  loop = callPackage ../tools/misc/loop { };
+
   mailcore2 = callPackage ../development/libraries/mailcore2 {
     icu = icu58;
   };

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: [PATCH 2/2] 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

diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
index f86f3041aba..acb88d9773c 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 b95afac470f..00000000000
--- 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"