diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix new file mode 100644 index 000000000000..f86f3041aba2 --- /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 000000000000..f991a604f336 --- /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 000000000000..b95afac470f5 --- /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 719ff9a5d6b9..ca4312349ed4 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; };