Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b0aa80e427cf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2092ed1be339
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on May 1, 2020

  1. libfilezilla: 0.19.3 -> 0.21.0

    @peterhoeg
    peterhoeg committed May 1, 2020
    Copy the full SHA
    0a2faff View commit details

  2. filezilla: 3.46.3 -> 3.48.0

    @peterhoeg
    peterhoeg committed May 1, 2020
    Copy the full SHA
    78cc331 View commit details

Commits on May 2, 2020

  1. Merge pull request #86217 from peterhoeg/u/filezilla_3_48 

    filezilla: 3.46.3 -> 3.48.0
    @peterhoeg
    peterhoeg authored May 2, 2020
    Copy the full SHA
    2092ed1 View commit details
Showing with 22 additions and 8 deletions.
  1. +17 −6 pkgs/applications/networking/ftp/filezilla/default.nix
  2. +5 −2 pkgs/development/libraries/libfilezilla/default.nix
23 changes: 17 additions & 6 deletions pkgs/applications/networking/ftp/filezilla/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
{ stdenv
, fetchurl

, dbus
, gettext
, gnutls
, gtk2
, libfilezilla
, libidn
, nettle
@@ -16,33 +14,46 @@
, xdg_utils
}:

let
# we can drop this when wxgtk is built with gtk3 by default
# see: https://github.com/NixOS/nixpkgs/pull/73145
wxgtk' = wxGTK30.override { compat26 = false; withGtk2 = false; };

in
stdenv.mkDerivation rec {
pname = "filezilla";
version = "3.46.3";
version = "3.48.0";

src = fetchurl {
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
sha256 = "15bkg9qs07h4pzkxba1gymp8f264dk0zrzd9brx48fcwm7qbzigi";
sha256 = "0msxl8ihbycd56hmn1q8sl1gzmsxc7j8ar9k4zsryd0ayyz7wv05";
};

# https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769
postPatch = ''
sed -i src/interface/Mainfrm.h \
-e '/^#define/a #include <list>'
'';

configureFlags = [
"--disable-manualupdatecheck"
"--disable-autoupdatecheck"
];

nativeBuildInputs = [ pkgconfig ];

buildInputs = [
dbus
gettext
gnutls
gtk2
libfilezilla
libidn
nettle
pugixml
sqlite
tinyxml
wxGTK30
wxgtk'
wxgtk'.gtk
xdg_utils
];

7 changes: 5 additions & 2 deletions pkgs/development/libraries/libfilezilla/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,16 +9,19 @@

stdenv.mkDerivation rec {
pname = "libfilezilla";
version = "0.19.3";
version = "0.21.0";

src = fetchurl {
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0fml6whdbfcwc8nfjhvrnidkscv6q2x988zf3alfjl2mdpw4jgd4";
sha256 = "1wjvxi3spkp58lay590bs5s2i8fn94lqkc7qvq4q7ns4l9k9z3av";
};

nativeBuildInputs = [ pkgconfig ];

buildInputs = [ gettext gnutls nettle ];

enableParallelBuilding = true;

meta = with stdenv.lib; {
homepage = "https://lib.filezilla-project.org/";
description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs";