mirror of
https://github.com/tweag/gomod2nix.git
synced 2024-11-09 20:19:08 +00:00
Merge pull request #96 from martinbaillie/master
Parameterise `tools.go`
This commit is contained in:
commit
3cbf3a51fe
2 changed files with 8 additions and 4 deletions
|
@ -161,10 +161,12 @@ let
|
||||||
|
|
||||||
mkGoEnv =
|
mkGoEnv =
|
||||||
{ pwd
|
{ pwd
|
||||||
|
, toolsGo ? pwd + "/tools.go"
|
||||||
|
, modules ? pwd + "/gomod2nix.toml"
|
||||||
}@attrs:
|
}@attrs:
|
||||||
let
|
let
|
||||||
goMod = parseGoMod (readFile "${toString pwd}/go.mod");
|
goMod = parseGoMod (readFile "${toString pwd}/go.mod");
|
||||||
modulesStruct = fromTOML (readFile "${toString pwd}/gomod2nix.toml");
|
modulesStruct = fromTOML (readFile modules);
|
||||||
|
|
||||||
go = selectGo attrs goMod;
|
go = selectGo attrs goMod;
|
||||||
|
|
||||||
|
@ -201,11 +203,11 @@ let
|
||||||
export GOSUMDB=off
|
export GOSUMDB=off
|
||||||
export GOPROXY=off
|
export GOPROXY=off
|
||||||
|
|
||||||
'' + optionalString (pathExists (pwd + "/tools.go")) ''
|
'' + optionalString (pathExists toolsGo) ''
|
||||||
mkdir source
|
mkdir source
|
||||||
cp ${pwd + "/go.mod"} source/go.mod
|
cp ${pwd + "/go.mod"} source/go.mod
|
||||||
cp ${pwd + "/go.sum"} source/go.sum
|
cp ${pwd + "/go.sum"} source/go.sum
|
||||||
cp ${pwd + "/tools.go"} source/tools.go
|
cp ${toolsGo} source/tools.go
|
||||||
cd source
|
cd source
|
||||||
|
|
||||||
rsync -a -K --ignore-errors ${vendorEnv}/ vendor
|
rsync -a -K --ignore-errors ${vendorEnv}/ vendor
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
### buildGoApplication
|
### buildGoApplication
|
||||||
Arguments:
|
Arguments:
|
||||||
- **modules** Path to gomod2nix.toml (_default: `pwd + "/gomod2nix.toml"`).
|
- **modules** Path to `gomod2nix.toml` (_default: `pwd + "/gomod2nix.toml"`).
|
||||||
- **src** Path to sources (_default: `pwd`).
|
- **src** Path to sources (_default: `pwd`).
|
||||||
- **pwd** Path to working directory (_default: `null`).
|
- **pwd** Path to working directory (_default: `null`).
|
||||||
- **go** The Go compiler to use (can be omitted).
|
- **go** The Go compiler to use (can be omitted).
|
||||||
|
@ -16,5 +16,7 @@ All other arguments are passed verbatim to `stdenv.mkDerivation`.
|
||||||
### mkGoEnv
|
### mkGoEnv
|
||||||
Arguments:
|
Arguments:
|
||||||
- **pwd** Path to working directory.
|
- **pwd** Path to working directory.
|
||||||
|
- **modules** Path to `gomod2nix.toml` (_default: `pwd + "/gomod2nix.toml"`).
|
||||||
|
- **toolsGo** Path to `tools.go` (_default: `pwd + "/tools.go"`).
|
||||||
|
|
||||||
All other arguments are passed verbatim to `stdenv.mkDerivation`.
|
All other arguments are passed verbatim to `stdenv.mkDerivation`.
|
||||||
|
|
Loading…
Reference in a new issue