Nixpkgs update, and crypton-connection upgrade

README.md

@@ -99,7 +99,7 @@ of `tutorial.sh`.
 ## Usage
 
 ```
-vaultenv 0.16.0 - run programs with secrets from HashiCorp Vault
+vaultenv 0.16.1 - run programs with secrets from HashiCorp Vault
 
 Usage: vaultenv [--version] [--host HOST] [--port PORT] [--addr ADDR]
                 [--token TOKEN | --github-token TOKEN | --kubernetes-role ROLE]

app/Main.hs

@@ -36,7 +36,7 @@ import qualified Control.Retry              as Retry
 import qualified Data.Aeson                 as Aeson
 import qualified Data.ByteString            as ByteString
 import qualified Data.ByteString.Char8      as SBS
-import qualified Data.ByteString.Lazy       as LBS hiding (unpack, putStrLn)
+import qualified Data.ByteString.Lazy       as LBS hiding (unpack)
 import qualified Data.ByteString.Lazy.Char8 as LBS
 import qualified Data.Foldable              as Foldable
 import qualified Data.HashMap.Strict        as HashMap

default.nix

@@ -1,4 +1,11 @@
-{ pkgs ? import ./nix/nixpkgs-pinned.nix {}
+{ pkgs ? import ./nix/nixpkgs-pinned.nix
+  # Allow vault to be used only as a part of this development shell.
+  # We are not allowing the use of vault as a part of our final package
+  # because vault-1.16.1 is lisenced under BSL-1.1
+  { config.allowUnfreePredicate = pkg:
+      (pkgs.lib.getName pkg) == "vault" &&
+      (pkgs.lib.getVersion pkg) == "1.16.1";
+  }
 }:
   with pkgs; buildEnv {
     name = "vaultenv-devenv";

nix/haskell-dependencies.nix

@@ -7,7 +7,7 @@ haskellPackages:
       async
       base
       bytestring
-      connection
+      crypton-connection
       containers
       directory
       dotenv

nix/nixpkgs-pinned.nix

@@ -9,9 +9,7 @@ let
 
   nixpkgs = import sources.nixpkgs {
     overlays = [(import ./overlay.nix)] ++ overlays;
-    config = {
-      imports = [ config ];
-    };
+    inherit config;
   };
 in
 nixpkgs

nix/sources.json

@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c5d810f4c74c824ae0fb788103003c6c9d366a08",
-        "sha256": "1lmizli5hbk7hlvss0ixx4zl5g4s77z493lr2xn37csph5xcl3rb",
+        "rev": "b0dab7cc34ef4d8a1b2de36178da801090bcb271",
+        "sha256": "0mgyyp7gdi891kz0jrkqchq0mnq65lf0y84wqm38faakpmj9y57m",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/c5d810f4c74c824ae0fb788103003c6c9d366a08.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/b0dab7cc34ef4d8a1b2de36178da801090bcb271.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "static-haskell-nix": {

package.yaml

@@ -1,7 +1,7 @@
 # Changed the name here because nixpkgs also includes a vaultenv and we haven't
 # figured out how to mask that when we build vaultenv with nix itself.
 name: vaultenv-real
-version: 0.16.0
+version: 0.16.1
 synopsis: Runs processes with secrets from HashiCorp Vault
 license: BSD3
 github: channable/vaultenv
@@ -11,7 +11,7 @@ dependencies:
   - base
   - async
   - bytestring
-  - connection
+  - crypton-connection
   - containers
   - dotenv
   - directory

test/default.nix

@@ -1,4 +1,11 @@
-{ pkgs ? import ../nix/nixpkgs-pinned.nix {}
+{ pkgs ? import ../nix/nixpkgs-pinned.nix
+  # Allow vault to be used only as a part of this testing environment shell.
+  # We are not allowing the use of vault as a part of our final package
+  # because vault-1.16.1 is lisenced under BSL-1.1
+  { config.allowUnfreePredicate = pkg:
+      (pkgs.lib.getName pkg) == "vault" &&
+      (pkgs.lib.getVersion pkg) == "1.16.1";
+  }
 }:
   with pkgs; buildEnv {
     name = "vaultenv-testenv";

vaultenv.nix

@@ -10,7 +10,7 @@ let
 in
 mkDerivation {
   pname = "vaultenv";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src =
     let