cri-o: switch to buildGoModule #86378
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
saschagrunert
force-pushed
the
crio-buildgomodule
branch
from
e818e1b
to
509601d
Compare
saschagrunert
force-pushed
the
crio-buildgomodule
branch
from
509601d
to
d606e54
Compare
|
Okay sounds good, thank you for the hint. |
saschagrunert
force-pushed
the
crio-buildgomodule
branch
from
d606e54
to
1cfdd45
Compare
saschagrunert
force-pushed
the
crio-buildgomodule
branch
from
1cfdd45
to
2901456
Compare
|
Rebased on top of the latest master branch to resolve the conflict. |
saschagrunert
force-pushed
the
crio-buildgomodule
branch
from
2901456
to
08f85b5
Compare
zowoq
reviewed
May 7, 2020
saschagrunert
force-pushed
the
crio-buildgomodule
branch
from
08f85b5
to
8307bfa
Compare
|
Now that #86376 has been merged we can use diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 0851f1f716b..d662441a6dc 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -1,6 +1,6 @@
{ stdenv
, btrfs-progs
-, buildGoPackage
+, buildGoModule
, fetchFromGitHub
, glibc
, gpgme
@@ -14,11 +14,11 @@
, pkg-config
}:
-buildGoPackage rec {
+buildGoModule rec {
pname = "cri-o";
version = "1.18.0";
- goPackagePath = "github.com/cri-o/cri-o";
+ vendorSha256 = null;
src = fetchFromGitHub {
owner = "cri-o";
@@ -44,8 +44,6 @@ buildGoPackage rec {
BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub";
buildPhase = ''
- pushd go/src/${goPackagePath}
-
sed -i '/version.buildDate/d' Makefile
make binaries docs BUILDTAGS="$BUILDTAGS" |
This is just a cleanup to switch from buildGoPackage to buildGoModule. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
saschagrunert
force-pushed
the
crio-buildgomodule
branch
from
8307bfa
to
006e6b0
Compare
|
Rebased and changed as suggested. 👍 |
zowoq
approved these changes
May 14, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
This is just a cleanup to switch from buildGoPackage to buildGoModule.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)cc @NixOS/podman