summary refs log tree commit diff
path: root/pkgs/tools/misc
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-22 18:01:39 +0000
committerGitHub <noreply@github.com>2021-07-22 18:01:39 +0000
commit0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac (patch)
tree6475a18d8f5d3fd9ea110fd7db803c8ad312842c /pkgs/tools/misc
parent741be6dfc1fdd013ee52c4154dd82cd69d328be3 (diff)
parent4df8d6305c414a172f167f900e852724dedbca3a (diff)
downloadnixpkgs-0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac.tar
nixpkgs-0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac.tar.gz
nixpkgs-0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac.tar.bz2
nixpkgs-0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac.tar.lz
nixpkgs-0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac.tar.xz
nixpkgs-0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac.tar.zst
nixpkgs-0b0a8c7c9ac81a7d4e2936aee4a27915194e8bac.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r--pkgs/tools/misc/diffoscope/default.nix1
-rw-r--r--pkgs/tools/misc/fend/default.nix6
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index a4b2b888fae..88a9846e835 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -72,6 +72,7 @@ python3Packages.buildPythonApplication rec {
     "test_sbin_added_to_path"
     "test_diff_meta"
     "test_diff_meta2"
+    "test_obj_no_differences"
   ];
 
   meta = with lib; {
diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix
index 93e13996f7f..4ed308643e5 100644
--- a/pkgs/tools/misc/fend/default.nix
+++ b/pkgs/tools/misc/fend/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fend";
-  version = "0.1.20";
+  version = "0.1.21";
 
   src = fetchFromGitHub {
     owner = "printfn";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-2CzpPzUylzDiP9rbjneRR6joa9UEgnDfJ4Ffa/orhkk=";
+    sha256 = "sha256-LrHZsnW96+QsXuGxWoGqIEKTE86m3tMnh4fpDPIhd1w=";
   };
 
-  cargoSha256 = "sha256-xDh7SF73Qnx/GeW43JDmF+qeljSHbWWq4unWdTmAO+c=";
+  cargoSha256 = "sha256-GZ4Yt5iQkgupJMTYIbvCPtz19985MFf8IDy3ui0M6DE=";
 
   doInstallCheck = true;