From 8ae6cb2b9591376f0850aaa0f21e966b0391e519 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 2 Sep 2019 21:58:39 +0100 Subject: chore: Pin Nix version in Travis builds There are some unexpected cache misses in the Travis builds and I suspect this might be due to mismatching Nix versions. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) 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: -- cgit 1.4.1 From 68d14b6cfcd9b729c11ced8a9c84833d293d3875 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 2 Sep 2019 22:06:55 +0100 Subject: chore(gemma): Delete old image build configuration --- services/gemma/gemma-docker.nix | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 services/gemma/gemma-docker.nix 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 {}; -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" = {}; - }; - }; -} -- cgit 1.4.1 From cfeb6e57c7dc4cbb4ce1b059687c0b507462b32e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 2 Sep 2019 22:30:10 +0100 Subject: chore(tazblog): Clean up unneeded files --- services/tazblog/.gitignore | 7 ----- services/tazblog/.stylish.haskell.yaml | 20 ------------- services/tazblog/static/admin.css | 49 -------------------------------- services/tazblog/static/loginBoxTop.png | Bin 606 -> 0 bytes services/tazblog/static/signin.gif | Bin 1850 -> 0 bytes 5 files changed, 76 deletions(-) delete mode 100644 services/tazblog/.gitignore delete mode 100644 services/tazblog/.stylish.haskell.yaml delete mode 100644 services/tazblog/static/admin.css delete mode 100644 services/tazblog/static/loginBoxTop.png delete mode 100644 services/tazblog/static/signin.gif 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 Binary files a/services/tazblog/static/loginBoxTop.png and /dev/null differ diff --git a/services/tazblog/static/signin.gif b/services/tazblog/static/signin.gif deleted file mode 100644 index bbe282bae0..0000000000 Binary files a/services/tazblog/static/signin.gif and /dev/null differ -- cgit 1.4.1