maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/sources): Bump channels & overlays

Browse source 
* //nix/buildLisp: ccl dumped images have fixed themselves… again

* //3p/git: rebase patch on 2.36.0

* //3p/overlays/haskell: remove upstreamed workarounds

* Disable everything depending on cgit temporarily, since it doesn't
  compile with git 2.36 yet.

Change-Id: I9dc11c0846641341adbdcc7162cbf149a15fe0cb
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5519
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
sterni 2022-05-04 16:02:59 +02:00 • committed by clbot
parent e42fd0d611
commit 5fae8b0826
6 changed files with 37 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

11
third_party/overlays/haskell/default.nix vendored
View file

@ -9,14 +9,6 @@ self: super: # overlay parameters for the nixpkgs overlay
let
overrides = hsSelf: hsSuper: with self.haskell.lib.compose; {
# No overrides for the default package set necessary at the moment
# TODO(sterni): upstreamable?
generic-arbitrary = appendPatch
(self.fetchpatch {
name = "generic-arbitrary-no-negative-resize.patch";
url = "https://github.com/typeable/generic-arbitrary/commit/c13d119d8ad0d43860ecdb93b357b0239e366a6c.patch";
sha256 = "1jgbd2jn575icqw9nfdzh57nacm3pn8n53ka52129pnfjqfzyhsi";
})
hsSuper.generic-arbitrary;
};
in
{
@ -32,9 +24,6 @@ in
# so we can use GHC 9.0.2 and benefit from upstream binary cache.
random-fu = hsSelf.callPackage ./extra-pkgs/random-fu-0.2.nix { };
rvar = hsSelf.callPackage ./extra-pkgs/rvar-0.2.nix { };
# TODO(sterni): upstream this
universe-base = addBuildDepend hsSelf.OneTuple hsSuper.universe-base;
}
);
};