diff options
author | Vincent Ambo <mail@tazj.in> | 2019-09-02T21·54+0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-02T21·54+0100 |
commit | 3a4d8544fe98d56c41180d8f9bec88cf5e95385e (patch) | |
tree | b87d514f1b2a5663cc793f8e4194e95c34d058f8 | |
parent | d577629b5b2c767a6031f90fe1303f8811a8b870 (diff) | |
parent | cfeb6e57c7dc4cbb4ce1b059687c0b507462b32e (diff) |
Merge pull request #3 from tazjin/chore/pin-travis-nix r/76
Pin Nix version in Travis builds
-rw-r--r-- | .travis.yml | 1 | ||||
-rw-r--r-- | services/gemma/gemma-docker.nix | 19 | ||||
-rw-r--r-- | services/tazblog/.gitignore | 7 | ||||
-rw-r--r-- | services/tazblog/.stylish.haskell.yaml | 20 | ||||
-rw-r--r-- | services/tazblog/static/admin.css | 49 | ||||
-rw-r--r-- | services/tazblog/static/loginBoxTop.png | bin | 606 -> 0 bytes | |||
-rw-r--r-- | services/tazblog/static/signin.gif | bin | 1850 -> 0 bytes |
7 files changed, 1 insertions, 95 deletions
diff --git a/.travis.yml b/.travis.yml index eace0ae15bc6..fbccf99f223a 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 69cfdd4c1692..000000000000 --- 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 a95070c31f1e..000000000000 --- 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 cb432ce231ba..000000000000 --- 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 10980dc9e4c1..000000000000 --- 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 8a0ee3ba8d6f..000000000000 --- 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 bbe282bae0a4..000000000000 --- a/services/tazblog/static/signin.gif +++ /dev/null Binary files differ |