summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml')
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml24
1 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 56bd4ac4ab8..fa4e798d1d3 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -73,26 +73,18 @@ default-package-overrides:
   # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
   # not yet available in Nixpkgs
   - gi-gdkx11 < 4
-  # Needs Cabal 3.4 for Setup.hs
-  - gi-javascriptcore < 4.0.23 #
-  - gi-soup < 2.4.24 #
-  - gi-webkit2 < 4.0.27 #
   # 2021-05-11: not all diagrams libraries have adjusted to
   # monoid-extras 0.6 yet, keep them pinned to lower versions
   # until we can do a full migration, see
   # https://github.com/diagrams/diagrams-core/issues/115
   # We can keep this pin at most until base 4.15
+  # Since the monoid-extras adjustment was combined with
+  # a major release in some cases, we need to wait for
+  # diagrams 1.5 to be released.
   - monoid-extras < 0.6
+  - dual-tree < 0.2.3.0
   - diagrams-core < 1.5.0
   - diagrams-lib < 1.4.4
-  # 2021-05-11: Pin for hls 1.1.0
-  - ghcide == 1.2.*
-  - hls-plugin-api == 1.1.0.0
-  - hls-explicit-imports-plugin < 1.0.0.2
-  # 2021-05-12: remove once versions >= 5.0.0 is in stackage
-  - futhark < 0.19.5
-  # 2021-06-05: remove once pandoc 2.14 is in stackage
-  - pandoc-crossref < 0.3.11.0
   # 2021-06-14: hnix still needs old versions https://github.com/haskell-nix/hnix/issues/952
   - hnix-store-core < 0.5
   - hnix-store-remote < 0.5
@@ -113,7 +105,6 @@ extra-packages:
   - haddock-library ==1.7.*             # required by stylish-cabal-0.5.0.0
   - happy == 1.19.9                     # for purescript
   - hinotify == 0.3.9                   # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
-  - hlint < 3.3                         # We don‘t have ghc-lib-parser 9.0.X yet.
   - immortal == 0.2.2.1                 # required by Hasura 1.3.1, 2020-08-20
   - mmorph == 1.1.3                     # Newest working version of mmorph on ghc 8.6.5. needed for hls
   - network == 2.6.3.1                  # required by pkgs/games/hedgewars/default.nix, 2020-11-15
@@ -122,9 +113,6 @@ extra-packages:
   - resolv == 0.1.1.2                   # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
   - sbv == 7.13                         # required for pkgs.petrinizer
   - crackNum < 3.0                      # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
-  - gi-gdk == 3.0.24                    # 2021-05-07: For haskell-gi 0.25 without gtk4
-  - gi-gtk < 4.0                        # 2021-05-07: For haskell-gi 0.25 without gtk4
-  - gi-gdkx11 == 3.0.11                 # 2021-05-07: For haskell-gi 0.25 without gtk4
   - ShellCheck == 0.7.1                 # 2021-05-09: haskell-ci 0.12.1 pins this version
   - hackage-db < 2.1.1                  # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501
 
@@ -143,6 +131,9 @@ package-maintainers:
     - pretty-simple
     - spago
     - termonad
+  domenkozar:
+    - cachix
+    - cachix-api
   expipiplus1:
     - VulkanMemoryAllocator
     - autoapply
@@ -313,6 +304,7 @@ package-maintainers:
     - large-hashable
     - haskell-ci
     - diagrams
+    - rel8
     # owothia
     - irc-client
     - chatter