From a520e1d1d69b5f81bb5a333136f4a702586084bf Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 25 Apr 2023 13:52:22 -0400
Subject: [PATCH] Narrow the workaround for broken language-ecmascript
---
flake.nix | 7 -------
nix/haskell-packages.nix | 4 ++++
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/flake.nix b/flake.nix
index e6e67b9..91b59ea 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,13 +21,6 @@
# Get a nixpkgs customized for this system and including our overlay.
pkgs = import nixpkgs {
inherit system;
- config = {
- # XXX haskellPackages.language-ecmascript is marked as broken. It
- # is a dependency of an executable of tahoe-great-black-swamp (which
- # we don't use, but gets dragged in because we depend on the
- # tahoe-great-black-swamp library).
- allowBroken = true;
- };
};
hslib = hs-flake-utils.lib {
inherit pkgs;
diff --git a/nix/haskell-packages.nix b/nix/haskell-packages.nix
index 91bdcbc..0411c50 100644
--- a/nix/haskell-packages.nix
+++ b/nix/haskell-packages.nix
@@ -1,4 +1,8 @@
{haskellLib}: hfinal: hprev: {
tahoe-chk = hfinal.callPackage ./tahoe-chk.nix {};
tahoe-great-black-swamp = hfinal.callPackage ./tahoe-great-black-swamp.nix {};
+
+ # A broken dependency of a tahoe-great-black-swamp executable that we don't
+ # use. Flip the broken bit so we can get a build.
+ language-ecmascript = haskellLib.unmarkBroken hprev.language-ecmascript;
}
--
GitLab