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

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
Contributor

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 @

@marsam

This comment has been minimized.

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

This comment has been minimized.

Copy link
Contributor 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! 👍

This no longer uses gocenter.io as a proxy, but the official Go module proxy
instead.
@avdv

This comment has been minimized.

Copy link
Contributor 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
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
wtf on aarch64-linux Success
Details
wtf on x86_64-linux Success
Details
@marsam

This comment has been minimized.

Copy link
Contributor

marsam commented Nov 11, 2019

yes, thank you for working on this

@avdv avdv deleted the avdv:wtf-0.24.0 branch Nov 11, 2019
dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Nov 11, 2019
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.