Obviate check-flake
(#61)
This commit is contained in:
parent
d66e98108d
commit
f6830f0d08
3 changed files with 5 additions and 19 deletions
6
.github/workflows/ci.yaml
vendored
6
.github/workflows/ci.yaml
vendored
|
@ -20,9 +20,13 @@ jobs:
|
||||||
nix develop -j 4 -c echo
|
nix develop -j 4 -c echo
|
||||||
- name: Flake checks
|
- name: Flake checks
|
||||||
run: |
|
run: |
|
||||||
|
# Because 'nix flake check' is not system-aware
|
||||||
|
# See https://srid.ca/haskell-template/checks
|
||||||
|
nix run nixpkgs#sd 'systems = nixpkgs.lib.systems.flakeExposed' 'systems = [ "x86_64-linux" ]' flake.nix
|
||||||
|
|
||||||
# Sandbox must be disabled due to HLS,
|
# Sandbox must be disabled due to HLS,
|
||||||
# https://github.com/haskell/haskell-language-server/issues/3128
|
# https://github.com/haskell/haskell-language-server/issues/3128
|
||||||
nix --option sandbox false build .#check --no-link -L
|
nix --option sandbox false flake check -L
|
||||||
# TODO: Remove after https://github.com/srid/haskell-flake/issues/19
|
# TODO: Remove after https://github.com/srid/haskell-flake/issues/19
|
||||||
- name: Hlint
|
- name: Hlint
|
||||||
run: |
|
run: |
|
||||||
|
|
16
flake.lock
generated
16
flake.lock
generated
|
@ -1,20 +1,5 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"check-flake": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1662502605,
|
|
||||||
"narHash": "sha256-jAT55UhabAxLAVGanxjnNdzH2/oX2ZjLsL4i2jPIP+g=",
|
|
||||||
"owner": "srid",
|
|
||||||
"repo": "check-flake",
|
|
||||||
"rev": "48a17393ed4fcd523399d6602c283775b5127295",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "srid",
|
|
||||||
"repo": "check-flake",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-parts": {
|
"flake-parts": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -68,7 +53,6 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"check-flake": "check-flake",
|
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"haskell-flake": "haskell-flake",
|
"haskell-flake": "haskell-flake",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
flake-parts.inputs.nixpkgs.follows = "nixpkgs";
|
flake-parts.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
haskell-flake.url = "github:srid/haskell-flake";
|
haskell-flake.url = "github:srid/haskell-flake";
|
||||||
treefmt-flake.url = "github:srid/treefmt-flake";
|
treefmt-flake.url = "github:srid/treefmt-flake";
|
||||||
check-flake.url = "github:srid/check-flake";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ self, nixpkgs, flake-parts, ... }:
|
outputs = inputs@{ self, nixpkgs, flake-parts, ... }:
|
||||||
|
@ -15,7 +14,6 @@
|
||||||
imports = [
|
imports = [
|
||||||
inputs.haskell-flake.flakeModule
|
inputs.haskell-flake.flakeModule
|
||||||
inputs.treefmt-flake.flakeModule
|
inputs.treefmt-flake.flakeModule
|
||||||
inputs.check-flake.flakeModule
|
|
||||||
];
|
];
|
||||||
perSystem = { self', config, pkgs, ... }: {
|
perSystem = { self', config, pkgs, ... }: {
|
||||||
haskellProjects.default = {
|
haskellProjects.default = {
|
||||||
|
|
Loading…
Reference in a new issue