Merge pull request #3 from tazjin/chore/pin-travis-nix r/76

Pin Nix version in Travis builds

7 files changed, 1 insertions, 95 deletions

diff --git a/.travis.yml b/.travis.yml
index eace0ae15b..fbccf99f22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: nix
+nix: 2.2.2
 env:
   - NIX_PATH="nixpkgs=${TRAVIS_BUILD_DIR}"
 before_script:
diff --git a/services/gemma/gemma-docker.nix b/services/gemma/gemma-docker.nix
deleted file mode 100644
index 69cfdd4c16..0000000000
--- a/services/gemma/gemma-docker.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-with import <nixpkgs> {}; 
-let
-  gemma = import ./default.nix;
-  entrypoint = writeScript "entrypoint.sh" ''
-    #!${stdenv.shell}
-    set -e
-    exec ${gemma}/bin/gemma
-  '';
-in dockerTools.buildImage {
-  name = "gemma";
-  contents = gemma; # [ gemma ];
-  config = {
-    Entrypoint = [ entrypoint ];
-    WorkingDir = "/data";
-    Volumes = {
-      "/data" = {};
-    };
-  };
-}
diff --git a/services/tazblog/.gitignore b/services/tazblog/.gitignore
deleted file mode 100644
index a95070c31f..0000000000
--- a/services/tazblog/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.o
-*.hi
-BlogState/
-dist/
-.cabal-sandbox/
-*.tar.gz
-.stack-work/
diff --git a/services/tazblog/.stylish.haskell.yaml b/services/tazblog/.stylish.haskell.yaml
deleted file mode 100644
index cb432ce231..0000000000
--- a/services/tazblog/.stylish.haskell.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-steps:
-  - imports:
-      align: group
-  - language_pragmas:
-      style: vertical
-      remove_redundant: true
-  - records: {}
-  - trailing_whitespace: {}
-columns: 120
-language_extensions:
-  - DeriveDataTypeable
-  - FlexibleContexts
-  - GeneralizedNewtypeDeriving
-  - MultiParamTypeClasses
-  - OverloadedStrings
-  - RecordWildCards
-  - ScopedTypeVariables
-  - TemplateHaskell
-  - TypeFamilies
-  - QuasiQuotes
diff --git a/services/tazblog/static/admin.css b/services/tazblog/static/admin.css
deleted file mode 100644
index 10980dc9e4..0000000000
--- a/services/tazblog/static/admin.css
+++ /dev/null
@@ -1,49 +0,0 @@
-@charset "UTF-8";
-/* CSS Document */
-
-body {
-	padding-top: 20px;
-	font-family: 'PT Sans', sans-serif;
-	background-image: linear-gradient(bottom, rgb(245,245,245) 66%, rgb(239,239,239) 83%);
-	background-image: -o-linear-gradient(bottom, rgb(245,245,245) 66%, rgb(239,239,239) 83%);
-	background-image: -webkit-linear-gradient(bottom, rgb(245,245,245) 66%, rgb(239,239,239) 83%);
-	background-image: -webkit-gradient(
-		linear,
-		left bottom,
-		left top,
-		color-stop(0.66, rgb(245,245,245)),
-		color-stop(0.83, rgb(239,239,239))
-	);
-	background-repeat: no-repeat;
-	background-color: rgb(245,245,245);
-}
-
-.loginBox {
-	width: 400px;
-	margin: 0 auto;
-}
-
-.loginBoxTop {
-	width: 380px;
-	height: 28px;
-	color: #FFFFFF;
-	font-size: 12px;
-	padding-left: 20px;
-	padding-top: 11px;
-	background: url(/static/loginBoxTop.png);
-}
-
-.loginBoxMiddle {
-    background-color: #F3F3F3;
-    border-top: 0px hidden;
-    border:1px solid #D2D2D2;
-    border-bottom-left-radius: 12px;
-    border-bottom-right-radius: 12px;
-	text-align: center;
-    font-size:12px;
-    height:auto;
-    padding-left: 10px;
-    padding-right: 10px;
-    min-height:200px;
-    width:378px;
-}
diff --git a/services/tazblog/static/loginBoxTop.png b/services/tazblog/static/loginBoxTop.png
deleted file mode 100644
index 8a0ee3ba8d..0000000000
--- a/services/tazblog/static/loginBoxTop.png
+++ /dev/null
Binary files differdiff --git a/services/tazblog/static/signin.gif b/services/tazblog/static/signin.gif
deleted file mode 100644
index bbe282bae0..0000000000
--- a/services/tazblog/static/signin.gif
+++ /dev/null
Binary files differ