From 2895a51862f1c5edc7fec60bca49b7309171b1b0 Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Fri, 8 Dec 2023 14:05:12 +0100 Subject: [PATCH] Upgrade nixpkgs to 23.11 --- config/hosts/grondahl/services/postgres.nix | 6 +++--- config/hosts/rudiger/services/nextcloud.nix | 2 -- config/hosts/rudiger/services/postgres.nix | 2 +- config/sources/nix/sources.json | 20 ++++++++++---------- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/config/hosts/grondahl/services/postgres.nix b/config/hosts/grondahl/services/postgres.nix index 950c67a..30f4f83 100644 --- a/config/hosts/grondahl/services/postgres.nix +++ b/config/hosts/grondahl/services/postgres.nix @@ -14,15 +14,15 @@ ensureUsers = [ { name = "matrix-synapse"; - ensurePermissions."DATABASE \"matrix-synapse\"" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } { name = "mobilizon"; - ensurePermissions."DATABASE mobilizon" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } { name = "authentik"; - ensurePermissions."DATABASE authentik" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } ]; initialScript = pkgs.writeText "synapse-init.sql" '' diff --git a/config/hosts/rudiger/services/nextcloud.nix b/config/hosts/rudiger/services/nextcloud.nix index f2c442f..54cf8ab 100644 --- a/config/hosts/rudiger/services/nextcloud.nix +++ b/config/hosts/rudiger/services/nextcloud.nix @@ -2,8 +2,6 @@ { services.nextcloud = { enable = true; - # Disable server-side file encryption for stronger SSL - enableBrokenCiphersForSSE = false; hostName = "cloud.graven.dev"; https = true; package = pkgs.nextcloud26; diff --git a/config/hosts/rudiger/services/postgres.nix b/config/hosts/rudiger/services/postgres.nix index 12f6dad..cee84a2 100644 --- a/config/hosts/rudiger/services/postgres.nix +++ b/config/hosts/rudiger/services/postgres.nix @@ -9,7 +9,7 @@ ensureUsers = [ { name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + ensureDBOwnership = true; } ]; }; diff --git a/config/sources/nix/sources.json b/config/sources/nix/sources.json index 6b04181..da19c15 100644 --- a/config/sources/nix/sources.json +++ b/config/sources/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "7b76374b2b44152bfbf41fcb60162c2ce9182e7a", - "sha256": "1ql11hzgxdahj9x0b20b70izcmayb22rinrg82kgp5z19bvpsgrp", + "rev": "6bd7cd686220bf3db0e212481faf9578e8c8ff0f", + "sha256": "15claxlj6y15db67qc7kb4vzyn6sv7r13z4q502vq7a4z2488z94", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/7b76374b2b44152bfbf41fcb60162c2ce9182e7a.tar.gz", + "url": "https://github.com/nmattia/niv/archive/6bd7cd686220bf3db0e212481faf9578e8c8ff0f.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixos-hardware": { @@ -17,22 +17,22 @@ "homepage": "", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8772491ed75f150f02552c60694e1beff9f46013", - "sha256": "07m3i4g10ka2klmqfpqfxjfsnidk3cw53andqr33lxhy7rrvf6x2", + "rev": "fa194fc484fd7270ab324bb985593f71102e84d1", + "sha256": "06yn179lbhql3vkk4cjca4mdwr6lfdh6n1vqma3a4266dap6hcf4", "type": "tarball", - "url": "https://github.com/NixOS/nixos-hardware/archive/8772491ed75f150f02552c60694e1beff9f46013.tar.gz", + "url": "https://github.com/NixOS/nixos-hardware/archive/fa194fc484fd7270ab324bb985593f71102e84d1.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "nixos-23.05", + "branch": "nixos-23.11", "description": "Nix Packages collection", "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", - "sha256": "0pchhv9rrki70j0rrpj8pgj29cl7a595s6msh05ah5naasn3n17i", + "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4", + "sha256": "03daj0laqlqdp053wr2fznwjfbkkyh12qq1wa87zdsgdnnrgd6sc", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5b528f99f73c4fad127118a8c1126b5e003b01a9.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/b4372c4924d9182034066c823df76d6eaf1f4ec4.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixus": {