Skip to content
Permalink
Browse files

Merge pull request #723 from input-output-hk/serge/nix-shell-almost

nix-shell, almost
  • Loading branch information...
deepfire committed Jul 11, 2019
2 parents 2991bd0 + 352a9bb commit adc7ea818ecd39467566a7a344320a2a0f8cdd67
Showing with 33 additions and 5 deletions.
  1. +1 −0 .gitignore
  2. +4 −2 default.nix
  3. +24 −3 nix/nix-tools.nix
  4. +1 −0 release.nix
  5. +3 −0 shell.nix
@@ -21,6 +21,7 @@ dist/
*.swp
*.swo
*~
\#*
*_flymake.hs
result*
**/tags
@@ -1,4 +1,6 @@
{ customConfig ? {}, ... }:
{ customConfig ? {}
, withHoogle ? true
, ... }:
#
# The default.nix file. This will generate targets for all
# buildables (see release.nix for nomenclature, excluding
@@ -52,7 +54,7 @@ let
documents = import ./doc/default.nix {inherit commonLib; };
in {
inherit scripts tests;
inherit (nixTools) nix-tools;
inherit (nixTools) nix-tools shell;
network-pdf-wip = documents.network-pdf-wip;
network-pdf = documents.network-pdf;
}
@@ -1,6 +1,27 @@
{ ... }@args:
{ withHoogle ? true
, ... }@args:

let
commonLib = import ./iohk-common.nix;

in commonLib.nix-tools.default-nix ./pkgs.nix args
pkgs = commonLib.nix-tools.default-nix ./pkgs.nix args;
in pkgs // {
shell = pkgs.nix-tools.shellFor {
inherit withHoogle;
packages = pkgs: with pkgs; [
io-sim
io-sim-classes
ouroboros-consensus
ouroboros-network
typed-transitions
];
buildInputs = with pkgs.nix-tools._raw; [
cabal-install.components.exes.cabal
commonLib.stack-hpc-coveralls
] ++ (with commonLib.pkgs; [
git
pkgconfig
stack
systemd
]);
};
}
@@ -67,6 +67,7 @@ commonLib.pkgs.lib.mapAttrsRecursiveCond
network-pdf-wip = default.network-pdf-wip;
network-pdf = default.network-pdf;
};
builds-on-supported-systems = [ "shell" ];
required-targets = jobs: [
# targets are specified using above nomenclature:
jobs.nix-tools.tests.ouroboros-consensus.test-consensus.x86_64-linux
@@ -0,0 +1,3 @@
{ withHoogle ? true
}:
(import ./default.nix { inherit withHoogle; }).shell

0 comments on commit adc7ea8

Please sign in to comment.
You can’t perform that action at this time.