From dddd22dcc6935c9248edecffc91c7eec6eccc674 Mon Sep 17 00:00:00 2001 From: isabel Date: Sun, 4 Aug 2024 15:08:36 +0100 Subject: [PATCH] chore: bump --- examples/custom/flake.nix | 6 +- examples/defaults/flake.lock | 118 ++++++++++++----------------------- examples/defaults/flake.nix | 6 +- flake.lock | 98 +++++++++-------------------- 4 files changed, 80 insertions(+), 148 deletions(-) diff --git a/examples/custom/flake.nix b/examples/custom/flake.nix index 3928455..0f5ef97 100644 --- a/examples/custom/flake.nix +++ b/examples/custom/flake.nix @@ -10,7 +10,11 @@ flake-parts.lib.mkFlake { inherit inputs; } { imports = [ inputs.chainix.flakeModule ]; - systems = [ "x86_64-linux" ]; + systems = [ + "x86_64-linux" + "aarch64-darwin" + ]; + perSystem = { config, ... }: { diff --git a/examples/defaults/flake.lock b/examples/defaults/flake.lock index b8b50d3..f84acd4 100644 --- a/examples/defaults/flake.lock +++ b/examples/defaults/flake.lock @@ -3,15 +3,15 @@ "chainix": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs", - "pre-commit-nix": "pre-commit-nix" + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1722645134, - "narHash": "sha256-bM4OEglwsQ0kI1uw7pn1qoa89s9owlD7RtEZm6His1E=", + "lastModified": 1722765892, + "narHash": "sha256-T5IHTRQPNWJ+WNuAVOfWHUsWbfsSkZhZiW28cr9OhZg=", "owner": "isabelroses", "repo": "chainix", - "rev": "f1f53fdd9044bf96ec43846e1d9c11e4fe39ff41", + "rev": "42235c9b35ef0baef34c991e40ce0ccad8858a07", "type": "github" }, "original": { @@ -38,7 +38,10 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "chainix", + "nixpkgs" + ] }, "locked": { "lastModified": 1722555600, @@ -56,7 +59,7 @@ }, "flake-parts_2": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { "lastModified": 1722555600, @@ -72,11 +75,37 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "chainix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "chainix" + ] + }, + "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" + } + }, "gitignore": { "inputs": { "nixpkgs": [ "chainix", - "pre-commit-nix", + "git-hooks", "nixpkgs" ] }, @@ -96,11 +125,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722415718, - "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=", + "lastModified": 1722640603, + "narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce", + "rev": "81610abc161d4021b29199aa464d6a1a521e0cc9", "type": "github" }, "original": { @@ -122,51 +151,7 @@ "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1722640603, "narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=", @@ -182,32 +167,11 @@ "type": "github" } }, - "pre-commit-nix": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "chainix": "chainix", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" } } }, diff --git a/examples/defaults/flake.nix b/examples/defaults/flake.nix index 64005c1..f807978 100644 --- a/examples/defaults/flake.nix +++ b/examples/defaults/flake.nix @@ -10,7 +10,11 @@ flake-parts.lib.mkFlake { inherit inputs; } { imports = [ inputs.chainix.flakeModule ]; - systems = [ "x86_64-linux" ]; + systems = [ + "x86_64-linux" + "aarch64-darwin" + ]; + perSystem = { config, ... }: { diff --git a/flake.lock b/flake.lock index 8efbe1e..c8928d0 100644 --- a/flake.lock +++ b/flake.lock @@ -18,7 +18,9 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1722555600, @@ -34,10 +36,33 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": [] + }, + "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" + } + }, "gitignore": { "inputs": { "nixpkgs": [ - "pre-commit-nix", + "git-hooks", "nixpkgs" ] }, @@ -71,76 +96,11 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "pre-commit-nix": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs", - "pre-commit-nix": "pre-commit-nix" + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs" } } },