movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

haskellPackages: Fix eval warnings and errors

Browse source
This commit is contained in:
maralorn 2024-03-18 13:54:18 +01:00
parent 12ffb29d61
commit c71f355699
2 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/koka/default.nix
View file

@ -20,7 +20,7 @@
, FloatingHex , FloatingHex
, isocline , isocline
, lens , lens
, lsp_2_4_0_0 , lsp
, mtl , mtl
, network , network
, network-simple , network-simple
@ -86,7 +86,7 @@ mkDerivation rec {
FloatingHex FloatingHex
isocline isocline
lens lens
lsp_2_4_0_0 lsp
mtl mtl
network network
network-simple network-simple

10
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -201,9 +201,6 @@ self: super: {
# currently, cabal-plan seems to get not much maintenance # currently, cabal-plan seems to get not much maintenance
cabal-plan = doJailbreak super.cabal-plan; cabal-plan = doJailbreak super.cabal-plan;
# Too strict bounds on optparse-applicative
weeder = lib.warnIf (lib.versionAtLeast super.weeder.version "2.8.0") "jailbreak on weeder may be obsolete" doJailbreak super.weeder;
# Allow scotty < 0.21 # Allow scotty < 0.21
# For < 0.22 add https://github.com/taffybar/taffybar/commit/71fe820d892a85e49ad2f2843eac0a59e01f3fd4 # For < 0.22 add https://github.com/taffybar/taffybar/commit/71fe820d892a85e49ad2f2843eac0a59e01f3fd4
taffybar = appendPatches [ taffybar = appendPatches [
@ -1962,10 +1959,7 @@ self: super: {
vivid-supercollider = dontCheck super.vivid-supercollider; vivid-supercollider = dontCheck super.vivid-supercollider;
# Test suite does not compile. # Test suite does not compile.
feed = overrideCabal (drv: { feed = dontCheck super.feed;
jailbreak = lib.warnIf (lib.toInt drv.revision >= 4) "haskellPackages.feed: jailbreak can be removed" true;
doCheck = false;
}) super.feed;
spacecookie = overrideCabal (old: { spacecookie = overrideCabal (old: {
buildTools = (old.buildTools or []) ++ [ pkgs.buildPackages.installShellFiles ]; buildTools = (old.buildTools or []) ++ [ pkgs.buildPackages.installShellFiles ];
@ -2905,7 +2899,7 @@ self: super: {
}) super.kmonad; }) super.kmonad;
ghc-syntax-highlighter_0_0_11_0 = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: super: { ghc-syntax-highlighter_0_0_11_0 = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: super: {
ghc-lib-parser = self.ghc-lib-parser_9_8_1_20231121; ghc-lib-parser = self.ghc-lib-parser_9_8_2_20240223;
}); });
# 2024-03-17: broken # 2024-03-17: broken