From 1c5d42f7109ad6d6d9026abb23fb039c182cb866 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 30 Jul 2016 10:24:36 +0200 Subject: udiskie: use wrap GApps and icon setup hooks --- pkgs/top-level/python-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 350843e3df79..048dfb385fa4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27136,6 +27136,8 @@ in modules // { buildInputs = [ pkgs.asciidoc-full # For building man page. + pkgs.hicolor_icon_theme + pkgs.wrapGAppsHook ]; propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt ]; @@ -27147,11 +27149,6 @@ in modules // { cp -v doc/udiskie.8 $out/share/man/man8/ ''; - preFixup = '' - wrapProgram "$out/bin/"* \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - ''; - # tests require dbusmock doCheck = false; -- cgit 1.4.1 From b67db150c8bf642d359b79c5507da0b26025c028 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 7 Sep 2016 16:00:33 +0200 Subject: udiskie: 1.4.8 -> 1.5.1 Also switch to `fetchFromGitHub` and do minor formatting. --- pkgs/top-level/python-packages.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 048dfb385fa4..b446708824d7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27121,13 +27121,15 @@ in modules // { }; }; - udiskie = buildPythonPackage rec { - version = "1.4.8"; + udiskie = buildPythonApplication rec { + version = "1.5.1"; name = "udiskie-${version}"; - src = pkgs.fetchurl { - url = "https://github.com/coldfix/udiskie/archive/${version}.tar.gz"; - sha256 = "0fj1kh6pmwyyy54ybc5fa625lhrxzhzmfx1nwz2lym5cpm4b21fl"; + src = pkgs.fetchFromGitHub { + owner = "coldfix"; + repo = "udiskie"; + rev = version; + sha256 = "01x5fvllb262x6r3547l23z7p6hr7ddz034bkhmj2cqmf83sxwxd"; }; preConfigure = '' @@ -27140,7 +27142,10 @@ in modules // { pkgs.wrapGAppsHook ]; - propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt ]; + propagatedBuildInputs = with self; [ + pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 + pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt + ]; postBuild = "make -C doc"; -- cgit 1.4.1 From 2fa41249ceb8aee3ed8403d5d5bd04f414451106 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 10 Sep 2016 12:16:39 +0200 Subject: udiskie: move to all-packages This is an application, not a python library and should therefore be in its own package. --- pkgs/applications/misc/udiskie/default.nix | 43 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 45 ++---------------------------- 3 files changed, 47 insertions(+), 43 deletions(-) create mode 100644 pkgs/applications/misc/udiskie/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix new file mode 100644 index 000000000000..042401a727e9 --- /dev/null +++ b/pkgs/applications/misc/udiskie/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, asciidoc-full, gettext +, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify +, pythonPackages, udisks2, wrapGAppsHook }: + +pythonPackages.buildPythonApplication rec { + name = "udiskie-${version}"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "coldfix"; + repo = "udiskie"; + rev = version; + sha256 = "01x5fvllb262x6r3547l23z7p6hr7ddz034bkhmj2cqmf83sxwxd"; + }; + + buildInputs = [ + asciidoc-full # For building man page. + hicolor_icon_theme + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + gettext gobjectIntrospection gtk3 libnotify pythonPackages.docopt + pythonPackages.pygobject3 pythonPackages.pyyaml udisks2 + ]; + + postBuild = "make -C doc"; + + postInstall = '' + mkdir -p $out/share/man/man8 + cp -v doc/udiskie.8 $out/share/man/man8/ + ''; + + # tests require dbusmock + doCheck = false; + + meta = with stdenv.lib; { + description = "Removable disk automounter for udisks"; + license = licenses.mit; + homepage = https://github.com/coldfix/udiskie; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86fa34a3b430..edb3a0da39e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14672,6 +14672,8 @@ in udevil = callPackage ../applications/misc/udevil {}; + udiskie = callPackage ../applications/misc/udiskie { }; + sakura = callPackage ../applications/misc/sakura { vte = gnome3.vte; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b446708824d7..02c2408ac639 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27121,49 +27121,8 @@ in modules // { }; }; - udiskie = buildPythonApplication rec { - version = "1.5.1"; - name = "udiskie-${version}"; - - src = pkgs.fetchFromGitHub { - owner = "coldfix"; - repo = "udiskie"; - rev = version; - sha256 = "01x5fvllb262x6r3547l23z7p6hr7ddz034bkhmj2cqmf83sxwxd"; - }; - - preConfigure = '' - export XDG_RUNTIME_DIR=/tmp - ''; - - buildInputs = [ - pkgs.asciidoc-full # For building man page. - pkgs.hicolor_icon_theme - pkgs.wrapGAppsHook - ]; - - propagatedBuildInputs = with self; [ - pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 - pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt - ]; - - postBuild = "make -C doc"; - - postInstall = '' - mkdir -p $out/share/man/man8 - cp -v doc/udiskie.8 $out/share/man/man8/ - ''; - - # tests require dbusmock - doCheck = false; - - meta = { - description = "Removable disk automounter for udisks"; - license = licenses.mit; - homepage = https://github.com/coldfix/udiskie; - maintainers = with maintainers; [ AndersonTorres ]; - }; - }; + # For backwards compatibility. Please use nixpkgs.udiskie instead. + udiskie = pkgs.udiskie.override { pythonPackages = self; }; # Should be bumped along with EFL! pythonefl = buildPythonPackage rec { -- cgit 1.4.1