diff options
author | sterni <sternenseemann@systemli.org> | 2021-03-19T00·46+0100 |
---|---|---|
committer | sterni <sternenseemann@systemli.org> | 2021-03-19T16·49+0000 |
commit | 531fc2b80bd4ca5aac8abe371255bcd40395e766 (patch) | |
tree | 82b853410d02feae5c0b9291d1a26cfc1a47a570 /third_party/nixpkgs-exposed/haskell_overlay/default.nix | |
parent | 90fdd7f23d6cc0d1374332d49218aef9a0d6a52f (diff) |
chore(3p/haskell_overlay): remove obsolete overrides r/2285
I actually wanted to check up on regex-tdfa-text in owothia, but realized it was actually in a dependency. When porting the patch for chatter to nixpkgs, I wondered if we could get rid of other overrides or if we need to fix anything else in upstream. * aeson, attoparsec, cassava, psqueues, hedgehog: jailbreaks are no longer necessary * fgl, fgl-arbitrary: upstream has the versions pinned by now * hgeometry, hgeometry-combinatoral: upstream has moved past the pinned versions, but we don't need to keep them downgraded as xanthous's build is not broken by them. * random-source: the upstream compiler shouldn't crash anymore, additionally upstream has the version pinned here currently * semialign: upstream also has 1.1.0.1 by now * splitmix: splitmix has been fixed upstream and haskellPackages has moved past 0.1 * hspec-core: test suite passes or upstream has disabled it as well * QuickCheck: upstream advanced to the same version * vinyl: upstream moved past the pinned version, causes no build failures * comonad-extras: has been fixed upstream Change-Id: I34eff81ceaac005f2ad90dd9c1d3e623b8da91c0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2606 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'third_party/nixpkgs-exposed/haskell_overlay/default.nix')
-rw-r--r-- | third_party/nixpkgs-exposed/haskell_overlay/default.nix | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/third_party/nixpkgs-exposed/haskell_overlay/default.nix b/third_party/nixpkgs-exposed/haskell_overlay/default.nix index 9598b9674035..af6bbd475672 100644 --- a/third_party/nixpkgs-exposed/haskell_overlay/default.nix +++ b/third_party/nixpkgs-exposed/haskell_overlay/default.nix @@ -1,49 +1,10 @@ { pkgs }: self: super: with pkgs.haskell.lib; rec { - aeson = doJailbreak super.aeson; - - attoparsec = doJailbreak super.attoparsec; - - cassava = doJailbreak super.cassava; - - fgl = overrideSrc (doJailbreak super.fgl) rec { - src = pkgs.fetchzip { - url = "mirror://hackage/fgl-${version}/fgl-${version}.tar.gz"; - sha256 = "0spyd56b2rmwp8n6h167rfjwy8lpcvar1p2rqhw9q580h2l9v61l"; - }; - version = "5.7.0.3"; - }; - - fgl-arbitrary = overrideSrc super.fgl-arbitrary rec { - src = pkgs.fetchzip { - url = "mirror://hackage/fgl-arbitrary-${version}/fgl-arbitrary-${version}.tar.gz"; - sha256 = "0bacdv51am13x5k64xvmxcs5gkdkh0gpmnh05wgd2vqg1n8r7fwb"; - }; - version = "0.2.0.6"; - }; - generic-arbitrary = appendPatch super.generic-arbitrary [ ./patches/generic-arbitrary-export-garbitrary.patch ]; - hgeometry = - appendPatch - (self.callHackageDirect { - pkg = "hgeometry"; - ver = "0.9.0.0"; - sha256 = "02hyvbqm57lr47w90vdgl71cfbd6lvwpqdid9fcnmxkdjbq4kv6b"; - } {}) [ ./patches/hgeometry-fix-haddock.patch ]; - - hgeometry-combinatorial = - self.callHackageDirect { - pkg = "hgeometry-combinatorial"; - ver = "0.9.0.0"; - sha256 = "12k41wd9fd1y3jd5djwcpwg2s1cva87wh14i0m1yn49zax9wl740"; - } {}; - - psqueues = doJailbreak super.psqueues; - random = dontCheck (self.callHackageDirect { pkg = "random"; ver = "1.2.0"; @@ -53,52 +14,5 @@ self: super: with pkgs.haskell.lib; rec { # random <1.2 test-framework = doJailbreak super.test-framework; hashable = doJailbreak super.hashable; - - random-source = overrideSrc super.random-source rec { - src = pkgs.fetchzip { - url = "mirror://hackage/random-source-${version}/random-source-${version}.tar.gz"; - sha256 = "0yx0i4fv1xg535zd2isczfngsq5740wzl6w44168lxdmpw9fmsyz"; - }; - # downgraded as the latest version was causing a ghc crash: - # https://gitlab.haskell.org/ghc/ghc/-/issues/18537 - version = "0.3.0.8"; - }; - - semialign = self.callHackageDirect { - pkg = "semialign"; - ver = "1.1.0.1"; - sha256 = "1xs5dvz87gx6xnannw6bc70nzr8ffhk0j6n7n0p5dqair9sz77x4"; - } {}; - - splitmix = dontCheck (self.callHackageDirect { - pkg = "splitmix"; - ver = "0.1"; - sha256 = "1k7l07h2w4fhjdqiqvw48if0irx0ngv6niach265j7lbfxsm8qql"; - } {}); - - hedgehog = doJailbreak super.hedgehog; - - hspec-core = dontCheck super.hspec-core; - - QuickCheck = overrideSrc super.QuickCheck rec { - src = pkgs.fetchzip { - url = "mirror://hackage/QuickCheck-${version}/QuickCheck-${version}.tar.gz"; - sha256 = "0x9pnr9m81jlywj38w3530zw1g0xmfszmj9303m2fp58zpad96h0"; - }; - version = "2.14.1"; - }; - test-framework-quickcheck2 = doJailbreak super.test-framework-quickcheck2; - - vinyl = overrideSrc (markUnbroken super.vinyl) - rec { - src = pkgs.fetchzip { - url = "mirror://hackage/vinyl-${version}/vinyl-${version}.tar.gz"; - sha256 = "190ffrmm76fh8fi9afkcda2vldf89y7dxj10434h28mbpq55kgsx"; - }; - version = "0.12.0"; - }; - - comonad-extras = appendPatch (markUnbroken super.comonad-extras) - [ ./patches/update-comonad-extras.patch ]; } |