Merge remote-tracking branch 'origin/master' into add-to-store

Author: Ericson2314

default.nix

@@ -0,0 +1,14 @@
+{ pkgs ? import <nixpkgs> {} }: let
+  overlay = import ./overlay.nix;
+  overrideHaskellPackages = orig: {
+    buildHaskellPackages =
+      orig.buildHaskellPackages.override overrideHaskellPackages;
+    overrides = if orig ? overrides
+      then pkgs.lib.composeExtensions orig.overrides overlay
+      else overlay;
+  };
+in {
+  haskellPackages =
+    pkgs.haskellPackages.override overrideHaskellPackages;
+  inherit pkgs;
+}

hnix-store-core/hnix-store-core.cabal

@@ -27,7 +27,7 @@ library
                      , System.Nix.ReadonlyStore
                      , System.Nix.Store
                      , System.Nix.Util
-  build-depends:       base >=4.10 && <4.12
+  build-depends:       base >=4.10
                      , base16-bytestring
                      , bytestring
                      , binary

hnix-store-core/shell.nix

@@ -1 +1 @@
-(import ../release.nix).hnix-store-core.env
+(import ../shell.nix).hnix-store-core

hnix-store-remote/hnix-store-remote.cabal

@@ -20,7 +20,7 @@ library
                      , System.Nix.Store.Remote.Types
                      , System.Nix.Store.Remote.Util
 
-  build-depends:       base >=4.10 && <4.12
+  build-depends:       base >=4.10
                      , base64-bytestring
                      , bytestring
                      , binary

hnix-store-remote/shell.nix

@@ -1 +1 @@
-(import ../release.nix).hnix-store-remote.env
+(import ../shell.nix).hnix-store-remote

overlay.nix

@@ -0,0 +1,6 @@
+huper: helf: {
+  hnix-store-core =
+    helf.callCabal2nix "hnix-store-core" ./hnix-store-core {};
+  hnix-store-remote =
+    helf.callCabal2nix "hnix-store-remote" ./hnix-store-remote {};
+}

release.nix

@@ -0,0 +1,19 @@
+let
+  packages = [ "hnix-store-core" "hnix-store-remote" ];
+  inherit (import ./. {}) pkgs haskellPackages;
+  hslib = pkgs.haskell.lib;
+  extract-external-inputs = p:
+    builtins.filter (dep: !(builtins.elem dep packages))
+      (map (x: x.pname) (hslib.getHaskellBuildInputs haskellPackages.${p}));
+  external-inputs = map (x: haskellPackages.${x}) (builtins.concatLists
+    (map extract-external-inputs packages));
+  package-envs = builtins.listToAttrs (map (p: {
+    name = p;
+    value = haskellPackages.${p}.env;
+  }) packages);
+in (haskellPackages.mkDerivation {
+  pname = "hnix-store-core";
+  version = "0.0.0.0";
+  libraryHaskellDepends = external-inputs;
+  license = pkgs.stdenv.lib.licenses.asl20;
+}).env // package-envs