diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-11-22 21:33:23 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-11-22 21:33:23 -0800 |
| commit | 4b73049ccc2f309919629bdf105c2611383e691e (patch) | |
| tree | ae9fe247a2f7838457c7009ffe36413960b8ce38 /pkgs/tools/text | |
| parent | e46718d278bf9a74bfda21ab5570c571788fc409 (diff) | |
| parent | 40d43349e66e87b1009cc945e42acd90892f5306 (diff) | |
| download | nixpkgs-4b73049ccc2f309919629bdf105c2611383e691e.tar nixpkgs-4b73049ccc2f309919629bdf105c2611383e691e.tar.gz nixpkgs-4b73049ccc2f309919629bdf105c2611383e691e.tar.bz2 nixpkgs-4b73049ccc2f309919629bdf105c2611383e691e.tar.lz nixpkgs-4b73049ccc2f309919629bdf105c2611383e691e.tar.xz nixpkgs-4b73049ccc2f309919629bdf105c2611383e691e.tar.zst nixpkgs-4b73049ccc2f309919629bdf105c2611383e691e.zip | |
Merge remote-tracking branch 'origin/staging' into staging-next
Conflicts: nixos/tests/custom-ca.nix
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/source-highlight/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 4a7b588cd9d..289740854f2 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -18,6 +18,13 @@ stdenv.mkDerivation rec { sha256 = "1wnj0jmkmrwjww7qk9dvfxh8h06jdn7mi8v2fvwh95b6x87z5l47"; excludes = [ "ChangeLog" ]; }) + + # Upstream fix for clang-13 and gcc-12 test support + (fetchpatch { + name = "gcc-12.patch"; + url = "http://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=ab9fe5cb9b85c5afab94f2a7f4b6d7d473c14ee9"; + sha256 = "1v33zd2766k7cdgmajw2lffw9wd7v4f8z01f40z53f6bp608nr62"; + }) ]; # source-highlight uses it's own binary to generate documentation. @@ -35,7 +42,7 @@ stdenv.mkDerivation rec { "--with-bash-completion=${placeholder "out"}/share/bash_completion.d" ]; - doCheck = !stdenv.cc.isClang; + doCheck = true; enableParallelBuilding = true; # Upstream uses the same intermediate files in multiple tests, running |