diff --git a/flake.lock b/flake.lock index f31e717..0bc58cd 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -57,11 +57,28 @@ "type": "github" } }, + "nixpkgs-go": { + "locked": { + "lastModified": 1772801855, + "narHash": "sha256-lyMJ2u3rgG1+PYX0mNlwtk1EopVUsypnPY4SMi22aQQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ef9ca28baceba7da849e0fdb18bab8d3173fd208", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ef9ca28baceba7da849e0fdb18bab8d3173fd208", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-go": "nixpkgs-go" } }, "systems": { diff --git a/flake.nix b/flake.nix index ee7b077..e9e900d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ description = "A utility for generating Mermaid diagrams from Terraform configurations"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-go.url = "github:nixos/nixpkgs/ef9ca28baceba7da849e0fdb18bab8d3173fd208"; flake-utils.url = "github:numtide/flake-utils"; gomod2nix = { @@ -15,13 +16,19 @@ outputs = { self, nixpkgs, + nixpkgs-go, flake-utils, gomod2nix, }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; - overlays = [gomod2nix.overlays.default]; + overlays = [ + gomod2nix.overlays.default + (final: prev: { + go = nixpkgs-go.packages.${system}.go; + }) + ]; }; callPackage = pkgs.callPackage; in { @@ -35,7 +42,11 @@ // { overlays.default = final: prev: { terramaid = import ./default.nix { - pkgs = final.extend gomod2nix.overlays.default; + pkgs = + (final.extend gomod2nix.overlays.default).extend + (final: prev: { + go = nixpkgs-go.packages.${final.stdenv.hostPlatform.system}.go; + }); }; }; };