From 5eec3924c6559408bb644c15eda849599a5f352a Mon Sep 17 00:00:00 2001 From: Fiscal Velvet Poet Date: Tue, 8 Oct 2024 16:11:49 +1000 Subject: [PATCH] chore(nix): bumped to v2.24.6 --- flake.lock | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 1 + outputs.nix | 4 ++ shell.nix | 1 + 4 files changed, 167 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 22741ee..5342952 100644 --- a/flake.lock +++ b/flake.lock @@ -46,7 +46,7 @@ }, "crane": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-utils": [ "ragenix", "flake-utils" @@ -114,6 +114,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -129,6 +145,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -162,6 +199,37 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": [ + "nix" + ], + "gitignore": [ + "nix" + ], + "nixpkgs": [ + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "hakyll-skeleton": { "flake": false, "locked": { @@ -179,6 +247,48 @@ "url": "https://reciproka.dev/reciproka/hakyll-skeleton/" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1715853528, + "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96", + "type": "github" + }, + "original": { + "owner": "libgit2", + "ref": "v1.8.1", + "repo": "libgit2", + "type": "github" + } + }, + "nix": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", + "git-hooks-nix": "git-hooks-nix", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_2", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1725964975, + "narHash": "sha256-kgq3B+olx62bzGD5C6ighdAoDweLq+AebxVHcDnKH4w=", + "owner": "NixOS", + "repo": "nix", + "rev": "eb11c1499876cd4c9c188cbda5b1003b36ce2e59", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "2.24.6", + "repo": "nix", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1683408522, @@ -195,6 +305,38 @@ "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgsUnstable": { "locked": { "lastModified": 1725103162, @@ -212,6 +354,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1727540905, "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", @@ -289,7 +447,8 @@ "inputs": { "colmena": "colmena", "hakyll-skeleton": "hakyll-skeleton", - "nixpkgs": "nixpkgs_2", + "nix": "nix", + "nixpkgs": "nixpkgs_3", "nixpkgsUnstable": "nixpkgsUnstable", "ragenix": "ragenix", "reciproka-web": "reciproka-web", diff --git a/flake.nix b/flake.nix index 8394164..9ad94de 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,7 @@ flake = false; url = git+https://reciproka.dev/resrok/resrok-web/?ref=consensus; }; + nix.url = github:NixOS/nix/?ref=2.24.6; nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.05; nixpkgsUnstable.url = github:NixOS/nixpkgs/?ref=nixos-unstable; utils.url = "github:numtide/flake-utils"; diff --git a/outputs.nix b/outputs.nix index f7f1586..a9d705f 100644 --- a/outputs.nix +++ b/outputs.nix @@ -4,6 +4,7 @@ reciproka-web, ragenix, colmena, + nix, nixpkgs, nixpkgsUnstable, resrok-web, @@ -17,6 +18,7 @@ in { devShell = pkgs.callPackage ./shell.nix { + inherit (nix.packages."${pkgs.system}") nix; inherit (ragenix.packages."${pkgs.system}") ragenix; inherit (colmena.packages."${pkgs.system}") colmena; inherit (nixpkgsUnstable.legacyPackages."${pkgs.system}") alejandra; @@ -32,6 +34,8 @@ in { overlays = []; }; }; + defaults = { + }; flemming = { imports = [ ./nixos/hosts/flemming diff --git a/shell.nix b/shell.nix index 82d21e2..eaaabb1 100644 --- a/shell.nix +++ b/shell.nix @@ -4,6 +4,7 @@ alejandra, mkShell, colmena, + nix, }: with pkgs; mkShell {