Merge pull request #1 from holochain/2019-06-17-dist

2019 06 17 dist

app-spec-cluster/default.nix

@@ -0,0 +1,6 @@
+{ pkgs }:
+{
+ buildInputs = []
+ ++ (pkgs.callPackage ./test { }).buildInputs
+ ;
+}

app-spec-cluster/src/test.nix → app-spec-cluster/test/default.nix

@@ -1,6 +1,5 @@
+{ pkgs }:
 let
-  pkgs = import ../../nixpkgs/nixpkgs.nix;
-
   name = "hc-app-spec-cluster-test";
 
   script = pkgs.writeShellScriptBin name
@@ -12,4 +11,6 @@ let
    ( EMULATION_HOLOCHAIN_BIN_PATH=./.cargo/bin/holochain node ./app_spec/cluster_test/index.js 2)
   '';
 in
-script
+{
+ buildInputs = [ script ];
+}

app-spec/default.nix

@@ -0,0 +1,7 @@
+{ pkgs }:
+{
+ buildInputs = []
+ ++ (pkgs.callPackage ./test { }).buildInputs
+ ++ (pkgs.callPackage ./test_proc_macro { }).buildInputs
+ ;
+}

app-spec/src/test.nix → app-spec/test/default.nix

@@ -1,6 +1,5 @@
+{ pkgs }:
 let
-  pkgs = import ../../nixpkgs/nixpkgs.nix;
-
   name = "hc-app-spec-test";
 
   script = pkgs.writeShellScriptBin name ''
@@ -9,4 +8,6 @@ let
   (cd app_spec && ./build_and_test.sh);
   '';
 in
-script
+{
+ buildInputs = [ script ];
+}

app-spec/src/test_proc_macro.nix → app-spec/test_proc_macro/default.nix

@@ -1,6 +1,5 @@
+{ pkgs }:
 let
-  pkgs = import ../../nixpkgs/nixpkgs.nix;
-
   name = "hc-app-spec-test-proc";
 
   script = pkgs.writeShellScriptBin name
@@ -9,4 +8,6 @@ let
    ( cd app_spec_proc_macro && ./build_and_test.sh )
   '';
 in
-script
+{
+ buildInputs = [ script ];
+}

cli/default.nix

@@ -0,0 +1,8 @@
+{ pkgs }:
+{
+ buildInputs = []
+ ++ (pkgs.callPackage ./install { }).buildInputs
+ ++ (pkgs.callPackage ./test { }).buildInputs
+ ++ (pkgs.callPackage ./uninstall { }).buildInputs
+ ;
+}

cli/src/install.nix → cli/install/default.nix

@@ -1,11 +1,12 @@
+{ pkgs }:
 let
-  pkgs = import ../../nixpkgs/nixpkgs.nix;
-
   name = "hc-cli-install";
 
   script = pkgs.writeShellScriptBin name
   ''
   cargo build -p hc --release && cargo install -f --path cli
   '';
 in
-script
+{
+ buildInputs = [ script ];
+}

cli/src/test.nix → cli/test/default.nix

@@ -1,5 +1,5 @@
+{ pkgs }:
 let
-  pkgs = import ../../nixpkgs/nixpkgs.nix;
 
   name = "hc-cli-test";
 
@@ -8,4 +8,6 @@ let
   (cd cli && cargo test);
   '';
 in
-script
+{
+ buildInputs = [ script ];
+}

cli/src/uninstall.nix → cli/uninstall/default.nix

@@ -1,6 +1,5 @@
+{ pkgs }:
 let
-  pkgs = import ../../nixpkgs/nixpkgs.nix;
-
   name = "hc-cli-uninstall";
 
   script = pkgs.writeShellScriptBin name
@@ -9,4 +8,6 @@ let
    rm -f $CARGO_HOME/bin/hc
   '';
 in
-script
+{
+ buildInputs = [ script ];
+}

conductor/default.nix

@@ -0,0 +1,8 @@
+{ pkgs }:
+{
+ buildInputs = []
+ ++ (pkgs.callPackage ./node { }).buildInputs
+ ++ (pkgs.callPackage ./rust { }).buildInputs
+ ++ (pkgs.callPackage ./wasm { }).buildInputs
+ ;
+}

conductor/node/default.nix

@@ -0,0 +1,7 @@
+{ pkgs }:
+{
+ buildInputs = []
+ ++ (pkgs.callPackage ./install { }).buildInputs
+ ++ (pkgs.callPackage ./test { }).buildInputs
+ ;
+}

conductor/node/src/install.nix → conductor/node/install/default.nix

@@ -1,6 +1,5 @@
+{ pkgs }:
 let
-  pkgs = import ../../../nixpkgs/nixpkgs.nix;
-
   name = "hc-conductor-node-install";
 
   script = pkgs.writeShellScriptBin name
@@ -9,4 +8,6 @@ let
    ./scripts/build_nodejs_conductor.sh
   '';
 in
-script
+{
+ buildInputs = [ script ];
+}

conductor/node/src/test.nix → conductor/node/test/default.nix

@@ -1,11 +1,12 @@
+{ pkgs }:
 let
