Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b4ae841b238a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2a462f27dc56
Choose a head ref
  • 6 commits
  • 4 files changed
  • 2 contributors

Commits on May 26, 2019

  1. Revert "gtk-doc: fix css file permissions" 

    This reverts commit 0e27680.
Let's revert the gtk-doc update for now; it causes too many problems.
    @vcunat @FRidh
    vcunat authored and FRidh committed May 26, 2019
    Copy the full SHA
    451be59 View commit details

  2. Revert "gtk-doc: build with meson" 

    This reverts commit 064ca0a.
The previous gtk-doc version won't build with our current meson.
    @vcunat @FRidh
    vcunat authored and FRidh committed May 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7c15686 View commit details

  3. Revert "gtk-doc: 1.29 -> 1.30" 

    This reverts commit 765079f.
Problems, usually around https://gitlab.gnome.org/GNOME/gtk-doc/issues/84
    @vcunat @FRidh
    vcunat authored and FRidh committed May 26, 2019
    Copy the full SHA
    b41ef4c View commit details

  4. Revert "libical: temporarily don't build docs to unblock staging-next" 

    This reverts commit dae72e7.
Not needed now.
    @vcunat @FRidh
    vcunat authored and FRidh committed May 26, 2019
    Copy the full SHA
    ea01202 View commit details

  5. Revert "libpsl: don't build docs" 

    This reverts commit 7c62ef8.
Not needed now.
    @vcunat @FRidh
    vcunat authored and FRidh committed May 26, 2019
    Copy the full SHA
    8809ebe View commit details

  6. Merge staging-next into staging

    @FRidh
    FRidh committed May 26, 2019
    Copy the full SHA
    2a462f2 View commit details
5 changes: 2 additions & 3 deletions pkgs/development/libraries/libical/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "libical-${version}";
version = "3.0.4";

outputs = [ "out" "dev" ]; #"devdoc" ];
outputs = [ "out" "dev" "devdoc" ];

src = fetchFromGitHub {
owner = "libical";
@@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
perl pkgconfig cmake ninja vala gobject-introspection
(python3.withPackages (pkgs: with pkgs; [ pygobject3 ])) # running libical-glib tests
# Docs building fails: https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489
# gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
gtk-doc docbook_xsl docbook_xml_dtd_43 # docs
];
buildInputs = [ glib libxml2 icu ];

2 changes: 1 addition & 1 deletion pkgs/development/libraries/libpsl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
configureFlags = [
"--disable-builtin"
"--disable-static"
# "--enable-gtk-doc"
"--enable-gtk-doc"
"--enable-man"
];

24 changes: 0 additions & 24 deletions ...development/tools/documentation/gtk-doc/0001-highlight-fix-permission-on-file-style.patch
View file

This file was deleted.

53 changes: 12 additions & 41 deletions pkgs/development/tools/documentation/gtk-doc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,30 @@
{ stdenv
, fetchFromGitLab
, meson
, ninja
, pkgconfig
, python3
, libxml2Python
, docbook_xml_dtd_43
, docbook_xsl
, libxslt
, gettext
, gnome3
{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python3, libxml2Python, libxslt, which
, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool, gnome3
, withDblatex ? false, dblatex
}:

stdenv.mkDerivation rec {
pname = "gtk-doc";
version = "1.30";
version = "1.29";

src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = "GTK_DOC_${stdenv.lib.replaceStrings ["."] ["_"] version }";
sha256 = "05lr6apj3pd3s59a7k6p45k9ywwrp577ra4pvkhxvb5p7v90c2fi";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1cc6yl8l275qn3zpjl6f0s4fwmkczngjr9hhsdv74mln4h08wmql";
};

patches = [
passthru.respect_xml_catalog_files_var_patch
# https://gitlab.gnome.org/GNOME/gtk-doc/issues/84
./0001-highlight-fix-permission-on-file-style.patch
];

outputDevdoc = "out";

nativeBuildInputs = [
gettext
meson
ninja
];

buildInputs = [
docbook_xml_dtd_43
docbook_xsl
libxslt
pkgconfig
python3
libxml2Python
]
++ stdenv.lib.optional withDblatex dblatex
;
nativeBuildInputs = [ autoreconfHook ];
buildInputs =
[ pkgconfig perl python3 libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
gnome-doc-utils gettext which itstool
] ++ stdenv.lib.optional withDblatex dblatex;

mesonFlags = [
"-Dtests=false"
"-Dyelp_manual=false"
];
configureFlags = [ "--disable-scrollkeeper" ];

# Make pygments available for binaries, python.withPackages creates a wrapper
# but scripts are not allowed in shebangs so we link it into sys.path.