From 8ae6cb2b9591376f0850aaa0f21e966b0391e519 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 2 Sep 2019 21:58:39 +0100 Subject: [PATCH 1/3] 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 eace0ae15..fbccf99f2 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: From 68d14b6cfcd9b729c11ced8a9c84833d293d3875 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 2 Sep 2019 22:06:55 +0100 Subject: [PATCH 2/3] 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 69cfdd4c1..000000000 --- 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" = {}; - }; - }; -} From cfeb6e57c7dc4cbb4ce1b059687c0b507462b32e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 2 Sep 2019 22:30:10 +0100 Subject: [PATCH 3/3] 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 a95070c31..000000000 --- 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 cb432ce23..000000000 --- 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 10980dc9e..000000000 --- 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 8a0ee3ba8d6f88bb242f80bc1d76b2cf41fb14db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 606 zcmeAS@N?(olHy`uVBq!ia0y~yV4MJCYjLmv$+Lt+xxGKkfMEeDl8s zI~8U8S2bsuwJ|sRKVP|Z%{|@z=l9?9oOtu$N$A!U-_G(iymJ0pR%!G9$M56r*B^ac zX0)W^sC)#U*5ZV^ybUy_Dn|WZ2DH^Zf1Hg>-g2rK;frA;pY0{9$UQYeeo@>hToR!FVdQ&MBeEzqF*Fv_v5zu~;E7rzkZsrBWd&H8oG6I5n?C zp(J0SBqLQJsVKj^IJHP2u|z>XBR@A)KR2k1HT2HL*BVAvZBQRiU`FC>3lRP+4wbUW$TBMPgQBg|1yeQGRl2 iadA*;VQFe{iH4>^X0bv+PGWLu3eYKO`Cwg{#d-ibwCK

Sa6hCaFmLbu!E1RnWDO$r@nE3p_7}nd4{F`|NmNW zlv{F@UUZged!1u>+SNr$JJbNmRfO@lAE>a?ebo9m!GG; zou#~Cc9?B|p{KLPnxeXDe4X_6_`k>1WOthM_4s&(rKz>YU2>M7sJ?-YtEjZbV|ST$ zgrt+5wr6^r-s0+ynX|*n*rv0_)7j#NlCE)uqiK7bVt1LBq`a7+xxvZTrmn(leV%@c zsc?az)!XEGho+mOyY~0_WO$mDp0|98sB?s*V0D;@l&@}oppcrhXnUM^iKlOaqSV^s z*WBfCfuUV1qjhnTToVJmh zwTGCojGeZQn6jg=#Omzv;NQpt!lg(Snh!?C$dP_4l~G&xew(cZH;3b(nB~p?Zy}Uv!sjex9eU z!+D6NYkZxNnzY{I>d4UCrmezkexKRh=B&2KdWfgV&)dk)+klL!e~qe)m$HqQvdz-o zWO|&QtiXDRrtRQXRHs<(q)d zphJruO}ez{)2LIM#)2h@xGMwDL9=#-5ECMS2Fe2=#1Gpd7-ASp63JJu0mzdpU(UR_ z^XJNMC0HIU9`x(b(V$T=3yh#3EuyslV#26{1_}bTxp)&tP7DE`24wRgNLLVG2=eRS z&!2y#1fKLK;DGzZk^q0~>_T9FCM>w02@sY6N*~nxphO5SIAERyb_j$|9d*=_L=6Lg zF^mZG3B>3MCprcxEmNJxRg z1Lg=+Lk(ASqk<2o=);8pO7wtA2n~cO=9pxXNlyZrB=AQA=_DXS0tr0RfD9B+kpL7& zP>{eN4IBXloHERrK%aIdKmi2}{81>M6zroX6lF$Q<_(nI&_)*6I8aZM7A$Z<00PnC zjSohEcZM51G;k>!Y>?op1F**bD(kGUs*!;Q3B2M!6A9qqfENjPutNelz|pG*KtSNY z4!7oz035?E3qdkXK#+k08L06q1Ri7nK@-mA-~b7K?I#X5CEwC zT++fa%!tAdhD6{nhPw;|Ebzbt6MT&b;4n}{6%2%tzzGcGl7JZ_BoOe!44h!G2vv+w z@d*_(Ai^2}KXJ!62|O{v8WZ2~M8g;tEHl9o)Lb(Poh~5ny!8I?1u}#*@PZgPghEOL zC|I(<(o8q)w9}8kDYXqYB(TB)yd*G31qm!|^#Ut&ErKc)l)bgst1LZ*1dt>!McEbD zAi)$1RDJc+c;~J20}ovPpa9PR03Z;UFJ#eg2YbM)v)>9d?)c-7KR!VTTPOfX0w3^! zxdQGa0LTOhG`{%<-fexgDKq!C$ zoGs3G5X_(kH^{*bCJ+b%u>;@!raupw@PsJrpacg3fo+s9g)oev3=NnM2owYYm