Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wtf: 0.23.0 -> 0.24.0 #73182

Merged
merged 2 commits into from Nov 11, 2019
Merged

wtf: 0.23.0 -> 0.24.0 #73182

merged 2 commits into from Nov 11, 2019

Conversation

avdv
Copy link
Member

@avdv avdv commented Nov 10, 2019

Motivation for this change

New upstream release.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@ofborg ofborg bot requested a review from kalbasit November 10, 2019 21:34
@marsam
Copy link
Contributor

marsam commented Nov 11, 2019

Since nixpkgs already has Go 1.13, I think we can remove the overrideModAttrs. Can you check if the following works for you?

diff --git i/pkgs/applications/misc/wtf/default.nix w/pkgs/applications/misc/wtf/default.nix
index 46c13408143..f20c4aff169 100644
--- i/pkgs/applications/misc/wtf/default.nix
+++ w/pkgs/applications/misc/wtf/default.nix
@@ -9,10 +9,6 @@ buildGoModule rec {
   pname = "wtf";
   version = "0.24.0";
 
-  overrideModAttrs = _oldAttrs : _oldAttrs // {
-    preBuild = ''export GOPROXY="https://gocenter.io"'';
-  };
-
   src = fetchFromGitHub {
     owner = "wtfutil";
     repo = pname;
@@ -20,10 +16,12 @@ buildGoModule rec {
     sha256 = "0jz7hjcm0hfxcih2zplp47wx6lyvhhzj9ka4ljqrx0i4l7cm9ahs";
    };
 
-  modSha256 = "03vj6q1ln71r685k2j91ycj6xxrc688pj4bdc561693r20sr49xj";
+  modSha256 = "04d8hvd90f7v853p23xcx38qz3ryv7kz7zjk9b131cjnd4mcv0sm";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
+  subPackages = [ "." ];
+
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
diff --git i/pkgs/top-level/all-packages.nix w/pkgs/top-level/all-packages.nix
index fb992084797..12ff6823846 100644
--- i/pkgs/top-level/all-packages.nix
+++ w/pkgs/top-level/all-packages.nix
@@ -25325,9 +25325,7 @@ in
 
   zimg = callPackage ../development/libraries/zimg { };
 
-  wtf = callPackage ../applications/misc/wtf {
-    buildGoModule = buildGo112Module;
-  };
+  wtf = callPackage ../applications/misc/wtf { };
 
   zk-shell = callPackage ../applications/misc/zk-shell { };

@avdv
Copy link
Member Author

avdv commented Nov 11, 2019

Since nixpkgs already has Go 1.13, I think we can remove the overrideModAttrs. Can you check if the following works for you?

Yes, works for me! 👍

@marsam @avdv
wtf: Use Go 1.13 and drop overrideModAttrs
ad4a1e0 
This no longer uses gocenter.io as a proxy, but the official Go module proxy
instead.
@avdv
Copy link
Member Author

avdv commented Nov 11, 2019

@marsam I have pushed your change as a new commit on your behalf. Hope that's OK?!

@marsam marsam merged commit 542fb77 into NixOS:master Nov 11, 2019
@marsam
Copy link
Contributor

marsam commented Nov 11, 2019

yes, thank you for working on this

@avdv avdv deleted the wtf-0.24.0 branch November 11, 2019 13:17
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Nov 11, 2019
@marsam @dtzWill
Merge pull request NixOS#73182 from avdv/wtf-0.24.0
14e7a0a 
wtf: 0.23.0 -> 0.24.0
(cherry picked from commit 542fb77)
dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Nov 11, 2019
@dtzWill
Revert "Merge pull request NixOS#73182 from avdv/wtf-0.24.0"
8d92423 
This reverts commit 14e7a0a.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kalbasit kalbasit Awaiting requested review from kalbasit

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@avdv @marsam