-  pkgs = import ../../../nixpkgs/nixpkgs.nix;
-
   name = "hc-conductor-node-test";
 
   script = pkgs.writeShellScriptBin name
   ''
   hc-conductor-node-install && ( cd nodejs_conductor && npm test );
   '';
 in
-script
+{
+ buildInputs = [ script ];
+}

conductor/rust/default.nix

@@ -0,0 +1,7 @@
+{ pkgs }:
+{
+ buildInputs = []
+ ++ (pkgs.callPackage ./install { }).buildInputs
+ ++ (pkgs.callPackage ./uninstall { }).buildInputs
+ ;
+}

conductor/rust/src/install.nix → conductor/rust/install/default.nix

@@ -1,11 +1,12 @@
+{ pkgs }:
 let
-  pkgs = import ../../../nixpkgs/nixpkgs.nix;
-
   name = "hc-conductor-rust-install";
 
   script = pkgs.writeShellScriptBin name
   ''
   cargo build -p holochain --release && cargo install -f --path conductor
   '';
 in
-script
+{
+ buildInputs = [ script ];
+}

conductor/rust/src/uninstall.nix → conductor/rust/uninstall/default.nix

@@ -1,6 +1,5 @@
+{ pkgs }:
 let
-  pkgs = import ../../../nixpkgs/nixpkgs.nix;
-
   name = "hc-conductor-rust-uninstall";
 
   script = pkgs.writeShellScriptBin name
@@ -9,4 +8,6 @@ let
    rm -f $CARGO_HOME/bin/holochain
   '';
 in
-script
+{
+ buildInputs = [ script ];
+}

conductor/wasm/src/compile.nix → conductor/wasm/compile/default.nix

@@ -1,6 +1,5 @@
+{ pkgs }:
 let
-  pkgs = import ../../../nixpkgs/nixpkgs.nix;
-
   name = "hc-conductor-wasm-compile";
 
   script = pkgs.writeShellScriptBin name
@@ -10,4 +9,6 @@ let
   wasm-bindgen target/wasm32-unknown-unknown/release/holochain_conductor_wasm.wasm --out-dir conductor_wasm/npm_package/gen --nodejs
   '';
 in
-script
+{
+ buildInputs = [ script ];
+}

conductor/wasm/default.nix

@@ -0,0 +1,9 @@
+{ pkgs }:
+{
+ buildInputs = []
+ ++ (pkgs.callPackage ./compile { }).buildInputs
+ ++ (pkgs.callPackage ./install { }).buildInputs
+ ++ (pkgs.callPackage ./test { }).buildInputs
+ ++ (pkgs.callPackage ./uninstall { }).buildInputs
+ ;
+}

conductor/wasm/src/install.nix → conductor/wasm/install/default.nix

@@ -1,6 +1,5 @@
+{ pkgs }:
 let
-  pkgs = import ../../../nixpkgs/nixpkgs.nix;
-
   name = "hc-conductor-wasm-install";
 
   version = "0.2.32";
@@ -15,18 +14,20 @@ let
 
   # drop the incorrect version of wasm-bindgen
   if installed && ! correct-version;
-   then 
+   then
         hc-conductor-wasm-uninstall;
   fi;
 
   # install the correct version of wasm-bindgen
   if ! installed;
-   then 
+   then
      cargo install wasm-bindgen-cli --version "${version}";
   fi;
 
   # report the installed version
   wasm-bindgen -V;
   '';
 in
-script
+{
+ buildInputs = [ script ];
+}

conductor/wasm/src/test.nix → conductor/wasm/test/default.nix

@@ -1,6 +1,5 @@
+{ pkgs }:
 let
-  pkgs = import ../../../nixpkgs/nixpkgs.nix;
-
   name = "hc-conductor-wasm-test";
 
   script = pkgs.writeShellScriptBin name
@@ -9,4 +8,6 @@ let
   ( cd ./conductor_wasm/npm_package && npm install && npm test );
   '';
 in
-script
+{
+ buildInputs = [ script ];
+}

conductor/wasm/src/uninstall.nix → conductor/wasm/uninstall/default.nix

@@ -1,11 +1,12 @@
+{ pkgs }:
 let
-  pkgs = import ../../../nixpkgs/nixpkgs.nix;
-
   name = "hc-conductor-wasm-uninstall";
 
   script = pkgs.writeShellScriptBin name
   ''
   cargo uninstall wasm-bindgen-cli
   '';
 in
-script
+{
+ buildInputs = [ script ];
+}

darwin/default.nix

@@ -0,0 +1,12 @@
+{ pkgs }:
+let
+ # https://stackoverflow.com/questions/51161225/how-can-i-make-macos-frameworks-available-to-clang-in-a-nix-environment
+ frameworks = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk.frameworks else {};
+ ld-flags = if pkgs.stdenv.isDarwin then "-F${frameworks.CoreFoundation}/Library/Frameworks -framework CoreFoundation " else "";
+in
+{
+ frameworks = frameworks;
+ ld-flags = ld-flags;
+ buildInputs = []
+ ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ frameworks.Security frameworks.CoreFoundation frameworks.CoreServices ];
+}