diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-11-20 04:30:05 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-11-20 04:58:00 +0100 |
commit | 5b11829a631951db37076f92e1a3672d8f0995f4 (patch) | |
tree | e18d5673656738cd31545ad509e7f9c5520068be /pkgs/desktops | |
parent | 6bddcf4645c91cd57afc9dccdf37c654bf18e310 (diff) | |
download | nixlib-5b11829a631951db37076f92e1a3672d8f0995f4.tar nixlib-5b11829a631951db37076f92e1a3672d8f0995f4.tar.gz nixlib-5b11829a631951db37076f92e1a3672d8f0995f4.tar.bz2 nixlib-5b11829a631951db37076f92e1a3672d8f0995f4.tar.lz nixlib-5b11829a631951db37076f92e1a3672d8f0995f4.tar.xz nixlib-5b11829a631951db37076f92e1a3672d8f0995f4.tar.zst nixlib-5b11829a631951db37076f92e1a3672d8f0995f4.zip |
yelp-tools: move to top-level
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-3/core/yelp-tools/default.nix | 28 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 4 |
2 files changed, 2 insertions, 30 deletions
diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix deleted file mode 100644 index 43863bf7f856..000000000000 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: - -stdenv.mkDerivation rec { - pname = "yelp-tools"; - version = "3.32.2"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "yelp-tools"; attrPath = "gnome3.yelp-tools"; }; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 libxslt itstool gnome3.yelp-xsl ]; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp/Tools; - description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; - maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 3b55cf86bd9e..1e138b1ba6cc 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -160,8 +160,6 @@ lib.makeScope pkgs.newScope (self: with self; { yelp-xsl = callPackage ./core/yelp-xsl { }; - yelp-tools = callPackage ./core/yelp-tools { }; - zenity = callPackage ./core/zenity { }; @@ -360,4 +358,6 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) gegl_0_4; # added 2019-10-31 inherit (pkgs) gjs; # added 2019-01-05 + + inherit (pkgs) yelp-tools; # added 2019-11-20 }) |