alter base library version bounds; also remove nix support

colonnade/colonnade.cabal

@@ -35,11 +35,11 @@ library
     Colonnade
     Colonnade.Encode
   build-depends:
-      base >= 4.8 && < 5
+      base >= 4.12 && < 5
     , contravariant >= 1.2 && < 1.6
     , vector >= 0.10 && < 0.13
     , text >= 1.0 && < 1.3
-    , bytestring >= 0.10 && < 0.11
+    , bytestring >= 0.10 && < 0.12
     , profunctors >= 5.0 && < 5.7
     , semigroups >= 0.18.2 && < 0.20
   default-language:    Haskell2010

colonnade/default.nix

@@ -1,8 +0,0 @@
-{ frontend ? false }:
-let
-  pname = "colonnade"; 
-  main = (import ../nix/default.nix {
-    inherit frontend;
-  });
-in
-  main.${pname}

colonnade/shell.nix

@@ -1 +0,0 @@
-(import ./. {}).env

lucid-colonnade/src/Lucid/Colonnade.hs

@@ -75,7 +75,7 @@ instance Semigroup d => Semigroup (Cell d) where
 
 instance Monoid d => Monoid (Cell d) where
   mempty = Cell mempty (return mempty)
-  mappend (Cell a1 c1) (Cell a2 c2) = Cell (mappend a1 a2) (liftA2 mappend c1 c2)
+  mappend = (<>)
 
 -- | Create a 'Cell' from a 'Widget'
 htmlCell :: Html d -> Cell d

nix/default.nix

@@ -1,73 +0,0 @@
-{ frontend ? false }:
-
-let _nixpkgs = import <nixpkgs> {};
-    nixpkgs = _nixpkgs.fetchFromGitHub {
-      owner = "NixOS";
-      repo = "nixpkgs";
-      rev = "5c4a404b0d0e5125070dde5c1787210149157e83";
-      sha256 = "0a478l0dxzy5hglavkilxjkh45zfg31q50hgkv1npninc4lpv5f7";
-    };
-    pkgs = import nixpkgs { config = {}; overlays = []; };
-
-    fetch-github-json = owner: repo: path:
-      let commit = builtins.fromJSON (builtins.readFile path);
-      in pkgs.fetchFromGitHub {
-        name = "${repo}-${commit.rev}";
-        inherit owner repo;
-        inherit (commit) rev sha256;
-      };
-      
-    reflex-platform = import (fetch-github-json "layer-3-communications" "reflex-platform" ./reflex-platform.json) {};
-    jsaddle-src = fetch-github-json "ghcjs" "jsaddle" ./jsaddle.json;
-    compiler = "ghc8_2_1";
-
-    filterPredicate = p: type:
-      let path = baseNameOf p; in !(
-           (type == "directory" && pkgs.lib.hasPrefix "dist" path)
-        || (type == "symlink"   && pkgs.lib.hasPrefix "result" path)
-        || pkgs.lib.hasPrefix ".ghc" path
-        || pkgs.lib.hasPrefix ".git" path
-        || pkgs.lib.hasSuffix "~" path
-        || pkgs.lib.hasSuffix ".o" path
-        || pkgs.lib.hasSuffix ".so" path
-        || pkgs.lib.hasSuffix ".nix" path);
-
-    overrides = reflex-platform.${compiler}.override {
-      overrides = self: super:
-        with reflex-platform;
-        with reflex-platform.lib;
-        with reflex-platform.nixpkgs.haskell.lib;
-        with reflex-platform.nixpkgs.haskellPackages; 
-        let
-          cp              = file: (self.callPackage (./deps + "/${file}.nix") {});
-          build-from-json = name: str: self.callCabal2nix name str {};
-          build           = name: path: self.callCabal2nix name (builtins.filterSource filterPredicate path) {};
-        in
-        {
-          gtk2hs-buildtools = self.callPackage ./gtk2hs-buildtools.nix {};
-          colonnade = build "colonnade" ../colonnade;
-          siphon    = build "siphon" ../siphon;
-          reflex-dom-colonnade = build "reflex-dom-colonnade" ../reflex-dom-colonnade;
-          lucid-colonnade = build "lucid-colonnade" ../lucid-colonnade;
-          blaze-colonnade = build "blaze-colonnade" ../blaze-colonnade;
-          yesod-colonnade = build "yesod-colonnade" ../yesod-colonnade;
-        } //
-        {
-          jsaddle              = doJailbreak (build-from-json "jsaddle"            "${jsaddle-src}/jsaddle");
-          jsaddle-webkitgtk    = doJailbreak (build-from-json "jsaddle-webkitgtk"  "${jsaddle-src}/jsaddle-webkitgtk");
-          jsaddle-webkit2gtk   = doJailbreak (build-from-json "jsaddle-webkit2gtk" "${jsaddle-src}/jsaddle-webkit2gtk");
-          jsaddle-wkwebview    = doJailbreak (build-from-json "jsaddle-wkwebview"  "${jsaddle-src}/jsaddle-wkwebview");
-          jsaddle-clib         = doJailbreak (build-from-json "jsaddle-clib"       "${jsaddle-src}/jsaddle-clib");
-          jsaddle-warp         = dontCheck (doJailbreak (build-from-json "jsaddle-warp"       "${jsaddle-src}/jsaddle-warp"));
-        };
-
-    };
-in rec {
-  inherit reflex-platform fetch-github-json overrides nixpkgs pkgs;
-  colonnade = overrides.colonnade;
-  siphon    = overrides.siphon;
-  reflex-dom-colonnade = overrides.reflex-dom-colonnade;
-  lucid-colonnade = overrides.lucid-colonnade;
-  blaze-colonnade = overrides.blaze-colonnade;
-  yesod-colonnade = overrides.yesod-colonnade;
-}

