From f20358789f59d35abe97ee522c5dde8cbaaa3dc4 Mon Sep 17 00:00:00 2001 From: Fiscal Velvet Poet Date: Wed, 5 Jun 2024 21:51:48 +1000 Subject: [PATCH 1/5] nixos: bumped to HEAD of 24.05 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 488f2e0..c547cd8 100644 --- a/flake.lock +++ b/flake.lock @@ -213,16 +213,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716633019, - "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", + "lastModified": 1717281328, + "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", + "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 3de43c0..8394164 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ flake = false; url = git+https://reciproka.dev/resrok/resrok-web/?ref=consensus; }; - nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-23.11; + nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.05; nixpkgsUnstable.url = github:NixOS/nixpkgs/?ref=nixos-unstable; utils.url = "github:numtide/flake-utils"; voc-web = { From 5fd853e2342cfcdd7be4061674195104ad073836 Mon Sep 17 00:00:00 2001 From: Fiscal Velvet Poet Date: Wed, 5 Jun 2024 21:53:37 +1000 Subject: [PATCH 2/5] nixpkgsUnstable: bumped to HEAD of nixos-unstable --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c547cd8..cbc76b4 100644 --- a/flake.lock +++ b/flake.lock @@ -197,11 +197,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1716293225, - "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { From 1fb99ab958d95beb545e0bafbb12065ce02f56fb Mon Sep 17 00:00:00 2001 From: Fiscal Velvet Poet Date: Wed, 5 Jun 2024 22:00:46 +1000 Subject: [PATCH 3/5] pi3: remove deprecated uboot setting --- hardware/raspberry_pi_3_model_B.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hardware/raspberry_pi_3_model_B.nix b/hardware/raspberry_pi_3_model_B.nix index 35eb268..938b1af 100644 --- a/hardware/raspberry_pi_3_model_B.nix +++ b/hardware/raspberry_pi_3_model_B.nix @@ -31,7 +31,6 @@ raspberryPi = { enable = false; version = 3; - uboot.enable = true; firmwareConfig = '' arm_64bit=1 # Force kernel loading system to assume a 64-bit kernel display_auto_detect=1 # Enable auto detection of screen resolution From 3662f9f5882cc816a845f7357f338e4d7ced5719 Mon Sep 17 00:00:00 2001 From: Fiscal Velvet Poet Date: Wed, 5 Jun 2024 22:14:54 +1000 Subject: [PATCH 4/5] forgejo: updated deprecated setting to ensureDBOwnership --- profiles/reciproka-forgejo.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/profiles/reciproka-forgejo.nix b/profiles/reciproka-forgejo.nix index 283179d..2cf5325 100644 --- a/profiles/reciproka-forgejo.nix +++ b/profiles/reciproka-forgejo.nix @@ -73,11 +73,7 @@ in { ensureUsers = [ { name = "forgejo"; # Ensure the database user persists - ensurePermissions = { - # Ensure the database permissions persist - "DATABASE forgejo" = "ALL PRIVILEGES"; - "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES"; - }; + ensureDBOwnership = true; } ]; package = pkgs.postgresql_16; From fcabd95e7e8cab7b982685a7f5c09a0970e30b3e Mon Sep 17 00:00:00 2001 From: Fiscal Velvet Poet Date: Wed, 5 Jun 2024 23:07:10 +1000 Subject: [PATCH 5/5] forgejo: updated deprecated psql setting to DEFAULT.APP_NAME --- profiles/reciproka-forgejo.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/reciproka-forgejo.nix b/profiles/reciproka-forgejo.nix index 2cf5325..c33b7af 100644 --- a/profiles/reciproka-forgejo.nix +++ b/profiles/reciproka-forgejo.nix @@ -19,6 +19,7 @@ in { httpPort = 3002; # Provided unique port rootUrl = "https://reciproka.dev/"; # Root web URL settings = let + DEFAULT.APP_NAME = "Reciproka Kolektivo: Forgejo Service"; # Give the site a name server = { DOMAIN = "reciproka.dev"; # Domain name HTTP_PORT = 3002; # Provided unique port