Commit graph

79 commits

Author SHA1 Message Date
adisbladis
79d737ec6e Fix passing of Go to buildGoApplication 2022-05-29 16:24:58 +08:00
adisbladis
d831b947fc Fix go.mod parser for repeated replace directives
Constructs such as
```
replace google.golang.org/grpc => google.golang.org/grpc v1.33.2
replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
```

Are perfectly valid and we previously discarded every one but the last of them.
2022-05-29 16:23:37 +08:00
adisbladis
3c029180a3 tests: Reimplement test harness in Go
And make it run in parallell
2022-05-28 22:56:52 +08:00
adisbladis
ecb0d11088 generate: Set correct working directory for go mod download 2022-05-28 22:56:52 +08:00
adisbladis
631293329e tests.minikube: Fix test 2022-05-28 22:56:52 +08:00
adisbladis
6273e2cefb Remove max workers argument
Now that we're not spawning subprocesses like crazy it's far less
relevant to limit concurrency.
2022-05-28 22:56:52 +08:00
adisbladis
33b65aa13e root: Use new format for building self 2022-05-28 22:56:52 +08:00
adisbladis
44bb5b9495 builder: Use new format for building 2022-05-28 22:56:52 +08:00
adisbladis
53270b071e Replace dependency on Nix with go-nix
This calculates the output hashes in pure Go and removes Nix from
being a run time dependency of gomod2nix.

Additionally it should be faster, but that's untested.
2022-05-28 22:56:52 +08:00
adisbladis
5125e0aa97 Add back internal caching for previously generated packages 2022-05-28 22:56:52 +08:00
adisbladis
de2aeaeb0b Run go mod tidy 2022-05-28 22:56:52 +08:00
adisbladis
1d2041bfc6 Restructure internal package names 2022-05-28 22:56:52 +08:00
adisbladis
5cb8bd825d fetch: Run in parallell 2022-05-28 22:56:52 +08:00
adisbladis
f10ef7325c fetch: Migrate to new fetcher method (using Go as the fetcher) 2022-05-28 22:56:52 +08:00
adisbladis
a5c4020da8 fetch.go: Only use a singular cache instance 2022-05-28 22:56:52 +08:00
adisbladis
12916dd856 tests: Get rid of meta since stdenv.lib is no longer available 2022-05-28 22:56:52 +08:00
adisbladis
8cb0e010cf
Merge pull request #40 from tweag/buildgopackage-drop
Drop support for buildGoPackage format
2022-05-26 19:57:01 +08:00
adisbladis
4ffc0dfd48 Drop support for buildGoPackage format
It was buggy at best and will never really work out because of semantic differences, mainly around nested package handling.

