Use nix-tools to build cardano-sl

We now use the nix-tools generated pacakge set. For now the wallet-new unit test and cardano-chain test had to be disabled due to build failures.
input-output-hk · Dec 11, 2018 · 326719f · 326719f
1 parent b0603de
commit 326719f
Show file tree

Hide file tree

Showing 109 changed files with 9,481 additions and 13 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,7 @@
+# GitHub Linguist annotations.
+# Hide nix/.stack.nix/*.nix
+# That is stuff that is generated by nix-tools stack-to-nix
+
+nix/.stack.nix/*.nix linguist-generated=true
+.stack-to-nix.cache linguist-generated=true
+nix/.stack-pkgs.nix linguist-generated=true
diff --git a/.gitignore b/.gitignore
@@ -231,3 +231,11 @@ venv.bak/
 /faucet/default.nix
 /faucet/shell.nix
 /faucet/recaptcha-secret.txt
+
+# GitHub Linguist annotations.
+# Hide nix/.stack.nix/*.nix
+# That is stuff that is generated by nix-tools stack-to-nix
+
+nix/.stack.nix/*.nix linguist-generated=true
+.stack-to-nix.cache linguist-generated=true
+nix/.stack-pkgs.nix linguist-generated=true
diff --git a/.stack-to-nix.cache b/.stack-to-nix.cache
diff --git a/auxx/cardano-sl-auxx.cabal b/auxx/cardano-sl-auxx.cabal
@@ -193,7 +193,7 @@ test-suite cardano-auxx-test
                      , cardano-sl-crypto
                      , hspec
                      , universum >= 0.1.11
-
+  build-tool-depends: hspec-discover:hspec-discover
   hs-source-dirs:      test
   default-language:    Haskell2010
   ghc-options:         -threaded

diff --git a/binary/cardano-sl-binary.cabal b/binary/cardano-sl-binary.cabal
@@ -120,6 +120,7 @@ test-suite binary-test
                      , time-units
                      , universum >= 0.1.11
                      , unordered-containers
+  build-tool-depends: hspec-discover:hspec-discover
 
   hs-source-dirs:      test
   default-language:    Haskell2010

diff --git a/chain/cardano-sl-chain.cabal b/chain/cardano-sl-chain.cabal
@@ -310,6 +310,8 @@ test-suite chain-test
                      , universum
                      , unordered-containers
                      , vector
+  build-tool-depends: hspec-discover:hspec-discover
+
   default-language:    Haskell2010
   default-extensions:  NoImplicitPrelude
                        OverloadedStrings

diff --git a/client/cardano-sl-client.cabal b/client/cardano-sl-client.cabal
@@ -111,6 +111,7 @@ test-suite cardano-client-test
                      , QuickCheck
                      , universum >= 0.1.11
                      , unordered-containers
+  build-tool-depends: hspec-discover:hspec-discover
 
   hs-source-dirs:      test
   default-language:    Haskell2010

diff --git a/core/cardano-sl-core.cabal b/core/cardano-sl-core.cabal
@@ -250,6 +250,7 @@ test-suite core-test
                      , time-units
                      , universum >= 0.1.11
                      , unordered-containers
+  build-tool-depends: hspec-discover:hspec-discover
 
   ghc-options:
                        -threaded

diff --git a/crypto/cardano-sl-crypto.cabal b/crypto/cardano-sl-crypto.cabal
@@ -138,6 +138,7 @@ test-suite crypto-test
                      , text
                      , universum >= 0.1.11
                      , unordered-containers
+  build-tool-depends: hspec-discover:hspec-discover
 
   ghc-options:         -threaded
                        -rtsopts

diff --git a/default.nix b/default.nix
@@ -46,10 +46,11 @@ let
   localLib = import ./lib.nix;
 in
 { system ? builtins.currentSystem
+, crossSystem ? null
 , config ? {}  # The nixpkgs configuration file
 
 # Use a pinned version nixpkgs.
-, pkgs ? localLib.importPkgs { inherit system config; }
+, pkgs ? localLib.importPkgs { inherit system crossSystem config; }
 
 # SHA1 hash which will be embedded in binaries
 , gitrev ? localLib.commitIdFromGitRepo ./.git
@@ -288,7 +289,23 @@ let
           cardano-wallet;
         inherit (self.haskellPackages)
           cardano-report-server; }
-
+  # nix-tools setup
+  // (with builtins; with pkgs.lib; let nix-tools = import ./nix/pkgs.nix { nixpkgs = _: pkgs; }; in
+  {
+    nix-tools = { _raw = nix-tools; }
+      # some shorthands
+      // { libs = mapAttrs (k: v: if   v.components ? "library"
+                                  then v.components.library
+                                  else null) nix-tools; }
+      // { exes = mapAttrs (k: v: if   length (attrValues v.components.exes) > 0
+                                  then (if pkgs.stdenv.targetPlatform.isWindows then pkgs.copyJoin else pkgs.symlinkJoin)
+                                       { name = "${k}-exes"; paths = attrValues v.components.exes; }
+                                  else null) nix-tools; }
+      // { tests = mapAttrs (k: v: if length (attrValues v.components.tests) > 0
+                                   then v.components.tests
+                                   else null) nix-tools; }
+      ;
+  })
   );
 
 in

diff --git a/explorer/cardano-sl-explorer.cabal b/explorer/cardano-sl-explorer.cabal
@@ -347,6 +347,8 @@ test-suite cardano-explorer-test
                      , lens
                      , universum >= 0.1.11
                      , warp
+  build-tool-depends: hspec-discover:hspec-discover
+
   hs-source-dirs:      test
   default-language:    Haskell2010
   ghc-options:         -threaded

diff --git a/generator/cardano-sl-generator.cabal b/generator/cardano-sl-generator.cabal
@@ -137,6 +137,7 @@ test-suite cardano-generator-test
                      , serokell-util
                      , universum >= 0.1.11
                      , unordered-containers
+  build-tool-depends: hspec-discover:hspec-discover
 
   hs-source-dirs:      test
   default-language:    Haskell2010

diff --git a/lib/cardano-sl.cabal b/lib/cardano-sl.cabal
@@ -348,6 +348,7 @@ test-suite cardano-test
                      , time-units
                      , universum >= 0.1.11
                      , unordered-containers
+  build-tool-depends: hspec-discover:hspec-discover
 
   hs-source-dirs:      test
   default-language:    Haskell2010

diff --git a/networking/cardano-sl-networking.cabal b/networking/cardano-sl-networking.cabal
@@ -235,6 +235,7 @@ test-suite cardano-sl-networking-test
                      , serokell-util >= 0.1.2.3
                      , stm
                      , time-units
+  build-tool-depends: hspec-discover:hspec-discover
   hs-source-dirs:      test
   default-language:    Haskell2010
   ghc-options:         -threaded

diff --git a/nix/.stack-pkgs.nix b/nix/.stack-pkgs.nix
diff --git a/nix/.stack.nix/acid-state-exts.nix b/nix/.stack.nix/acid-state-exts.nix