diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-10-01 10:43:44 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-10-01 10:43:44 -0700 |
| commit | 98172435f7ccf1912ab7804296c5026a545ae2dd (patch) | |
| tree | 8df4430c1dbb2a5a09ca5085cd9198da896c4a87 /pkgs/tools | |
| parent | e7bb9e102323f79832c2e0553b98651a582368c9 (diff) | |
| parent | 14961c87810330d22fc1ee11e11a17e32805ff8b (diff) | |
| download | nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.gz nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.bz2 nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.lz nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.xz nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.tar.zst nixlib-98172435f7ccf1912ab7804296c5026a545ae2dd.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/X11/wmutils-core/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/avfs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/package-management/rpm/default.nix | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix index 62f6e65bc214..4200293ed080 100644 --- a/pkgs/tools/X11/wmutils-core/default.nix +++ b/pkgs/tools/X11/wmutils-core/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "wmutils-core-${version}"; - version = "1.0"; + version = "1.1"; src = fetchurl { url = "https://github.com/wmutils/core/archive/v${version}.tar.gz"; - sha256 = "10vn56rbrjykcrjr06ki4qc12sri1ywrcvm89nmxlqhkxx4i239p"; + sha256 = "0aq95khs154j004b79w9rgm80vpggxfqynha5rckm2cx20d1fa5s"; }; buildInputs = [ libxcb ]; diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index 1a9a09aaa50f..060247aa532d 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "avfs-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2"; - sha1 = "e4f8377ea2565c1ac59f7b66893905b778ddf849"; + sha256 = "1j7ysjkv0kbkwjagcdgwcnbii1smd58pwwlpz0l7amki5dxygpn6"; }; buildInputs = [ pkgconfig fuse xz ]; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 0d537a1c30cb..ef7b99952968 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, nspr, nss, popt, db, xz, python }: +{ stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python }: stdenv.mkDerivation rec { - name = "rpm-4.11.2"; + name = "rpm-4.12.0"; src = fetchurl { - url = "http://rpm.org/releases/rpm-4.11.x/${name}.tar.bz2"; - sha256 = "1m2859js0dwg26sg2mnbkpzhvx303b12kx26az74cf5k6bk8sgs0"; + url = "http://rpm.org/releases/rpm-4.12.x/${name}.tar.bz2"; + sha256 = "18hk47hc755nslvb7xkq4jb095z7va0nlcyxdpxayc4lmb8mq3bp"; }; - buildInputs = [ cpio zlib bzip2 file nspr nss popt db xz python ]; + buildInputs = [ cpio zlib bzip2 file libarchive nspr nss popt db xz python ]; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. |