summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2016-01-18 19:13:59 +0100
committerTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2016-01-18 19:13:59 +0100
commit6c2b00bcb25a40c4eeb6ac6e865dbc821a0e8318 (patch)
tree2b3b7cc4920a1243700b203e9a4e1a939f25f6cd /pkgs/tools
parent148396c02219f1c6fcdb5991a7de7716cefaa1d8 (diff)
parent9a1f430e53b7aad436d8eb2755cc90e2f4fee9f6 (diff)
downloadnixlib-6c2b00bcb25a40c4eeb6ac6e865dbc821a0e8318.tar
nixlib-6c2b00bcb25a40c4eeb6ac6e865dbc821a0e8318.tar.gz
nixlib-6c2b00bcb25a40c4eeb6ac6e865dbc821a0e8318.tar.bz2
nixlib-6c2b00bcb25a40c4eeb6ac6e865dbc821a0e8318.tar.lz
nixlib-6c2b00bcb25a40c4eeb6ac6e865dbc821a0e8318.tar.xz
nixlib-6c2b00bcb25a40c4eeb6ac6e865dbc821a0e8318.tar.zst
nixlib-6c2b00bcb25a40c4eeb6ac6e865dbc821a0e8318.zip
Merge pull request #12452 from Profpatsch/snapper
snapper: 0.2.4 -> 0.2.8
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/misc/snapper/default.nix18
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 41a5a6797d14..9f304a75a65c 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfs-progs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45,  diffutils, pam, utillinux, attr, gettext }:
+{ stdenv, fetchFromGitHub, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfs-progs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45,  diffutils, pam, utillinux, attr, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "snapper-0.2.4";
-
-  src = fetchgit {
-    url = "https://github.com/openSUSE/snapper";
-    rev = "24e18153f7a32d0185dcfb20f8b8a4709ba8fe4a";
-    sha256 = "ec4b829430bd7181995e66a26ac86e8ac71c27e77faf8eb06db71d645c6f859b";
+  name = "snapper-${ver}";
+  ver = "0.2.8";
+
+  src = fetchFromGitHub {
+    owner = "openSUSE";
+    repo = "snapper";
+    rev = "v${ver}";
+    sha256 = "1rj8vy6hq140pbnc7mjjb34mfqdgdah1dmlv2073izdgakh7p38j";
   };
 
   buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfs-progs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ];
@@ -18,8 +20,6 @@ stdenv.mkDerivation rec {
     substituteInPlace snapper/Makefile.am --replace \
       "libsnapper_la_LIBADD = -lboost_thread-mt -lboost_system-mt -lxml2 -lacl -lz -lm" \
       "libsnapper_la_LIBADD = -lboost_thread -lboost_system -lxml2 -lacl -lz -lm";
-    # general cleanup
-    sed -i 's/^INCLUDES/AM_CPPFLAGS/' $(grep -rl ^INCLUDES .|grep "\.am$")
     '';
 
   configurePhase = ''