From 505d16f50d342ff75371dc33c7b4c29958df0227 Mon Sep 17 00:00:00 2001 From: Ales Huzik Date: Sun, 17 Jan 2021 16:55:57 +1100 Subject: [PATCH 1/3] snapper-gui: init at 2020-10-20 Existing snapper-gui package at pythonPackages.snapperGUI is outdated for 6 years, broken (probably for a while) and misplaced. I weren't able to fix it, so I repackaged it taking gpodder package for inspiration --- .../applications/misc/snapper-gui/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/misc/snapper-gui/default.nix diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix new file mode 100644 index 00000000000..1746ad3f739 --- /dev/null +++ b/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.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ ahuzik ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fabdff4f25..26de3cc3e19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24825,6 +24825,7 @@ in smartdeblur = callPackage ../applications/graphics/smartdeblur { }; snapper = callPackage ../tools/misc/snapper { }; + snapper-gui = callPackage ../applications/misc/snapper-gui { }; snd = callPackage ../applications/audio/snd { }; From 2b6b8b2303ede61a084b89359a1a89c79270550b Mon Sep 17 00:00:00 2001 From: Ales Huzik Date: Sun, 17 Jan 2021 18:21:22 +1100 Subject: [PATCH 2/3] remove broken pythonPackages.snapperGUI. superceded by snapper-gui from the previous commit --- .../python-modules/snappergui/default.nix | 30 ------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/development/python-modules/snappergui/default.nix diff --git a/pkgs/development/python-modules/snappergui/default.nix b/pkgs/development/python-modules/snappergui/default.nix deleted file mode 100644 index d63390185a9..00000000000 --- a/pkgs/development/python-modules/snappergui/default.nix +++ /dev/null @@ -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 ]; - }; - -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb786ff781e..db290136c7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7096,8 +7096,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 { }; From db0fddeb5401a0e6dcf40edb278daa6314acda85 Mon Sep 17 00:00:00 2001 From: Ales Huzik Date: Sun, 17 Jan 2021 20:54:20 +1100 Subject: [PATCH 3/3] snapper-gui: clarify license: gpl2 -> gpl2Plus --- pkgs/applications/misc/snapper-gui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix index 1746ad3f739..e41860551fc 100644 --- a/pkgs/applications/misc/snapper-gui/default.nix +++ b/pkgs/applications/misc/snapper-gui/default.nix @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { and revert changes. Currently works with btrfs, ext4 and thin-provisioned LVM volumes. ''; homepage = "https://github.com/ricardomv/snapper-gui"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ ahuzik ]; };