summary refs log tree commit diff
path: root/pkgs/tools/archivers
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-07-25 12:47:13 +0000
committerRobin Gloster <mail@glob.in>2016-07-25 12:47:13 +0000
commitf222d9874643197fb61ca8460449f10abae1a4fd (patch)
treeb8b9c2dcdf54cc418ef54d579b7d21e0830006b8 /pkgs/tools/archivers
parent1f04b4a566d3c8f8de5354ed09dee46557c4abe3 (diff)
parente725c927d4a09ee116fe18f2f0718364678a321f (diff)
downloadnixlib-f222d9874643197fb61ca8460449f10abae1a4fd.tar
nixlib-f222d9874643197fb61ca8460449f10abae1a4fd.tar.gz
nixlib-f222d9874643197fb61ca8460449f10abae1a4fd.tar.bz2
nixlib-f222d9874643197fb61ca8460449f10abae1a4fd.tar.lz
nixlib-f222d9874643197fb61ca8460449f10abae1a4fd.tar.xz
nixlib-f222d9874643197fb61ca8460449f10abae1a4fd.tar.zst
nixlib-f222d9874643197fb61ca8460449f10abae1a4fd.zip
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/archivers')
-rw-r--r--pkgs/tools/archivers/xarchiver/default.nix6
-rw-r--r--pkgs/tools/archivers/zpaq/default.nix4
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix
index 507e777a7c37..e924a58d4d71 100644
--- a/pkgs/tools/archivers/xarchiver/default.nix
+++ b/pkgs/tools/archivers/xarchiver/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchFromGitHub, gtk, pkgconfig, intltool }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.4.6";
+  version = "0.5.4.7";
   name = "xarchiver-${version}";
 
   src = fetchFromGitHub {
     owner = "ib";
     repo = "xarchiver";
     rev = "${name}";
-    sha256 = "1w6b4cchd4prswrn981a7bkq44ad51xm2qiwlpzy43ynql14q877";
+    sha256 = "0w9lx8d8r50j48qfhn2r0dlcnwy3pjyy6xjvgpr0qagy5l1q1qj4";
   };
 
   buildInputs = [ gtk pkgconfig intltool ];
 
   meta = {
     description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
-    homepage = http://sourceforge.net/projects/xarchiver/;
+    homepage = https://github.com/ib/xarchiver;
     maintainers = [ stdenv.lib.maintainers.domenkozar ];
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index eb23524d3acf..832f8a4f8c56 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, unzip }:
 stdenv.mkDerivation rec {
   name = "zpaq-${version}";
-  version = "7.13";
+  version = "7.14";
 
   src = let
     mungedVersion = with stdenv.lib; concatStrings (splitString "." version);
   in fetchurl {
-    sha256 = "06fry12c92nxds2m5cd69h0cpxvp0mxhssagmjiwxpmgn57wy84i";
+    sha256 = "1xmmn5sy19yip8cbr3plhd7nh7x7k1b09lq2kqfcp6bndg7jxgby";
     url = "http://mattmahoney.net/dc/zpaq${mungedVersion}.zip";
   };