From f8b7d6c4eb9915515f3fecc2843eaab7e48df94d Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Fri, 3 Apr 2020 15:17:11 -0700
Subject: Consolidate most build functions to biz.nix

---
 Com/Simatime/buildGhc.nix   | 67 -------------------------------------
 Com/Simatime/buildGhcjs.nix | 80 ---------------------------------------------
 2 files changed, 147 deletions(-)
 delete mode 100644 Com/Simatime/buildGhc.nix
 delete mode 100644 Com/Simatime/buildGhcjs.nix

(limited to 'Com')

diff --git a/Com/Simatime/buildGhc.nix b/Com/Simatime/buildGhc.nix
deleted file mode 100644
index 2b578b8..0000000
--- a/Com/Simatime/buildGhc.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-nixpkgs: main:
-
-with nixpkgs;
-with nixpkgs.lib;
-
-let
-  # provided by .envrc
-  root = builtins.getEnv "BIZ_ROOT";
-
-  # general functions to put in a lib
-  lines = s: strings.splitString "\n" s;
-  seq = ls: builtins.filter (x: x!= null) ls;
-
-  # turn the file path into a Haskell module name
-  relpath = builtins.replaceStrings ["${root}/"] [""] (builtins.toString main);
-  module = builtins.replaceStrings ["/" ".hs"] ["." ""] relpath;
-
-  # extract info from special comments
-  content = builtins.readFile main;
-  exe = builtins.head (lists.flatten (seq
-    (map (builtins.match "^-- : exe ([[:alnum:]._-]*)$")
-      (lines content))));
-  deps = lists.flatten (seq
-    (map (builtins.match "^-- : dep ([[:alnum:]._-]*)$")
-      (lines content)));
-
-  # do the build...
-
-  depsToPackageSet = packageSet: deps:
-    map (s: builtins.getAttr s packageSet) deps;
-
-  claySrc = pkgs.fetchFromGitHub {
-    owner = "sebastiaanvisser";
-    repo = "clay";
-    rev = "cc7729b1b42a79e261091ff7835f7fc2a7ae3cee";
-    sha256 = "1vd67976lvi5l4qq18zy6j44apynkl44ps04p8vwfx4gzr895dyp";
-  };
-
-  ghc865_ = pkgs.haskell.packages.ghc865.override (oldAttrs: {
-    overrides = with pkgs.haskell.lib; self: super: {
-      clay = self.callCabal2nix "clay" claySrc {};
-      wai-middleware-metrics = dontCheck super.wai-middleware-metrics;
-    };
-  });
-
-  ghc = ghc865_.ghcWithPackages (hp: depsToPackageSet hp deps);
-
-in stdenv.mkDerivation {
-  name = module;
-  version = "0";
-  src = ../../.; # this is the git root
-  nativeBuildInputs = [ ghc ];
-  strictDeps = true;
-  buildPhase = ''
-    #
-    mkdir -p $out/{bin,static} ${baseNameOf relpath}
-    #
-    # compile with ghc
-    #
-    ${ghc}/bin/ghc -Werror -i. \
-        --make ${main} \
-        -main-is ${module} \
-        -o $out/bin/${exe}
-  '';
-  # the install process was handled above
-  installPhase = "exit 0";
-} // { env = ghc; }
diff --git a/Com/Simatime/buildGhcjs.nix b/Com/Simatime/buildGhcjs.nix
deleted file mode 100644
index 0020fa4..0000000
--- a/Com/Simatime/buildGhcjs.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-nixpkgs: main:
-
-with nixpkgs;
-with nixpkgs.lib;
-
-let
-  # provided by .envrc
-  root = builtins.getEnv "BIZ_ROOT";
-
-  # general functions to put in a lib
-  lines = s: strings.splitString "\n" s;
-  seq = ls: builtins.filter (x: x!= null) ls;
-
-  # turn the file path into a Haskell module name
-  relpath = builtins.replaceStrings ["${root}/"] [""] (builtins.toString main);
-  module = builtins.replaceStrings ["/" ".hs"] ["." ""] relpath;
-
-  # extract info from special comments
-  content = builtins.readFile main;
-  exe = builtins.head (lists.flatten (seq
-    (map (builtins.match "^-- : exe ([[:alnum:]._-]*)$")
-      (lines content))));
-  deps = lists.flatten (seq
-    (map (builtins.match "^-- : dep ([[:alnum:]._-]*)$")
-      (lines content)));
-
-  # do the build...
-
-  depsToPackageSet = packageSet: deps:
-    map (s: builtins.getAttr s packageSet) deps;
-
-  claySrc = pkgs.fetchFromGitHub {
-    owner = "sebastiaanvisser";
-    repo = "clay";
-    rev = "cc7729b1b42a79e261091ff7835f7fc2a7ae3cee";
-    sha256 = "1vd67976lvi5l4qq18zy6j44apynkl44ps04p8vwfx4gzr895dyp";
-  };
-
-  # ghcjs-8.6.0.1
-  ghcjs_ = pkgs.haskell.packages.ghcjs.override (oldAttrs: {
-    overrides = with pkgs.haskell.lib; self: super: {
-      QuickCheck = dontCheck super.QuickCheck;
-      base-compat-batteries = dontCheck super.http-types;
-      clay = dontCheck (self.callCabal2nix "clay" claySrc {});
-      comonad = dontCheck super.comonad;
-      http-types = dontCheck super.http-types;
-      network-uri= dontCheck super.network-uri;
-      scientific = dontCheck super.scientific; # takes forever
-      servant = dontCheck super.servant;
-      tasty-quickcheck = dontCheck super.tasty-quickcheck;
-      time-compat = dontCheck super.time-compat;
-    };
-  });
-
-  ghcjs = ghcjs_.ghcWithPackages (hp: depsToPackageSet hp deps);
-
-in stdenv.mkDerivation {
-  name = module;
-  version = "0";
-  src = ../../.; # the git root
-  nativeBuildInputs = [ ghcjs ];
-  strictDeps = true;
-  buildPhase = ''
-    #
-    mkdir -p $out/{bin,static} ${baseNameOf relpath}
-    #
-    # compile with ghcjs
-    #
-    ${ghcjs}/bin/ghcjs -Werror -i. \
-        --make ${main} \
-        -main-is ${module} \
-        -o ${exe}
-    #
-    # optimize js output
-    #
-    ${pkgs.closurecompiler}/bin/closure-compiler \
-        ${exe}.jsexe/all.js > $out/static/${exe}
-  '';
-  installPhase = "exit 0";
-} // { env = ghcjs; }
-- 
cgit v1.2.3