Merge pull request #135252 from nagy/poedit

poedit: 2.4.3 -> 3.0

authored by Sandro and committed by GitHub fac5049c da85d133

+7 -5
+4 -4
pkgs/tools/text/poedit/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3, 2 boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, 3 nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: 4 5 stdenv.mkDerivation rec { 6 pname = "poedit"; 7 - version = "2.4.3"; 8 9 src = fetchFromGitHub { 10 owner = "vslavik"; 11 repo = "poedit"; 12 rev = "v${version}-oss"; 13 - sha256 = "02xf2w3d2lnr3vqmil9vvg9pir7d21x4zrj9xwpgb7dhs0gimj0x"; 14 }; 15 16 nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook 17 libxslt xmlto boost libtool pkg-config ]; 18 19 - buildInputs = [ lucenepp nlohmann_json wxGTK30-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; 20 21 propagatedBuildInputs = [ gettext ]; 22
··· 1 + { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK31-gtk3, 2 boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, 3 nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: 4 5 stdenv.mkDerivation rec { 6 pname = "poedit"; 7 + version = "3.0"; 8 9 src = fetchFromGitHub { 10 owner = "vslavik"; 11 repo = "poedit"; 12 rev = "v${version}-oss"; 13 + sha256 = "0bxhyxsa641ip6wab9ms9g4w6mb1bv46y5h5b436spl5c70rcn4z"; 14 }; 15 16 nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook 17 libxslt xmlto boost libtool pkg-config ]; 18 19 + buildInputs = [ lucenepp nlohmann_json wxGTK31-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; 20 21 propagatedBuildInputs = [ gettext ]; 22
+3 -1
pkgs/top-level/all-packages.nix
··· 8173 8174 pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; 8175 8176 - poedit = callPackage ../tools/text/poedit { }; 8177 8178 polipo = callPackage ../servers/polipo { }; 8179
··· 8173 8174 pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; 8175 8176 + poedit = callPackage ../tools/text/poedit { 8177 + wxGTK31-gtk3 = wxGTK31-gtk3.override { withWebKit = true; }; 8178 + }; 8179 8180 polipo = callPackage ../servers/polipo { }; 8181