Unverified Commit ca970ca8 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

wget2: 2.2.0 -> 2.2.1 (#477654)

parents a5c5446d 8a80d9b3

pkgs/by-name/wg/wget2/gettext-0.25.patch

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
diff --git a/configure.ac b/configure.ac

index 7429f614..67b0bf0c 100644

--- a/configure.ac

+++ b/configure.ac

@@ -410,17 +410,11 @@ test "${ENABLE_XATTR}" = "yes" && AC_DEFINE([ENABLE_XATTR], 1,

 #

 # Gettext

 #

-m4_ifdef([AM_GNU_GETTEXT], [

-  AM_GNU_GETTEXT([external],[need-ngettext])

-  AC_CONFIG_FILES([po/Makefile.in])

-  have_po=yes

-], [

-  have_po=no

-])

-m4_ifdef([AM_GNU_GETTEXT_VERSION], [

+AM_GNU_GETTEXT([external],[need-ngettext])

+AC_CONFIG_FILES([po/Makefile.in])

+have_po=yes

 #do not indent here

 AM_GNU_GETTEXT_VERSION([0.21])

-])

 AM_CONDITIONAL([HAVE_PO], [ test "$have_po" = "yes" ])

 

 #

pkgs/by-name/wg/wget2/package.nix

+2 −6
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


stdenv.mkDerivation rec {

  pname = "wget2";

  version = "2.2.0";

  version = "2.2.1";



  outputs = [

    "out"
@@ -40,13 +40,9 @@ stdenv.mkDerivation rec { 
    owner = "gnuwget";

    repo = "wget2";

    tag = "v${version}";

    hash = "sha256-0tOoStZHr5opehFmuQdFRPYvOv8IMrDTBNFtoweY3VM=";

    hash = "sha256-od5Zyeod3auMY3u0IxMEMHnGeKGzEgMk+W5jjMQqSXc=";

  };



  patches = [

    ./gettext-0.25.patch

  ];



  # wget2_noinstall contains forbidden reference to /build/

  postPatch = ''

    substituteInPlace src/Makefile.am \