e628862e97
Main motivation for this is to get the openldap update that fixes 10 CVEs: CVE-2020-36221 to including CVE-2020-36230. See also this issue which lists them all: https://github.com/NixOS/nixpkgs/issues/113490 Someone should also redeploy whitby as soon as this lands in canon and all build failures have been fixed. Things done to resolve upstream breakages: * grpc no longer takes abseil-cpp as an input, it has also been removed in the override. * Upgrade glittershark's kernel to 5.11 since the linuxPackages_5_9 attribute has been removed by upstream and the patch used by them is available for 5.11 as well. * The fixed output hash for third_patry.apereo-cas changed for some reason. * Remove the pin of haskellPackages.vector from the haskell overlay. It broke as the most recent version of vector in nixos-unstable no longer depends on semigroups. This effectively updates vector from 0.12.1.2 to 0.12.2.0. * Align two comments in tvix/libstore/worker-protocol.hh because the updated clang-format now demands that. Change-Id: I2ecf10a98de935e9222acf1feaea447d4c11ed2d Reviewed-on: https://cl.tvl.fyi/c/depot/+/2538 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org>
104 lines
3.1 KiB
Nix
104 lines
3.1 KiB
Nix
{ 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";
|
|
sha256 = "06s3mmqbsfwv09j2s45qnd66nrxfp9280gnl9ng8yh128pfr7bjh";
|
|
} {});
|
|
|
|
# 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 ];
|
|
}
|