From 1cd703f3a96c1d4751fd6bf472b1565fcfeaefc1 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Tue, 23 Sep 2014 11:46:56 +0200 Subject: [PATCH 1/4] Add package: snapper Snapper is a tool for Linux filesystem snapshot management, developed for OpenSuSE. --- pkgs/tools/misc/snapper/default.nix | 52 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 55 insertions(+) create mode 100644 pkgs/tools/misc/snapper/default.nix diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix new file mode 100644 index 00000000000..0f28b15ea97 --- /dev/null +++ b/pkgs/tools/misc/snapper/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfsProgs, 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"; + }; + + buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfsProgs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ]; + + patchPhase = '' + # work around missing btrfs/version.h; otherwise, use "-DHAVE_BTRFS_VERSION_H" + substituteInPlace snapper/Btrfs.cc --replace "define BTRFS_LIB_VERSION (100)" "define BTRFS_LIB_VERSION (200)"; + # fix strange SuSE boost naming + 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 = '' + aclocal + libtoolize --force --automake --copy + autoheader + automake --add-missing --copy + autoconf + + ./configure --disable-silent-rules --disable-ext4 --disable-btrfs-quota --prefix=$out + ''; + + makeFlags = "DESTDIR=$(out)"; + + NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ]; + + # Probably a hack, but using DESTDIR and PREFIX makes everything work! + postInstall = '' + cp -r $out/$out/* $out + rm -r $out/nix + ''; + + meta = with stdenv.lib; { + description = "Tool for Linux filesystem snapshot management"; + homepage = http://snapper.io; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.tstrobel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0b9b236f08..bdc444ec30b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10077,6 +10077,9 @@ let smartdeblur = callPackage ../applications/graphics/smartdeblur { }; + # TODO: boost is just fixed as boost156 is split into out and lib, and I don't know how to access lib + snapper = callPackage ../tools/misc/snapper { boost=boost149; }; + snd = callPackage ../applications/audio/snd { }; shntool = callPackage ../applications/audio/shntool { }; From 5aa986906600e0b3e47031a770c7b7aa1e9a9570 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Tue, 23 Sep 2014 12:18:52 +0200 Subject: [PATCH 2/4] Add python package: snapper-gui Graphical frontend for snapper. Not tested, yet. --- pkgs/top-level/python-packages.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f64c9ceb4f..694ee88e992 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10798,6 +10798,24 @@ let }; }; + snapperGUI = buildPythonPackage rec { + name = "Snapper-GUI"; + + src = fetchgit { + url = "https://github.com/ricardomv/snapper-gui"; + rev = "11d98586b122180c75a86fccda45c4d7e3137591"; + sha256 = "7a9f86fc17dbf130526e70c3e925eac30e2c74d6b932efbf7e7cd9fbba6dc4b1"; + }; + + propagatedBuildInputs = with pythonPackages; [ pygobject3 dbus ]; + + meta = { + homepage = https://github.com/ricardomv/snapper-gui; + description = "Graphical frontend for snapper"; + license = licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.tstrobel ]; + }; + }; # python2.7 specific packages } // optionalAttrs isPy27 ( @@ -10917,5 +10935,4 @@ let maintainers = [ stdenv.lib.maintainers.DamienCassou ]; }; }; - }); in pythonPackages From 48265fd1816ba5bb44221c5261bbbe90538c4c74 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Tue, 23 Sep 2014 15:46:06 +0200 Subject: [PATCH 3/4] Use Nix default version of boost library. --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdc444ec30b..1e26b713cac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10077,8 +10077,7 @@ let smartdeblur = callPackage ../applications/graphics/smartdeblur { }; - # TODO: boost is just fixed as boost156 is split into out and lib, and I don't know how to access lib - snapper = callPackage ../tools/misc/snapper { boost=boost149; }; + snapper = callPackage ../tools/misc/snapper { }; snd = callPackage ../applications/audio/snd { }; From 97437ac7a1f7f0518b9fff57189375a4a977ef75 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Tue, 23 Sep 2014 15:50:50 +0200 Subject: [PATCH 4/4] Disable tests for snapper-gui --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 694ee88e992..dcab1172600 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10807,6 +10807,9 @@ let sha256 = "7a9f86fc17dbf130526e70c3e925eac30e2c74d6b932efbf7e7cd9fbba6dc4b1"; }; + # no tests available + doCheck = false; + propagatedBuildInputs = with pythonPackages; [ pygobject3 dbus ]; meta = {