Skip to content
This repository has been archived by the owner on Aug 18, 2020. It is now read-only.

Commit

Permalink
Merge #26
Browse files Browse the repository at this point in the history
26: pull envs and config from iohkNix.cardanoLib r=disassembler a=disassembler

iohkNix.cardanoLib now contains configuration.yaml and genesis files as well as `environments` and `forEnvironments` so nix no longer needs to depend on cardano-sl (cabal file still does obviously).

Co-authored-by: Samuel Leathers <samuel.leathers@iohk.io>
  • Loading branch information
iohk-bors[bot] and disassembler committed Aug 19, 2019
2 parents 1569266 + fd7474e commit 10072d0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
8 changes: 1 addition & 7 deletions default.nix
Expand Up @@ -32,13 +32,7 @@ let
# nixTools contains all the haskell binaries and libraries built by haskell.nix
nixTools = import ./nix/nix-tools.nix {};
# cardano-sl
oldCardanoRev = (builtins.fromJSON (builtins.readFile ./nix/old-cardano-sl-src.json)).rev;
oldCardanoSrc = import ./nix/old-cardano.nix {
inherit commonLib;
};
oldCardano = (import oldCardanoSrc { gitrev = oldCardanoRev;});
inherit (oldCardano) cardanoConfig;
environments = builtins.removeAttrs (import (oldCardanoSrc + "/lib.nix")).environments [ "demo" ];
inherit (commonLib) cardanoConfig environments;

# scripts contains startup scripts for proxy
scripts = import ./nix/scripts.nix {
Expand Down
2 changes: 1 addition & 1 deletion lib.nix
Expand Up @@ -16,4 +16,4 @@ let
}) {};
pkgs = iohkNix.pkgs;
lib = pkgs.lib;
in lib // iohkNix
in lib // iohkNix.cardanoLib // iohkNix
6 changes: 3 additions & 3 deletions nix/iohk-nix-src.json
@@ -1,7 +1,7 @@
{
"url": "https://github.com/input-output-hk/iohk-nix",
"rev": "aa26de40d6bb226fade6e3f6e80ef6e0ef70925b",
"date": "2019-07-31T11:56:57+00:00",
"sha256": "0aqvhm5whr2bzcxbzn69q31i00cdsqqbpay00z69a0vxkv2568rz",
"rev": "3ba96c81cd937189e7721973a83d3c12daa506a1",
"date": "2019-08-19T17:54:12+00:00",
"sha256": "0gxpnk3dzg524zd2k94xqgyaani9fvlam6l7yxs1b2fszd00fk5h",
"fetchSubmodules": false
}

0 comments on commit 10072d0

Please sign in to comment.