colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell.packages.ghc98.ghc: 9.8.1 -> 9.8.2

Browse Source 
This fixes the mismatch between haskell.compiler.ghc98 and haskell.packages.ghc98
This commit is contained in:
sternenseemann 2024-02-26 20:18:28 +01:00
parent 2d02d0d463
commit 46cdbff42b
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/haskell-packages.nix
View File

@ -480,7 +480,7 @@ in {
ghc = bh.compiler.ghc982;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { };
};
ghc98 = packages.ghc981;
ghc98 = packages.ghc982;
ghcHEAD = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghcHEAD;
ghc = bh.compiler.ghcHEAD;

23
pkgs/top-level/release-haskell.nix
View File

@ -72,6 +72,7 @@ let
ghc963
ghc964
ghc981
ghc982
];
# packagePlatforms applied to `haskell.packages.*`
@ -449,8 +450,8 @@ let
;
};
haskell.packages.native-bignum.ghc981 = {
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc981)
haskell.packages.native-bignum.ghc982 = {
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc982)
hello
random
QuickCheck
@ -490,18 +491,23 @@ let
# working as expected.
cabal-install = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
Cabal_3_10_2_1 = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
Cabal-syntax_3_10_1_0 = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
cabal2nix = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
cabal2nix-unstable = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
funcmp = released;
haskell-language-server = lib.subtractLists [
@ -512,17 +518,21 @@ let
] released;
hoogle = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
hlint = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
hpack = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
hsdns = released;
jailbreak-cabal = released;
language-nix = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
large-hashable = [
compilerNames.ghc928
@ -530,6 +540,7 @@ let
nix-paths = released;
titlecase = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
ghc-api-compat = [
compilerNames.ghc8107
@ -540,12 +551,15 @@ let
];
ghc-lib = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
ghc-lib-parser = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
ghc-lib-parser-ex = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
ghc-source-gen = [
# Feel free to remove these as they break,
@ -556,13 +570,16 @@ let
];
ghc-tags = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
hashable = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
primitive = released;
weeder = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
] released;
})
{
@ -664,7 +681,7 @@ let
constituents = accumulateDerivations [
jobs.pkgsStatic.haskell.packages.native-bignum.ghc948 # non-hadrian
jobs.pkgsStatic.haskellPackages
jobs.pkgsStatic.haskell.packages.native-bignum.ghc981
jobs.pkgsStatic.haskell.packages.native-bignum.ghc982
];
};
}