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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-05-08 20:59:05 +02:00
parent 252bf94a74 6d46d8a9b9
commit dd78ce1c53
730 changed files with 3908 additions and 1908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/documentation/gnome-doc-utils/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3
{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome
, python2Packages }:
python2Packages.buildPythonApplication rec {
@@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec {
propagatedBuildInputs = [ libxml2Python ];
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
};
};

4
pkgs/development/tools/documentation/gtk-doc/default.nix
View File

@@ -8,7 +8,7 @@
, docbook-xsl-nons
, libxslt
, gettext
, gnome3
, gnome
, withDblatex ? false, dblatex
}:
@@ -77,7 +77,7 @@ python3.pkgs.buildPythonApplication rec {
passthru = {
# Consumers are expected to copy the m4 files to their source tree, let them reuse the patch
respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch;
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "none";
};