From 8cea8e0fe6d4daad01d884a5e8f93cef2c1e1119 Mon Sep 17 00:00:00 2001 From: fi Date: Wed, 15 Jan 2025 20:09:38 +0100 Subject: [PATCH 1/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4?narHash=sha256-A7CTIQ8SW0hfbhKlwK%2BvSsu4pD%2BOaelw3v6goX6go%2BU%3D' (2024-12-23) → 'github:nix-community/nixos-generators/74b8e31dd709760c86eed16b6c1d0b88d7360937?narHash=sha256-mvTZ7fLKA6ggGnA8GZwcXV57EvVReRTCfi26xc08Q3g%3D' (2025-01-13) • Updated input 'nixos-generators/nixlib': 'github:nix-community/nixpkgs.lib/0a31e8d833173ae63e43fd9dbff1ccf09c4f778c?narHash=sha256-dPhc%2Bf2wkmhMqMIfq%2BhColJdysgVxKP9ilZ5bR0NRZI%3D' (2024-12-22) → 'github:nix-community/nixpkgs.lib/1418bc28a52126761c02dd3d89b2d8ca0f521181?narHash=sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s%3D' (2025-01-12) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/bd27be8c9381a66288504d5266db495de571d7bf?narHash=sha256-vL6dGj%2B0w%2Bl1cK4duEokolgmx4Hu3O1TPjpD6Dfd7oY%3D' (2025-01-06) → 'github:NixOS/nixpkgs/e24b4c09e963677b1beea49d411cd315a024ad3a?narHash=sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ%3D' (2025-01-15) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/6199c32fe66a688ce7c3483de2b05b358ab7a0a6?narHash=sha256-y1OxajWQrxP7naHYPoUCrf4AAhEqOGwpNbj%2BqBXSn5s%3D' (2025-01-06) → 'github:NixOS/nixpkgs/b16e3d70060653b149ecb5ce014229b06fc6314e?narHash=sha256-IiP%2B6VTVnE1r4aDQxkIcHsnfOoFVIqAwAo4Tend%2B8R4%3D' (2025-01-15) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/9f46f57b78d2ef865cd8c58eff8d430bb62a471a?narHash=sha256-AdKOlljgcTLOrJb3HFpaaoHWJhFrkVeT9HbRm0JvcwE%3D' (2025-01-06) → 'github:NixOS/nixpkgs/79fb36c527a228a09f0064dbadf16ea0c53558bb?narHash=sha256-%2BOXbtG8uquUww0cDW6FSbjhJHpx4bA1uqPpMd4Vo9ZI%3D' (2025-01-15) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index f2eb41a..22eda58 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ }, "nixlib": { "locked": { - "lastModified": 1734829460, - "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", + "lastModified": 1736643958, + "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", + "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", "type": "github" }, "original": { @@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1734915500, - "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=", + "lastModified": 1736730523, + "narHash": "sha256-mvTZ7fLKA6ggGnA8GZwcXV57EvVReRTCfi26xc08Q3g=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4", + "rev": "74b8e31dd709760c86eed16b6c1d0b88d7360937", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736167739, - "narHash": "sha256-vL6dGj+0w+l1cK4duEokolgmx4Hu3O1TPjpD6Dfd7oY=", + "lastModified": 1736916166, + "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd27be8c9381a66288504d5266db495de571d7bf", + "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1736204625, - "narHash": "sha256-y1OxajWQrxP7naHYPoUCrf4AAhEqOGwpNbj+qBXSn5s=", + "lastModified": 1736968098, + "narHash": "sha256-IiP+6VTVnE1r4aDQxkIcHsnfOoFVIqAwAo4Tend+8R4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6199c32fe66a688ce7c3483de2b05b358ab7a0a6", + "rev": "b16e3d70060653b149ecb5ce014229b06fc6314e", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1736165148, - "narHash": "sha256-AdKOlljgcTLOrJb3HFpaaoHWJhFrkVeT9HbRm0JvcwE=", + "lastModified": 1736924247, + "narHash": "sha256-+OXbtG8uquUww0cDW6FSbjhJHpx4bA1uqPpMd4Vo9ZI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f46f57b78d2ef865cd8c58eff8d430bb62a471a", + "rev": "79fb36c527a228a09f0064dbadf16ea0c53558bb", "type": "github" }, "original": { From 5e4bfb17fb086fe726bf5231e62789933733ccbb Mon Sep 17 00:00:00 2001 From: fi Date: Tue, 21 Jan 2025 18:19:26 +0100 Subject: [PATCH 2/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/74b8e31dd709760c86eed16b6c1d0b88d7360937?narHash=sha256-mvTZ7fLKA6ggGnA8GZwcXV57EvVReRTCfi26xc08Q3g%3D' (2025-01-13) → 'github:nix-community/nixos-generators/d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453?narHash=sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL%2BtIBm49vpepwL1MQ%3D' (2025-01-16) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/e24b4c09e963677b1beea49d411cd315a024ad3a?narHash=sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ%3D' (2025-01-15) → 'github:NixOS/nixpkgs/6b90f6de986555ac39fc69c438d1192a397bf686?narHash=sha256-IT0B8bzp0JHYlMZ62qFdwKrj9zxdn3AEAsByXFWMcY4%3D' (2025-01-20) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/b16e3d70060653b149ecb5ce014229b06fc6314e?narHash=sha256-IiP%2B6VTVnE1r4aDQxkIcHsnfOoFVIqAwAo4Tend%2B8R4%3D' (2025-01-15) → 'github:NixOS/nixpkgs/8f02b83dbc10aeeb27d2b4cb7d15f2611b2706b4?narHash=sha256-q8Na0pUQaVGyYRMq%2BM4VejamPtNfnmQC92sJmmkqAy4%3D' (2025-01-21) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/79fb36c527a228a09f0064dbadf16ea0c53558bb?narHash=sha256-%2BOXbtG8uquUww0cDW6FSbjhJHpx4bA1uqPpMd4Vo9ZI%3D' (2025-01-15) → 'github:NixOS/nixpkgs/2582766522e754520bf3f883f06560f89870a5ba?narHash=sha256-GG0myEzULU7uiwoNGnwqiclki%2BJg8dPG6nv7yKo7lMc%3D' (2025-01-21) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 22eda58..cc86f81 100644 --- a/flake.lock +++ b/flake.lock @@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1736730523, - "narHash": "sha256-mvTZ7fLKA6ggGnA8GZwcXV57EvVReRTCfi26xc08Q3g=", + "lastModified": 1737057290, + "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "74b8e31dd709760c86eed16b6c1d0b88d7360937", + "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736916166, - "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", + "lastModified": 1737362405, + "narHash": "sha256-IT0B8bzp0JHYlMZ62qFdwKrj9zxdn3AEAsByXFWMcY4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", + "rev": "6b90f6de986555ac39fc69c438d1192a397bf686", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1736968098, - "narHash": "sha256-IiP+6VTVnE1r4aDQxkIcHsnfOoFVIqAwAo4Tend+8R4=", + "lastModified": 1737479843, + "narHash": "sha256-q8Na0pUQaVGyYRMq+M4VejamPtNfnmQC92sJmmkqAy4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b16e3d70060653b149ecb5ce014229b06fc6314e", + "rev": "8f02b83dbc10aeeb27d2b4cb7d15f2611b2706b4", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1736924247, - "narHash": "sha256-+OXbtG8uquUww0cDW6FSbjhJHpx4bA1uqPpMd4Vo9ZI=", + "lastModified": 1737469477, + "narHash": "sha256-GG0myEzULU7uiwoNGnwqiclki+Jg8dPG6nv7yKo7lMc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "79fb36c527a228a09f0064dbadf16ea0c53558bb", + "rev": "2582766522e754520bf3f883f06560f89870a5ba", "type": "github" }, "original": { From e2ff9244c223eef51d4081847c5ecaf5f8f3c36b Mon Sep 17 00:00:00 2001 From: fi Date: Tue, 21 Jan 2025 18:36:50 +0100 Subject: [PATCH 3/5] Update mastodon to 4.3.3 --- config/hosts/mastodon/mastodon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index 18c25e0..e7a3024 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -16,14 +16,14 @@ let }; mastodonNekoverseOverlay = final: prev: { mastodon = (prev.mastodon.override rec { - version = "4.3.2"; + version = "4.3.3"; srcOverride = final.applyPatches { src = pkgs.stdenv.mkDerivation { name = "mastodonWithThemes"; src = pkgs.fetchgit { url = "https://github.com/mastodon/mastodon.git"; rev = "v${version}"; - sha256 = "sha256-A1sSUBtlztKFsZ3TY/c9CXFV8LhttRW2JmSU0QSVOIg="; + sha256 = "sha256-6FyLhRy+/uW+RYt+IRHpkTABjKGTQYjR/4GSPN+GlGY="; }; installPhase = '' cp -r ./ $out/ From a709d4d7c30933b55fa7079f25f4c555194bef17 Mon Sep 17 00:00:00 2001 From: fi Date: Tue, 21 Jan 2025 19:11:29 +0100 Subject: [PATCH 4/5] Bump valkyrie system.stateVersion to 24.11 --- config/hosts/valkyrie/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hosts/valkyrie/configuration.nix b/config/hosts/valkyrie/configuration.nix index f4e2db5..aca6e04 100644 --- a/config/hosts/valkyrie/configuration.nix +++ b/config/hosts/valkyrie/configuration.nix @@ -96,5 +96,5 @@ services.prometheus.exporters.node.enable = false; - system.stateVersion = "23.05"; + system.stateVersion = "24.11"; } From 893e94895496fe7736f6f33219c34fa22e321cc5 Mon Sep 17 00:00:00 2001 From: fi Date: Tue, 21 Jan 2025 19:13:45 +0100 Subject: [PATCH 5/5] Use stable nixpkgs for valkyrie uptime-kuma container --- config/hosts/valkyrie/containers/uptime-kuma/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/hosts/valkyrie/containers/uptime-kuma/default.nix b/config/hosts/valkyrie/containers/uptime-kuma/default.nix index ca36384..7f55ea4 100644 --- a/config/hosts/valkyrie/containers/uptime-kuma/default.nix +++ b/config/hosts/valkyrie/containers/uptime-kuma/default.nix @@ -1,7 +1,6 @@ -{ nixpkgs-unstable, ... }: +{ ... }: { containers.uptime-kuma = { - nixpkgs = nixpkgs-unstable; autoStart = true; config = { ... }: { networking.useHostResolvConf = true;