diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-13 12:01:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-13 12:01:05 +0000 |
| commit | f90dd167f5d20a7346795fd5bb85d57683c23a80 (patch) | |
| tree | 3a4d965a1dcf38e665158577d2a044a2a83622f3 /pkgs/os-specific | |
| parent | e7f95ba94cb96a5900ba2936cc9bfc9ec48e653c (diff) | |
| parent | 725db3491ee6bea89fb1ae289fceae75b0480388 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/psmisc/default.nix | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 092c75a5837d7..f269c9146df44 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -1,26 +1,23 @@ -{lib, stdenv, fetchFromGitLab, fetchpatch, autoconf, automake, gettext, ncurses}: +{ lib +, stdenv +, fetchFromGitLab +, autoconf +, automake +, gettext +, ncurses +}: stdenv.mkDerivation rec { pname = "psmisc"; - version = "23.5"; + version = "23.6"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-02jvRPqN8DS30ID42hQFu400NoFC5QiH5YA3NB+EoFI="; + hash = "sha256-TjnOn8a7HAgt11zcM0i5DM5ERmsvLJHvo1e5FOsl6IA="; }; - patches = [ - # Upstream patch to be released in the next version - (fetchpatch { - name = "fallback-to-kill.diff"; - url = "https://gitlab.com/psmisc/psmisc/-/commit/6892e321e7042e3df60a5501a1c59d076e8a856f.patch"; - sha256 = "sha256-3uk1KXEOqAxpHWBORUw5+dR5s/Z55JJs5tuBZlTdjlo="; - excludes = [ "ChangeLog" ]; - }) - ]; - nativeBuildInputs = [ autoconf automake gettext ]; buildInputs = [ ncurses ]; |