summary refs log tree commit diff
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2019-12-09 09:32:59 -0500
committerGitHub <noreply@github.com>2019-12-09 09:32:59 -0500
commit7ddeecd50fdf1c75ec38aab4360506b13c0b8b68 (patch)
treeb8735412a354b5459cf2b7fa454fb240cee3c00a
parentd1685e81ef11c697df050fc9c146a27b0698d85c (diff)
parent5419097ccd10b8f074eed1998988ae250fe4eb9b (diff)
downloadnixpkgs-7ddeecd50fdf1c75ec38aab4360506b13c0b8b68.tar
nixpkgs-7ddeecd50fdf1c75ec38aab4360506b13c0b8b68.tar.gz
nixpkgs-7ddeecd50fdf1c75ec38aab4360506b13c0b8b68.tar.bz2
nixpkgs-7ddeecd50fdf1c75ec38aab4360506b13c0b8b68.tar.lz
nixpkgs-7ddeecd50fdf1c75ec38aab4360506b13c0b8b68.tar.xz
nixpkgs-7ddeecd50fdf1c75ec38aab4360506b13c0b8b68.tar.zst
nixpkgs-7ddeecd50fdf1c75ec38aab4360506b13c0b8b68.zip
Merge pull request #75359 from marsam/update-procs
procs: 0.8.13 -> 0.8.16
-rw-r--r--pkgs/tools/admin/procs/default.nix16
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 24f8036b428..20e9c8b3d47 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -1,22 +1,30 @@
-{ stdenv, fetchFromGitHub, rustPlatform
+{ stdenv, fetchFromGitHub, rustPlatform, fetchpatch
 , Security
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "procs";
-  version = "0.8.13";
+  version = "0.8.16";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0yy41v2crds9500fa4r0kqiddciqkilr2h13nrjqy44ckvw2mi5y";
+    sha256 = "0l4n3gr1sc7wfa21p8yh7idaii0mnfpyqp4cg7f9l4345isy94vq";
   };
 
-  cargoSha256 = "1gnl97h0l9k8xnrwl6807qlbx13vd45kmla02mk9p1h52sr0din5";
+  cargoSha256 = "03c63dlzvag341n6la1s61ccri1avlprd91m11z9zzjhi9b46kcr";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
+  patches = [
+    # Fix tests on darwin. Remove with the next release
+    (fetchpatch {
+      url = "https://github.com/dalance/procs/commit/bb554e247b5b339bc00fa5dd2e771b0d7cb09cd5.patch";
+      sha256 = "1szvvifa4pdbgdsmdj5f0zq6qzf1lh6wwc6ipawblfzwmg7d9wvk";
+    })
+  ];
+
   meta = with stdenv.lib; {
     description = "A modern replacement for ps written in Rust";
     homepage = "https://github.com/dalance/procs";