From 8557402d9348358af429f868164e453245fd8dae Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 28 Jun 2020 13:52:53 -0500 Subject: [PATCH] mcfly: 0.3.6 -> 0.4.0 --- pkgs/tools/misc/mcfly/default.nix | 13 ++++++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index f206c54a0037..7feb2fce7107 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -1,27 +1,26 @@ -{ stdenv, rustPlatform, fetchFromGitHub, Security }: +{ stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.3.6"; + version = "0.4.0"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "1g3n7ll0yg7w7hb3jgp25mlnqwsdzv0608f41z7q5gmsskdm3v1j"; + sha256 = "01rw7gdvpr2s3yj7wphsm5gfrgzf5jkrci4mpqiw7xp8d5k87nzl"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - preInstall = '' install -Dm644 -t $out/share/mcfly mcfly.bash + install -Dm644 -t $out/share/mcfly mcfly.zsh ''; - cargoSha256 = "0r2zb59rpja9z7q0gsylqaq4vqm5rp57fy56ajjrm6k6z06nq7bv"; + cargoSha256 = "1q1mi69prn9q1nk4021c69vq160ls6md6gpqxk7zyf25r5ckdd98"; meta = with stdenv.lib; { homepage = "https://github.com/cantino/mcfly"; - description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now."; + description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now"; license = licenses.mit; maintainers = [ maintainers.melkor333 ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 105d34b3d18e..8fb582bfb4e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4734,9 +4734,7 @@ in mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; - mcfly = callPackage ../tools/misc/mcfly { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mcfly = callPackage ../tools/misc/mcfly { }; mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices;