summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-09-27 10:49:29 +0200
committerGitHub <noreply@github.com>2018-09-27 10:49:29 +0200
commit929680d531c4ea06323a25bc8ce5991dd99bd737 (patch)
tree06b44065ec8865969d64c39d82a5c8b6fb84cb52 /pkgs
parent6f6222c40f14c83e0f64037fad05c3b06208534c (diff)
parente1a851811b2ac0d6273b285059d1481bcb4168ec (diff)
downloadnixpkgs-929680d531c4ea06323a25bc8ce5991dd99bd737.tar
nixpkgs-929680d531c4ea06323a25bc8ce5991dd99bd737.tar.gz
nixpkgs-929680d531c4ea06323a25bc8ce5991dd99bd737.tar.bz2
nixpkgs-929680d531c4ea06323a25bc8ce5991dd99bd737.tar.lz
nixpkgs-929680d531c4ea06323a25bc8ce5991dd99bd737.tar.xz
nixpkgs-929680d531c4ea06323a25bc8ce5991dd99bd737.tar.zst
nixpkgs-929680d531c4ea06323a25bc8ce5991dd99bd737.zip
Merge pull request #46977 from r-ryantm/auto-update/psmisc
psmisc: 23.1 -> 23.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/psmisc/default.nix31
1 files changed, 21 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index 1eec10860f7..8b3906dedb1 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -1,19 +1,30 @@
-{stdenv, fetchurl, ncurses}:
+{stdenv, fetchFromGitLab, autoconf, automake, gettext, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "psmisc-23.1";
+  pname = "psmisc";
+  version = "23.2";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/psmisc/${name}.tar.xz";
-    sha256 = "0c5s94hqpwfmyswx2f96gifa6wdbpxxpkyxcrlzbxpvmrxsd911f";
+  src = fetchFromGitLab {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0d90wmibxpkl0d7sdibvvkwpyxyg6m6ksh5gwrjh15vf1swvd5i1";
   };
 
-  buildInputs = [ncurses];
+  nativeBuildInputs = [ autoconf automake gettext ];
+  buildInputs = [ ncurses ];
 
-  meta = {
-    homepage = http://psmisc.sourceforge.net/;
+  preConfigure = ''
+    echo $version > .tarball-version
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://gitlab.com/psmisc/psmisc;
     description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ryantm ];
   };
 }