Skip to content
Permalink
Browse files

nix shell: accomodate package-set-path in release.nix (thanks @jbgi!)

  • Loading branch information...
deepfire committed Jul 10, 2019
1 parent 333f707 commit 352a9bb6bfd5bce8f84447ae6e17f0d309e1be1a
Showing with 25 additions and 24 deletions.
  1. +1 −21 default.nix
  2. +24 −3 nix/nix-tools.nix
@@ -54,27 +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;

shell = nixTools.nix-tools.shellFor {
inherit withHoogle;
packages = pkgs: with pkgs; [
io-sim
io-sim-classes
ouroboros-consensus
ouroboros-network
typed-transitions
];
buildInputs = with nixTools.nix-tools._raw; [
cabal-install.components.exes.cabal
commonLib.stack-hpc-coveralls
] ++ (with commonLib.pkgs; [
git
pkgconfig
stack
systemd
]);
};
}
@@ -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
]);
};
}

0 comments on commit 352a9bb

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