public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yelp-tools: move to top-level

Browse Source
This commit is contained in:
Jan Tojnar
2019-11-20 04:58:00 +01:00
parent 6bddcf4645
commit 5b11829a63
8 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/display-managers/lightdm/default.nix
+2 -1
View File
@@ -27,6 +27,7 @@
, qt4 , qt4
, withQt5 ? false , withQt5 ? false
, qtbase , qtbase
, yelp-tools
}: }:
with stdenv.lib; with stdenv.lib;
@@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoconf autoconf
automake automake
gnome3.yelp-tools yelp-tools
gnome3.yelp-xsl gnome3.yelp-xsl
gobject-introspection gobject-introspection
gtk-doc gtk-doc
pkgs/applications/editors/gobby/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ avahiSupport ? false # build support for Avahi in libinfinity { avahiSupport ? false # build support for Avahi in libinfinity
, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook , stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook, yelp-tools
, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: , gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }:
let let
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az"; sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az";
}; };
nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool gnome3.yelp-tools wrapGAppsHook ]; nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool yelp-tools wrapGAppsHook ];
buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ]; buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ];
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";
pkgs/applications/graphics/glabels/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, barcode, gnome3, autoreconfHook { stdenv, fetchurl, barcode, gnome3, autoreconfHook
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
, intltool, itstool, makeWrapper, pkgconfig , intltool, itstool, makeWrapper, pkgconfig, yelp-tools
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
buildInputs = [ buildInputs = [
barcode gtk3 gtk-doc gnome3.yelp-tools barcode gtk3 gtk-doc yelp-tools
gnome3.gnome-common gsettings-desktop-schemas gnome3.gnome-common gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool itstool libxml2 librsvg libe-book libtool
]; ];
pkgs/applications/misc/font-manager/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch, { stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch,
pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, yelp-tools,
vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection
}: }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
itstool itstool
desktop-file-utils desktop-file-utils
vala vala
gnome3.yelp-tools yelp-tools
wrapGAppsHook wrapGAppsHook
# For https://github.com/FontManager/master/blob/master/lib/unicode/meson.build # For https://github.com/FontManager/master/blob/master/lib/unicode/meson.build
gobject-introspection gobject-introspection
pkgs/applications/misc/glom/default.nix
+2 -1
View File
@@ -30,6 +30,7 @@
, postgresql , postgresql
, gnome3 , gnome3
, gobject-introspection , gobject-introspection
, yelp-tools
, wrapGAppsHook , wrapGAppsHook
}: }:
@@ -67,7 +68,7 @@ in stdenv.mkDerivation rec {
libtool libtool
mm-common mm-common
intltool intltool
gnome3.yelp-tools yelp-tools
itstool itstool
doxygen doxygen
graphviz graphviz
pkgs/desktops/gnome-3/default.nix
+2 -2
View File
@@ -160,8 +160,6 @@ lib.makeScope pkgs.newScope (self: with self; {
yelp-xsl = callPackage ./core/yelp-xsl { }; yelp-xsl = callPackage ./core/yelp-xsl { };
yelp-tools = callPackage ./core/yelp-tools { };
zenity = callPackage ./core/zenity { }; 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) gegl_0_4; # added 2019-10-31
inherit (pkgs) gjs; # added 2019-01-05 inherit (pkgs) gjs; # added 2019-01-05
inherit (pkgs) yelp-tools; # added 2019-11-20
}) })
pkgs/desktops/gnome-3/core/yelp-tools/default.nix → pkgs/development/misc/yelp-tools/default.nix
+3 -1
View File
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
}; };
passthru = { passthru = {
updateScript = gnome3.updateScript { packageName = "yelp-tools"; attrPath = "gnome3.yelp-tools"; }; updateScript = gnome3.updateScript {
packageName = pname;
};
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
pkgs/top-level/all-packages.nix
+2 -1
View File
@@ -20439,7 +20439,6 @@ in
orca = python3Packages.callPackage ../applications/misc/orca { orca = python3Packages.callPackage ../applications/misc/orca {
inherit (pkgs) pkgconfig; inherit (pkgs) pkgconfig;
inherit (gnome3) yelp-tools;
}; };
osm2xmap = callPackage ../applications/misc/osm2xmap { osm2xmap = callPackage ../applications/misc/osm2xmap {
@@ -22259,6 +22258,8 @@ in
inherit (gnome3) yelp; inherit (gnome3) yelp;
yelp-tools = callPackage ../development/misc/yelp-tools { };
yokadi = python3Packages.callPackage ../applications/misc/yokadi {}; yokadi = python3Packages.callPackage ../applications/misc/yokadi {};
yoshimi = callPackage ../applications/audio/yoshimi { }; yoshimi = callPackage ../applications/audio/yoshimi { };