summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2019-01-21 16:09:56 -0800
committerBen Sima <ben@bsima.me>2019-01-21 16:09:56 -0800
commit98d33b9a533bd1d84ad44746c22cbd3db68fc492 (patch)
tree3677b6dd9616560ed89b1e363a5b306300088fa3
parent9f60de28de44ea01da25b4cf1305fb63962effd0 (diff)
add ibb
-rw-r--r--default.nix2
-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.nix5
-rw-r--r--shell.nix5
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 { }
diff --git a/Main.hs b/ibb/Main.hs
index e552769..e552769 100644
--- a/Main.hs
+++ b/ibb/Main.hs
diff --git a/Makefile b/ibb/Makefile
index a815cc7..f51c298 100644
--- a/Makefile
+++ b/ibb/Makefile
@@ -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