Merge pull request #109604 from alesguzik/repackage_snapper-gui

pkgs/applications/misc/snapper-gui/default.nix

@@ -0,0 +1,49 @@
+{ lib, stdenv, fetchFromGitHub, python3, python3Packages
+, gnome3, gtk3, wrapGAppsHook, gtksourceview3, snapper
+, gobject-introspection
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "snapper-gui";
+  version = "2020-10-20";
+
+  src = fetchFromGitHub {
+    owner = "ricardomv";
+    repo = pname;
+    rev = "f0c67abe0e10cc9e2ebed400cf80ecdf763fb1d1";
+    sha256 = "13j4spbi9pxg69zifzai8ifk4207sn0vwh6vjqryi0snd5sylh7h";
+  };
+
+  nativeBuildInputs = [ wrapGAppsHook ];
+
+  buildInputs = [
+    python3
+    gobject-introspection
+    gnome3.adwaita-icon-theme
+  ];
+
+  doCheck = false; # it doesn't have any tests
+
+  propagatedBuildInputs = with python3Packages; [
+    gtk3
+    dbus-python
+    pygobject3
+    setuptools
+    gtksourceview3
+    snapper
+  ];
+
+  meta = with lib; {
+    description = "Graphical interface for snapper";
+    longDescription = ''
+      A graphical user interface for the tool snapper for Linux filesystem
+      snapshot management. It can compare snapshots and revert differences between snapshots.
+      In simple terms, this allows root and non-root users to view older versions of files
+      and revert changes. Currently works with btrfs, ext4 and thin-provisioned LVM volumes.
+    '';
+    homepage = "https://github.com/ricardomv/snapper-gui";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ahuzik ];
+  };
+}

pkgs/development/python-modules/snappergui/default.nix

@@ -1,30 +0,0 @@
-{ lib, stdenv
-, buildPythonPackage
-, fetchgit
-, pygobject3
-, dbus-python
-}:
-
-buildPythonPackage {
-  pname = "Snapper-GUI";
-  version = "0.1";
-
-  src = fetchgit {
-    url = "https://github.com/ricardomv/snapper-gui";
-    rev = "11d98586b122180c75a86fccda45c4d7e3137591";
-    sha256 = "7a9f86fc17dbf130526e70c3e925eac30e2c74d6b932efbf7e7cd9fbba6dc4b1";
-  };
-
-  # no tests available
-  doCheck = false;
-
-  propagatedBuildInputs = [ pygobject3 dbus-python ];
-
-  meta = with lib; {
-    homepage = "https://github.com/ricardomv/snapper-gui";
-    description = "Graphical frontend for snapper";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ tstrobel ];
-  };
-
-}

pkgs/top-level/all-packages.nix

@@ -24827,6 +24827,7 @@ in
   smartdeblur = callPackage ../applications/graphics/smartdeblur { };
 
   snapper = callPackage ../tools/misc/snapper { };
+  snapper-gui = callPackage ../applications/misc/snapper-gui { };
 
   snd = callPackage ../applications/audio/snd { };
 

pkgs/top-level/python-packages.nix

@@ -7120,8 +7120,6 @@ in {
 
   snapcast = callPackage ../development/python-modules/snapcast { };
 
-  snapperGUI = callPackage ../development/python-modules/snappergui { };
-
   snapshottest = callPackage ../development/python-modules/snapshottest { };
 
   sniffio = callPackage ../development/python-modules/sniffio { };