diff options
Diffstat (limited to 'third_party/overlays')
-rw-r--r-- | third_party/overlays/haskell/default.nix | 14 | ||||
-rw-r--r-- | third_party/overlays/tvl.nix | 13 |
2 files changed, 19 insertions, 8 deletions
diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix index b745c063ab30..9841631e73d4 100644 --- a/third_party/overlays/haskell/default.nix +++ b/third_party/overlays/haskell/default.nix @@ -26,6 +26,20 @@ 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; diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 976efe838979..4cfdd846a6a0 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -39,22 +39,19 @@ depot.nix.readTree.drvTargets { nix = self.nix_2_3; nix_latest = super.nix; - # nixos-option now unfortunately depends on (at the time of writing) Nix 2.15 - # instead of Nix 2.3 as before. The intention seems to be to keep it in sync - # with the latest Nix and it uses unstable interfaces of Nix (the libraries). - # TODO(sterni): can we link it statically and avoid a second Nix store path? + # nixos-option only builds against Nix 2.15 nixos-option = super.nixos-option.override { - nix = self.nix_latest; + nix = self.nixVersions.nix_2_15; }; # Too match telega in emacs-overlay or wherever tdlib = super.tdlib.overrideAttrs (_: { - version = "1.8.15"; + version = "1.8.16"; src = self.fetchFromGitHub { owner = "tdlib"; repo = "td"; - rev = "64264b0f775a027fa9e0bf72051a8b2a5a2df071"; - sha256 = "1qs8pizap7glm98kjjliph1s7dn4fffwvs5ml8nv9d55dispjc4f"; + rev = "cde095db6c75827fe4bd237039574aad373ad96b"; + sha256 = "1zzacz2mhjmc36aqdc5v8a7zdi0mi7k8hnrnpj9gii061pm4vx4v"; }; }); |