···3838git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml3939git add pkgs/development/haskell-modules/hackage-packages.nix4040git commit -F - << EOF4141-hackage2nix: Mark failing builds broken4141+haskellPackages: mark builds failing on hydra as broken42424343This commit has been generated by maintainers/scripts/haskell/mark-broken.sh4444EOF
···3737if [[ "${1:-}" == "--do-commit" ]]; then3838git add pkgs/development/haskell-modules/hackage-packages.nix3939git commit -F - << EOF4040-hackage-packages.nix: Regenerate based on current config4040+haskellPackages: regenerate package set based on current config41414242This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh4343EOF
+1-1
maintainers/scripts/haskell/update-stackage.sh
···6161if [[ "${1:-}" == "--do-commit" ]]; then6262git add $stackage_config6363git commit -F - << EOF6464-Stackage Nightly: $old_version -> $version6464+haskellPackages: stackage-nightly $old_version -> $version65656666This commit has been generated by maintainers/scripts/haskell/update-stackage.sh6767EOF
+2-1
nixos/modules/config/console.nix
···43434444 options.console = {4545 font = mkOption {4646- type = types.str;4646+ type = with types; either str path;4747 default = "Lat2-Terminus16";4848 example = "LatArCyrHeb-16";4949 description = ''5050 The font used for the virtual consoles. Leave empty to use5151 whatever the <command>setfont</command> program considers the5252 default font.5353+ Can be either a font name or a path to a PSF font file.5354 '';5455 };5556
···1616, glib-networking1717, librsvg1818, gst_all_11919+, xdg-utils1920}:20212122stdenv.mkDerivation rec {···7877 openssl7978 sqlite8079 webkitgtk8080+8181+ # open link in browser8282+ xdg-utils81838284 # TLS support for loading external content in webkitgtk WebView8385 glib-networking
···11---- a/docs/Makefile22-+++ b/docs/Makefile33-@@ -3,7 +3,7 @@44-# Patching is needed here for the following reason:55-# * importing the `constants` package from Kitty has a side effect that it66-# creates the user configuration directory. This package gets imported77-# while sphinx scans the code for documentation strings.88-#99-1010- # You can set these variables from the command line.1111- SPHINXOPTS = -j auto -T $(FAIL_WARN)1212--SPHINXBUILD = sphinx-build1313-+SPHINXBUILD = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build1414- SPHINXPROJ = kitty1515- SOURCEDIR = .1616- BUILDDIR = _build
···89899090 targetCC = builtins.head toolsForTarget;91919292- # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=238569292+ # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.9393+ # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=238569394 # see #84670 and #49071 for more background.9494- useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;9595+ useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl);9696+9797+ runtimeDeps = [9898+ targetPackages.stdenv.cc.bintools9999+ coreutils100100+ ]101101+ # On darwin, we need unwrapped bintools as well (for otool)102102+ ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [103103+ targetPackages.stdenv.cc.bintools.bintools104104+ ];9510596106in97107stdenv.mkDerivation (rec {···245235 for i in "$out/bin/"*; do246236 test ! -h $i || continue247237 egrep --quiet '^#!' <(head -n 1 $i) || continue248248- sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i238238+ sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i249239 done250240 '';251241
+13-3
pkgs/development/compilers/ghc/8.8.4.nix
···98989999 targetCC = builtins.head toolsForTarget;100100101101- # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856101101+ # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.102102+ # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856102103 # see #84670 and #49071 for more background.103103- useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;104104+ useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl);105105+106106+ runtimeDeps = [107107+ targetPackages.stdenv.cc.bintools108108+ coreutils109109+ ]110110+ # On darwin, we need unwrapped bintools as well (for otool)111111+ ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [112112+ targetPackages.stdenv.cc.bintools.bintools113113+ ];104114105115in106116stdenv.mkDerivation (rec {···252242 for i in "$out/bin/"*; do253243 test ! -h $i || continue254244 egrep --quiet '^#!' <(head -n 1 $i) || continue255255- sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i245245+ sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i256246 done257247 '';258248
+13-3
pkgs/development/compilers/ghc/9.0.1.nix
···90909191 targetCC = builtins.head toolsForTarget;92929393- # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=238569393+ # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.9494+ # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=238569495 # see #84670 and #49071 for more background.9595- useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;9696+ useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl);9797+9898+ runtimeDeps = [9999+ targetPackages.stdenv.cc.bintools100100+ coreutils101101+ ]102102+ # On darwin, we need unwrapped bintools as well (for otool)103103+ ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [104104+ targetPackages.stdenv.cc.bintools.bintools105105+ ];9610697107in98108stdenv.mkDerivation (rec {···235225 for i in "$out/bin/"*; do236226 test ! -h $i || continue237227 egrep --quiet '^#!' <(head -n 1 $i) || continue238238- sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i228228+ sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i239229 done240230 '';241231
+13-3
pkgs/development/compilers/ghc/head.nix
···100100101101 targetCC = builtins.head toolsForTarget;102102103103- # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856103103+ # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.104104+ # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856104105 # see #84670 and #49071 for more background.105105- useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;106106+ useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl);107107+108108+ runtimeDeps = [109109+ targetPackages.stdenv.cc.bintools110110+ coreutils111111+ ]112112+ # On darwin, we need unwrapped bintools as well (for otool)113113+ ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [114114+ targetPackages.stdenv.cc.bintools.bintools115115+ ];106116107117in108118stdenv.mkDerivation (rec {···252242 for i in "$out/bin/"*; do253243 test ! -h $i || continue254244 egrep --quiet '^#!' <(head -n 1 $i) || continue255255- sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i245245+ sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i256246 done257247 '';258248
···53535454 # Use the default version of mysql to build this package (which is actually mariadb).5555 # test phase requires networking5656- mysql = dontCheck (super.mysql.override { mysql = pkgs.libmysqlclient; });5656+ mysql = dontCheck super.mysql;57575858 # CUDA needs help finding the SDK headers and libraries.5959 cuda = overrideCabal super.cuda (drv: {···833833 sed -i 's|"tophat"|"./dist/build/tophat/tophat"|' app-test-bin/*.hs834834 '' + (drv.postPatch or "");835835 });836836+837837+ # Runtime dependencies and CLI completion838838+ nvfetcher = generateOptparseApplicativeCompletion "nvfetcher" (overrideCabal839839+ super.nvfetcher (drv: {840840+ buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ];841841+ postInstall = drv.postInstall or "" + ''842842+ wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${843843+ pkgs.lib.makeBinPath [ pkgs.nvchecker pkgs.nix-prefetch-git ]844844+ }"845845+ '';846846+ }));847847+836848}
···481481 # ^^ if the project is not a library, and we have a build target, then use "copy" to install482482 # just the target specified; "install" will error here, since not all targets have been built.483483 else ''484484- ${setupCommand} copy484484+ ${setupCommand} copy ${buildTarget}485485 local packageConfDir="$out/lib/${ghc.name}/package.conf.d"486486 local packageConfFile="$packageConfDir/${pname}-${version}.conf"487487 mkdir -p "$packageConfDir"
···222222 # working as expected.223223 cabal-install = all;224224 Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ];225225+ cabal2nix-unstable = all;225226 funcmp = all;226227 # Doesn't currently work on ghc-9.0:227228 # https://github.com/haskell/haskell-language-server/issues/297