1
0

replace fetchGit with pkgs.fetchgit

This commit is contained in:
clerie 2022-10-17 23:03:09 +02:00
parent 0b66c298ab
commit 6dc04a8581
9 changed files with 29 additions and 27 deletions

View File

@ -1,13 +1,13 @@
{ ... }: { pkgs, ... }:
{ {
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
"bubblesort.clerie.de" = { "bubblesort.clerie.de" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
root = fetchGit { root = pkgs.fetchgit {
url = "https://git.clerie.de/clerie/bubblesort_js.git"; url = "https://git.clerie.de/clerie/bubblesort_js.git";
ref = "main";
rev = "39d54701a11f4fb48d7e023e384a848e6bde5640"; rev = "39d54701a11f4fb48d7e023e384a848e6bde5640";
sha256 = "sha256-au/sbTVLDER0BbXD6cKJIpq0GcS/saiRQw46mZQWsO0=";
}; };
}; };
}; };

View File

@ -1,4 +1,4 @@
{ ... }: { pkgs, ... }:
{ {
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
@ -13,10 +13,10 @@
"clerie.de" = { "clerie.de" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
root = fetchGit { root = pkgs.fetchgit {
url = "https://git.clerie.de/clerie/clerie.de.git"; url = "https://git.clerie.de/clerie/clerie.de.git";
ref = "main";
rev = "67738c06cff85e2cefbea87d45c277bd01a3778a"; rev = "67738c06cff85e2cefbea87d45c277bd01a3778a";
sha256 = "sha256-CfoCNurVaE2f6C43UA7IW1dihPb3Xx7nWVnsaAGb/Ew=";
}; };
locations."~ ^/.well-known/openpgpkey/hu/[a-z0-9]+/?$" = { locations."~ ^/.well-known/openpgpkey/hu/[a-z0-9]+/?$" = {
extraConfig = '' extraConfig = ''

View File

@ -1,4 +1,4 @@
{ ... }: { pkgs, ... }:
{ {
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
@ -13,10 +13,10 @@
"milchinsel.de" = { "milchinsel.de" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
root = fetchGit { root = pkgs.fetchgit {
url = "https://git.clerie.de/clerie/milchinsel.de.git"; url = "https://git.clerie.de/clerie/milchinsel.de.git";
ref = "master";
rev = "8ca6727902fb5a2581b56c4b3ab8d01585f3acb0"; rev = "8ca6727902fb5a2581b56c4b3ab8d01585f3acb0";
sha256 = "sha256-JYdEZDLLojsgWwfJYR1riBUhs73/mdlVSOeLUgnqNhg=";
}; };
}; };
}; };

View File

@ -1,14 +1,14 @@
{ ... }: { pkgs, ... }:
{ {
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
"ping.clerie.de" = { "ping.clerie.de" = {
enableACME = true; enableACME = true;
addSSL = true; addSSL = true;
root = fetchGit { root = pkgs.fetchgit {
url = "https://git.clerie.de/clerie/ping.clerie.de.git"; url = "https://git.clerie.de/clerie/ping.clerie.de.git";
ref = "main";
rev = "c9c0849e1f63fd2e3aeeba8ce19ec44065a5d563"; rev = "c9c0849e1f63fd2e3aeeba8ce19ec44065a5d563";
sha256 = "sha256-w6YG8qtuAVR7ET9pI/j8UMhF3JLDywLbD6DbM/Huyzw=";
}; };
/* /*
locations."= /" = { locations."= /" = {

View File

@ -1,20 +1,20 @@
{ ... }: { pkgs, ... }:
{ {
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
"prediger.riese.space" = { "prediger.riese.space" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
root = fetchGit { root = pkgs.fetchgit {
url = "https://git.clerie.de/clerie/prediger.riese.space.git"; url = "https://git.clerie.de/clerie/prediger.riese.space.git";
ref = "main";
rev = "7f51e884ccf8a258838adb1d825bc51eeef2f475"; rev = "7f51e884ccf8a258838adb1d825bc51eeef2f475";
sha256 = "sha256-tL+k9l0fX4dc971y4EWGM++BvjfnvRAtU/LvS2QYANU=";
}; };
locations."/map/" = { locations."/map/" = {
alias = fetchGit { alias = pkgs.fetchgit {
url = "https://git.clerie.de/quiribi/Prediger-workadventure.git"; url = "https://git.clerie.de/quiribi/Prediger-workadventure.git";
ref = "master";
rev = "304850367aad275c3410005580313dac7fe24788"; rev = "304850367aad275c3410005580313dac7fe24788";
sha256 = "sha256-t6C7k5p6ZKfQedumTqxEmGYQqgaE3OiK5q41dDWnz/Y=";
} + "/"; } + "/";
extraConfig = '' extraConfig = ''
add_header Access-Control-Allow-Origin *; add_header Access-Control-Allow-Origin *;

View File

@ -1,4 +1,4 @@
{ ... }: { pkgs, ... }:
{ {
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
@ -13,10 +13,10 @@
"reichartstrasse.de" = { "reichartstrasse.de" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
root = fetchGit { root = pkgs.fetchgit {
url = "https://git.clerie.de/clerie/reichartstrasse.de.git"; url = "https://git.clerie.de/clerie/reichartstrasse.de.git";
ref = "master";
rev = "377e27d8a8d4b701fa7da072d3f3e68925c5f274"; rev = "377e27d8a8d4b701fa7da072d3f3e68925c5f274";
sha256 = "sha256-eOljD7TsSmE8LpNd/3kKAPBLvNVpED7FN9++srOALOU=";
}; };
}; };
}; };

View File

@ -1,14 +1,15 @@
{ {
pkgs,
buildPythonPackage, buildPythonPackage,
flask, flask,
python3, python3,
}: }:
let let
src = fetchGit { src = pkgs.fetchgit {
url = "https://git.clerie.de/clerie/iot-data.git"; url = "https://git.clerie.de/clerie/iot-data.git";
ref = "main";
rev = "f60e3a3f89549b4ce88df20888c08a01062d086a"; rev = "f60e3a3f89549b4ce88df20888c08a01062d086a";
sha256 = "sha256-D8wusJfYbOkL/Nq6yfYBvhnkBmRcDktORicUpDsIrUE=";
}; };
pname = "iot-data"; pname = "iot-data";
version = "0.0.1"; version = "0.0.1";

View File

@ -1,4 +1,5 @@
{ {
pkgs,
buildPythonPackage, buildPythonPackage,
flask, flask,
requests, requests,
@ -6,10 +7,10 @@
}: }:
let let
src = fetchGit { src = pkgs.fetchgit {
url = "https://git.clerie.de/clerie/uptime-status.git"; url = "https://git.clerie.de/clerie/uptime-status.git";
ref = "main";
rev = "caacaced97617838bbd9b7b91a4e3d06e411139b"; rev = "caacaced97617838bbd9b7b91a4e3d06e411139b";
sha256 = "sha256-qVvUZ+j2JnG26Fl/UcfpjY30RQjAPqCCwbxtz/+r/dU=";
}; };
pname = "uptimestatus"; pname = "uptimestatus";
version = "0.0.1"; version = "0.0.1";

View File

@ -1,4 +1,5 @@
{ {
pkgs,
buildPythonPackage, buildPythonPackage,
flask, flask,
flask_sqlalchemy, flask_sqlalchemy,
@ -7,7 +8,6 @@
yarn2nix-moretea, yarn2nix-moretea,
nodejs, nodejs,
pkg-config, pkg-config,
pkgs,
psycopg2, psycopg2,
python3, python3,
stdenv, stdenv,
@ -16,10 +16,10 @@
}: }:
let let
src = fetchGit { src = pkgs.fetchgit {
url = "https://git.clerie.de/clerie/wetter.git"; url = "https://git.clerie.de/clerie/wetter.git";
ref = "master";
rev = "3193c6d507af5d6f5d62c23046b7fbf0c638ddb4"; rev = "3193c6d507af5d6f5d62c23046b7fbf0c638ddb4";
sha256 = "sha256-ouUmmw020jKg/SRlYhGBFRw/atxW+atQ1JSTFQNi5iw=";
}; };
pname = "wetter"; pname = "wetter";
version = "0.0.1"; version = "0.0.1";