From a4c52ea87c0e2d8e06183059c2adfced6a2b475b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 20 Apr 2024 02:08:57 +0100 Subject: [PATCH] feat: use colmena repo --- flake.lock | 169 ++++++++++++++++++++++++++++++++++++++++------------- flake.nix | 4 +- 2 files changed, 130 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index cdae9bd..2b590d8 100644 --- a/flake.lock +++ b/flake.lock @@ -66,7 +66,7 @@ "bfom": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "utils": "utils" }, "locked": { @@ -99,10 +99,31 @@ "type": "gitlab" } }, + "colmena": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3", + "stable": "stable" + }, + "locked": { + "lastModified": 1711386353, + "narHash": "sha256-gWEpb8Hybnoqb4O4tmpohGZk6+aerAbJpywKcFIiMlg=", + "owner": "zhaofengli", + "repo": "colmena", + "rev": "cd65ef7a25cdc75052fbd04b120aeb066c3881db", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "repo": "colmena", + "type": "github" + } + }, "compsoc_public": { "inputs": { "bfom": "bfom", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "utils": "utils_2" }, "locked": { @@ -166,6 +187,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1668681692, @@ -203,6 +240,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems_2" }, @@ -275,7 +327,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1652722411, @@ -293,7 +345,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1692351612, @@ -311,7 +363,7 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1686572087, @@ -374,6 +426,20 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1687011986, + "narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2c09e8eb8717e240ef9c5727c1cc9186db9fb309", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1686921029, "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", @@ -388,7 +454,7 @@ "type": "indirect" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -402,7 +468,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1689935543, "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", @@ -416,7 +482,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1690026219, "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", @@ -430,7 +496,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -444,7 +510,7 @@ "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { "lastModified": 1695837737, "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", @@ -476,16 +542,18 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1652840887, - "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_4": { @@ -503,6 +571,20 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1652840887, + "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1691371061, "narHash": "sha256-BxPbPVlBIoneaXIBiHd0LVzA+L4nmvFCNBU6TmQAiMM=", @@ -516,7 +598,7 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1706913249, "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", @@ -531,7 +613,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1693060755, "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=", @@ -545,7 +627,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1693087214, "narHash": "sha256-Kn1SSqRfPpqcI1MDy82JXrPT1WI8c03TA2F0xu6kS+4=", @@ -560,28 +642,15 @@ "type": "indirect" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1687011986, - "narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2c09e8eb8717e240ef9c5727c1cc9186db9fb309", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "root": { "inputs": { "agenix": "agenix", "alejandra": "alejandra", "arion": "arion", + "colmena": "colmena", "compsoc_public": "compsoc_public", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_6", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_7", "simple-nixos-mailserver": "simple-nixos-mailserver", "skynet_discord_bot": "skynet_discord_bot", "skynet_ldap_backend": "skynet_ldap_backend", @@ -612,7 +681,7 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ], @@ -639,7 +708,7 @@ "skynet_discord_bot": { "inputs": { "naersk": "naersk_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "utils": "utils_4" }, "locked": { @@ -661,7 +730,7 @@ "skynet_ldap_backend": { "inputs": { "naersk": "naersk_3", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", "utils": "utils_5" }, "locked": { @@ -682,7 +751,7 @@ }, "skynet_ldap_frontend": { "inputs": { - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "utils": "utils_6" }, "locked": { @@ -703,7 +772,7 @@ }, "skynet_website": { "inputs": { - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "utils": "utils_7" }, "locked": { @@ -724,7 +793,7 @@ }, "skynet_website_2016": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_14", "utils": "utils_8" }, "locked": { @@ -745,7 +814,7 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "utils": "utils_9" }, "locked": { @@ -766,7 +835,7 @@ }, "skynet_website_renew": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_16", "utils": "utils_10" }, "locked": { @@ -785,6 +854,22 @@ "type": "gitlab" } }, + "stable": { + "locked": { + "lastModified": 1696039360, + "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 66eb62f..a1cbad4 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,7 @@ url = "github:kamadorueda/alejandra/3.0.0"; inputs.nixpkgs.follows = "nixpkgs"; }; + colmena.url = "github:zhaofengli/colmena"; # email # simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; @@ -84,6 +85,7 @@ nixpkgs, agenix, alejandra, + colmena, ... } @ inputs: let pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs; @@ -94,7 +96,7 @@ name = "Skynet build env"; nativeBuildInputs = [ pkgs.buildPackages.git - pkgs.buildPackages.colmena + colmena.defaultPackage."x86_64-linux" pkgs.buildPackages.nmap ]; buildInputs = [agenix.packages.x86_64-linux.default];