Skip to content

Commit c113339

Browse files
committed
Rename project description
1 parent 9b6a99b commit c113339

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
**/result
1+
**/result*

snack/default.nix

+11-11
Original file line numberDiff line numberDiff line change
@@ -250,24 +250,24 @@ let
250250
buildInputs = [pkgs.makeWrapper];
251251
};
252252

253-
snack = executable:
253+
executable = descr:
254254
let
255255
ghc = pkgs.haskellPackages.ghcWithPackages
256256
(ps: map (p: ps.${p}) deps);
257-
deps = executable.dependencies;
257+
deps = descr.dependencies;
258258
ghcOpts =
259-
if (builtins.hasAttr "ghc-options" executable)
260-
then executable.ghc-options
259+
if (builtins.hasAttr "ghc-options" descr)
260+
then descr.ghc-options
261261
else [];
262-
base = executable.src;
262+
base = descr.src;
263263
foo =
264-
if (builtins.hasAttr "extra-files" executable)
264+
if (builtins.hasAttr "extra-files" descr)
265265
then
266-
if builtins.isList executable.extra-files
267-
then (_x: executable.extra-files)
268-
else executable.extra-files
266+
if builtins.isList descr.extra-files
267+
then (_x: descr.extra-files)
268+
else descr.extra-files
269269
else (x: []);
270-
mainModName = executable.main;
270+
mainModName = descr.main;
271271
in
272272
{
273273
build =
@@ -282,6 +282,6 @@ let
282282
in
283283
{
284284
inherit
285-
snack
285+
executable
286286
;
287287
}

tests/packages/snack.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
let
22
pkgs = import ../../nix {};
3-
snack = pkgs.snack-lib.snack;
3+
snack = pkgs.snack-lib;
44
in
5-
snack
5+
snack.executable
66
{ main = "Foo";
77
src = ./src;
88
dependencies = ["conduit"];

tests/template-haskell/snack.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
let
22
pkgs = import ../../nix {};
3-
snack = pkgs.snack-lib.snack;
3+
snack = pkgs.snack-lib;
44
in
5-
snack
5+
snack.executable
66
{ main = "Main";
77
src = ./.;
88
dependencies = ["file-embed"];

0 commit comments

Comments
 (0)