diff options
author | Will Dietz <w@wdtz.org> | 2018-04-19 13:06:30 -0500 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2018-04-19 13:15:23 -0500 |
commit | 54c6a9c7104660757a713a8d2795df57b59251c5 (patch) | |
tree | 421cff62cadfd34e00885439b155382a7dd2f2a3 /pkgs/os-specific/linux/procps-ng | |
parent | 5bc59008b952a08379b2149f9c6b9667be672c4e (diff) | |
download | nixpkgs-54c6a9c7104660757a713a8d2795df57b59251c5.tar nixpkgs-54c6a9c7104660757a713a8d2795df57b59251c5.tar.gz nixpkgs-54c6a9c7104660757a713a8d2795df57b59251c5.tar.bz2 nixpkgs-54c6a9c7104660757a713a8d2795df57b59251c5.tar.lz nixpkgs-54c6a9c7104660757a713a8d2795df57b59251c5.tar.xz nixpkgs-54c6a9c7104660757a713a8d2795df57b59251c5.tar.zst nixpkgs-54c6a9c7104660757a713a8d2795df57b59251c5.zip |
procps-ng: 3.3.13 -> 3.3.14
* patches were from upstream, merged in this update \o/ * "addressses" incorrect hash by moving to latest version
Diffstat (limited to 'pkgs/os-specific/linux/procps-ng')
-rw-r--r-- | pkgs/os-specific/linux/procps-ng/default.nix | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 316f0ad1a28..617bbd2d64f 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,33 +1,19 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, ncurses, libtool, gettext, autoconf, automake, pkgconfig }: +{ lib, stdenv, fetchFromGitLab, ncurses, libtool, gettext, autoconf, automake, pkgconfig }: stdenv.mkDerivation rec { name = "procps-${version}"; - version = "3.3.13"; + version = "3.3.14"; src = fetchFromGitLab { owner ="procps-ng"; repo = "procps"; rev = "v${version}"; - sha256 = "0r3h9adhqi5fi62lx65z839fww35lfh2isnknhkaw71xndjpzr0q"; + sha256 = "0l2xfm3vr8qpzvdnkcvmfj1rdw6lxx840zw9vp0z9f008y5fc31g"; }; buildInputs = [ ncurses ]; nativeBuildInputs = [ libtool gettext autoconf automake pkgconfig ]; - # https://gitlab.com/procps-ng/procps/issues/88 - # Patches needed for musl and glibc 2.28 - patches = [ - (fetchpatch { - url = "https://gitlab.com/procps-ng/procps/uploads/f91ff094be1e4638aeffb67bdbb751ba/numa.h.diff"; - sha256 = "16r537d2wfrvbv6dg9vyfck8n31xa58903mnssw1s4kb5ap83yd5"; - extraPrefix = ""; - }) - (fetchpatch { - url = "https://gitlab.com/procps-ng/procps/uploads/6a7bdea4d82ba781451316fda74192ae/libio_detection.diff"; - sha256 = "0qp0j60kiycjsv213ih10imjirmxz8zja3rk9fq5lr5xf7k2lr3p"; - }) - ]; - # autoreconfHook doesn't quite get, what procps-ng buildprocss does # with po/Makefile.in.in and stuff. preConfigure = '' |