deleting more core-specific logic

holochain · Jun 16, 2019 · 8529efc · 8529efc
1 parent c2e5445
commit 8529efc
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 118 deletions.
diff --git a/cli/build.nix b/cli/build.nix
@@ -1,11 +1,9 @@
 let
-  dist = import ./src/dist.nix;
   install = import ./src/install.nix;
   test = import ./src/test.nix;
   uninstall = import ./src/uninstall.nix;
 in
 [
-  dist
   install
   test
   uninstall

diff --git a/cli/src/dist.nix b/cli/src/dist.nix
diff --git a/conductor/node/build.nix b/conductor/node/build.nix
@@ -1,10 +1,8 @@
 let
-  dist = import ./src/dist.nix;
   install = import ./src/install.nix;
   test = import ./src/test.nix;
 in
 [
-  dist
   install
   test
 ]
diff --git a/conductor/node/src/dist.nix b/conductor/node/src/dist.nix
diff --git a/conductor/rust/build.nix b/conductor/rust/build.nix
@@ -1,10 +1,8 @@
 let
-  dist = import ./src/dist.nix;
   install = import ./src/install.nix;
   uninstall = import ./src/uninstall.nix;
 in
 [
-  dist
   install
   uninstall
 ]
diff --git a/conductor/rust/src/dist.nix b/conductor/rust/src/dist.nix
diff --git a/default.nix b/default.nix
@@ -1,3 +1,6 @@
+let
+ pkgs = import ./nixpkgs/nixpkgs.nix;
+in
 {
  buildInputs =
  let
@@ -19,14 +22,14 @@
  ++ import ./cli/build.nix
  ++ import ./conductor/build.nix
  ++ import ./darwin/build.nix
- ++ import ./dist/build.nix
+ ++ pkgs.callPackage ./dist { }
  ++ import ./git/build.nix
  ++ import ./node/build.nix
  ++ import ./openssl/build.nix
  ++ import ./qt/build.nix
  ++ import ./rust/build.nix;
 
- pkgs = import ./nixpkgs/nixpkgs.nix;
+ pkgs = pkgs;
  darwin = import ./darwin/config.nix;
  openssl = import ./openssl/config.nix;
  rust = import ./rust/config.nix;

diff --git a/dist/build.nix b/dist/build.nix
diff --git a/dist/default.nix b/dist/default.nix
@@ -0,0 +1,16 @@
+{ pkgs }:
+let
+ config = import ./config.nix;
+ audit = pkgs.callPackage ./src/audit.nix { config = config; };
+ dist = import ./src/dist.nix;
+ flush = import ./src/flush.nix;
+in
+[
+  pkgs.nix-prefetch-scripts
+
+  audit
+  dist
+  flush
+]
+++ import ./cli/build.nix
+++ import ./conductor/build.nix
diff --git a/dist/rust/lib.nix b/dist/rust/lib.nix
diff --git a/dist/src/audit.nix b/dist/src/audit.nix
@@ -1,9 +1,8 @@
+{ pkgs, config }:
 let
-  pkgs = import ../../nixpkgs/nixpkgs.nix;
   rust = import ../../rust/config.nix;
 
   dist = import ../config.nix;
-  release = import ../../release/config.nix;
 
   cli = import ../cli/config.nix;
   conductor = import ../conductor/config.nix;
@@ -18,7 +17,7 @@ let
   echo "All the important dist vars:"
   echo
 
-  echo "Release version is ${release.core.version.current}"
+  echo "Release version is ${config.version}"
   echo "Binary version is ${dist.version}"
 
   echo