From 7fa5939cf9d6e1f37615deee4165b07d74a29380 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Fri, 25 Nov 2022 22:48:27 +0100 Subject: [PATCH] reduce lockfile size --- flake.lock | 270 +++++++++-------------------------------------------- flake.nix | 15 +++ 2 files changed, 58 insertions(+), 227 deletions(-) diff --git a/flake.lock b/flake.lock index 383f70a..1dfba2b 100644 --- a/flake.lock +++ b/flake.lock @@ -16,22 +16,6 @@ "type": "gitlab" } }, - "blobs_2": { - "flake": false, - "locked": { - "lastModified": 1604995301, - "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "repo": "blobs", - "type": "gitlab" - } - }, "cyberchaos": { "inputs": { "digital-nftables": "digital-nftables", @@ -80,29 +64,6 @@ "type": "github" } }, - "deploy-rs_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nix-hexchen", - "nixpkgs" - ], - "utils": "utils_2" - }, - "locked": { - "lastModified": 1659725433, - "narHash": "sha256-1ZxuK67TL29YLw88vQ18Y2Y6iYg8Jb7I6/HVzmNB6nM=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "41f15759dd8b638e7b4f299730d94d5aa46ab7eb", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, "digital-nftables": { "flake": false, "locked": { @@ -138,22 +99,6 @@ } }, "doom-emacs": { - "flake": false, - "locked": { - "lastModified": 1667001463, - "narHash": "sha256-M4gBRCfUlopMwqqfygPlfYrDEWgn5iivDHCpYkZ9yQE=", - "owner": "doomemacs", - "repo": "doom-emacs", - "rev": "3d8f9ae5ea90aad27d3f40ff701bc2f368391420", - "type": "github" - }, - "original": { - "owner": "doomemacs", - "repo": "doom-emacs", - "type": "github" - } - }, - "doom-emacs_2": { "flake": false, "locked": { "lastModified": 1660901074, @@ -187,22 +132,6 @@ } }, "emacs-overlay": { - "flake": false, - "locked": { - "lastModified": 1666989765, - "narHash": "sha256-bPwGXizMQnXxEsKt1n0lGGB8kiaXhmehu1pSy0VwCow=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "87fd982e510d78c7ed61df5a0e339fe57f858f87", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, - "emacs-overlay_2": { "flake": false, "locked": { "lastModified": 1664478431, @@ -333,11 +262,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "owner": "edolstra", "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", "type": "github" }, "original": { @@ -362,22 +291,6 @@ "type": "github" } }, - "flake-compat_4": { - "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-utils": { "locked": { "lastModified": 1667395993, @@ -393,21 +306,6 @@ "type": "github" } }, - "flake-utils_2": { - "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" - } - }, "format-all": { "flake": false, "locked": { @@ -431,7 +329,7 @@ "nix-hexchen", "nixpkgs" ], - "utils": "utils_3" + "utils": "utils_2" }, "locked": { "lastModified": 1666903647, @@ -478,16 +376,16 @@ }, "nix-doom-emacs": { "inputs": { - "doom-emacs": "doom-emacs_2", + "doom-emacs": "doom-emacs", "doom-snippets": "doom-snippets", - "emacs-overlay": "emacs-overlay_2", + "emacs-overlay": "emacs-overlay", "emacs-so-long": "emacs-so-long", "evil-escape": "evil-escape", "evil-markdown": "evil-markdown", "evil-org-mode": "evil-org-mode", "evil-quick-diff": "evil-quick-diff", "explain-pause-mode": "explain-pause-mode", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-utils": [ "nix-hexchen", "flake-utils" @@ -528,15 +426,32 @@ "nix-hexchen": { "inputs": { "cyberchaos": "cyberchaos", - "deploy-rs": "deploy-rs_2", - "doom-emacs": "doom-emacs", - "emacs-overlay": "emacs-overlay", - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", + "deploy-rs": [ + "deploy-rs" + ], + "doom-emacs": [ + "nix-hexchen", + "nix-doom-emacs", + "doom-emacs" + ], + "emacs-overlay": [ + "nix-hexchen", + "nix-doom-emacs", + "emacs-overlay" + ], + "flake-compat": "flake-compat_2", + "flake-utils": [ + "deploy-rs", + "utils" + ], "home-manager": "home-manager", "nix-doom-emacs": "nix-doom-emacs", - "nixos-mailserver": "nixos-mailserver", - "nixpkgs": "nixpkgs", + "nixos-mailserver": [ + "nixos-mailserver" + ], + "nixpkgs": [ + "nixpkgs-unstable" + ], "nixpkgs-bindfix": "nixpkgs-bindfix", "sops-nix": "sops-nix", "waybar-iceportal": "waybar-iceportal" @@ -575,35 +490,12 @@ "inputs": { "blobs": "blobs", "nixpkgs": [ - "nix-hexchen", + "nixpkgs-unstable" + ], + "nixpkgs-22_05": [ "nixpkgs" ], - "nixpkgs-22_05": "nixpkgs-22_05", - "utils": [ - "nix-hexchen", - "flake-utils" - ] - }, - "locked": { - "lastModified": 1658267644, - "narHash": "sha256-NJRe1rnlF112eZwxNASlRL8/ghwD8g+lpHIYRkWQxC8=", - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "rev": "004c229ca44c069d93c92abf67ff1619fb508c6a", - "type": "gitlab" - }, - "original": { - "owner": "simple-nixos-mailserver", - "repo": "nixos-mailserver", - "type": "gitlab" - } - }, - "nixos-mailserver_2": { - "inputs": { - "blobs": "blobs_2", - "nixpkgs": "nixpkgs_2", - "nixpkgs-22_05": "nixpkgs-22_05_3", - "utils": "utils_4" + "utils": "utils_3" }, "locked": { "lastModified": 1655930346, @@ -622,27 +514,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1667991831, - "narHash": "sha256-DHgEsLZI044B9T4AjA3K6+yB9/DqLr4dyA7OIx0FG7o=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "872fceeed60ae6b7766cc0a4cd5bf5901b9098ec", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-22_05": { - "locked": { - "lastModified": 1654936503, - "narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=", + "lastModified": 1667921968, + "narHash": "sha256-EI+//LbhUzX471LHq8GgB+oUHpdA2rsiXpY1q5tDYGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dab6df51387c3878cdea09f43589a15729cae9f4", + "rev": "df2bcbbd1c2aa144261cf1b0003c889c075dc693", "type": "github" }, "original": { @@ -651,7 +527,7 @@ "type": "indirect" } }, - "nixpkgs-22_05_2": { + "nixpkgs-22_05": { "locked": { "lastModified": 1666488099, "narHash": "sha256-DANs2epN5QgvxWzH7xF3dzb4WE0lEuMLrMEu/vPmQxw=", @@ -667,21 +543,6 @@ "type": "github" } }, - "nixpkgs-22_05_3": { - "locked": { - "lastModified": 1654936503, - "narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dab6df51387c3878cdea09f43589a15729cae9f4", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-22.05", - "type": "indirect" - } - }, "nixpkgs-bindfix": { "locked": { "lastModified": 1646653989, @@ -712,36 +573,6 @@ "type": "indirect" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1642635915, - "narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6d8215281b2f87a5af9ed7425a26ac575da0438f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1667921968, - "narHash": "sha256-EI+//LbhUzX471LHq8GgB+oUHpdA2rsiXpY1q5tDYGw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "df2bcbbd1c2aa144261cf1b0003c889c075dc693", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-22.05", - "type": "indirect" - } - }, "nose": { "flake": false, "locked": { @@ -860,8 +691,8 @@ "mattermost-server": "mattermost-server", "mattermost-webapp": "mattermost-webapp", "nix-hexchen": "nix-hexchen", - "nixos-mailserver": "nixos-mailserver_2", - "nixpkgs": "nixpkgs_3", + "nixos-mailserver": "nixos-mailserver", + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable" } }, @@ -903,7 +734,7 @@ "nix-hexchen", "nixpkgs" ], - "nixpkgs-22_05": "nixpkgs-22_05_2" + "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { "lastModified": 1666499473, @@ -951,21 +782,6 @@ } }, "utils_2": { - "locked": { - "lastModified": 1648297722, - "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_3": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -980,7 +796,7 @@ "type": "github" } }, - "utils_4": { + "utils_3": { "locked": { "lastModified": 1605370193, "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", diff --git a/flake.nix b/flake.nix index d7421d2..7582536 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,21 @@ deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; + + # these exist mostly to make the flake.lock somewhat more human-friendly + # note that in theory doing this might break things, but it seems fairly unlikely + nix-hexchen.inputs = { + nixos-mailserver.follows = "nixos-mailserver"; + nixpkgs.follows = "nixpkgs-unstable"; + deploy-rs.follows = "deploy-rs"; + doom-emacs.follows = "nix-hexchen/nix-doom-emacs/doom-emacs"; + emacs-overlay.follows = "nix-hexchen/nix-doom-emacs/emacs-overlay"; + flake-utils.follows = "/deploy-rs/utils"; + }; + nixos-mailserver.inputs = { + "nixpkgs-22_05".follows = "nixpkgs"; + nixpkgs.follows = "nixpkgs-unstable"; + }; }; outputs = { self, nixpkgs, nix-hexchen, deploy-rs, ... }@inputs: