110328232d
Included changes: * tvix/eval: enable some lang tests on nix_latest Nix 2.16 contains some breaking language changes which Tvix does not yet implement, but the existing tests for them are now passed by Nix 2.16 (but not yet by Tvix). * tvix/eval: disable a lang test on nix_latest In Nix 2.17, the identifier formatting test fails because some behaviour changed. We have not investigated further yet. * 3p/overlays: use version of ihp-hsx that works with GHC 9.4 Originally from the separate cl/9185. * top-level: introduce a mechanism to exclude build targets from CI in the top level. This fixes b/296. * users/grfn: disable builds of xanthous (and dependents) until the CLs fixing its build are submitted * 3p/overlays: build nixos-option against Nix 2.15, the only version with which it builds * 3p/overlays: bump tdlib to 1.8.16 Change-Id: Ia377f39dbdb08ac45ff830a615e64babc091e5ee Reviewed-on: https://cl.tvl.fyi/c/depot/+/9125 Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su>
70 lines
2.6 KiB
Nix
70 lines
2.6 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;
|
|
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 {
|
|
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
|
|
];
|
|
|
|
# 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-0.1.0.0.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-0.1.0.1.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-0.2.1.0.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 { };
|
|
};
|
|
};
|
|
};
|
|
}
|