summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-04-07 00:15:14 +0000
committerGitHub <noreply@github.com>2021-04-07 00:15:14 +0000
commit5e509a83ed29d4543bb97e807cb444400e14aac3 (patch)
treea19542290411a1747875e2e10f2bf267ab07b274 /pkgs/tools
parent44d53d308b6bf7236867cf81aed996ba23275e19 (diff)
parente7ab6c321919236d5beb51370785d094f6c49a2a (diff)
downloadnixpkgs-5e509a83ed29d4543bb97e807cb444400e14aac3.tar
nixpkgs-5e509a83ed29d4543bb97e807cb444400e14aac3.tar.gz
nixpkgs-5e509a83ed29d4543bb97e807cb444400e14aac3.tar.bz2
nixpkgs-5e509a83ed29d4543bb97e807cb444400e14aac3.tar.lz
nixpkgs-5e509a83ed29d4543bb97e807cb444400e14aac3.tar.xz
nixpkgs-5e509a83ed29d4543bb97e807cb444400e14aac3.tar.zst
nixpkgs-5e509a83ed29d4543bb97e807cb444400e14aac3.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/misc/fzf/default.nix6
-rw-r--r--pkgs/tools/security/ghidra/default.nix6
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 3cca3ab6dc1..0688f1d6487 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "fzf";
-  version = "0.26.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = pname;
     rev = version;
-    sha256 = "0p9hslaawnqnnf1s6hj3vdh11ncq7mrb4w4i933mdkychw5jav38";
+    sha256 = "sha256-q0rAAD6du0WLcd46LUpkG3gBIvmtOE/foEMW5QCoIak=";
   };
 
-  vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p";
+  vendorSha256 = "sha256-FKDCIotyra/TZ48wbpzudJZ2aI2pn+ZR4EoZ+9+19Mw=";
 
   outputs = [ "out" "man" ];
 
diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix
index 2e55b24f723..66112332663 100644
--- a/pkgs/tools/security/ghidra/default.nix
+++ b/pkgs/tools/security/ghidra/default.nix
@@ -25,12 +25,12 @@ let
 in stdenv.mkDerivation rec {
 
   pname = "ghidra";
-  version = "9.2.1";
-  versiondate = "20201215";
+  version = "9.2.2";
+  versiondate = "20201229";
 
   src = fetchzip {
     url = "https://www.ghidra-sre.org/ghidra_${version}_PUBLIC_${versiondate}.zip";
-    sha256 = "0rjzmx0nbv9flb666mk3w2dqliyfzjyc4ldjfmb5d29wpgnf9bnz";
+    sha256 = "1xahkwiqdcwxssah16hhgrmyam49cb341xp5ysycj1h0kkm8p53s";
   };
 
   nativeBuildInputs = [