pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

Merge pull request 'Fix git ref git.b12f.io -> git.pub.solar' (#253) from infra-fix-git-ref-vm-tools into infra
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source 
Reviewed-on: #253
Reviewed-by: b12f <hello@benjaminbaedorf.eu>
This commit is contained in:
b12f 2023-09-13 12:36:48 +02:00
parent 6691801d0f 9685baa34b
commit e260839584
Signed by: pub.solar gitea
GPG key ID: F0332B04B7054873
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.lock
View file

@ -471,19 +471,19 @@
}, },
"locked": { "locked": {
"dir": "vmtools", "dir": "vmtools",
"lastModified": 1669648111, "lastModified": 1694596254,
"narHash": "sha256-EKh7iM4fCyZ7L6+HmGn3QkZ1HuG9zMEkziOH3K13SbY=", "narHash": "sha256-aqGmoQXVG0Q1SeZuIWws8dbn1JRnjOGxtDVs2SBzNR0=",
"ref": "main", "ref": "main",
"rev": "d78c4afe040440437949ce581ae0dcdc5893553c", "rev": "463d525addaf05beaf4a632fd85e2a2b25ddf8ee",
"revCount": 28, "revCount": 69,
"type": "git", "type": "git",
"url": "https://git.b12f.io/pub-solar/infra?dir=vmtools" "url": "https://git.pub.solar/pub-solar/infra?dir=vmtools"
}, },
"original": { "original": {
"dir": "vmtools", "dir": "vmtools",
"ref": "main", "ref": "main",
"type": "git", "type": "git",
"url": "https://git.b12f.io/pub-solar/infra?dir=vmtools" "url": "https://git.pub.solar/pub-solar/infra?dir=vmtools"
} }
}, },
"utils": { "utils": {

2
flake.nix
View file

@ -39,7 +39,7 @@
nvfetcher.inputs.nixpkgs.follows = "nixos"; nvfetcher.inputs.nixpkgs.follows = "nixos";
nvfetcher.inputs.flake-compat.follows = "flake-compat"; nvfetcher.inputs.flake-compat.follows = "flake-compat";
triton-vmtools.url = "git+https://git.b12f.io/pub-solar/infra?ref=main&dir=vmtools"; triton-vmtools.url = "git+https://git.pub.solar/pub-solar/infra?ref=main&dir=vmtools";
triton-vmtools.inputs.nixpkgs.follows = "nixos"; triton-vmtools.inputs.nixpkgs.follows = "nixos";
keycloak-theme-pub-solar.url = "git+https://git.pub.solar/pub-solar/keycloak-theme?ref=main"; keycloak-theme-pub-solar.url = "git+https://git.pub.solar/pub-solar/keycloak-theme?ref=main";

1
hosts/flora-6/collabora.nix
View file

@ -5,7 +5,6 @@
self, self,
... ...
}: { }: {
virtualisation = { virtualisation = {
docker = { docker = {
enable = true; # sadly podman is not supported rightnow enable = true; # sadly podman is not supported rightnow