From 26e2ab55d019a0ada73ac90ebdea52fc3bb2bdc8 Mon Sep 17 00:00:00 2001 From: langsjo <104687438+langsjo@users.noreply.github.com> Date: Mon, 2 Jun 2025 20:09:52 +0300 Subject: [PATCH] gopher: 3.0.17 -> 3.0.19 Also remove the patch, since this release fixes that issue (cherry picked from commit 6041ea02f4280e63753c792da9ff533b7ce2193e) --- pkgs/by-name/go/gopher/int_main.patch | 13 ------------- pkgs/by-name/go/gopher/package.nix | 8 ++------ 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 pkgs/by-name/go/gopher/int_main.patch diff --git a/pkgs/by-name/go/gopher/int_main.patch b/pkgs/by-name/go/gopher/int_main.patch deleted file mode 100644 index 07024525b309..000000000000 --- a/pkgs/by-name/go/gopher/int_main.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index 1b20711..79ce215 100644 ---- a/configure -+++ b/configure -@@ -679,7 +679,7 @@ cat > conftest.$ac_ext << EOF - #line 680 "configure" - #include "confdefs.h" - --main(){return(0);} -+int main(){return(0);} - EOF - if { (eval echo configure:685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes diff --git a/pkgs/by-name/go/gopher/package.nix b/pkgs/by-name/go/gopher/package.nix index a2a0c04d82c8..19a05a661c92 100644 --- a/pkgs/by-name/go/gopher/package.nix +++ b/pkgs/by-name/go/gopher/package.nix @@ -7,21 +7,17 @@ stdenv.mkDerivation rec { pname = "gopher"; - version = "3.0.17"; + version = "3.0.19"; src = fetchFromGitHub { owner = "jgoerzen"; repo = "gopher"; rev = "release/${version}"; - sha256 = "1j6xh5l8v231d4mwl9gj1c34dc0jmazz6zg1qqfxmqr9y609jq3h"; + sha256 = "sha256-8J63TnC3Yq7+64PPLrlPEueMa9D/eWkPsb08t1+rPAA="; }; buildInputs = [ ncurses ]; - patches = [ - ./int_main.patch # https://github.com/jgoerzen/gopher/pull/8 - ]; - preConfigure = "export LIBS=-lncurses"; meta = with lib; {