Skip to content

Commit 03c573e

Browse files
committed
Bump cabal upper bound
1 parent b092a70 commit 03c573e

File tree

7 files changed

+56
-188
lines changed

7 files changed

+56
-188
lines changed

default.nix

Lines changed: 0 additions & 10 deletions
This file was deleted.

flake.nix

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
# This is a template created by `hix init`
3+
inputs.haskellNix.url = "github:input-output-hk/haskell.nix";
4+
inputs.nixpkgs.follows = "haskellNix/nixpkgs-unstable";
5+
inputs.flake-utils.url = "github:numtide/flake-utils";
6+
outputs = { self, nixpkgs, flake-utils, haskellNix }:
7+
let
8+
supportedSystems = [
9+
"x86_64-linux"
10+
"x86_64-darwin"
11+
"aarch64-linux"
12+
"aarch64-darwin"
13+
];
14+
in
15+
flake-utils.lib.eachSystem supportedSystems (system:
16+
let
17+
overlays = [ haskellNix.overlay
18+
(final: prev: {
19+
hixProject =
20+
final.haskell-nix.hix.project {
21+
src = ./.;
22+
evalSystem = "x86_64-darwin";
23+
};
24+
})
25+
(import ./nix/overlays/gtk-debug.nix)
26+
(final: prev: {
27+
webkitgtk = prev.webkitgtk.overrideAttrs (attrs: rec {
28+
version = "2.32.4";
29+
src = final.fetchurl {
30+
url = "https://webkitgtk.org/releases/${attrs.pname}-${version}.tar.xz";
31+
sha256 = "1zfkfyhm4i7901pp32wcwcfxax69qgq5k44x0glwaywdg4zjvkh0";
32+
};
33+
});
34+
})
35+
];
36+
pkgs = import nixpkgs { inherit system overlays; inherit (haskellNix) config; };
37+
flake = pkgs.hixProject.flake {};
38+
in flake // {
39+
legacyPackages = pkgs;
40+
});
41+
42+
# --- Flake Local Nix Configuration ----------------------------
43+
nixConfig = {
44+
# This sets the flake to use the IOG nix cache.
45+
# Nix should ask for permission before using it,
46+
# but remove it here if you do not want it to.
47+
extra-substituters = ["https://cache.iog.io"];
48+
extra-trusted-public-keys = ["hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="];
49+
allow-import-from-derivation = "true";
50+
};
51+
}

nix/hix.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{ compiler-nix-name = "ghc924";
2+
shell.tools.cabal = {};
3+
}

nix/sources.json

Lines changed: 0 additions & 38 deletions
This file was deleted.

nix/sources.nix

Lines changed: 0 additions & 134 deletions
This file was deleted.

shell.nix

Lines changed: 0 additions & 4 deletions
This file was deleted.

webkit2gtk3-javascriptcore.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: webkit2gtk3-javascriptcore
2-
Version: 0.14.4.3
2+
Version: 0.14.4.4
33
Synopsis: JavaScriptCore FFI from webkitgtk
44
Description: FFI for JavaScriptCore module from webkitgtk
55
License: BSD3
@@ -25,7 +25,7 @@ Source-Repository head
2525

2626
custom-setup
2727
setup-depends: base >= 4.6,
28-
Cabal >= 1.24 && < 3.3,
28+
Cabal >= 1.24 && < 3.9,
2929
gtk2hs-buildtools >= 0.13.5.4 && < 0.14
3030

3131
Library

0 commit comments

Comments
 (0)