Browse Source

Update dependency versions for next release

tags/v0.3.0.2^0
Peter J. Jones 1 year ago
parent
commit
0797202884
Signed by: Peter Jones <pjones@devalot.com> GPG Key ID: 9DAFAA8D01941E49
5 changed files with 23 additions and 20 deletions
  1. 2
    2
      CHANGES.md
  2. 1
    1
      LICENSE
  3. 3
    3
      cassava-streams.cabal
  4. 16
    13
      default.nix
  5. 1
    1
      stack.yaml

+ 2
- 2
CHANGES.md View File

@@ -1,8 +1,8 @@
1 1
 # Change Log / Release Notes
2 2
 
3
-## 0.3.0.2 (Next Release)
3
+## 0.3.0.2 (March 20, 2018)
4 4
 
5
-  * Updated to LTS Haskell 8.24
5
+  * Updated to LTS Haskell 11.1
6 6
 
7 7
   * Bumped dependencies
8 8
 

+ 1
- 1
LICENSE View File

@@ -1,4 +1,4 @@
1
-Copyright (c) 2014-2017 Peter Jones <pjones@devalot.com>
1
+Copyright (c) 2014-2018 Peter Jones <pjones@devalot.com>
2 2
 
3 3
 All rights reserved.
4 4
 

+ 3
- 3
cassava-streams.cabal View File

@@ -6,7 +6,7 @@ license:       BSD3
6 6
 license-file:  LICENSE
7 7
 author:        Peter Jones <pjones@devalot.com>
8 8
 maintainer:    Peter Jones <pjones@devalot.com>
9
-copyright:     Copyright (c) 2014-2017 Peter Jones
9
+copyright:     Copyright (c) 2014-2018 Peter Jones
10 10
 category:      Data, Text, CSV, IO-Streams
11 11
 build-type:    Simple
12 12
 cabal-version: >=1.18
@@ -62,7 +62,7 @@ library
62 62
   build-depends: base       >= 4.8   && < 5.0
63 63
                , bytestring >= 0.10  && < 0.11
64 64
                , cassava    >= 0.4   && < 0.6
65
-               , io-streams >= 1.1   && < 1.5
65
+               , io-streams >= 1.1   && < 1.6
66 66
                , vector     >= 0.10  && < 0.13
67 67
 
68 68
 --------------------------------------------------------------------------------
@@ -100,6 +100,6 @@ test-suite test
100 100
                , cassava
101 101
                , cassava-streams
102 102
                , io-streams
103
-               , tasty >= 0.8 && < 1.0
103
+               , tasty >= 0.8 && < 1.1
104 104
                , tasty-quickcheck >= 0.8 && < 1.0
105 105
                , vector

+ 16
- 13
default.nix View File

@@ -1,17 +1,20 @@
1
-# These arguments are so you can override settings from the command
2
-# line using the `nix-hs' tool.
3
-{ nixpkgs   ? import <nixpkgs> { }
4
-, compiler  ? "default"
5
-, profiling ? false
6
-}:
1
+{ pkgs ? (import <nixpkgs> {}).pkgs }:
7 2
 
8 3
 let
9
-  pkgs = nixpkgs;
10
-
11
-  buildInputs = with pkgs; [
12
-    # List extra dependencies here.
13
-  ];
4
+  # List any extra packages you want available while your package is
5
+  # building or while in a nix shell:
6
+  extraPackages = with pkgs; [ ];
14 7
 
8
+  # Helpful if you want to override any Haskell packages:
9
+  haskell = pkgs.haskellPackages;
15 10
 in
16
-  pkgs.nix-hs.interactive ./cassava-streams.nix
17
-    { inherit compiler profiling buildInputs; }
11
+
12
+# Load the local nix file and use the overrides from above:
13
+haskell.callPackage ./cassava-streams.nix {
14
+  mkDerivation = { buildTools ? []
15
+                 , ...
16
+                 }@args:
17
+    haskell.mkDerivation (args // {
18
+      buildTools = buildTools ++ extraPackages;
19
+    });
20
+}

+ 1
- 1
stack.yaml View File

@@ -1,4 +1,4 @@
1
-resolver: lts-8.24
1
+resolver: lts-11.1
2 2
 
3 3
 packages:
4 4
   - ./

Loading…
Cancel
Save