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/top-level/release-haskell.nix | |
| 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/top-level/release-haskell.nix')
| -rw-r--r-- | nixpkgs/pkgs/top-level/release-haskell.nix | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/nixpkgs/pkgs/top-level/release-haskell.nix b/nixpkgs/pkgs/top-level/release-haskell.nix index 6113dcdb121d..1c5615d5dbb1 100644 --- a/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/nixpkgs/pkgs/top-level/release-haskell.nix @@ -69,6 +69,7 @@ let ghc927 ghc928 ghc945 + ghc946 ghc962 ]; @@ -480,20 +481,11 @@ let # package sets (like Cabal, jailbreak-cabal) are # working as expected. cabal-install = released; - Cabal_3_6_3_0 = released; - Cabal_3_8_1_0 = released; - Cabal-syntax_3_8_1_0 = released; Cabal_3_10_1_0 = released; Cabal-syntax_3_10_1_0 = released; - cabal2nix = lib.subtractLists [ - compilerNames.ghc962 - ] released; - cabal2nix-unstable = lib.subtractLists [ - compilerNames.ghc962 - ] released; - funcmp = lib.subtractLists [ - compilerNames.ghc962 - ] released; + cabal2nix = released; + cabal2nix-unstable = released; + funcmp = released; haskell-language-server = lib.subtractLists [ # Support ceased as of 1.9.0.0 compilerNames.ghc884 @@ -504,14 +496,13 @@ let hlint = lib.subtractLists [ compilerNames.ghc962 ] released; - hpack = lib.subtractLists [ - compilerNames.ghc962 - ] released; + hpack = released; hsdns = released; jailbreak-cabal = released; - language-nix = lib.subtractLists [ - compilerNames.ghc962 - ] released; + language-nix = released; + large-hashable = [ + compilerNames.ghc928 + ]; nix-paths = released; titlecase = released; ghc-api-compat = [ @@ -526,6 +517,14 @@ let ghc-lib = released; ghc-lib-parser = released; ghc-lib-parser-ex = released; + ghc-source-gen = [ + # Feel free to remove these as they break, + # ghc-source-gen currently doesn't support GHC 9.4 + compilerNames.ghc884 + compilerNames.ghc8107 + compilerNames.ghc902 + compilerNames.ghc928 + ]; ghc-tags = [ compilerNames.ghc8107 compilerNames.ghc902 @@ -535,7 +534,11 @@ let compilerNames.ghc927 compilerNames.ghc928 compilerNames.ghc945 + compilerNames.ghc946 + compilerNames.ghc962 ]; + hashable = released; + primitive = released; weeder = [ compilerNames.ghc8107 compilerNames.ghc902 @@ -545,6 +548,8 @@ let compilerNames.ghc927 compilerNames.ghc928 compilerNames.ghc945 + compilerNames.ghc946 + compilerNames.ghc962 ]; }) { |