diff options
author | sterni <sternenseemann@systemli.org> | 2024-01-13T18·21+0100 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-01-19T21·47+0000 |
commit | 526295a71d205f68a3000884981b9312fc400469 (patch) | |
tree | 3e39deeb38651ff10659b2b7c319f3d141c9a54b /third_party/overlays/haskell/default.nix | |
parent | 9a09505b777cbfadff0a86f69d7a50b33ed1b835 (diff) |
chore(3p/sources): Bump channels & overlays r/7422
- 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.*: https://github.com/ryantm/agenix/commit/a23aa271bec82d3e962bafb994595c1c4a62b133#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>
Diffstat (limited to 'third_party/overlays/haskell/default.nix')
-rw-r--r-- | third_party/overlays/haskell/default.nix | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix index 614fc26d5606..5dbb8f45f838 100644 --- a/third_party/overlays/haskell/default.nix +++ b/third_party/overlays/haskell/default.nix @@ -8,20 +8,6 @@ self: super: # overlay parameters for the nixpkgs overlay let haskellLib = self.haskell.lib.compose; - dhall-source = subdir: pkg: - haskellLib.overrideSrc - { - src = "${super.fetchFromGitHub { - owner = "Profpatsch"; - repo = "dhall-haskell"; - # https://github.com/dhall-lang/dhall-haskell/pull/2426 - rev = "5e3a407d8ac826597d935d8398825a0ca73fc4e9"; - sha256 = "005plj6kgxlkm9npaq07kmsgmiqk50dpwb9li9w1ly4aj1zgfjnd"; - }}/${subdir}"; - } - (haskellLib.overrideCabal { patches = [ ]; } pkg); - - in { haskellPackages = super.haskellPackages.override { @@ -40,10 +26,6 @@ in haskellLib.doJailbreak ]; - # TODO: this is to fix a bug in dhall-nix - dhall = dhall-source "dhall" hsSuper.dhall; - dhall-nix = dhall-source "dhall-nix" hsSuper.dhall-nix; - 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 { }; |