serokell/haskell-with-utf8
1
1
Fork 0
mirror of https://github.com/serokell/haskell-with-utf8.git synced 2024-08-16 10:10:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

deps: Allow GHC 9.0.1

Browse Source 
* Bump the uppser bound on `base` to allow GHC 9.
* Add GHC 9.0.1 to the set of flake checks.
This commit is contained in:
Kirill Elagin 2021-03-29 09:05:42 -04:00
parent addd9ce503
commit 4fe4fe599f
4 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flake.lock
View File

@ -23,17 +23,16 @@
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
}, },
"locked": { "locked": {
"lastModified": 1614746792, "lastModified": 1617010607,
"narHash": "sha256-KAxmQxYDRbB/pYW5vqvPSwZ3kft5UulZ5fY1nodP8FQ=", "narHash": "sha256-xaC+581n/gEI/NvtppOMWWD00I+O5ysVd17oEIHWo4w=",
"owner": "input-output-hk", "owner": "input-output-hk",
"repo": "haskell.nix", "repo": "haskell.nix",
"rev": "43cb0fc8957be7ab027f8bd5d48bc22479032c1f", "rev": "9ce7bf1e0276a9f71440ab6f74b044908647bcfc",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "input-output-hk", "owner": "input-output-hk",
"repo": "haskell.nix", "repo": "haskell.nix",
"rev": "43cb0fc8957be7ab027f8bd5d48bc22479032c1f",
"type": "github" "type": "github"
} }
}, },
@ -103,17 +102,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1615307759, "lastModified": 1616785305,
"narHash": "sha256-KpzbA2Uf7ZSuu+Q7fAA1DBiY319HrU1QbjzsmgL3I8w=", "narHash": "sha256-Zgs4UrUZ2J6MJLTwO8AHHt9bPDyTdJLYyzgfdABKtF4=",
"owner": "serokell", "owner": "serokell",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25cb6c920e31f80cc4c4559c840c5753d4a9012f", "rev": "8addc8b778fbd9df4464ef0e8ac07d29ce7fcfa6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "serokell", "owner": "serokell",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25cb6c920e31f80cc4c4559c840c5753d4a9012f",
"type": "github" "type": "github"
} }
}, },

12
flake.nix
View File

@ -7,8 +7,8 @@
inputs = { inputs = {
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
haskell-nix.url = "github:input-output-hk/haskell.nix/43cb0fc8957be7ab027f8bd5d48bc22479032c1f"; haskell-nix.url = "github:input-output-hk/haskell.nix";
nixpkgs.url = "github:serokell/nixpkgs/25cb6c920e31f80cc4c4559c840c5753d4a9012f"; nixpkgs.url = "github:serokell/nixpkgs";
}; };
outputs = { self, nixpkgs, flake-utils, haskell-nix }: outputs = { self, nixpkgs, flake-utils, haskell-nix }:
@ -29,13 +29,13 @@
checks = checks =
let let
mkGhcCheck = ghcName: { mkGhcCheck = ghcVersion: {
name = "test-${ghcName}"; name = "test-ghc${ghcVersion}";
value = check { ghc = pkgs.haskell-nix.compiler.${ghcName}; }; value = check { ghc = pkgs.haskell-nix.compiler."ghc${ghcVersion}"; };
}; };
in { in {
test = with-utf8.checks.with-utf8-test; test = with-utf8.checks.with-utf8-test;
} // lib.listToAttrs (map mkGhcCheck [ "ghc884" "ghc8104" ]); } // lib.listToAttrs (map mkGhcCheck [ "884" "8104" "901" ]);
apps.utf8-troubleshoot = { apps.utf8-troubleshoot = {
type = "app"; type = "app";

2
package.yaml
View File

@ -37,7 +37,7 @@ ghc-options:
- -Wredundant-constraints - -Wredundant-constraints
dependencies: dependencies:
- base >= 4.10 && < 4.15 - base >= 4.10 && < 4.16
- text >= 0.7 && < 1.3 - text >= 0.7 && < 1.3
library: library:

8
with-utf8.cabal
View File

@ -4,7 +4,7 @@ cabal-version: 1.18
-- --
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
-- --
-- hash: 82e6b04d01f14be8fc41ce3d7271039952fa94becdc1dd8d66d99b1fa434f675 -- hash: f91b72904bb053decd8bf11fafaaaa6c44c48fb8f1b4046243127067afc269d3
name: with-utf8 name: with-utf8
version: 1.0.2.2 version: 1.0.2.2
@ -50,7 +50,7 @@ library
lib lib
ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints
build-depends: build-depends:
base >=4.10 && <4.15 base >=4.10 && <4.16
, safe-exceptions >=0.1 && <0.2 , safe-exceptions >=0.1 && <0.2
, text >=0.7 && <1.3 , text >=0.7 && <1.3
default-language: Haskell2010 default-language: Haskell2010
@ -65,7 +65,7 @@ executable utf8-troubleshoot
c-sources: c-sources:
app/utf8-troubleshoot/cbits/locale.c app/utf8-troubleshoot/cbits/locale.c
build-depends: build-depends:
base >=4.10 && <4.15 base >=4.10 && <4.16
, directory >=1.2.5.0 && <1.4 , directory >=1.2.5.0 && <1.4
, filepath >=1.0 && <1.5 , filepath >=1.0 && <1.5
, process >=1.0.1.1 && <1.7 , process >=1.0.1.1 && <1.7
@ -91,7 +91,7 @@ test-suite with-utf8-test
tasty-discover:tasty-discover tasty-discover:tasty-discover
build-depends: build-depends:
HUnit HUnit
, base >=4.10 && <4.15 , base >=4.10 && <4.16
, deepseq , deepseq
, hedgehog , hedgehog
, safe-exceptions , safe-exceptions