From 9bc2bd8960c138639a65d6f9ca5da1b4fd5b6150 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Sun, 23 Feb 2025 10:36:38 -0500 Subject: [PATCH 1/3] fix(template): explicitly declare flake-parts input Signed-off-by: Cameron Smith --- template/bash/flake.nix | 5 ++++- template/cpp-cmake/flake.nix | 5 ++++- template/dart/flake.nix | 5 ++++- template/go-mod/flake.nix | 5 ++++- template/haskell/flake.nix | 5 ++++- template/lua-app/flake.nix | 5 ++++- template/nodejs-backend/flake.nix | 5 ++++- template/ocaml/flake.nix | 5 ++++- template/php/flake.nix | 5 ++++- template/powershell/flake.nix | 5 ++++- template/python-app/flake.nix | 5 ++++- template/python-pkg/flake.nix | 5 ++++- template/rust/flake.nix | 5 ++++- template/swiftpm/flake.nix | 5 ++++- template/vite-react/flake.nix | 5 ++++- template/zig/flake.nix | 5 ++++- 16 files changed, 64 insertions(+), 16 deletions(-) diff --git a/template/bash/flake.nix b/template/bash/flake.nix index cb74035..50c0de1 100644 --- a/template/bash/flake.nix +++ b/template/bash/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart Bash application project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/cpp-cmake/flake.nix b/template/cpp-cmake/flake.nix index 583d019..6750ebd 100644 --- a/template/cpp-cmake/flake.nix +++ b/template/cpp-cmake/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart C/C++ cmake project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/dart/flake.nix b/template/dart/flake.nix index 3bcc129..b9706d4 100644 --- a/template/dart/flake.nix +++ b/template/dart/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart Dart application project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/go-mod/flake.nix b/template/go-mod/flake.nix index a63775f..901693b 100644 --- a/template/go-mod/flake.nix +++ b/template/go-mod/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart Go module project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/haskell/flake.nix b/template/haskell/flake.nix index d994dd2..d2c4a08 100644 --- a/template/haskell/flake.nix +++ b/template/haskell/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart Haskell application project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/lua-app/flake.nix b/template/lua-app/flake.nix index b25f4b6..ec8c124 100644 --- a/template/lua-app/flake.nix +++ b/template/lua-app/flake.nix @@ -1,7 +1,10 @@ { description = "Description for the project"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/nodejs-backend/flake.nix b/template/nodejs-backend/flake.nix index 1a3d5ef..8c51cef 100644 --- a/template/nodejs-backend/flake.nix +++ b/template/nodejs-backend/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart Node.js backend project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/ocaml/flake.nix b/template/ocaml/flake.nix index ea227d2..7d8cb07 100644 --- a/template/ocaml/flake.nix +++ b/template/ocaml/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart OCaml application project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/php/flake.nix b/template/php/flake.nix index 54e9cba..4f64b8e 100644 --- a/template/php/flake.nix +++ b/template/php/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart PHP application project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/powershell/flake.nix b/template/powershell/flake.nix index 6466781..d3eb4d3 100644 --- a/template/powershell/flake.nix +++ b/template/powershell/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart Powershell application project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/python-app/flake.nix b/template/python-app/flake.nix index 349b390..fd207c9 100644 --- a/template/python-app/flake.nix +++ b/template/python-app/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart Python application project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/python-pkg/flake.nix b/template/python-pkg/flake.nix index 0e22a40..dc79174 100644 --- a/template/python-pkg/flake.nix +++ b/template/python-pkg/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart Python package project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/rust/flake.nix b/template/rust/flake.nix index b49363d..f18b64a 100644 --- a/template/rust/flake.nix +++ b/template/rust/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart Rust application project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/swiftpm/flake.nix b/template/swiftpm/flake.nix index 950b6f0..6460fb5 100644 --- a/template/swiftpm/flake.nix +++ b/template/swiftpm/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart Bash application project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/vite-react/flake.nix b/template/vite-react/flake.nix index 18359f0..6eb8e24 100644 --- a/template/vite-react/flake.nix +++ b/template/vite-react/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart Node.js backend project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { diff --git a/template/zig/flake.nix b/template/zig/flake.nix index f37c2d9..4b8ff76 100644 --- a/template/zig/flake.nix +++ b/template/zig/flake.nix @@ -1,7 +1,10 @@ { description = "Example kickstart Zig application project."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ {flake-parts, ...}: flake-parts.lib.mkFlake {inherit inputs;} { From fe2b9310745596a133a8730c1e79e944964a16ba Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Sun, 23 Feb 2025 10:36:52 -0500 Subject: [PATCH 2/3] fix(flake): explicitly declare flake-parts input Signed-off-by: Cameron Smith --- flake.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9e1daff..1dfd588 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,10 @@ { description = "Kickstart templates to get started building with Nix."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + }; outputs = inputs @ { flake-parts, From 56d7d5b57079a3da4ded4dc41397f18d458359d3 Mon Sep 17 00:00:00 2001 From: Cameron Smith Date: Sun, 23 Feb 2025 10:37:53 -0500 Subject: [PATCH 3/3] chore(flake): lock flake-parts input Signed-off-by: Cameron Smith --- flake.lock | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index a52014a..f3d385d 100644 --- a/flake.lock +++ b/flake.lock @@ -13,8 +13,9 @@ "type": "github" }, "original": { - "id": "flake-parts", - "type": "indirect" + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" } }, "nixpkgs": {