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

Merge branch 'master.upstream' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III
2015-07-05 13:06:02 -07:00
parent 2363660191 2d1aafef55
commit d605663ae2
155 changed files with 4271 additions and 2114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/filesystems/duperemove/default.nix
+7 -5
View File
@@ -1,12 +1,14 @@
{ lib, stdenv, fetchurl, libgcrypt, pkgconfig, glib, linuxHeaders }:
{ lib, stdenv, fetchFromGitHub, libgcrypt, pkgconfig, glib, linuxHeaders }:
stdenv.mkDerivation rec {
name = "duperemove-${version}";
version = "0.09.beta2";
version = "0.09.4";
src = fetchurl {
url = "https://github.com/markfasheh/duperemove/archive/v${version}.tar.gz";
sha256 = "0rn7lf9rjf4ypgfwms2y7b459rri4rfn809h6wx8xl9nbm5niil4";
src = fetchFromGitHub {
owner = "markfasheh";
repo = "duperemove";
rev = "v${version}";
sha256 = "1d586k6rbfqb5557i1p5xq8ngbppbwpxlkw8wqm7d900a3hp36nl";
};
buildInputs = [ libgcrypt pkgconfig glib linuxHeaders ];
pkgs/tools/filesystems/glusterfs/default.nix
+4 -4
View File
@@ -6,11 +6,11 @@ let
s = # Generated upstream information
rec {
baseName="glusterfs";
version="3.7.1";
version="3.7.2";
name="${baseName}-${version}";
hash="0d1bcijwvc3rhr24xsn7nnp0b5xwlwvybamb05jzja5m7hapydpw";
url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.1/glusterfs-3.7.1.tar.gz";
sha256="0d1bcijwvc3rhr24xsn7nnp0b5xwlwvybamb05jzja5m7hapydpw";
hash="0cw6p21nnxcvzd8rymd5q0ydlaz4hx4rmv22hwbb39h7a2rvfv79";
url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.2/glusterfs-3.7.2.tar.gz";
sha256="0cw6p21nnxcvzd8rymd5q0ydlaz4hx4rmv22hwbb39h7a2rvfv79";
};
buildInputs = [
fuse bison flex_2_5_35 openssl python ncurses readline