nix/gtk2hs-buildtools.nix

@@ -1,20 +0,0 @@
-{ mkDerivation, alex, array, base, Cabal, containers, directory
-, filepath, happy, hashtables, pretty, process, random, stdenv
-}:
-mkDerivation {
-  pname = "gtk2hs-buildtools";
-  version = "0.13.4.0";
-  sha256 = "0f3e6ba90839efd43efe8cecbddb6478a55e2ce7788c57a0add4df477dede679";
-  isLibrary = true;
-  isExecutable = true;
-  enableSeparateDataOutput = true;
-  libraryHaskellDepends = [
-    array base Cabal containers directory filepath hashtables pretty
-    process random
-  ];
-  libraryToolDepends = [ alex happy ];
-  executableHaskellDepends = [ base ];
-  homepage = "http://projects.haskell.org/gtk2hs/";
-  description = "Tools to build the Gtk2Hs suite of User Interface libraries";
-  license = stdenv.lib.licenses.gpl2;
-}

nix/jsaddle.json

@@ -1,6 +0,0 @@
-{
-  "owner": "ghcjs",
-  "repo": "jsaddle",
-  "rev": "b423436565fce7f69a65d843c71fc52dc455bf54",
-  "sha256": "09plndkh5wnbqi34x3jpaz0kjdjgyf074faf5xk97rsm81vhz8kk"
-}

nix/overrides.nix

@@ -1,7 +0,0 @@
-{ options ? (x: x), filterPredicate ? (x: true), lib, cabal2nixResult, self, super }:
-let build = path: options (self.callPackage (cabal2nixResult (builtins.filterSource filterPredicate path)) {});
-in {
-  # Core Libraries
-  colonnade = lib.dontCheck (build ../colonnade);
-  reflex-dom-colonnade = build ../reflex-dom-colonnade;
-}

nix/reflex-platform.json

@@ -1,7 +0,0 @@
-{
-  "url": "https://github.com/reflex-frp/reflex-platform",
-  "rev": "0446e9df3adfc7271015c278a2ec5b7e7a6a46f3",
-  "date": "2017-05-05T11:40:26-04:00",
-  "sha256": "0v0d53xqrmh0i01iiq1flq66gw3cb6g9894j94cflsavmhih8y1d",
-  "fetchSubmodules": true
-}

reflex-dom-colonnade/default.nix

@@ -1,8 +0,0 @@
-{ frontend ? false }:
-let
-  pname = "reflex-dom-colonnade"; 
-  main = (import ../nix/default.nix {
-    inherit frontend;
-  });
-in
-  main.${pname}

reflex-dom-colonnade/overrides-ghc.nix

@@ -1,7 +0,0 @@
-{ reflex-platform, ... }:
-let dc = reflex-platform.nixpkgs.haskell.lib.dontCheck;
-in reflex-platform.ghc.override {
-  overrides = self: super: {
-    colonnade = dc (self.callPackage (reflex-platform.cabal2nixResult ../colonnade) {});
-  };
-}

reflex-dom-colonnade/shell.nix

@@ -1 +0,0 @@
-(import ./. {}).env

stack-haddock-upload

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# Author: Dimitri Sabadie <dimitri.sabadie@gmail.com>
-# 2015
-
-dist=`stack path --dist-dir --stack-yaml ./stack.yaml 2> /dev/null`
-
-echo -e "\033[1;36mGenerating documentation...\033[0m"
-stack haddock 2> /dev/null
-
-if [ "$?" -eq "0" ]; then
-  docdir=$dist/doc/html
-  cd $docdir
-  doc=$1-$2-docs
-  echo -e "Compressing documentation from \033[1;34m$docdir\033[0m for \033[1;35m$1\033[0m-\033[1;33m$2\033[1;30m"
-  cp -r $1 $doc
-  tar -c -v -z --format=ustar -f $doc.tar.gz $doc
-  echo -e "\033[1;32mUploading to Hackage...\033[0m"
-  read -p "Hackage username: " username
-  read -p "Hackage password: " -s password
-  echo ""
-  curl -X PUT -H 'Content-Type: application/x-tar' -H 'Content-Encoding: gzip' --data-binary "@$doc.tar.gz" "https://$username:$password@hackage.haskell.org/package/$1-$2/docs"
-  exit $?
-else
-  echo -e "\033[1;31mNot in a stack-powered project\033[0m"
-fi

stack.yaml

@@ -1,35 +0,0 @@
-resolver: nightly-2018-06-11
-packages:
-- 'colonnade'
-- 'blaze-colonnade'
-- 'lucid-colonnade'
-- 'siphon'
-- 'yesod-colonnade'
-# - 'geolite-csv'
-
-extra-deps:
-- 'yesod-elements-1.1'
-
-# Override default flag values for local packages and extra-deps
-flags: {}
-
-# Extra package databases containing global packages
-extra-package-dbs: []
-
-# Control whether we use the GHC we find on the path
-# system-ghc: true
-#
-# Require a specific version of stack, using version ranges
-# require-stack-version: -any # Default
-# require-stack-version: ">=1.1"
-#
-# Override the architecture used by stack, especially useful on Windows
-# arch: i386
-# arch: x86_64
-#
-# Extra directories used by stack for building
-# extra-include-dirs: [/path/to/dir]
-# extra-lib-dirs: [/path/to/dir]
-#
-# Allow a newer minor version of GHC than the snapshot specifies
-# compiler-check: newer-minor