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: 32c9ee2cfc18
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f729755d4d84
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 9, 2020

  1. libfilezilla: 0.24.0 -> 0.24.1

    @peterhoeg
    peterhoeg committed Sep 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d70480f View commit details

  2. filezilla: 3.49.1 -> 3.50.0

    @peterhoeg
    peterhoeg committed Sep 9, 2020
    Copy the full SHA
    a9683dc View commit details

  3. Merge pull request #97521 from peterhoeg/u/fz_3500 

    filezilla: 3.49.1 -> 3.50.0
    @Ma27
    Ma27 authored Sep 9, 2020
    Copy the full SHA
    f729755 View commit details
Showing with 8 additions and 7 deletions.
  1. +4 −3 pkgs/applications/networking/ftp/filezilla/default.nix
  2. +4 −4 pkgs/development/libraries/libfilezilla/default.nix
7 changes: 4 additions & 3 deletions pkgs/applications/networking/ftp/filezilla/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv
, fetchurl
, autoreconfHook
, dbus
, gettext
, gnutls
@@ -16,11 +17,11 @@

stdenv.mkDerivation rec {
pname = "filezilla";
version = "3.49.1";
version = "3.50.0";

src = fetchurl {
url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
sha256 = "1dmkwpc0vy7058bh9a10ida0k64rxggap8ysl5xx3457y468rk2f";
sha256 = "sha256-4NuHJpylIIqtFKAkFTN7T57+PEnC1NFOZukhx4oTXBA=";
};

# https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
"--disable-autoupdatecheck"
];

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];

buildInputs = [
dbus
8 changes: 4 additions & 4 deletions pkgs/development/libraries/libfilezilla/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv
, fetchurl

, autoreconfHook
, gettext
, gnutls
, nettle
@@ -11,14 +11,14 @@

stdenv.mkDerivation rec {
pname = "libfilezilla";
version = "0.24.0";
version = "0.24.1";

src = fetchurl {
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
sha256 = "1372i9f501kn8p1vkqdydaqvvi6lzxsnw2yzyxx5j4syqd4p0qa5";
sha256 = "sha256-/dW07hkWr3sdQC591GfwXfdiS7ZfuVoIdaA3EuzC1v0=";
};

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];

buildInputs = [ gettext gnutls nettle ]
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ];