jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #38482 from dtzWill/update/procps-ng-3.3.13

Browse Source 
procps-ng: 3.3.12 -> 3.3.13
This commit is contained in:
Will Dietz 2018-04-05 13:39:00 -05:00 committed by GitHub
commit 8c2b80290a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/os-specific/linux/procps-ng/default.nix
View File

@ -1,19 +1,33 @@
{ lib, stdenv, fetchFromGitLab, ncurses, libtool, gettext, autoconf, automake, pkgconfig }:
{ lib, stdenv, fetchFromGitLab, fetchpatch, ncurses, libtool, gettext, autoconf, automake, pkgconfig }:
stdenv.mkDerivation rec {
name = "procps-${version}";
version = "3.3.12";
version = "3.3.13";
src = fetchFromGitLab {
owner ="procps-ng";
repo = "procps";
rev = "v${version}";
sha256 = "0k5vvvjn954xqnhk97j62ilwmipbi4gqjcznllmk6ilfmszqczzz";
sha256 = "0r3h9adhqi5fi62lx65z839fww35lfh2isnknhkaw71xndjpzr0q";
};
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 = ''