mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(third_party/overlays/dhall): move haskellPackages overlay

Browse source 
It was overriding the overrides in haskellPackages, which we didn’t
notice because there is no overrides in the hasell overlay atm.

I also removed the `with` blocks and inlined `overrides`.

Change-Id: Ide72109dbd2568b6cb2435b15024cf1523bec1fe
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6785
Autosubmit: Profpatsch <mail@profpatsch.de>
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
This commit is contained in:
Profpatsch 2022-09-25 15:34:23 +02:00 committed by clbot
parent e7d24fd2b8
commit d44203d046
2 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
third_party/overlays/dhall/default.nix vendored
View file

@ -3,15 +3,6 @@
self: super: self: super:
let let
dhall-source = subdir: pkg: super.haskell.lib.overrideSrc pkg {
src = "${super.fetchFromGitHub {
owner = "Profpatsch";
repo = "dhall-haskell";
# https://github.com/dhall-lang/dhall-haskell/pull/2426
rev = "82123817316192d39f9a3e68b8ce9c9cff0a48ed";
sha256 = "sha256-gbHoUKIdLPIttqeV471jsT8OJz6uiI6LpHOwtLbBGHY=";
}}/${subdir}";
};
# binary releases of dhall tools, since the build in nixpkgs is # binary releases of dhall tools, since the build in nixpkgs is
# broken most of the time. The binaries are also fully static # broken most of the time. The binaries are also fully static
@ -25,13 +16,8 @@ let
{ pkgs = self; }; { pkgs = self; };
in in
{ {
# TODO: this is to fix a bug in dhall-nix # ATTN: see the haskell overlay for some overrides we need.
haskellPackages = super.haskellPackages.override {
overrides = hsSelf: hsSuper: {
dhall = dhall-source "dhall" hsSuper.dhall;
dhall-nix = dhall-source "dhall-nix" hsSuper.dhall-nix;
};
};
# dhall = easy-dhall-nix.dhall-simple; # dhall = easy-dhall-nix.dhall-simple;
# dhall-nix = easy-dhall-nix.dhall-nix-simple; # dhall-nix = easy-dhall-nix.dhall-nix-simple;
dhall-bash = easy-dhall-nix.dhall-bash-simple; dhall-bash = easy-dhall-nix.dhall-bash-simple;

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

@ -7,25 +7,35 @@
self: super: # overlay parameters for the nixpkgs overlay self: super: # overlay parameters for the nixpkgs overlay
let let
overrides = hsSelf: hsSuper: with self.haskell.lib.compose; { dhall-source = subdir: pkg: super.haskell.lib.overrideSrc pkg {
# No overrides for the default package set necessary at the moment src = "${super.fetchFromGitHub {
owner = "Profpatsch";
repo = "dhall-haskell";
# https://github.com/dhall-lang/dhall-haskell/pull/2426
rev = "82123817316192d39f9a3e68b8ce9c9cff0a48ed";
sha256 = "sha256-gbHoUKIdLPIttqeV471jsT8OJz6uiI6LpHOwtLbBGHY=";
}}/${subdir}";
}; };
in in
{ {
haskellPackages = super.haskellPackages.override { haskellPackages = super.haskellPackages.override {
inherit overrides; overrides = hsSelf: hsSuper: {
# 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;
};
}; };
haskell = lib.recursiveUpdate super.haskell { haskell = lib.recursiveUpdate super.haskell {
packages.ghc8107 = super.haskell.packages.ghc8107.override { packages.ghc8107 = super.haskell.packages.ghc8107.override {
overrides = lib.composeExtensions overrides ( overrides = hsSelf: hsSuper: {
hsSelf: hsSuper: with self.haskell.lib.compose; {
# TODO(sterni): TODO(grfn): patch xanthous to work with random-fu 0.3.*, # 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. # 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 { }; random-fu = hsSelf.callPackage ./extra-pkgs/random-fu-0.2.nix { };
rvar = hsSelf.callPackage ./extra-pkgs/rvar-0.2.nix { }; rvar = hsSelf.callPackage ./extra-pkgs/rvar-0.2.nix { };
} };
);
}; };
}; };
} }