Merge pull request #51533 from k0ral/master

loop: unstable-2018-10-02 -> unstable-2018-12-04
This commit is contained in:
Alexey Shmalko 2018-12-05 13:45:55 +02:00 committed by GitHub
commit 2ce6bceb26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 21 deletions

View file

@ -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;

View file

@ -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)",