From 859a933a5aaaeeb9855542f2a890760128b6b9b1 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Sun, 10 Nov 2019 22:14:41 +0100 Subject: [PATCH 1/2] wtf: 0.23.0 -> 0.24.0 --- pkgs/applications/misc/wtf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 2706a5ed658a..46c134081433 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "wtf"; - version = "0.23.0"; + version = "0.24.0"; overrideModAttrs = _oldAttrs : _oldAttrs // { preBuild = ''export GOPROXY="https://gocenter.io"''; @@ -17,10 +17,10 @@ buildGoModule rec { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0bhk81jmv6rq8h898lmvrh9v356310fbi82lvakmgay7nvzk9a1c"; + sha256 = "0jz7hjcm0hfxcih2zplp47wx6lyvhhzj9ka4ljqrx0i4l7cm9ahs"; }; - modSha256 = "1ndb7zbhaq0cnd8fd05fvb62qi0mxilgydz42qqz2z4fkbx9gp3m"; + modSha256 = "03vj6q1ln71r685k2j91ycj6xxrc688pj4bdc561693r20sr49xj"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From ad4a1e0f850f34d938c466cd858e360d801dd623 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 11 Nov 2019 08:51:55 +0100 Subject: [PATCH 2/2] wtf: Use Go 1.13 and drop `overrideModAttrs` This no longer uses gocenter.io as a proxy, but the official Go module proxy instead. --- pkgs/applications/misc/wtf/default.nix | 8 +++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 46c134081433..f20c4aff1697 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/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 a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb9920847977..12ff68238468 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { };