Merge #107: Cleanup Cabal files and dependencies; switch to Cabal 2.2

This commit is contained in:
Anton Latukha 2021-01-07 21:56:15 +02:00 committed by GitHub
commit 9e42e7eab6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 94 additions and 85 deletions

View File

@ -1,3 +1,4 @@
cabal-version: 2.2
name: hnix-store-core
version: 0.4.0.0
synopsis: Core effects for interacting with the Nix store.
@ -17,9 +18,15 @@ extra-source-files: ChangeLog.md
, README.md
, tests/samples/example0.drv
, tests/samples/example1.drv
cabal-version: >=1.10
Common commons
if impl(ghc >= 8.10)
ghc-options: -Wall -Wunused-packages
else
ghc-options: -Wall
library
import: commons
exposed-modules: System.Nix.Base32
, System.Nix.Build
, System.Nix.Derivation
@ -71,6 +78,7 @@ Flag bounded_memory
default: False
test-suite format-tests
import: commons
if flag(bounded_memory)
cpp-options: -DBOUNDED_MEMORY
ghc-options: -rtsopts -fprof-auto
@ -96,9 +104,7 @@ test-suite format-tests
, filepath
, directory
, filepath
, io-streams
, process
, process-extras
, tasty
, tasty-discover
, tasty-golden

View File

@ -1,3 +1,4 @@
cabal-version: 2.2
name: hnix-store-remote
version: 0.4.0.0
synopsis: Remote hnix store
@ -11,7 +12,12 @@ copyright: 2018 Richard Marko
category: Nix
build-type: Simple
extra-source-files: ChangeLog.md, README.md
cabal-version: >=1.10
Common commons
if impl(ghc >= 8.10)
ghc-options: -Wall -Wunused-packages
else
ghc-options: -Wall
flag io-testsuite
default:
@ -21,6 +27,7 @@ flag io-testsuite
binaries and Linux namespace support.
library
import: commons
exposed-modules: System.Nix.Store.Remote
, System.Nix.Store.Remote.Binary
, System.Nix.Store.Remote.Builders
@ -36,14 +43,11 @@ library
, binary
, bytestring
, containers
, filepath
, text
, unix
, network
, nix-derivation >= 1.1.1 && <2
, mtl
, unordered-containers
, filepath
, time
, hnix-store-core >= 0.4 && <0.5
, vector
@ -52,6 +56,8 @@ library
ghc-options: -Wall
test-suite hnix-store-remote-tests
import: commons
if !flag(io-testsuite)
buildable: False
@ -63,11 +69,9 @@ test-suite hnix-store-remote-tests
, Spec
, Util
hs-source-dirs: tests
build-depends:
attoparsec
build-depends: base
, hnix-store-core >= 0.3
, hnix-store-remote
, base
, base64-bytestring
, binary
, bytestring
@ -83,7 +87,6 @@ test-suite hnix-store-remote-tests
, tasty-hunit
, tasty-quickcheck
, linux-namespaces
, mtl
, nix-derivation
, temporary
, text