diff --git a/flake.nix b/flake.nix index 190e681..a9b621d 100644 --- a/flake.nix +++ b/flake.nix @@ -69,7 +69,11 @@ ]; }; packages = evaluated.config.packages; - expectedPackages = [ pkgs.hello self.packages.${system}.tools ] ++ builtins.attrValues goAnalysis; + tools = import ./go/package.nix { + inherit (pkgs) lib; + buildGo127Module = pkgs.buildGoModule.override { go = pkgs.go; }; + }; + expectedPackages = [ pkgs.hello tools ] ++ builtins.attrValues goAnalysis; hasExpectedPackages = builtins.length packages == 6 && builtins.all (package: builtins.elem package packages) expectedPackages && builtins.all (tool: builtins.elem tool packages) (builtins.attrValues goAnalysis); diff --git a/go/package.nix b/go/package.nix index 97f87f2..5dd6b6f 100644 --- a/go/package.nix +++ b/go/package.nix @@ -3,7 +3,7 @@ buildGo127Module { pname = "meissa-tools"; version = (lib.importJSON ../.release-please-manifest.json).go or "0.0.0"; src = lib.fileset.toSource { root = ./.; fileset = ./.; }; - vendorHash = "sha256-CB74ZafnUJ1K0A4Liv0KJinHvYxiXIwPg2OYdvcHzBo="; + vendorHash = "sha256-gXUE5nvRY4WOvIP0ZM5WscVD6BCXFgjD0OQ+gx/XBFs="; subPackages = [ "cmd/code-shape-gate" "cmd/ref-gate" "cmd/refresh-nix-hashes" ]; env.CGO_ENABLED = "0"; ldflags = [ "-s" "-w" ];