diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
| commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
| tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/development/tools/haskell/hadrian | |
| parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
| parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
| download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/tools/haskell/hadrian')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/haskell/hadrian/default.nix | 7 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source.patch | 12 |
2 files changed, 19 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/tools/haskell/hadrian/default.nix b/nixpkgs/pkgs/development/tools/haskell/hadrian/default.nix index 5911c34982b0..1801d63cf8b9 100644 --- a/nixpkgs/pkgs/development/tools/haskell/hadrian/default.nix +++ b/nixpkgs/pkgs/development/tools/haskell/hadrian/default.nix @@ -4,6 +4,10 @@ , extra, filepath, lib, mtl, parsec, shake, text, transformers , unordered-containers, cryptohash-sha256, base16-bytestring , userSettings ? null +# Whether to pass --hyperlinked-source to haddock or not. This is a custom +# workaround as we wait for this to be configurable via userSettings or similar. +# https://gitlab.haskell.org/ghc/ghc/-/issues/23625 +, enableHyperlinkedSource ? true , writeText }: @@ -18,6 +22,9 @@ mkDerivation { postUnpack = '' sourceRoot="$sourceRoot/hadrian" ''; + patches = lib.optionals (!enableHyperlinkedSource) [ + ./disable-hyperlinked-source.patch + ]; # Overwrite UserSettings.hs with a provided custom one postPatch = lib.optionalString (userSettings != null) '' install -m644 "${writeText "UserSettings.hs" userSettings}" src/UserSettings.hs diff --git a/nixpkgs/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source.patch b/nixpkgs/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source.patch new file mode 100644 index 000000000000..72010f85cddc --- /dev/null +++ b/nixpkgs/pkgs/development/tools/haskell/hadrian/disable-hyperlinked-source.patch @@ -0,0 +1,12 @@ +diff --git a/hadrian/src/Settings/Builders/Haddock.hs b/hadrian/src/Settings/Builders/Haddock.hs +index 902b2f85e2..429a441c3b 100644 +--- a/src/Settings/Builders/Haddock.hs ++++ b/src/Settings/Builders/Haddock.hs +@@ -57,7 +57,6 @@ haddockBuilderArgs = mconcat + , arg $ "--odir=" ++ takeDirectory output + , arg $ "--dump-interface=" ++ output + , arg "--html" +- , arg "--hyperlinked-source" + , arg "--hoogle" + , arg "--quickjump" + , arg $ "--title=" ++ pkgName pkg ++ "-" ++ version |