summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-04-30 14:05:41 +0200
committertv <tv@krebsco.de>2017-04-30 15:46:32 +0200
commitb6e8b5ccbf5f6862cf3f8629df9e101b90e342db (patch)
tree96cd0405eb43b9d4937216e19dea5b27c7387344
parent34f190366c99b7b3f7a90636e14ac77794a532c0 (diff)
rm {common,env,install}.nix
-rw-r--r--Makefile4
-rw-r--r--common.nix7
-rw-r--r--env.nix67
-rw-r--r--install.nix11
4 files changed, 0 insertions, 89 deletions
diff --git a/Makefile b/Makefile
index dbd3b4a..978bf5f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,6 @@ ghci: shell.nix
install:
$(error to install run "make result && nix-env -i ./result")
-.PHONY: install-env
-install-env:
- nix-env -f env.nix -i
-
.PHONY: result
result: shell.nix
nix-build --arg nixpkgs 'import <stockholm>' ./shell.nix
diff --git a/common.nix b/common.nix
deleted file mode 100644
index 35b4e2c..0000000
--- a/common.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- haskell-overrides = self: super: {
- blessings = self.callPackage ./nix/blessings.nix {};
- email-header = self.callPackage ./nix/email-header.nix {};
- scanner = self.callPackage ./nix/scanner.nix {};
- };
-}
diff --git a/env.nix b/env.nix
deleted file mode 100644
index 13038df..0000000
--- a/env.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ nixpkgs ? import <nixpkgs> {} }:
-
-let
- pname = "much";
- version = "2";
-
- buildInputs = with pkgs; [
- hsEnv
- ];
-
- extraCmds = with pkgs; ''
- export MANPATH=$(ls -d $(echo "$PATH" | tr : \\n | sed -n 's:\(^/nix/store/[^/]\+\).*:\1/share/man:p') 2>/dev/null | tr \\n :)
- $(grep export ${hsEnv.outPath}/bin/ghc)
- ${mkExports staticPkgs}
- '';
-
- # ghcWithPackagesOld b/c terminfo collision
- hsEnv = hsPkgs.ghcWithPackages (self: with self;
- [
- aeson
- blaze-builder
- blessings
- cabal-install
- case-insensitive
- docopt
- email-header
- friendly-time
- hsemail
- linebreak
- mbox
- multipart
- process
- random
- rosezipper
- safe
- scanner
- split
- temporary
- terminal-size
- ]
- );
-
- hsPkgs = pkgs.haskellngPackages.override {
- overrides = (import ./common.nix).haskell-overrides;
- };
-
- pkgs = nixpkgs // staticPkgs;
- staticPkgs = with nixpkgs; {
- };
-
- #{{{ mkExports : set -> string
- # Create shell script that exports a set's attributes.
- mkExports = set: with builtins; with pkgs.lib.strings;
- let
- # XXX attribute names are not escaped, they have to be sane
- # XXX the value should not contain <newline>
- mkExport = k: "export ${k}=${escapeSh (getAttr k set)}";
- escapeSh = stringAsChars (c: "\\${c}");
- in
- concatStringsSep "\n" (map mkExport (attrNames set));
- #}}}
-
-in pkgs.myEnvFun {
- name = "${pname}-${version}";
- inherit buildInputs extraCmds;
-}
-# vim: set fdm=marker :
diff --git a/install.nix b/install.nix
deleted file mode 100644
index 3b5f3f8..0000000
--- a/install.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ nixpkgs ? import <nixpkgs> {}
-, target
-}:
-
-let
- hspkgs = nixpkgs.pkgs.haskellngPackages.override {
- overrides = (import ./common.nix).haskell-overrides;
- };
-in
-
-hspkgs.callPackage target {}