From 63a0d84701f00783aa0716a06ff154b766d31e67 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Fri, 2 May 2025 15:27:05 +0300 Subject: [PATCH] feat: Migrate to NixOS 24.11 --- README.md | 4 +-- flake.lock | 6 ++-- sp-modules/simple-nixos-mailserver/flake.lock | 34 +++++-------------- 3 files changed, 14 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 542ca37..cbf03ee 100644 --- a/README.md +++ b/README.md @@ -57,8 +57,8 @@ Overriding is more powerful (for non-nested flakes) as it allows to change a fla Example: ```console -$ nix flake lock --override-input nixpkgs github:nixos/nixpkgs?ref=nixos-24.05 -$ nix flake lock --override-input selfprivacy-api git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git?ref=flakes +$ nix flake lock --override-input nixpkgs 'github:nixos/nixpkgs?ref=nixos-24.11' +$ nix flake lock --override-input selfprivacy-api 'git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git?ref=flakes' ``` Similarly to update mechanism (described above), depending on the "precision" of an URL, its update scope varies accordingly. diff --git a/flake.lock b/flake.lock index 3efce54..5bb346f 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { diff --git a/sp-modules/simple-nixos-mailserver/flake.lock b/sp-modules/simple-nixos-mailserver/flake.lock index 7f92ada..adf1a26 100644 --- a/sp-modules/simple-nixos-mailserver/flake.lock +++ b/sp-modules/simple-nixos-mailserver/flake.lock @@ -37,15 +37,14 @@ "blobs": "blobs", "flake-compat": "flake-compat", "nixpkgs": "nixpkgs", - "nixpkgs-24_05": "nixpkgs-24_05", - "utils": "utils" + "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1718084203, - "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=", + "lastModified": 1734884447, + "narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b", + "rev": "63209b1def2c9fc891ad271f474a3464a5833294", "type": "gitlab" }, "original": { @@ -69,18 +68,18 @@ "type": "indirect" } }, - "nixpkgs-24_05": { + "nixpkgs-24_11": { "locked": { - "lastModified": 1721949857, - "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, @@ -88,21 +87,6 @@ "inputs": { "mailserver": "mailserver" } - }, - "utils": { - "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root",