From d64997991dd97b6f8aa766feb6100eb82f3b555f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 21 Jul 2024 13:10:18 +0100 Subject: [PATCH] update: rebased the mailserver to pull in updates from upstream --- flake.lock | 122 ++++++++++++++++++++--------------------------------- 1 file changed, 45 insertions(+), 77 deletions(-) diff --git a/flake.lock b/flake.lock index 8e63bca..b2efc10 100644 --- a/flake.lock +++ b/flake.lock @@ -266,11 +266,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -514,33 +514,18 @@ "type": "github" } }, - "nixpkgs-22_11": { + "nixpkgs-24_05": { "locked": { - "lastModified": 1669558522, - "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" - } - }, - "nixpkgs-23_05": { - "locked": { - "lastModified": 1684782344, - "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", + "ref": "nixos-24.05", "type": "indirect" } }, @@ -867,17 +852,15 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_11": "nixpkgs-22_11", - "nixpkgs-23_05": "nixpkgs-23_05", - "utils": "utils_3" + "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1696865182, - "narHash": "sha256-zyUUOA+RiwRjLP6+zi80p5pqftYK3+9yIN5wQ9VlGkw=", + "lastModified": 1721563560, + "narHash": "sha256-y+Rag94tKu8Z6ouJlfxFb8EK9fKs1TNZa4nX7MT2kZg=", "owner": "compsoc1%2Fskynet", "repo": "misc%2Fnixos-mailserver", - "rev": "14007ae0eaeba4cc0235135f872122e398f09040", + "rev": "903190561842dd9cc2e7c25dda10ea26fccfd7e9", "type": "gitlab" }, "original": { @@ -891,7 +874,7 @@ "inputs": { "naersk": "naersk_2", "nixpkgs": "nixpkgs_10", - "utils": "utils_4" + "utils": "utils_3" }, "locked": { "host": "gitlab.skynet.ie", @@ -913,7 +896,7 @@ "inputs": { "naersk": "naersk_3", "nixpkgs": "nixpkgs_12", - "utils": "utils_5" + "utils": "utils_4" }, "locked": { "host": "gitlab.skynet.ie", @@ -934,7 +917,7 @@ "skynet_ldap_frontend": { "inputs": { "nixpkgs": "nixpkgs_13", - "utils": "utils_6" + "utils": "utils_5" }, "locked": { "host": "gitlab.skynet.ie", @@ -955,7 +938,7 @@ "skynet_website": { "inputs": { "nixpkgs": "nixpkgs_14", - "utils": "utils_7" + "utils": "utils_6" }, "locked": { "host": "gitlab.skynet.ie", @@ -976,7 +959,7 @@ "skynet_website_2009": { "inputs": { "nixpkgs": "nixpkgs_15", - "utils": "utils_8" + "utils": "utils_7" }, "locked": { "host": "gitlab.skynet.ie", @@ -997,7 +980,7 @@ "skynet_website_2017": { "inputs": { "nixpkgs": "nixpkgs_16", - "utils": "utils_9" + "utils": "utils_8" }, "locked": { "host": "gitlab.skynet.ie", @@ -1018,7 +1001,7 @@ "skynet_website_2023": { "inputs": { "nixpkgs": "nixpkgs_17", - "utils": "utils_10" + "utils": "utils_9" }, "locked": { "host": "gitlab.skynet.ie", @@ -1040,7 +1023,7 @@ "skynet_website_games": { "inputs": { "nixpkgs": "nixpkgs_18", - "utils": "utils_11" + "utils": "utils_10" }, "locked": { "host": "gitlab.skynet.ie", @@ -1061,7 +1044,7 @@ "skynet_website_renew": { "inputs": { "nixpkgs": "nixpkgs_19", - "utils": "utils_12" + "utils": "utils_11" }, "locked": { "host": "gitlab.skynet.ie", @@ -1309,24 +1292,6 @@ } }, "utils_10": { - "inputs": { - "systems": "systems_11" - }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_11": { "inputs": { "systems": "systems_12" }, @@ -1344,7 +1309,7 @@ "type": "github" } }, - "utils_12": { + "utils_11": { "inputs": { "systems": "systems_13" }, @@ -1381,21 +1346,6 @@ } }, "utils_3": { - "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_4": { "inputs": { "systems": "systems_5" }, @@ -1413,7 +1363,7 @@ "type": "github" } }, - "utils_5": { + "utils_4": { "inputs": { "systems": "systems_6" }, @@ -1431,7 +1381,7 @@ "type": "github" } }, - "utils_6": { + "utils_5": { "inputs": { "systems": "systems_7" }, @@ -1449,7 +1399,7 @@ "type": "github" } }, - "utils_7": { + "utils_6": { "inputs": { "systems": "systems_8" }, @@ -1467,7 +1417,7 @@ "type": "github" } }, - "utils_8": { + "utils_7": { "inputs": { "systems": "systems_9" }, @@ -1485,7 +1435,7 @@ "type": "github" } }, - "utils_9": { + "utils_8": { "inputs": { "systems": "systems_10" }, @@ -1502,6 +1452,24 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_9": { + "inputs": { + "systems": "systems_11" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root",