From bda336b10b59456bc5c5557e7584489508db460e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 20 Feb 2018 18:55:00 +0100 Subject: [PATCH] Massage version bounds --- .gitignore | 4 ++++ cryptoids-class/package.yaml | 6 +++--- cryptoids-types/package.yaml | 8 ++++---- cryptoids/package.yaml | 20 ++++++++++---------- filepath-crypto/package.yaml | 22 +++++++++++----------- stack.nix | 7 ++----- stack.yaml | 5 ++--- uuid-crypto/package.yaml | 16 ++++++++-------- 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index a94e1e9..9f367a2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,11 +2,15 @@ **/result* **/.stack-work **/dist +**/.cabal-sandbox +**/cabal.sandbox.config cryptoids/cryptoids.cabal cryptoids/cryptoids.nix cryptoids-types/cryptoids-types.cabal cryptoids-types/cryptoids-types.nix +cryptoids-class/cryptoids-class.cabal +cryptoids-class/cryptoids-class.nix filepath-crypto/filepath-crypto.cabal filepath-crypto/filepath-crypto.nix uuid-crypto/uuid-crypto.cabal diff --git a/cryptoids-class/package.yaml b/cryptoids-class/package.yaml index 64d88f4..8370e21 100644 --- a/cryptoids-class/package.yaml +++ b/cryptoids-class/package.yaml @@ -24,9 +24,9 @@ ghc-options: - -fno-warn-name-shadowing dependencies: - - base - - cryptoids-types - - exceptions + - base >=4.9 && <5 + - cryptoids-types >=0.0.0 && <0.1 + - exceptions >=0.8.3 && <0.9 library: source-dirs: src diff --git a/cryptoids-types/package.yaml b/cryptoids-types/package.yaml index c182f44..df78e3d 100644 --- a/cryptoids-types/package.yaml +++ b/cryptoids-types/package.yaml @@ -22,10 +22,10 @@ ghc-options: - -fno-warn-name-shadowing dependencies: - - base - - binary - - path-pieces - - http-api-data + - base >=4.9 && <5 + - binary >=0.8.3 && <0.9 + - path-pieces >=0.2.1 && <0.3 + - http-api-data >=0.3.7 && <0.4 library: source-dirs: src diff --git a/cryptoids/package.yaml b/cryptoids/package.yaml index 66f3311..9c9a532 100644 --- a/cryptoids/package.yaml +++ b/cryptoids/package.yaml @@ -24,16 +24,16 @@ ghc-options: - -Wall - -fno-warn-name-shadowing dependencies: - - base - - cryptoids-types - - cryptoids-class - - cryptonite - - bytestring - - binary - - memory - - exceptions - - filepath - - directory + - base >=4.9 && <5 + - cryptoids-types >=0.0 && <0.1 + - cryptoids-class >=0.0 && <0.1 + - cryptonite >=0.23 && <0.25 + - bytestring >=0.10.8 && <0.11 + - binary >=0.8.3 && <0.9 + - memory >=0.14.6 && <0.15 + - exceptions >=0.8.3 && <0.9 + - filepath >=1.4.1 && <1.5 + - directory >=1.3.0 && <1.4 library: source-dirs: src diff --git a/filepath-crypto/package.yaml b/filepath-crypto/package.yaml index 65a8973..31115b3 100644 --- a/filepath-crypto/package.yaml +++ b/filepath-crypto/package.yaml @@ -29,17 +29,17 @@ ghc-options: - -Wall - -fno-warn-name-shadowing dependencies: - - base - - cryptoids-types - - cryptoids-class - - cryptoids - - filepath - - sandi - - case-insensitive - - binary - - bytestring - - exceptions - - template-haskell + - base >=4.9 && <5 + - cryptoids-types >=0.0.0 && <0.1 + - cryptoids-class >=0.0.0 && <0.1 + - cryptoids >=0.5 && <0.6 + - filepath >=1.4.1 && <1.5 + - sandi >=0.4.0 && <0.5 + - case-insensitive >=1.2.0 && <1.3 + - binary >=0.8.3 && <0.9 + - bytestring >=0.10.8 && <0.11 + - exceptions >=0.8.3 && <0.9 + - template-haskell >=2.11.1 && <2.13 library: source-dirs: src diff --git a/stack.nix b/stack.nix index 5f26b5e..3e34758 100644 --- a/stack.nix +++ b/stack.nix @@ -4,10 +4,7 @@ let inherit (nixpkgs) haskell pkgs; in haskell.lib.buildStackProject { inherit ghc; - name = ''stackenv-uuid-crypto''; + name = ''stackenv-cryptoids''; buildInputs = with pkgs; - [ postgresql zlib.dev ncurses.dev - haskellPackages.yesod-bin haskellPackages.happy - haskellPackages.alex - ]; + []; } diff --git a/stack.yaml b/stack.yaml index 3101970..49f897a 100644 --- a/stack.yaml +++ b/stack.yaml @@ -15,7 +15,7 @@ # resolver: # name: custom-snapshot # location: "./custom-snapshot.yaml" -resolver: lts-10.3 +resolver: lts-10.5 # User packages to be built. # Various formats can be used as shown in the example below. @@ -43,8 +43,7 @@ packages: - filepath-crypto # Dependency packages to be pulled from upstream that are not in the resolver # (e.g., acme-missiles-0.3) -extra-deps: - - regex-compat-0.93.1 +extra-deps: [] # Override default flag values for local packages and extra-deps flags: {} diff --git a/uuid-crypto/package.yaml b/uuid-crypto/package.yaml index 644f271..e8ed57c 100644 --- a/uuid-crypto/package.yaml +++ b/uuid-crypto/package.yaml @@ -29,14 +29,14 @@ ghc-options: - -Wall - -fno-warn-name-shadowing dependencies: - - base - - cryptoids-types - - cryptoids-class - - cryptoids - - uuid - - binary - - bytestring - - exceptions + - base >=4.9 && <5 + - cryptoids-types >=0.0.0 && <0.1 + - cryptoids-class >=0.0.0 && <0.1 + - cryptoids >=0.5 && <0.6 + - uuid >=1.3.13 && <1.4 + - bytestring >=0.10.8 && <0.11 + - binary >=0.8.3 && <0.9 + - exceptions >=0.8.3 && <0.9 library: source-dirs: src