We're better off focusing on a single format which can be well supported.
2022-05-26 19:07:06 +08:00
adisbladis
c88d540afd
Merge pull request #39 from tweag/dev-cleanup
Dev cleanup
2022-05-26 18:49:55 +08:00
adisbladis
f7074712e8 flake.nix: Update to latest flake schema 2022-05-26 18:31:19 +08:00
adisbladis
d83a46b61f shell.nix: Use pinned nixpkgs from flake.lock 2022-05-26 18:29:48 +08:00
adisbladis
c9d91f60a7 flake.nix: Use development shell from shell.nix 2022-05-26 18:29:48 +08:00
adisbladis
d1df21fc5a flake.nix: Use overlay from separate overlay.nix expression 2022-05-26 18:17:02 +08:00
adisbladis
0b8585ba6c shell.nix: Add gomod2nix to development shell 2022-05-26 18:14:23 +08:00
adisbladis
17446bc33d Bump flake.lock 2022-05-26 18:12:32 +08:00
adisbladis
db9e176729
Merge pull request #38 from yihuang/demonstrate-error
fix symlink nested package
2022-05-26 18:08:43 +08:00
adisbladis
a47254f93d
Merge pull request #37 from yihuang/ci-test
run the test script in CI
2022-05-20 18:17:58 +08:00
adisbladis
fcda3a148a
Merge pull request #32 from charles-dyfis-net/flakeUpdate_2022-03-26
Run a flake update to get flake-utils w/ aarch64-darwin in default set
2022-05-20 18:17:24 +08:00
adisbladis
96f7710270
Merge pull request #29 from yihuang/fix-rev-regex
Fix pseudo version string regex
2022-05-20 18:17:06 +08:00
HuangYi
6cdf8f60e2
reproduce the relPath issue
Closes: #35
2022-05-20 17:41:57 +08:00
HuangYi
807b9e6c63
fix build with go 1.18 2022-05-20 17:41:24 +08:00
HuangYi
d151d0b036
fix relPath when there's replacement 2022-05-20 17:41:10 +08:00
HuangYi
7f6bfc93a3
fix another edge case 2022-05-20 16:31:44 +08:00
HuangYi
e54afe9222
fix symlink nested package
- added a test case to demonstrate the fail scenario
2022-05-20 15:54:53 +08:00
HuangYi
7dca9453ba
run the test script in CI 2022-05-20 14:48:28 +08:00
Charles Duffy
c1cf277739
Run a flake update to get a flake-utils with aarch64-darwin in default set 2022-03-26 14:10:01 -05:00
HuangYi
2d7eacc3ae
Fix pseudo version string regex
Closes: #28
2022-02-15 18:10:22 +08:00
adisbladis
fc5adcc530
Merge pull request #25 from yihuang/fix-regex
add regex to filter comment lines
2022-01-10 20:29:16 +12:00
HuangYi
c3f885a5b6
fix comments filter 2022-01-10 16:07:26 +08:00
adisbladis
596d01fd55
Merge pull request #24 from doronbehar/go-stdenv
builder: Use stdenv from arguments, not go.stdenv
2021-12-11 16:44:10 +12:00
Doron Behar
2428841585 builder: Use stdenv from arguments, not go.stdenv
It allows users to override the builder to use for example
`pkgsStatic.stdenv`.
2021-11-27 10:30:40 +02:00
adisbladis
67f22dd738
Merge pull request #9 from yihuang/fix-regex
fix regex expression on macos
2021-07-29 10:22:45 -05:00
adisbladis
f737d502ee
Merge pull request #12 from Mic92/flake
fix flake
2021-07-29 10:22:35 -05:00
Jörg Thalheim
8fae67792d fix flake
the old nixpkgs version would fail to build gomod2nix
2021-07-03 11:23:23 +02:00
yihuang
af2ff6eb58
fix regex expression on macos 2021-04-02 10:59:32 +08:00
adisbladis
c78d7b9f15
Merge pull request #8 from tweag/local-vendor
Add support for local replace directives
2021-03-29 17:38:57 +02:00
adisbladis
442b4154e2
Add support for local replace directives
This fixes relative path modules not being correctly vendored by
parsing go.mod in Nix and vendoring them into the correct directory in
the Nix sandbox.

Ideally this should also come with a pluggable source filtering
mechanism and/or maybe use any present gitignore files like
poetry2nix does.

To use this new feature you have to pass a new `pwd` param to
`buildGoApplication` as such:
```
buildGoApplication {
  pname = "foo";
  version = "bar";
  pwd = ./.;
  src = lib.cleanSource ./.;
}
```

Fixes #2
2021-03-29 17:20:50 +02:00
adisbladis
5dffe7b6ef
Merge pull request #4 from GTrunSec/flake-overlay
Fix: flake overlay
2021-03-17 02:07:49 +02:00
GTrunSec
0333f00e5f
Fix: flake overlay 2021-03-16 16:08:52 -07:00
adisbladis
f8ad3b8024
Remove Go vendor check relax patch
This is now in upstream nixpkgs
2021-02-10 15:50:58 +01:00