yelp-xsl: Move from gnome scope to top-level
This commit is contained in:
@@ -21,13 +21,13 @@
|
||||
, polkit
|
||||
, accountsservice
|
||||
, gtk-doc
|
||||
, gnome
|
||||
, gobject-introspection
|
||||
, vala
|
||||
, fetchpatch
|
||||
, withQt5 ? false
|
||||
, qtbase
|
||||
, yelp-tools
|
||||
, yelp-xsl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
autoconf
|
||||
automake
|
||||
yelp-tools
|
||||
gnome.yelp-xsl
|
||||
yelp-xsl
|
||||
gobject-introspection
|
||||
gtk-doc
|
||||
intltool
|
||||
|
||||
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
, libxslt
|
||||
, gst_all_1
|
||||
, wrapGAppsHook3
|
||||
, yelp-xsl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
sqlite
|
||||
libxml2
|
||||
libxslt
|
||||
gnome.yelp-xsl
|
||||
yelp-xsl
|
||||
adwaita-icon-theme
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
|
||||
@@ -104,8 +104,6 @@ in
|
||||
|
||||
totem = callPackage ./core/totem { };
|
||||
|
||||
yelp-xsl = callPackage ./core/yelp-xsl { };
|
||||
|
||||
#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
|
||||
|
||||
accerciser = callPackage ./apps/accerciser { };
|
||||
@@ -232,6 +230,7 @@ in
|
||||
seahorse = lib.warn "The ‘gnome.seahorse’ was moved to top-level. Please use ‘pkgs.seahorse’ directly." pkgs.seahorse; # Added on 2024-06-22.
|
||||
simple-scan = lib.warn "The ‘gnome.simple-scan’ was moved to top-level. Please use ‘pkgs.simple-scan’ directly." pkgs.simple-scan; # Added on 2024-06-22.
|
||||
yelp = lib.warn "The ‘gnome.yelp’ was moved to top-level. Please use ‘pkgs.yelp’ directly." pkgs.yelp; # Added on 2024-06-22.
|
||||
yelp-xsl = lib.warn "The ‘gnome.yelp-xsl’ was moved to top-level. Please use ‘pkgs.yelp-xsl’ directly." pkgs.yelp-xsl; # Added on 2024-06-22.
|
||||
zenity = lib.warn "The ‘gnome.zenity’ was moved to top-level. Please use ‘pkgs.zenity’ directly." pkgs.zenity; # Added on 2024-06-22.
|
||||
|
||||
#### Removals
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
, meson
|
||||
, ninja
|
||||
, python3
|
||||
, yelp-xsl
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
@@ -35,7 +36,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
buildInputs = [
|
||||
itstool # build script checks for its presence but I am not sure if anything uses it
|
||||
gnome.yelp-xsl
|
||||
yelp-xsl
|
||||
];
|
||||
|
||||
pythonPath = [
|
||||
|
||||
Reference in New Issue
Block a user