diff options
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | ibb/Main.hs (renamed from Main.hs) | 0 | ||||
| -rw-r--r-- | ibb/Makefile (renamed from Makefile) | 2 | ||||
| -rw-r--r-- | ibb/default.nix (renamed from biz.nix) | 2 | ||||
| -rw-r--r-- | ibb/shell.nix | 5 | ||||
| -rw-r--r-- | shell.nix | 5 |
6 files changed, 7 insertions, 9 deletions
diff --git a/default.nix b/default.nix deleted file mode 100644 index 4a13943..0000000 --- a/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc863" }: -nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./biz.nix { } @@ -1,4 +1,4 @@ -biz.exe: Main.hs +ibb.exe: Main.hs ghc -O -i. -o $@ $< tags: TAGS diff --git a/biz.nix b/ibb/default.nix index debf4d1..4384001 100644 --- a/biz.nix +++ b/ibb/default.nix @@ -4,7 +4,7 @@ }: mkDerivation { - pname = "biz"; + pname = "ibb"; version = "0"; src = ./.; isExecutable = true; diff --git a/ibb/shell.nix b/ibb/shell.nix new file mode 100644 index 0000000..b29c3ae --- /dev/null +++ b/ibb/shell.nix @@ -0,0 +1,5 @@ +{ nixpkgs ? import (fetchGit (import ../pkgs.nix)) {} +, compiler ? "ghc862" +}: +let ibb = nixpkgs.pkgs.haskell.packages.${compiler}.callPackage ./default.nix {}; +in ibb.env diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 9707164..0000000 --- a/shell.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ nixpkgs ? import (fetchGit (import ./pkgs.nix)) {} -, compiler ? "ghc862" -}: - -(import ./default.nix { inherit nixpkgs compiler; }).env |