cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #39167 from dtzWill/update/procps-ng-3.3.14

Browse source 
procps-ng: 3.3.13 -> 3.3.14, fix source hash issue
This commit is contained in:
Jörg Thalheim 2018-04-21 19:14:31 +01:00 committed by GitHub
commit 9a66462635
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkgs/os-specific/linux/procps-ng/default.nix
View file

@ -1,33 +1,17 @@
{ lib, stdenv, fetchFromGitLab, fetchpatch, ncurses, libtool, gettext, autoconf, automake, pkgconfig }:
{ lib, stdenv, fetchurl, 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";
src = fetchurl {
url = "https://gitlab.com/procps-ng/procps/-/archive/v${version}/procps-v${version}.tar.bz2";
sha256 = "0igvsl3s7m5ygxgypzksk4cp2wkvv3lk49s7i9m5wbimyakmr0vf";
};
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 = ''