From 20c92a8b2f5e59182f6e35cd3c88e30358fe0d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Sun, 7 May 2023 19:36:00 +0200 Subject: [PATCH] fix(flake): reduce number of nixpkgs --- flake.lock | 417 +++++++---------------------------------------------- flake.nix | 20 +++ 2 files changed, 76 insertions(+), 361 deletions(-) diff --git a/flake.lock b/flake.lock index 66d0b62..94621ae 100644 --- a/flake.lock +++ b/flake.lock @@ -77,132 +77,14 @@ "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" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "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_5": { - "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "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_7": { - "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_8": { - "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_9": { - "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ "nixpkgs" ], - "utils": "utils" + "utils": [ + "flake-utils" + ] }, "locked": { "lastModified": 1681092193, @@ -227,37 +109,9 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1677075142, - "narHash": "sha256-0RXVZcK2YtPckd/3+jb+yLpeXZ6jnQe25w9idztDXi8=", - "owner": "kmein", - "repo": "menstruation.rs", - "rev": "e34af4393963cdbadb456b7b9ae2e95e6db7b8a3", - "type": "github" - }, - "original": { - "owner": "kmein", - "repo": "menstruation.rs", - "type": "github" - } - }, - "menstruation-backend_2": { - "inputs": { - "flake-utils": [ - "menstruation-telegram", - "menstruation-backend", - "rust-overlay", - "flake-utils" - ], - "nixpkgs": [ - "menstruation-telegram", - "menstruation-backend", - "rust-overlay", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { "lastModified": 1677075142, @@ -275,9 +129,15 @@ }, "menstruation-telegram": { "inputs": { - "flake-utils": "flake-utils_3", - "menstruation-backend": "menstruation-backend_2", - "nixpkgs": "nixpkgs_3" + "flake-utils": [ + "flake-utils" + ], + "menstruation-backend": [ + "menstruation-backend" + ], + "nixpkgs": [ + "nixpkgs-old" + ] }, "locked": { "lastModified": 1677075205, @@ -314,54 +174,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1665296151, - "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1665296151, - "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1669418739, - "narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "695b3515251873e0a7e2021add4bba643c56cde3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "695b3515251873e0a7e2021add4bba643c56cde3", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1682669017, "narHash": "sha256-Vi+p4y3wnl0/4gcwTdmCO398kKlDaUrNROtf3GOD2NY=", @@ -377,82 +189,19 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs-old": { "locked": { - "lastModified": 1677158633, - "narHash": "sha256-t7za78oRkDIjdFQF0PCilfCziFyhfowCgs9Ry+sEvE4=", + "lastModified": 1682600000, + "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "129b6f78121802d18d215c9f9e04d7971c58ea0c", + "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1665296151, - "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1665296151, - "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1669418739, - "narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "695b3515251873e0a7e2021add4bba643c56cde3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "695b3515251873e0a7e2021add4bba643c56cde3", + "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", "type": "github" } }, @@ -474,8 +223,12 @@ "recht": { "inputs": { "blessings": "blessings", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_5" + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1677165419, @@ -514,10 +267,12 @@ "menstruation-backend": "menstruation-backend", "menstruation-telegram": "menstruation-telegram", "nixinate": "nixinate", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs", + "nixpkgs-old": "nixpkgs-old", "nur": "nur", "recht": "recht", "retiolum": "retiolum", + "rust-overlay": "rust-overlay", "scripts": "scripts", "telebots": "telebots", "tinc-graph": "tinc-graph", @@ -527,72 +282,19 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs" + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1677033035, - "narHash": "sha256-w6XsKaW46kZNEk2vVfuoNIBEq/YzDy9kNk8cU0xJZEQ=", + "lastModified": 1683426137, + "narHash": "sha256-iqLjaJDMppvK1ae1eL55b2r7EX+rbUuEnssFOe9eOm8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6c9e8ea3ba73a9fed29ddc1cc52ade8e5c946a8d", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1677033035, - "narHash": "sha256-w6XsKaW46kZNEk2vVfuoNIBEq/YzDy9kNk8cU0xJZEQ=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "6c9e8ea3ba73a9fed29ddc1cc52ade8e5c946a8d", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { - "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1677119371, - "narHash": "sha256-L0Da4eKzDZrsy8ysOS1lhgDjAgEqGvYGf/lXaRd5/YQ=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "c67c79ea25664d66e74ae91a6fa0d6c65d12d3a7", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_4": { - "inputs": { - "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1677119371, - "narHash": "sha256-L0Da4eKzDZrsy8ysOS1lhgDjAgEqGvYGf/lXaRd5/YQ=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "c67c79ea25664d66e74ae91a6fa0d6c65d12d3a7", + "rev": "546a8209ce0965475495dd422e4ab3c6de7a268c", "type": "github" }, "original": { @@ -604,16 +306,14 @@ "scripts": { "inputs": { "flake-utils": [ - "scripts", - "rust-overlay", "flake-utils" ], "nixpkgs": [ - "scripts", - "rust-overlay", "nixpkgs" ], - "rust-overlay": "rust-overlay_3" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { "lastModified": 1677271864, @@ -646,8 +346,12 @@ }, "telebots": { "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_7" + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs-old" + ] }, "locked": { "lastModified": 1677156381, @@ -671,7 +375,9 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_4" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { "lastModified": 1677160040, @@ -689,8 +395,12 @@ }, "traadfri": { "inputs": { - "flake-utils": "flake-utils_9", - "nixpkgs": "nixpkgs_9" + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs-old" + ] }, "locked": { "lastModified": 1677165914, @@ -706,21 +416,6 @@ "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" - } - }, "voidrice": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index a6306c4..bf329a5 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,12 @@ menstruation-telegram.url = "github:kmein/menstruation-telegram"; nixinate.url = "github:matthewcroughan/nixinate"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0"; nur.url = "github:nix-community/NUR"; recht.url = "github:kmein/recht"; scripts.url = "github:kmein/scripts"; retiolum.url = "git+https://git.thalheim.io/Mic92/retiolum"; + rust-overlay.url = "github:oxalica/rust-overlay"; telebots.url = "github:kmein/telebots"; tinc-graph.url = "github:kmein/tinc-graph"; traadfri.url = "github:kmein/traadfri"; @@ -20,11 +22,28 @@ agenix.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + home-manager.inputs.utils.follows = "flake-utils"; menstruation-backend.inputs.flake-utils.follows = "flake-utils"; menstruation-backend.inputs.nixpkgs.follows = "nixpkgs"; + menstruation-backend.inputs.rust-overlay.follows = "rust-overlay"; + menstruation-telegram.inputs.flake-utils.follows = "flake-utils"; + menstruation-telegram.inputs.menstruation-backend.follows = "menstruation-backend"; + menstruation-telegram.inputs.nixpkgs.follows = "nixpkgs-old"; nixinate.inputs.nixpkgs.follows = "nixpkgs"; + recht.inputs.flake-utils.follows = "flake-utils"; + recht.inputs.nixpkgs.follows = "nixpkgs"; + rust-overlay.inputs.flake-utils.follows = "flake-utils"; + rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; + scripts.inputs.flake-utils.follows = "flake-utils"; + scripts.inputs.nixpkgs.follows = "nixpkgs"; + scripts.inputs.rust-overlay.follows = "rust-overlay"; + telebots.inputs.flake-utils.follows = "flake-utils"; + telebots.inputs.nixpkgs.follows = "nixpkgs-old"; tinc-graph.inputs.flake-utils.follows = "flake-utils"; tinc-graph.inputs.nixpkgs.follows = "nixpkgs"; + tinc-graph.inputs.rust-overlay.follows = "rust-overlay"; + traadfri.inputs.flake-utils.follows = "flake-utils"; + traadfri.inputs.nixpkgs.follows = "nixpkgs-old"; voidrice.flake = false; }; @@ -297,6 +316,7 @@ vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {}; vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {}; vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {}; + vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {}; vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {}; vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {}; vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {};