diff --git a/flake.lock b/flake.lock index f05aa9b..e4a65e4 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -22,7 +22,9 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -61,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767640445, - "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=", + "lastModified": 1768127708, + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", "type": "github" }, "original": { @@ -80,7 +82,7 @@ "flake-parts": "flake-parts", "gomod2nix": "gomod2nix", "nixpkgs": "nixpkgs", - "systems": "systems_2", + "systems": "systems", "treefmt-nix": "treefmt-nix" } }, @@ -99,21 +101,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -121,11 +108,11 @@ ] }, "locked": { - "lastModified": 1767738726, - "narHash": "sha256-bHATlMr42JABTJgi4Wc8SJCK8Cv9AnR6HCl3k8eTwEs=", + "lastModified": 1768158989, + "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4db0238d79254c6d14f251808dc5264b8fc81b73", + "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9d9265e..e1cfb0d 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ gomod2nix = { url = "github:nix-community/gomod2nix"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.inputs.systems.follows = "systems"; }; treefmt-nix = { @@ -33,7 +34,9 @@ perSystem = { inputs', pkgs, ... }: let - devctl = inputs'.gomod2nix.legacyPackages.buildGoApplication { + inherit (inputs'.gomod2nix.legacyPackages) gomod2nix buildGoApplication; + + devctl = buildGoApplication { pname = "devctl"; version = "v0.3.0"; src = ./.; @@ -64,15 +67,15 @@ git gnumake go - inputs'.gomod2nix.packages.default + gomod2nix nil - nixfmt-rfc-style + nixfmt ]; DPRINT = pkgs.dprint + "/bin/dprint"; GO = pkgs.go + "/bin/go"; - GOMOD2NIX = inputs'.gomod2nix.packages.default + "/bin/gomod2nix"; - NIXFMT = pkgs.nixfmt-rfc-style + "/bin/nixfmt"; + GOMOD2NIX = gomod2nix + "/bin/gomod2nix"; + NIXFMT = pkgs.nixfmt + "/bin/nixfmt"; }; treefmt = {