nmattia/snack
1
1
Fork 0
mirror of https://github.com/nmattia/snack.git synced 2024-11-28 12:27:41 +03:00
Code Issues Projects Releases Wiki Activity

Stop threading singleOut everywhere

Browse Source
This commit is contained in:
Nicolas Mattia 2018-07-06 15:40:29 +02:00
parent f8bb059954
commit 191065293d
7 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
snack-lib/build.nix
View File

@ -1,8 +1,8 @@
{ runCommand, lib, singleOut, callPackage, stdenv, rsync, symlinkJoin }:
{ runCommand, lib, callPackage, stdenv, rsync, symlinkJoin }:
with (callPackage ./modules.nix { inherit singleOut; });
with (callPackage ./modules.nix {});
with (callPackage ./lib.nix {});
with (callPackage ./module-spec.nix { inherit singleOut; });
with (callPackage ./module-spec.nix {});
rec {
# Returns an attribute set where the keys are all the built module names and

12
snack-lib/default.nix
View File

@ -15,13 +15,13 @@
with (callPackage ./files.nix {});
# why is "inherit" needed?
with (callPackage ./modules.nix { inherit singleOut; });
with (callPackage ./module-spec.nix { inherit singleOut; });
with (callPackage ./package-spec.nix { inherit singleOut; });
with (callPackage ./hpack.nix { inherit singleOut; });
with (callPackage ./modules.nix {});
with (callPackage ./module-spec.nix {});
with (callPackage ./package-spec.nix {});
with (callPackage ./hpack.nix {});
with (callPackage ./lib.nix {});
with (callPackage ./build.nix { inherit singleOut; });
with (callPackage ./ghci.nix { inherit singleOut; });
with (callPackage ./build.nix {});
with (callPackage ./ghci.nix {});
let

6
snack-lib/ghci.nix
View File

@ -1,7 +1,7 @@
{ makeWrapper, symlinkJoin, lib, callPackage, singleOut, writeScriptBin }:
{ makeWrapper, symlinkJoin, lib, callPackage, writeScriptBin }:
with (callPackage ./module-spec.nix { inherit singleOut; });
with (callPackage ./modules.nix { inherit singleOut; });
with (callPackage ./module-spec.nix {});
with (callPackage ./modules.nix {});
rec {

6
snack-lib/hpack.nix
View File

@ -1,6 +1,6 @@
{ lib, glibcLocales, callPackage, singleOut, writeText, runCommand, haskellPackages }:
{ lib, glibcLocales, callPackage, writeText, runCommand, haskellPackages }:
with (callPackage ./modules.nix { inherit singleOut; });
with (callPackage ./modules.nix {});
let
y2j = runCommand "yaml2json"
@ -18,8 +18,6 @@ let
"${y2j} ${writeText "y2j" text} > $out"
);
in builtins.fromJSON json;
in
{
snackNixFromHPack = packageYaml:

5
snack-lib/module-spec.nix
View File

@ -1,11 +1,10 @@
# Functions related to module specs
{ lib
, callPackage
, singleOut
}:
with (callPackage ./modules.nix { inherit singleOut; });
with (callPackage ./package-spec.nix { inherit singleOut; });
with (callPackage ./modules.nix {});
with (callPackage ./package-spec.nix {});
with (callPackage ./lib.nix {});
rec {

1
snack-lib/modules.nix
View File

@ -2,7 +2,6 @@
{ lib
, callPackage
, runCommand
, singleOut
, haskellPackages
}:

3
snack-lib/package-spec.nix
View File

@ -1,9 +1,8 @@
{ lib
, singleOut
, callPackage
}:
with (callPackage ./modules.nix { inherit singleOut; });
with (callPackage ./modules.nix {});
rec {