public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into stdenv-updates.

Browse Source 
Conflicts:
	pkgs/top-level/all-packages.nix
This commit is contained in:
Peter Simons
2013-10-26 18:28:05 +02:00
parent f7bec094e6 e1c9c133b0
commit 91f2c362de
156 changed files with 2797 additions and 844 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/filesystems/e2fsprogs/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libuuid }:
stdenv.mkDerivation rec {
name = "e2fsprogs-1.42.7";
name = "e2fsprogs-1.42.8";
src = fetchurl {
url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
sha256 = "0ibkkvp6kan0hn0d1anq4n2md70j5gcm7mwna515w82xwyr02rfw";
sha256 = "b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68d00c97";
};
buildInputs = [ pkgconfig libuuid ];
pkgs/tools/filesystems/glusterfs/default.nix
+5 -5
View File
@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="glusterfs";
version="3.3.1";
name="glusterfs-3.3.1";
hash="06bmnyl3vh8s21kk98idm2fl7kq38na94k5l67l9l1grl3iyzahr";
url="http://download.gluster.org/pub/gluster/glusterfs/3.3/3.3.1/glusterfs-3.3.1.tar.gz";
sha256="06bmnyl3vh8s21kk98idm2fl7kq38na94k5l67l9l1grl3iyzahr";
version="3.4.1";
name="${baseName}-${version}";
hash="0fdp3bifd7n20xlmsmj374pbp11k7np71f7ibzycsvmqqviv9wdm";
url="http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.1/glusterfs-3.4.1.tar.gz";
sha256="0fdp3bifd7n20xlmsmj374pbp11k7np71f7ibzycsvmqqviv9wdm";
};
buildInputs = [
fuse bison flex openssl python ncurses readline