summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2023-04-30 12:31:38 +0200
committerYt <happysalada@proton.me>2023-04-30 08:51:32 -0400
commitcd72014a8778cbc1007f66acb2b79ec1fac8e8cc (patch)
tree8059dc4438f07a7edc8b314293fbfb193c271c82
parent0d36943e521a6c72b7d1014b562f7a4bd4b182db (diff)
downloadnixpkgs-cd72014a8778cbc1007f66acb2b79ec1fac8e8cc.tar
nixpkgs-cd72014a8778cbc1007f66acb2b79ec1fac8e8cc.tar.gz
nixpkgs-cd72014a8778cbc1007f66acb2b79ec1fac8e8cc.tar.bz2
nixpkgs-cd72014a8778cbc1007f66acb2b79ec1fac8e8cc.tar.lz
nixpkgs-cd72014a8778cbc1007f66acb2b79ec1fac8e8cc.tar.xz
nixpkgs-cd72014a8778cbc1007f66acb2b79ec1fac8e8cc.tar.zst
nixpkgs-cd72014a8778cbc1007f66acb2b79ec1fac8e8cc.zip
python3.pkgs.jinja2: don't build offline documentation by default
E.g. `systemd` fails like this:

    last 25 log lines:
    > Checking for function "blkid_probe_set_hint" with dependency blkid: YES
    > Run-time dependency libkmod found: YES 30
    > Run-time dependency xencontrol found: NO (tried pkgconfig and cmake)
    > Run-time dependency libmicrohttpd found: NO (tried pkgconfig and cmake)
    > Checking for function "crypt_activate_by_token_pin" : NO
    > Run-time dependency libiptc found: NO (tried pkgconfig and cmake)
    > Run-time dependency libqrencode found: NO (tried pkgconfig and cmake)
    > Run-time dependency gnutls found: NO (tried pkgconfig and cmake)
    > Run-time dependency openssl found: NO (tried pkgconfig, system and cmake)
    > Run-time dependency p11-kit-1 found: NO (tried pkgconfig and cmake)
    > Run-time dependency tss2-esys tss2-rc tss2-mu found: NO (tried pkgconfig and cmake)
    > Run-time dependency libdw found: NO (tried pkgconfig and cmake)
    > Run-time dependency zlib found: NO (tried pkgconfig, cmake and system)
    > Library bz2 found: NO
    > Run-time dependency liblzma found: NO (tried pkgconfig and cmake)
    > Run-time dependency libzstd found: NO (tried pkgconfig and cmake)
    > Run-time dependency xkbcommon found: NO (tried pkgconfig and cmake)
    > Run-time dependency libpcre2-8 found: NO (tried pkgconfig and cmake)
    > Run-time dependency dbus-1 found: NO (tried pkgconfig and cmake)
    > Message: default-dnssec cannot be set to yes or allow-downgrade openssl and gcrypt are disabled. Setting default-dnssec to no.
    > Program python3 (jinja2) found: NO
    >
    > meson.build:1949:15: ERROR: python3 is missing modules: jinja2

Upon trying more packages I realized that this is not the only one (it
appears to be related to `python3.withPackages` in some cases).

For now, flip the default to unbreak a lot of stuff and remove the
`enableDocumentation = false;` hacks from a bunch of other packages.
-rw-r--r--pkgs/applications/misc/privacyidea/default.nix2
-rw-r--r--pkgs/development/python-modules/jinja2/default.nix2
-rw-r--r--pkgs/development/python-modules/sphinx/default.nix2
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix
index 14c532e3e1f..f5e13987aff 100644
--- a/pkgs/applications/misc/privacyidea/default.nix
+++ b/pkgs/applications/misc/privacyidea/default.nix
@@ -52,7 +52,7 @@ let
         doCheck = false;
       });
       # Required by flask-1.1
-      jinja2 = (super.jinja2.override { enableDocumentation = false; }).overridePythonAttrs (old: rec {
+      jinja2 = super.jinja2.overridePythonAttrs (old: rec {
         version = "2.11.3";
         src = old.src.override {
           inherit version;
diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix
index 6802811f7b8..1fb7b26db5b 100644
--- a/pkgs/development/python-modules/jinja2/default.nix
+++ b/pkgs/development/python-modules/jinja2/default.nix
@@ -10,7 +10,7 @@
 , pallets-sphinx-themes
 , sphinxcontrib-log-cabinet
 , sphinx-issues
-, enableDocumentation ? true
+, enableDocumentation ? false
 }:
 
 buildPythonPackage rec {
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index a69d328c7fd..1e14bc7a613 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -64,7 +64,7 @@ buildPythonPackage rec {
     alabaster
     docutils
     imagesize
-    (jinja2.override { enableDocumentation = false; })
+    jinja2
     packaging
     pygments
     requests