Skip to content

Commit

Permalink
Declare tasty-discover a testing build tool (#130)
Browse files Browse the repository at this point in the history
This properly fixes the use of the tasty-discover,
the report & info were sent upstream to fix it in docs:
haskell-works/tasty-discover#4.
Closes: #129
  • Loading branch information
Anton-Latukha committed Jan 19, 2021
1 parent 3242f24 commit 5d03ffc
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Cabal-Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
run: cabal v2-update

- name: "Install additional system packages"
run: sudo apt install libsodium-dev && cabal v2-install tasty-discover
run: sudo apt install libsodium-dev

# Still required for Remote
- name: "Install Nix"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/On-Release-Cabal-Linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: cabal v2-update

- name: "Install additional system packages"
run: sudo apt install libsodium-dev && cabal v2-install tasty-discover
run: sudo apt install libsodium-dev

# Still required for Remote
- name: "Install Nix"
Expand Down
2 changes: 2 additions & 0 deletions hnix-store-core/hnix-store-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ test-suite format-tests
StorePath
hs-source-dirs:
tests
build-tool-depends:
tasty-discover:tasty-discover
build-depends:
hnix-store-core
, attoparsec
Expand Down
2 changes: 2 additions & 0 deletions hnix-store-remote/hnix-store-remote.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ test-suite hnix-store-remote-tests
, Spec
, Util
hs-source-dirs: tests
build-tool-depends:
tasty-discover:tasty-discover
build-depends: base
, hnix-store-core >= 0.3
, hnix-store-remote
Expand Down
8 changes: 1 addition & 7 deletions overlay.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
pkgs: hlib: helf: huper: {
hnix-store-core =
( helf.callCabal2nix "hnix-store-core" ./hnix-store-core {}
).overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [
pkgs.haskellPackages.tasty-discover
];
});
helf.callCabal2nix "hnix-store-core" ./hnix-store-core {};
hnix-store-remote =
( helf.callCabal2nixWithOptions "hnix-store-remote" ./hnix-store-remote "-fio-testsuite" {}
).overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [
pkgs.nix
pkgs.haskellPackages.tasty-discover
];
});
}

0 comments on commit 5d03ffc

Please sign in to comment.