b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskell.packages.ghc94: remove remaining manually chosen versions

Browse source 
* `ghc-lib*` is tracked by Stackage LTS 21 and has the matching versions
  for GHC 9.4.

* `primitive` is actually upgraded in LTS 21 which we should follow.

* `th-desugar` and `th-abstraction` are downgraded in LTS 21 which we
  should follow.

* `rope-utf16-splay` matches the manually chosen version.
This commit is contained in:
sternenseemann 2023-07-01 11:52:03 +02:00
parent dcf434af95
commit 64bee9771e
3 changed files with 0 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
View file

@ -80,9 +80,6 @@ in {
dec = doJailbreak super.dec;
ed25519 = doJailbreak super.ed25519;
ghc-byteorder = doJailbreak super.ghc-byteorder;
ghc-lib = doDistribute self.ghc-lib_9_4_5_20230430;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_5_20230430;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_4_0_0;
hackage-security = doJailbreak super.hackage-security;
hashable-time = doJailbreak super.hashable-time;
HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP);
@ -93,11 +90,9 @@ in {
parallel = doJailbreak super.parallel;
path = doJailbreak super.path;
polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse);
primitive = dontCheck (doJailbreak self.primitive_0_7_4_0);
regex-posix = doJailbreak super.regex-posix;
resolv = doJailbreak super.resolv;
singleton-bool = doJailbreak super.singleton-bool;
rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0;
shake-cabal = doDistribute self.shake-cabal_0_2_2_3;
libmpd = doJailbreak super.libmpd;
generics-sop = doJailbreak super.generics-sop;
@ -114,8 +109,6 @@ in {
syb = dontCheck super.syb;
splitmix = doJailbreak super.splitmix;
th-desugar = doDistribute self.th-desugar_1_15;
th-abstraction = doDistribute self.th-abstraction_0_5_0_0;
time-compat = doJailbreak super.time-compat;
tomland = doJailbreak super.tomland;
type-equality = doJailbreak super.type-equality;

1
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -138,7 +138,6 @@ extra-packages:
- ShellCheck == 0.8.0 # 2022-12-28: required by haskell-ci 0.14.3
- retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2
- ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.*
- primitive == 0.7.4.0 # 2023-03-04: primitive 0.8 is not compatible with too many packages on ghc 9.4 as of now
- fourmolu == 0.10.1.0 # 2023-04-18: for hls-fourmolu-plugin 1.1.1.0
package-maintainers:

27
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

@ -232785,33 +232785,6 @@ self: {
license = lib.licenses.mit;
}) {inherit (pkgs) primesieve;};
"primitive_0_7_4_0" = callPackage
({ mkDerivation, base, base-orphans, deepseq, ghc-prim, QuickCheck
, quickcheck-classes-base, tagged, tasty, tasty-bench
, tasty-quickcheck, template-haskell, transformers
, transformers-compat
}:
mkDerivation {
pname = "primitive";
version = "0.7.4.0";
sha256 = "1mddh42i6xg02z315c4lg3zsxlr3wziwnpzh2nhzdcifh716sbav";
revision = "1";
editedCabalFile = "0av20kv9ib795qr62yzby5l46vhkifzc6fdj8cppzsfwnfbyvw62";
libraryHaskellDepends = [
base deepseq template-haskell transformers
];
testHaskellDepends = [
base base-orphans ghc-prim QuickCheck quickcheck-classes-base
tagged tasty tasty-quickcheck transformers transformers-compat
];
benchmarkHaskellDepends = [
base deepseq tasty-bench transformers
];
description = "Primitive memory-related operations";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"primitive" = callPackage
({ mkDerivation, base, base-orphans, deepseq, ghc-prim, QuickCheck
, quickcheck-classes-base, tagged, tasty, tasty-bench