526295a71d
- Adjust to ecl 23.9.9 release
- Regenerate go protos after protoc-gen-go update
- Drop dhall fork which hasn't kept up with 1.42.*
- Address new clippy warnings:
- Variant naming of Error::ValidationError
- Simplify .try_into().unwrap()
- Drop unnecessary identity function
- Test module must be last in file
- Drop unused `pub use`
- Update agenix to 0.15.0. Current master has a installCheckPhase that
doesn't work with C++ Nix 2.3.*:
a23aa271be (commitcomment-137185861)
Change-Id: Ic29eef20d6fd1362ce1031364a5ca6b4edf195bd
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10615
Reviewed-by: aspen <root@gws.fyi>
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
52 lines
1.9 KiB
Nix
52 lines
1.9 KiB
Nix
# Defines an overlay for overriding Haskell packages, for example to
|
|
# avoid breakage currently present in nixpkgs or to modify package
|
|
# versions.
|
|
|
|
{ lib, ... }:
|
|
|
|
self: super: # overlay parameters for the nixpkgs overlay
|
|
|
|
let
|
|
haskellLib = self.haskell.lib.compose;
|
|
in
|
|
{
|
|
haskellPackages = super.haskellPackages.override {
|
|
overrides = hsSelf: hsSuper: {
|
|
|
|
ihp-hsx = lib.pipe hsSuper.ihp-hsx [
|
|
(haskellLib.overrideSrc {
|
|
version = "1.1.0";
|
|
src = "${self.fetchFromGitHub {
|
|
owner = "digitallyinduced";
|
|
repo = "ihp";
|
|
rev = "b5d47963c998ccd779aa5c3d46484338fd621f0d";
|
|
sha256 = "sha256-M22W8VX4sRaeU2yVraR0S2t2VOwWGmoteD/M8TahdoE=";
|
|
}}/ihp-hsx";
|
|
})
|
|
haskellLib.doJailbreak
|
|
];
|
|
|
|
pa-prelude = hsSelf.callPackage ./extra-pkgs/pa-prelude.nix { };
|
|
pa-error-tree = hsSelf.callPackage ./extra-pkgs/pa-error-tree-0.1.0.0.nix { };
|
|
pa-field-parser = hsSelf.callPackage ./extra-pkgs/pa-field-parser.nix { };
|
|
pa-label = hsSelf.callPackage ./extra-pkgs/pa-label-0.1.0.1.nix { };
|
|
pa-pretty = hsSelf.callPackage ./extra-pkgs/pa-pretty-0.1.1.0.nix { };
|
|
pa-json = hsSelf.callPackage ./extra-pkgs/pa-json.nix { };
|
|
pa-run-command = hsSelf.callPackage ./extra-pkgs/pa-run-command-0.1.0.0.nix { };
|
|
};
|
|
};
|
|
|
|
haskell = lib.recursiveUpdate super.haskell {
|
|
packages.ghc8107 = super.haskell.packages.ghc8107.override {
|
|
overrides = hsSelf: hsSuper: {
|
|
# TODO(sterni): TODO(grfn): patch xanthous to work with random-fu 0.3.*,
|
|
# 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(grfn): port to brick 1.4 (EventM gains an additional type argument in 1.0)
|
|
brick = hsSelf.callPackage ./extra-pkgs/brick-0.73.nix { };
|
|
};
|
|
};
|
|
};
|
|
}
|