From 05d50f4c75b65b9b9ae6236a2b5bf0e2512fde48 Mon Sep 17 00:00:00 2001 From: Nico Jensch Date: Sat, 9 Sep 2023 10:15:23 +0200 Subject: [PATCH] build(flake.lock): let all flake inputs use the same inputs to save space and have things updated. also ships Garuda website changes --- flake.lock | 91 ++++++++++++++++-------------------------------------- flake.nix | 8 +++++ 2 files changed, 34 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index 37b7998..e0dc528 100644 --- a/flake.lock +++ b/flake.lock @@ -18,7 +18,9 @@ }, "devshell": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems" }, "locked": { @@ -36,22 +38,6 @@ } }, "flake-compat": { - "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-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -133,11 +119,11 @@ ] }, "locked": { - "lastModified": 1694102220, - "narHash": "sha256-gmrTUBC2YXzEnDmGWEri/+s+8O4gcNv/UK8Lf6a9blc=", + "lastModified": 1694134858, + "narHash": "sha256-fG/ESauOGmiojKlpJG8gB62dJa5Wd+ZIuiDMKK/HD3g=", "owner": "nix-community", "repo": "home-manager", - "rev": "91341cde4143b10ee66e994a53c35d376ad6cdfb", + "rev": "19c6a4081b14443420358262f8416149bd79561a", "type": "github" }, "original": { @@ -245,7 +231,9 @@ "nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat", + "flake-compat": [ + "flake-compat" + ], "nixpkgs": [ "nixpkgs" ], @@ -270,16 +258,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677383253, - "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=", - "owner": "NixOS", + "lastModified": 1693985761, + "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "9952d6bc395f5841262b006fbace8dd7e143b634", + "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -330,44 +318,16 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1693985761, - "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1689261696, - "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": [ + "flake-compat" + ], "flake-utils": "flake-utils", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -387,6 +347,7 @@ "root": { "inputs": { "devshell": "devshell", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "home-manager": "home-manager", "keys_alexjp": "keys_alexjp", @@ -398,7 +359,7 @@ "meshagent_aarch64": "meshagent_aarch64", "meshagent_x86_64": "meshagent_x86_64", "nixos-mailserver": "nixos-mailserver", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", "src-buildiso": "src-buildiso", "src-chaotic-mirror": "src-chaotic-mirror", @@ -471,11 +432,11 @@ "src-garuda-website": { "flake": false, "locked": { - "lastModified": 1681233202, - "narHash": "sha256-j2DsK7S9q9p2E6/NCtPf1tuvfEefjA/bh+P5YXA7l8k=", + "lastModified": 1694112632, + "narHash": "sha256-E4uVUgGi2iMNTl/UWrnAalI5BroXwJMNnaSwVO0pmuA=", "owner": "garuda-linux%2Fwebsite", "repo": "garuda", - "rev": "93dcb29f32049c47ab38b59e50c1a4e4a1ea8051", + "rev": "462fb51604ab0ed328a5dccfc5221407444f3cab", "type": "gitlab" }, "original": { diff --git a/flake.nix b/flake.nix index 991b260..774dda9 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,11 @@ inputs = { # Devshell to set up a development environment devshell.url = "github:numtide/devshell"; + devshell.inputs.nixpkgs.follows = "nixpkgs"; + + # Used by multiple flakes, have them use the same version + flake-compat.url = "github:edolstra/flake-compat"; + flake-compat.flake = false; # Flake parts for easy flake management flake-parts.url = "github:hercules-ci/flake-parts"; @@ -21,6 +26,7 @@ # Our mailserver nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master"; + nixos-mailserver.inputs.flake-compat.follows = "flake-compat"; nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs"; # Meshagent agents for remote management @@ -31,6 +37,8 @@ # Pre-commit hooks via nix-shell or nix develop pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; + pre-commit-hooks.inputs.flake-compat.follows = "flake-compat"; + pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; # SSH keys of maintainers keys_nico.url = "https://github.com/dr460nf1r3.keys";