summary refs log tree commit diff
path: root/pkgs/tools/filesystems
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-05-26 16:50:22 +0200
committerVladimír Čunát <vcunat@gmail.com>2016-05-26 16:50:22 +0200
commit81039713fad72bcfb6d29e358866344c254096c2 (patch)
tree5150eb44e296607c43c5c7ece21249d0e39ff098 /pkgs/tools/filesystems
parent21df05d1ad9ad8b3e8138138f65525d2e6324341 (diff)
parent8fbdb40ef0ce39e6605db3dfd223402636de8907 (diff)
downloadnixlib-81039713fad72bcfb6d29e358866344c254096c2.tar
nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.gz
nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.bz2
nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.lz
nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.xz
nixlib-81039713fad72bcfb6d29e358866344c254096c2.tar.zst
nixlib-81039713fad72bcfb6d29e358866344c254096c2.zip
Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r--pkgs/tools/filesystems/s3backer/default.nix28
1 files changed, 20 insertions, 8 deletions
diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix
index 89e49c9586c5..f3f8877db2c9 100644
--- a/pkgs/tools/filesystems/s3backer/default.nix
+++ b/pkgs/tools/filesystems/s3backer/default.nix
@@ -1,18 +1,30 @@
-{ stdenv, fetchurl, pkgconfig, fuse, curl, expat }:
+{ stdenv, fetchFromGitHub
+, autoreconfHook, pkgconfig
+, fuse, curl, expat }:
   
 stdenv.mkDerivation rec {
-  name = "s3backer-1.3.1";
+  name = "s3backer-${version}";
+  version = "1.4.2";
   
-  src = fetchurl {
-    url = "http://s3backer.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1dmdvhb7mcn0fdcljpdyvfynhqrsnrg50dgl1706i8f1831lgk1r";
+  src = fetchFromGitHub {
+    sha256 = "0b9vmykrfpzs9is31pqb8xvgjraghnax1ph2jkbib1ya0vhxm8dj";
+    rev = version;
+    repo = "s3backer";
+    owner = "archiecobbs";
   };
 
-  buildInputs = [ pkgconfig fuse curl expat ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ fuse curl expat ];
 
-  meta = {
+  autoreconfPhase = ''
+    patchShebangs ./autogen.sh
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
     homepage = http://code.google.com/p/s3backer/;
     description = "FUSE-based single file backing store via Amazon S3";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ nckx ];
   };
 }