diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2012-12-04 21:54:03 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2012-12-04 21:54:20 +0400 |
| commit | 8a6b0087a9504ffc06e5d391a2ba9ef86f089e37 (patch) | |
| tree | 2ba4b8e84484a5e70160a52e03aaee166e85679c /pkgs/tools | |
| parent | 50e7ddbdcafbda47de85af336d2aa96da904d5c1 (diff) | |
| download | nixpkgs-8a6b0087a9504ffc06e5d391a2ba9ef86f089e37.tar nixpkgs-8a6b0087a9504ffc06e5d391a2ba9ef86f089e37.tar.gz nixpkgs-8a6b0087a9504ffc06e5d391a2ba9ef86f089e37.tar.bz2 nixpkgs-8a6b0087a9504ffc06e5d391a2ba9ef86f089e37.tar.lz nixpkgs-8a6b0087a9504ffc06e5d391a2ba9ef86f089e37.tar.xz nixpkgs-8a6b0087a9504ffc06e5d391a2ba9ef86f089e37.tar.zst nixpkgs-8a6b0087a9504ffc06e5d391a2ba9ef86f089e37.zip | |
Update GlusterFS
Diffstat (limited to 'pkgs/tools')
4 files changed, 24 insertions, 26 deletions
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 3995faa588b..7cae84a19c7 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,28 +1,36 @@ -a : +{stdenv, fetchurl, fuse, bison, flex, openssl, python, ncurses, readline}: let - s = import ./src-for-default.nix; - buildInputs = with a; [ - fuse bison flex + 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"; + }; + buildInputs = [ + fuse bison flex openssl python ncurses readline ]; in +stdenv.mkDerivation rec { - src = a.fetchUrlFromSrcInfo s; - - inherit (s) name; + inherit (s) name version; inherit buildInputs; configureFlags = [ ''--with-mountutildir="$out/sbin"'' ]; + src = fetchurl { + inherit (s) url sha256; + }; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - meta = { + inherit (s) version; description = "Distributed storage system"; maintainers = [ - a.lib.maintainers.raskin + stdenv.lib.maintainers.raskin ]; - platforms = with a.lib.platforms; + platforms = with stdenv.lib.platforms; linux ++ freebsd; }; } diff --git a/pkgs/tools/filesystems/glusterfs/default.upstream b/pkgs/tools/filesystems/glusterfs/default.upstream new file mode 100644 index 00000000000..7c86455b440 --- /dev/null +++ b/pkgs/tools/filesystems/glusterfs/default.upstream @@ -0,0 +1,4 @@ +url http://download.gluster.org/pub/gluster/glusterfs/ +version_link '[0-9.]+/$' +version_link '[0-9.]+/$' +version_link '[.]tar[.]' diff --git a/pkgs/tools/filesystems/glusterfs/src-for-default.nix b/pkgs/tools/filesystems/glusterfs/src-for-default.nix deleted file mode 100644 index eeda32796f5..00000000000 --- a/pkgs/tools/filesystems/glusterfs/src-for-default.nix +++ /dev/null @@ -1,8 +0,0 @@ -rec { - advertisedUrl="http://ftp.gluster.com/pub/gluster/glusterfs/2.0/2.0.6/glusterfs-2.0.6.tar.gz"; - version = "2.0.6"; - url="http://ftp.gluster.com/pub/gluster/glusterfs/2.0/2.0.6/glusterfs-2.0.6.tar.gz"; - hash = "0qr8smwncrr63vzbaf2v4fwpdck3jpgywn2rq8sdhifff67ydc9h"; - name = "glusterfs-2.0.6"; - -} diff --git a/pkgs/tools/filesystems/glusterfs/src-info-for-default.nix b/pkgs/tools/filesystems/glusterfs/src-info-for-default.nix deleted file mode 100644 index 273ee4512e1..00000000000 --- a/pkgs/tools/filesystems/glusterfs/src-info-for-default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - downloadPage = "http://ftp.gluster.com/pub/gluster/glusterfs/2.0/"; - sourceRegexp = "^2[.]0[.]"; - choiceCommand = ''tail -1 | sed -re 's@(.*)/@&glusterfs-\1.tar.gz@' ''; - baseName = "glusterfs"; -} |