diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 67f713782423..40b7efc96bd0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2554,6 +2554,26 @@ self: super: { # has been resolved. lucid-htmx = doJailbreak super.lucid-htmx; + lsp_1_5_0_0 = doDistribute (super.lsp_1_5_0_0.override { + lsp-types = self.lsp-types_1_5_0_0; + }); + + # A delay between futhark package uploads caused us to end up with conflicting + # versions of futhark and futhark-manifest + futhark = assert super.futhark.version == "0.21.12"; overrideCabal (drv: { + editedCabalFile = null; + revision = null; + version = "0.21.13"; + sha256 = "0bzqlsaaqbbi47zvmvv7hd6hcz54hzw676rh9nxcjxgff3hzqb08"; + libraryHaskellDepends = drv.libraryHaskellDepends or [] ++ [ + self.fgl + self.fgl-visualize + self.co-log-core + ]; + }) (super.futhark.override { + lsp = self.lsp_1_5_0_0; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let # We need to build purescript with these dependencies and thus also its reverse # dependencies to avoid version mismatches in their dependency closure. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 506783ad32bb..67c5b5255fa8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1604,7 +1604,6 @@ broken-packages: - fused-effects-resumable - fused-effects-squeal - fusion - - futhark - futhask - futun - future diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 51fa6a6c283a..2e945a16b459 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -103540,9 +103540,7 @@ self: { ]; description = "An optimising compiler for a functional, array-oriented language"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; mainProgram = "futhark"; - broken = true; }) {}; "futhark-data" = callPackage