From 6df69984c014df8a1cb7e6d41e7dbcccfae407d1 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 1 Sep 2023 20:35:06 +0200 Subject: [PATCH] update caches --- flake.lock | 118 +++++++++++++++++++++++++++++---------- nixos/common/default.nix | 6 +- 2 files changed, 90 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index f8c1302..02753e2 100644 --- a/flake.lock +++ b/flake.lock @@ -175,6 +175,39 @@ } }, "crane_2": { + "inputs": { + "flake-compat": [ + "lanzaboote", + "flake-compat" + ], + "flake-utils": [ + "lanzaboote", + "flake-utils" + ], + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ], + "rust-overlay": [ + "lanzaboote", + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1688772518, + "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", + "owner": "ipetkov", + "repo": "crane", + "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_3": { "flake": false, "locked": { "lastModified": 1670284777, @@ -210,7 +243,7 @@ "inputs": { "alejandra": "alejandra", "all-cabal-json": "all-cabal-json", - "crane": "crane_2", + "crane": "crane_3", "devshell": "devshell", "flake-parts": "flake-parts_2", "flake-utils-pre-commit": "flake-utils-pre-commit", @@ -503,11 +536,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -665,11 +698,11 @@ ] }, "locked": { - "lastModified": 1692686040, - "narHash": "sha256-4GkXTC7sXpEL40QbJip49qsINAH+aKSciPT/1Pz6hfM=", + "lastModified": 1693399033, + "narHash": "sha256-yXhiMo8MnE86sGtPIHAKaLHhmhe8v9tqGGotlUgKJvY=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea59b79f31beaf4a8cb0ea2fc4dfba5732e4212a", + "rev": "f5c15668f9842dd4d5430787d6aa8a28a07f7c10", "type": "github" }, "original": { @@ -680,20 +713,22 @@ }, "lanzaboote": { "inputs": { + "crane": "crane_2", "flake-compat": "flake-compat_4", "flake-parts": "flake-parts", "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix" + "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1691761621, - "narHash": "sha256-xTPifd7/93/bmBEPMhb0zuU9nzRkUIZHr+PJUHoUld8=", + "lastModified": 1692972892, + "narHash": "sha256-ifDTnczs4c/v73LKQdmoGYO81JmysKTlR5ZUH5cr+cE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f13848606f5a313c33b9c9ceb34e0ae4d51b6766", + "rev": "6d6cdf59b9d1ca6a2732c57e40f7cbd0f1eb1755", "type": "github" }, "original": { @@ -1066,11 +1101,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1692684269, - "narHash": "sha256-zJk2pyF4Cuhtor0khtPlf+hfJIh22rzAUC+KU3Ob31Q=", + "lastModified": 1693576890, + "narHash": "sha256-GvUL36la2tOjKRRRZkTSQFusbaCvItoZNA8UNIPLXeU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d757ec498666cc1dcc6f2be26db4fd3e1e9ab37", + "rev": "30291c839a688a77c637024b99c9e10be398ea22", "type": "github" }, "original": { @@ -1081,11 +1116,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1691990649, - "narHash": "sha256-gMbKOiX1HwClRP9lADaaV/lnZr93NEaOFe4ApDx/zd8=", + "lastModified": 1693003285, + "narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e287913f7b1ef537c97aa301b67c34ea46b640f", + "rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7", "type": "github" }, "original": { @@ -1159,11 +1194,11 @@ }, "nixpkgs_stable": { "locked": { - "lastModified": 1692525914, - "narHash": "sha256-MUgZ9/9mE/EbEQA6JPdcQHkjoR5fgvaKhpy6UO67uEc=", + "lastModified": 1693428224, + "narHash": "sha256-FWUUlhYqkGEySUD0blTADRiDQ7fw+H1ikivfu88uy+w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "475d5ae2c4cb87b904545bdb547af05681198fcc", + "rev": "841889913dfd06a70ffb39f603e29e46f45f0c1a", "type": "github" }, "original": { @@ -1180,11 +1215,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1692606547, - "narHash": "sha256-XiUT92TRxVRRPgKGsJ+G4hunqyuIIEJ91ENxSA+68r0=", + "lastModified": 1693552651, + "narHash": "sha256-U0PdjLxFtgK1a7leKgzqPeorhncO9xo+wmPJ/NK8fIg=", "owner": "pta2002", "repo": "nixvim", - "rev": "56b2169683bc2389281f247697f6a14867fabd19", + "rev": "186b790febffd6d16c2ba6bbe55655ddbdeec894", "type": "github" }, "original": { @@ -1195,11 +1230,11 @@ }, "nur": { "locked": { - "lastModified": 1692686760, - "narHash": "sha256-Jos0lAuo6E8f3CEHtMlkmanCLY4PVo3dyn5Y/5TUxVk=", + "lastModified": 1693577091, + "narHash": "sha256-2f63QZib9qKskqTWs6f0Mu0HKWVE9iRJUaCokKCnMls=", "owner": "nix-community", "repo": "NUR", - "rev": "c2ade119d26d95bc84b0f48afa10c63894e1150e", + "rev": "dd22fdec18a5b2c1403b40ca2122db1a0c000f6b", "type": "github" }, "original": { @@ -1264,11 +1299,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1691747570, - "narHash": "sha256-J3fnIwJtHVQ0tK2JMBv4oAmII+1mCdXdpeCxtIsrL2A=", + "lastModified": 1692274144, + "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a", + "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa", "type": "github" }, "original": { @@ -1436,6 +1471,31 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "lanzaboote", + "flake-utils" + ], + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1689906077, + "narHash": "sha256-2tjLXKoSK7O0LYHlA6GCWL0gy2kZZno4krg+KZpDh6U=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "c88b28944129eeff5e819bdc21248dc07eb0625d", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "stable": { "locked": { "lastModified": 1669735802, diff --git a/nixos/common/default.nix b/nixos/common/default.nix index f6ebf44..3f3782f 100644 --- a/nixos/common/default.nix +++ b/nixos/common/default.nix @@ -41,13 +41,11 @@ auto-optimise-store = true; trusted-users = [ "root" "victor" ]; substituters = [ - "https://cachix.cachix.org" "https://nix-community.cachix.org" "https://nixpkgs-review-bot.cachix.org" "https://colmena.cachix.org" "https://cache.garnix.io" - "https://0x76-infra.cachix.org" - "https://webcord.cachix.org" + "https://cachix.cachix.org" ]; trusted-public-keys = [ "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM=" @@ -55,8 +53,6 @@ "nixpkgs-review-bot.cachix.org-1:eppgiDjPk7Hkzzz7XlUesk3rcEHqNDozGOrcLc8IqwE=" "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - "0x76-infra.cachix.org-1:dC1qp+VEN3jj5pdK4URlXR9hf3atT+MnpKGu6PZjMc8=" - "webcord.cachix.org-1:l555jqOZGHd2C9+vS8ccdh8FhqnGe8L78QrHNn+EFEs=" ]; }; optimise = {