gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix building in CI

Browse source
This commit is contained in:
kat witch 2021-11-24 19:58:40 +00:00 • committed by kat
parent 866b7e81c9
commit 5b1e34f01a
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
7 changed files with 27 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/hosts/marisa.nix
View file

@ -6,7 +6,7 @@
services.nginx
services.access
users.kat.server
];
] ++ optional (meta.trusted ? services) trusted.service.website;
deploy.tf = {

3
config/services/keycloak.nix
View file

@ -3,9 +3,6 @@
in {
services.keycloak = {
enable = builtins.getEnv "CI_PLATFORM" == "impure";
package = (pkgs.keycloak.override {
jre = pkgs.openjdk11;
});
bindAddress = "127.0.0.1";
httpPort = "8089";
httpsPort = "8445";

2
config/tf

@ -1 +1 @@
Subproject commit 4ad31dd64b0751320204b3a8e05b1f1d870027e8
Subproject commit 72a3eef071b64b18fb61d48041f9bc0285a358db

2
config/trusted

@ -1 +1 @@
Subproject commit bc613f9528ecf35f0bfbd83ab299f88d7c44f4a0
Subproject commit 4a7020983e7c7d246971edde580b8d3914bd2563

6
flake.lock generated
View file

@ -20,11 +20,11 @@
"arcexprs": {
"flake": false,
"locked": {
"lastModified": 1637367152,
"narHash": "sha256-6M3dJuONcD9INaBxFlx6U/nd057PD8/NlMN1jacsJE0=",
"lastModified": 1637628825,
"narHash": "sha256-5Bgr5YfJKQ7picN9BTLvANGZUCTEfRA9du6V1fkhOfA=",
"owner": "arcnmx",
"repo": "nixexprs",
"rev": "2e83baee2826fe6576304a1a70ada5b642abb1a9",
"rev": "8a3335348e13918c316cb393523f61e6cd43be9a",
"type": "github"
},
"original": {

1
overlays/default.nix
View file

@ -15,6 +15,7 @@ let
]);
config = {
allowUnfree = true;
allowUnsupportedSystem = true;
permittedInsecurePackages = [
"ffmpeg-3.4.8"
"ffmpeg-2.8.17"

75
trusted/flake.lock generated
View file

@ -259,7 +259,10 @@
},
"home-manager": {
"inputs": {
"nixpkgs": "nixpkgs"
"nixpkgs": [
"nixfiles",
"nixpkgs"
]
},
"locked": {
"lastModified": 1637481586,
@ -312,7 +315,10 @@
"nix-dns": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_2"
"nixpkgs": [
"nixfiles",
"nixpkgs"
]
},
"locked": {
"lastModified": 1635273082,
@ -341,7 +347,10 @@
"explain-pause-mode": "explain-pause-mode",
"flake-utils": "flake-utils_3",
"nix-straight": "nix-straight",
"nixpkgs": "nixpkgs_3",
"nixpkgs": [
"nixfiles",
"nixpkgs"
],
"nose": "nose",
"ob-racket": "ob-racket",
"org": "org",
@ -396,7 +405,7 @@
"katexprs": "katexprs",
"nix-dns": "nix-dns",
"nix-doom-emacs": "nix-doom-emacs",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs",
"nur": "nur",
"tf-nix": "tf-nix",
"trusted": [
@ -404,60 +413,16 @@
]
},
"locked": {
"narHash": "sha256-9GUQrhglle3iQO1BqL3yp8Hkvl/ID51G5cpNDfd+VJM=",
"path": "/nix/store/6rbym2i4whsjcxnxcdc7srxym4a27kxa-source",
"narHash": "sha256-Ivl7zeruE4IBziVoN45np+79Mqme7APYC+fVgHqjvyg=",
"path": "/nix/store/njggqc0knm08q2cmxxn2009ig1gnirgz-source",
"type": "path"
},
"original": {
"path": "/nix/store/6rbym2i4whsjcxnxcdc7srxym4a27kxa-source",
"path": "/nix/store/njggqc0knm08q2cmxxn2009ig1gnirgz-source",
"type": "path"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1637523980,
"narHash": "sha256-nBbVQHJtR7a+Ctyo67aGc1lwUsoeMhK9PVTh6pB+aYk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4f871e232b8827b0b1d22bc40bc1b0dfa4473156",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1616989418,
"narHash": "sha256-LcOn5wHR/1JwClfY/Ai/b+pSRY+d23QtIPQHwPAyHHI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9d8e05e088ad91b7c62886a2175f38bfa443db2c",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1630140382,
"narHash": "sha256-ntXepAHFlAEtaYIU5EzckRUODeeMgpu1u2Yug+4LFNc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "08ef0f28e3a41424b92ba1d203de64257a9fca6a",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixpkgs-unstable",
"type": "indirect"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1637155076,
"narHash": "sha256-26ZPNiuzlsnXpt55Q44+yzXvp385aNAfevzVEKbrU5Q=",
@ -659,11 +624,11 @@
"trusted": {
"flake": false,
"locked": {
"lastModified": 1637526942,
"narHash": "sha256-XzWMFgRPY5sQwUO01kZLRAvfFPekp7jXJIAqNiQ8wxs=",
"lastModified": 1637629540,
"narHash": "sha256-uWqbVzpZB9PJSyswP+k7cTSdGR5kz0rYBzGzWQxIhco=",
"ref": "main",
"rev": "bc613f9528ecf35f0bfbd83ab299f88d7c44f4a0",
"revCount": 87,
"rev": "4a7020983e7c7d246971edde580b8d3914bd2563",
"revCount": 88,
"type": "git",
"url": "ssh://git@github.com/kittywitch/nixfiles-trusted"
},