diff --git a/flake.lock b/flake.lock index 5b68d57..81bfd82 100644 --- a/flake.lock +++ b/flake.lock @@ -19,8 +19,12 @@ "deploy-rs": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "utils": "utils" + "nixpkgs": [ + "unstable" + ], + "utils": [ + "flake-utils" + ] }, "locked": { "lastModified": 1672327199, @@ -52,29 +56,13 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -86,9 +74,11 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixpkgs" + "unstable" ], - "utils": "utils_2" + "utils": [ + "flake-utils" + ] }, "locked": { "lastModified": 1672244468, @@ -123,8 +113,12 @@ }, "linkal": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1669844376, @@ -142,67 +136,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1671417167, - "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-22_11": { - "locked": { - "lastModified": 1669558522, - "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1673100377, - "narHash": "sha256-mT76pTd0YFxT6CwtPhDgHJhuIgLY+ZLSMiQpBufwMG4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9f11a2df77cb945c115ae2a65f53f38121597d73", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1663669617, - "narHash": "sha256-yUrzkRDc6P3hsI5TdQ5+q8gnyjadNvaM3MMEsEVS8qk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "41ac0bd371618db6dd67fd952cc5b3d6a9955a15", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1673163619, "narHash": "sha256-B33PFBL64ZgTWgMnhFL3jgheAN/DjHPsZ1Ih3z0VE5I=", @@ -218,28 +151,14 @@ "type": "github" } }, - "nur": { - "locked": { - "lastModified": 1673271967, - "narHash": "sha256-y8YoXFOtSIZBdpIt+LhBN+PPJRnFYZ8+G5NU6mMxzd4=", - "owner": "nix-community", - "repo": "NUR", - "rev": "3453c12ff68a863938c01a8d6f41528add468885", - "type": "github" - }, - "original": { - "id": "nur", - "type": "indirect" - } - }, "root": { "inputs": { "deploy-rs": "deploy-rs", + "flake-utils": "flake-utils", "home-manager": "home-manager", "homepage": "homepage", "linkal": "linkal", - "nixpkgs": "nixpkgs_3", - "nur": "nur", + "nixpkgs": "nixpkgs", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix", "unstable": "unstable" @@ -248,24 +167,27 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_2", "nixpkgs": [ + "unstable" + ], + "nixpkgs-22_11": [ "nixpkgs" ], - "nixpkgs-22_11": "nixpkgs-22_11", - "utils": "utils_3" + "utils": [ + "flake-utils" + ] }, "locked": { - "lastModified": 1671738303, - "narHash": "sha256-PRgqtaWf2kMSYqVmcnmhTh+UsC0RmvXRTr+EOw5VZUA=", + "lastModified": 1671659164, + "narHash": "sha256-DbpT+v1POwFOInbrDL+vMbYV3mVbTkMxmJ5j50QnOcA=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "6d0d9fb966cc565a3df74d3b686f924c7615118c", + "rev": "bc667fb6afc45f6cc2d118ab77658faf2227cffd", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "master", + "ref": "nixos-22.11", "repo": "nixos-mailserver", "type": "gitlab" } @@ -273,9 +195,11 @@ "sops-nix": { "inputs": { "nixpkgs": [ - "nixpkgs" + "unstable" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1673147300, @@ -306,51 +230,6 @@ "repo": "nixpkgs", "type": "github" } - }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "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" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 8b08ac4..4ffc628 100644 --- a/flake.nix +++ b/flake.nix @@ -4,9 +4,12 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + flake-utils.url = "github:numtide/flake-utils"; + home-manager = { url = "github:nix-community/home-manager/release-22.11"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "unstable"; + inputs.utils.follows = "flake-utils"; }; homepage = { @@ -20,26 +23,32 @@ deploy-rs = { url = "github:serokell/deploy-rs"; + inputs.utils.follows = "flake-utils"; + inputs.nixpkgs.follows = "unstable"; }; sops-nix = { url = "github:Mic92/sops-nix"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "unstable"; + inputs.nixpkgs-stable.follows = "nixpkgs"; }; simple-nixos-mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-22.11"; + inputs.nixpkgs.follows = "unstable"; + inputs.nixpkgs-22_11.follows = "nixpkgs"; + inputs.utils.follows = "flake-utils"; }; linkal = { url = "github:JulienMalka/Linkal/main"; - flake = true; + inputs.flake-utils.follows = "flake-utils"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, home-manager, nixpkgs, unstable, deploy-rs, sops-nix, nur, ... }@inputs: + outputs = { self, home-manager, nixpkgs, unstable, deploy-rs, sops-nix, ... }@inputs: let pkgs = import nixpkgs { system = "x86_64-linux"; }; pkgsrpi = import nixpkgs { system = "aarch64-linux"; };