From 98d33b9a533bd1d84ad44746c22cbd3db68fc492 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 21 Jan 2019 16:09:56 -0800
Subject: add ibb

---
 Main.hs         |  4 ----
 Makefile        | 12 ------------
 biz.nix         | 23 -----------------------
 default.nix     |  2 --
 ibb/Main.hs     |  4 ++++
 ibb/Makefile    | 12 ++++++++++++
 ibb/default.nix | 23 +++++++++++++++++++++++
 ibb/shell.nix   |  5 +++++
 shell.nix       |  5 -----
 9 files changed, 44 insertions(+), 46 deletions(-)
 delete mode 100644 Main.hs
 delete mode 100644 Makefile
 delete mode 100644 biz.nix
 delete mode 100644 default.nix
 create mode 100644 ibb/Main.hs
 create mode 100644 ibb/Makefile
 create mode 100644 ibb/default.nix
 create mode 100644 ibb/shell.nix
 delete mode 100644 shell.nix

diff --git a/Main.hs b/Main.hs
deleted file mode 100644
index e552769..0000000
--- a/Main.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Main where
-
-main :: IO ()
-main = putStrLn "Hello World"
diff --git a/Makefile b/Makefile
deleted file mode 100644
index a815cc7..0000000
--- a/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-biz.exe: Main.hs
-	ghc -O -i. -o $@ $<
-
-tags: TAGS
-
-TAGS: FORCE
-	hasktags -b -c .
-
-clean: FORCE
-	rm -f *.o *.exe *.hi
-
-.PHONY: FORCE
diff --git a/biz.nix b/biz.nix
deleted file mode 100644
index debf4d1..0000000
--- a/biz.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv
-, mkDerivation
-, base
-}:
-
-mkDerivation {
-  pname = "biz";
-  version = "0";
-  src = ./.;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    base
-  ];
-  executableHaskellDepends = [
-    base
-  ];
-  testHaskellDepends = [
-    base
-  ];
-  homepage = "https://git.sr.ht/~ben/biz";
-  description = "biz";
-  license = stdenv.lib.licenses.bsd3;
-}
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/ibb/Main.hs b/ibb/Main.hs
new file mode 100644
index 0000000..e552769
--- /dev/null
+++ b/ibb/Main.hs
@@ -0,0 +1,4 @@
+module Main where
+
+main :: IO ()
+main = putStrLn "Hello World"
diff --git a/ibb/Makefile b/ibb/Makefile
new file mode 100644
index 0000000..f51c298
--- /dev/null
+++ b/ibb/Makefile
@@ -0,0 +1,12 @@
+ibb.exe: Main.hs
+	ghc -O -i. -o $@ $<
+
+tags: TAGS
+
+TAGS: FORCE
+	hasktags -b -c .
+
+clean: FORCE
+	rm -f *.o *.exe *.hi
+
+.PHONY: FORCE
diff --git a/ibb/default.nix b/ibb/default.nix
new file mode 100644
index 0000000..4384001
--- /dev/null
+++ b/ibb/default.nix
@@ -0,0 +1,23 @@
+{ stdenv
+, mkDerivation
+, base
+}:
+
+mkDerivation {
+  pname = "ibb";
+  version = "0";
+  src = ./.;
+  isExecutable = true;
+  libraryHaskellDepends = [
+    base
+  ];
+  executableHaskellDepends = [
+    base
+  ];
+  testHaskellDepends = [
+    base
+  ];
+  homepage = "https://git.sr.ht/~ben/biz";
+  description = "biz";
+  license = stdenv.lib.licenses.bsd3;
+}
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
-- 
cgit v1.2.3