haskellPackages.futhark: 0.21.12 -> 0.21.13

By upgrading we make it match the futhark-manifest version we ship at
the moment, fixing the build. Most of the code, except the lsp 1.5.0.0
override can be removed on the next hackage bump.
This commit is contained in:
sternenseemann 2022-07-07 11:25:39 +02:00
parent 2be2a78f42
commit 0a0baa8935
3 changed files with 20 additions and 3 deletions

View file

@ -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.

View file

@ -1604,7 +1604,6 @@ broken-packages:
- fused-effects-resumable
- fused-effects-squeal
- fusion
- futhark
- futhask
- futun
- future

View file

@ -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