summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2018-09-25 22:38:09 +0200
committerAdrian Kummerlaender2018-09-25 22:38:09 +0200
commit26e521d9e11398a73ce8b265bae9a3be3b35e3d9 (patch)
tree6ea946384b775876ecb83371d21bcfc9486e1572
parentb59eeeb4ec16d04e77925fa88211cb3d1a0c9f5b (diff)
downloadnixos_system-26e521d9e11398a73ce8b265bae9a3be3b35e3d9.tar
nixos_system-26e521d9e11398a73ce8b265bae9a3be3b35e3d9.tar.gz
nixos_system-26e521d9e11398a73ce8b265bae9a3be3b35e3d9.tar.bz2
nixos_system-26e521d9e11398a73ce8b265bae9a3be3b35e3d9.tar.xz
nixos_system-26e521d9e11398a73ce8b265bae9a3be3b35e3d9.zip
Generate pkgs.kummerlaender.eu website
-rw-r--r--host/software/pkgs.kummerlaender.eu.nix40
-rw-r--r--host/software/tree.kummerlaender.eu.nix8
2 files changed, 43 insertions, 5 deletions
diff --git a/host/software/pkgs.kummerlaender.eu.nix b/host/software/pkgs.kummerlaender.eu.nix
index a41f55e..0771198 100644
--- a/host/software/pkgs.kummerlaender.eu.nix
+++ b/host/software/pkgs.kummerlaender.eu.nix
@@ -1,10 +1,48 @@
{ pkgs, ... }:
-{
+let
+ content = pkgs.fetchgit {
+ url = "gitea@localhost:adrian/pkgs.git";
+ rev = "dc52ff2c3eada599e3f27a53f96ffa1af798932d";
+ sha256 = "06znxiz5lwzkj479x3gwaa3g1c6jq4xqkjk2qajmfq9clzpkanrb";
+ };
+
+ result = pkgs.stdenv.mkDerivation {
+ name = "tree.kummerlaender.eu";
+
+ src = pkgs.fetchFromGitHub {
+ owner = "KnairdA";
+ repo = "tree.kummerlaender.eu";
+ rev = "95f100c7ac9fba6116f0e268950b83b706325bf2";
+ sha256 = "0llffkjdz3x0yp3nvb1fa6041rj696xnkifvy6kalsbrxy8mbfn5";
+ };
+
+ LANG = "en_US.UTF-8";
+
+ buildInputs = let
+ mypkgs = import (fetchTarball "https://pkgs.kummerlaender.eu/nixexprs.tar.gz") { };
+ in [
+ pkgs.pandoc
+ pkgs.highlight
+ mypkgs.katex-wrapper
+ mypkgs.make-xslt
+ ];
+
+ installPhase = ''
+ cp -r ${content}/web source/00_content
+ make-xslt
+ mkdir $out
+ cp -Lr target/99_result/* $out
+ '';
+ };
+in {
services.nginx.virtualHosts."pkgs.kummerlaender.eu" = {
addSSL = true;
enableACME = true;
locations = {
+ "/" = {
+ root = "${result}";
+ };
"/nixexprs.tar.gz" = {
proxyPass = "http://localhost:3000/adrian/pkgs/archive/master.tar.gz";
};
diff --git a/host/software/tree.kummerlaender.eu.nix b/host/software/tree.kummerlaender.eu.nix
index 0b2544f..3920c7c 100644
--- a/host/software/tree.kummerlaender.eu.nix
+++ b/host/software/tree.kummerlaender.eu.nix
@@ -3,8 +3,8 @@
let
content = pkgs.fetchgit {
url = "gitea@localhost:web/tree_content.git";
- rev = "ed052cbb514b1d6bf7cdb34c1f23bca5690bbef3";
- sha256 = "1hzhgmrg5l8bpr2gqhf9ky4hia99lvjk2rrbj50n9a64s850bdcb";
+ rev = "1544db46357bc6b03ac82cc47e6f99ec09b82b62";
+ sha256 = "05lw3qcqm6jccbp15fcy7nd83pzv9zidpvafr2f7xvr2czi7z2iy";
};
result = pkgs.stdenv.mkDerivation {
@@ -13,8 +13,8 @@ let
src = pkgs.fetchFromGitHub {
owner = "KnairdA";
repo = "tree.kummerlaender.eu";
- rev = "6af4f31f1aa4546c9d09cbfa6f5840b73986a5c6";
- sha256 = "01f0n9rh8bnwnqyvh16rs6cn3niq8d7cp9g497j8cvm3654v4baf";
+ rev = "95f100c7ac9fba6116f0e268950b83b706325bf2";
+ sha256 = "0llffkjdz3x0yp3nvb1fa6041rj696xnkifvy6kalsbrxy8mbfn5";
};
LANG = "en_US.UTF-8";