Skip to content

Commit

Permalink
use new non-overlay interface in gomod2nix
Browse files Browse the repository at this point in the history
We are still waiting for upstream to merge this
  • Loading branch information
Mic92 authored and mergify[bot] committed Sep 13, 2023
1 parent 158401c commit 9f31ef7
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 16 deletions.
43 changes: 37 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 2 additions & 10 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,13 @@
let
pkgs = nixpkgs.legacyPackages.${system};
callPackage = pkgs.darwin.apple_sdk_11_0.callPackage or pkgs.callPackage;

gomod2nixBuilder = callPackage "${gomod2nix}/builder" {
gomod2nix = gomod2nix';
};
gomod2nix' = callPackage "${gomod2nix}/default.nix" {
inherit (gomod2nixBuilder) mkGoEnv buildGoApplication;
};
in
{
packages.default = callPackage ./. {
inherit (gomod2nixBuilder) buildGoApplication;
inherit (gomod2nix.legacyPackages.${system}) buildGoApplication;
};
devShells.default = callPackage ./shell.nix {
inherit (gomod2nixBuilder) mkGoEnv;
gomod2nix = gomod2nix';
inherit (gomod2nix.legacyPackages.${system}) mkGoEnv gomod2nix;
};
}));
}

0 comments on commit 9f31ef7

Please sign in to comment.