summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/X11/primus/default.nix5
-rw-r--r--pkgs/tools/admin/salt/pepper/default.nix22
-rw-r--r--pkgs/tools/filesystems/glusterfs/default.nix9
-rw-r--r--pkgs/tools/filesystems/glusterfs/default.upstream7
-rw-r--r--pkgs/tools/graphics/asymptote/default.nix8
-rw-r--r--pkgs/tools/misc/bandwidth/default.nix2
-rw-r--r--pkgs/tools/misc/grub4dos/default.nix2
-rw-r--r--pkgs/tools/misc/mc/default.nix4
-rw-r--r--pkgs/tools/networking/gvpe/default.nix4
-rw-r--r--pkgs/tools/networking/gvpe/src-for-default.nix9
-rw-r--r--pkgs/tools/networking/gvpe/src-info-for-default.nix5
-rw-r--r--pkgs/tools/security/tor/torbrowser.nix6
-rw-r--r--pkgs/tools/security/tpm-quote-tools/default.nix21
-rw-r--r--pkgs/tools/system/ipmiutil/default.nix4
14 files changed, 63 insertions, 45 deletions
diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix
index 229e228e405c..d130c9bac7cc 100644
--- a/pkgs/tools/X11/primus/default.nix
+++ b/pkgs/tools/X11/primus/default.nix
@@ -20,7 +20,10 @@ let
 
   primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; };
   primus_i686 = if useNvidia then primusLib_i686_ else primusLib_i686_.override { nvidia_x11 = null; };
-  ldPath = lib.makeLibraryPath ([ primus primus.glvnd ] ++ lib.optionals (primusLib_i686 != null) [ primus_i686 primus_i686.glvnd ]);
+  ldPath = lib.makeLibraryPath (lib.filter (x: x != null) (
+    [ primus primus.glvnd ]
+    ++ lib.optionals (primusLib_i686 != null) [ primus_i686 primus_i686.glvnd ]
+  ));
 
 in writeScriptBin "primusrun" ''
   #!${stdenv.shell}
diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix
new file mode 100644
index 000000000000..ff9590c79a51
--- /dev/null
+++ b/pkgs/tools/admin/salt/pepper/default.nix
@@ -0,0 +1,22 @@
+{ lib
+, fetchurl
+, python2Packages
+}:
+
+python2Packages.buildPythonApplication rec {
+  name = "salt-pepper-${version}";
+  version = "0.5.0";
+  src = fetchurl {
+    url = "https://github.com/saltstack/pepper/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0gf4v5y1kp16i1na4c9qw7cgrpsh21p8ldv9r6b8gdwcxzadxbck";
+  };
+
+  doCheck = false; # no tests available
+
+  meta = with lib; {
+    description = "A CLI front-end to a running salt-api system";
+    homepage = https://github.com/saltstack/pepper;
+    maintainers = [ maintainers.pierrer ];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index e81c3768b254..2f49d630c151 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -3,14 +3,13 @@
  , liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which
 }:
 let 
-  s = # Generated upstream information 
+  s =
   rec {
     baseName="glusterfs";
-    version="3.9.1";
+    version = "3.10.0";
     name="${baseName}-${version}";
-    hash="02p3i1zr0i2fhjhz64wvhdn0z7b6b3hkiqz1bkyhracncspxnvw9";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.9/3.9.1/glusterfs-3.9.1.tar.gz";
-    sha256="02p3i1zr0i2fhjhz64wvhdn0z7b6b3hkiqz1bkyhracncspxnvw9";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.10/3.10.0/glusterfs-3.10.0.tar.gz";
+    sha256 = "1svysq55z4sd6bxcdpkxljwis4cnzkknag22ngyr7sgb4bs19c97";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python2 ncurses readline
diff --git a/pkgs/tools/filesystems/glusterfs/default.upstream b/pkgs/tools/filesystems/glusterfs/default.upstream
index 7c86455b4409..29494eab87b9 100644
--- a/pkgs/tools/filesystems/glusterfs/default.upstream
+++ b/pkgs/tools/filesystems/glusterfs/default.upstream
@@ -1,4 +1,5 @@
 url http://download.gluster.org/pub/gluster/glusterfs/
-version_link '[0-9.]+/$'
-version_link '[0-9.]+/$'
-version_link '[.]tar[.]'
+version_link '/[0-9.]+/$'
+version_link '/[0-9.]+/$'
+version_link 'glusterfs-[0-9.]+[.]tar[.]'
+minimize_overwrite
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 483c73d149b4..0fbca9f659ce 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -9,11 +9,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asymptote";
-    version="2.39";
+    version="2.40";
     name="${baseName}-${version}";
-    hash="187q81yw06x4gv2spfn0hcs1064ym3a8l6mdgawymfhqd60yhrs3";
-    url="https://netcologne.dl.sourceforge.net/project/asymptote/2.39/asymptote-2.39.src.tgz";
-    sha256="187q81yw06x4gv2spfn0hcs1064ym3a8l6mdgawymfhqd60yhrs3";
+    hash="08hy8hgh217df9kwznr22mg8vxxh3rbmbxgx3nqhxyggc9xqy544";
+    url="https://netcologne.dl.sourceforge.net/project/asymptote/2.40/asymptote-2.40.src.tgz";
+    sha256="08hy8hgh217df9kwznr22mg8vxxh3rbmbxgx3nqhxyggc9xqy544";
   };
   buildInputs = [
    ghostscriptX imagemagick fftw
diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index 05fbe9b56324..8b0e17191964 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -7,7 +7,7 @@ let
     else if stdenv.system == "x86_64-darwin" then "bandwidth-mac64"
     else if stdenv.system == "i686-darwin" then "bandwidth-mac32"
     else if stdenv.system == "i686-cygwin" then "bandwidth-win32"
-    else null;
+    else throw "Unknown architecture";
 in
 stdenv.mkDerivation rec {
   name = "bandwidth-${version}";
diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index d9e4ae3a638c..054c7d39405c 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -3,7 +3,7 @@
 let arch =
   if stdenv.isi686 then "i386"
   else if stdenv.isx86_64 then "x86_64"
-  else abort "Unknown architecture";
+  else throw "Unknown architecture";
 in stdenv.mkDerivation rec {
   name = "grub4dos-${version}";
   version = "0.4.6a-2016-12-24";
diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 0c9ac20fcc3e..7ea7789687fb 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "mc-${version}";
-  version = "4.8.18";
+  version = "4.8.19";
   
   src = fetchurl {
     url = "http://www.midnight-commander.org/downloads/${name}.tar.xz";
-    sha256 = "1kmysm1x7smxs9k483nin6bx1rx0av8xrqjx9yf73hc7r4anhqzp";
+    sha256 = "1pzjq4nfxl2aakxipdjs5hq9n14374ly1l00s40kd2djnnxmd7pb";
   };
   
   buildInputs = [ pkgconfig perl glib slang zip unzip file gettext libX11 libICE
diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix
index fe5581039256..6a9a34da9f8c 100644
--- a/pkgs/tools/networking/gvpe/default.nix
+++ b/pkgs/tools/networking/gvpe/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gvpe-${version}";
-  version = "2.25";
+  version = "3.0";
 
   src = fetchurl {
     url = "http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz";
-    sha256 = "1gsipcysvsk80gvyn9jnk9g0xg4ng9yd5zp066jnmpgs52d2vhvk";
+    sha256 = "1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf";
   };
 
   buildInputs = [ openssl gmp zlib ];
diff --git a/pkgs/tools/networking/gvpe/src-for-default.nix b/pkgs/tools/networking/gvpe/src-for-default.nix
deleted file mode 100644
index 3db30de0bdd9..000000000000
--- a/pkgs/tools/networking/gvpe/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="2.25";
-   name="gvpe-2.25";
-   hash="1gsipcysvsk80gvyn9jnk9g0xg4ng9yd5zp066jnmpgs52d2vhvk";
-   url="http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz";
-   advertisedUrl="http://ftp.gnu.org/gnu/gvpe/gvpe-2.25.tar.gz";
-  
-  
-}
diff --git a/pkgs/tools/networking/gvpe/src-info-for-default.nix b/pkgs/tools/networking/gvpe/src-info-for-default.nix
deleted file mode 100644
index bbd8f41da029..000000000000
--- a/pkgs/tools/networking/gvpe/src-info-for-default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  downloadPage = "http://ftp.gnu.org/gnu/gvpe/?C=M;O=D";
-  baseName = "gvpe";
-  sourceRegexp = "[.]tar[.]gz\$";
-}
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index fc77628a3c60..80a92b4a932e 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -24,13 +24,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "6.5";
+  version = "6.5.1";
 
   src = fetchurl {
     url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz";
     sha256 = if stdenv.is64bit then
-      "0q0rdwjiqjjh9awiyp0a55nkhyri5y6zhkyq3n3x6w4afihl0wf4" else
-      "1y1sx2gp7c66l7a4smfibl8mv54byvawhhkikpa5l2vic75vyhk9";
+      "1p2bgavvyzahqpjg9vp14c0s50rmha3v1hs1c8zvz6fj8fgrhn0i" else
+      "1zfghr01bhpn39wqaw7hyx7yap7xyla4m3mrgz2vi9a5qsyxmbcr";
   };
 
   preferLocalBuild = true;
diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix
index b294c1c9feb8..7ffe8e51eacd 100644
--- a/pkgs/tools/security/tpm-quote-tools/default.nix
+++ b/pkgs/tools/security/tpm-quote-tools/default.nix
@@ -1,16 +1,23 @@
 { stdenv, fetchurl, trousers, openssl }:
 
-stdenv.mkDerivation {
-  name = "tpm-quote-tools-1.0.2";
+stdenv.mkDerivation rec { 
+  name = "tpm-quote-tools-${version}";
+  version = "1.0.3";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/tpmquotetools/1.0.2/tpm-quote-tools-1.0.2.tar.gz";
-    sha256 = "17bf9d1hiiaybx6rgl0sqcb0prjz6d2mv8fwp4bj1c0rsfw5dbk8";
+  src = fetchurl { 
+    url = "mirror://sourceforge/project/tpmquotetools/${version}/${name}.tar.gz";
+    sha256 = "1d6ry2c78sgv0z4phfrwrbvgag83xnnfri2cdzrd86w4yfgnfwdf";
   };
 
   buildInputs = [ trousers openssl ];
 
-  meta = with stdenv.lib; {
+  postFixup = ''
+    patchelf \
+      --set-rpath "${stdenv.lib.makeLibraryPath [ openssl ]}:$(patchelf --print-rpath $out/bin/tpm_mkaik)" \
+      $out/bin/tpm_mkaik
+  '';
+
+  meta = with stdenv.lib; { 
     description = "A collection of programs that provide support for TPM based attestation using the TPM quote mechanism";
     longDescription = ''
       The TPM Quote Tools is a collection of programs that provide support
@@ -19,7 +26,7 @@ stdenv.mkDerivation {
     '';
     homepage    = http://tpmquotetools.sourceforge.net/;
     license     = licenses.bsd3;
-    maintainers = [ maintainers.ak ];
+    maintainers = with maintainers; [ ak ndowens ];
     platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index 059a5d9e416c..174772107268 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "3.0.1";
+  version = "3.0.2";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "179hvarw0mk3j1z4102q4692q4mx06y259llr891by0pri0bsb3n";
+    sha256 = "0nw12v7w9gx2px3b081i5mm5gl4l9n3vxhhk5n18vj1bs2jsxf4d";
   };
 
   buildInputs = [ openssl ];
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-16 16:09:20 +0000