git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #133029 from AndersonTorres/new-gftp

gftp: 2.0.19-> 2.7.0b

commitc7d76493ac6908a2b83f5a6fbd8e0e4263ce6818 authorAnderson Torres <torres.anderson.85@protonmail.com> dateSat 7 Aug 2021, 16:34 (5 years ago) parent0c6cc0b3f0a4b8
3 files changed+59−26
compare with master
unifiedsplit
pkgs/applications/networking/gftp/default.nix+56 pkgs/tools/networking/gftp/default.nix−25 pkgs/top-level/all-packages.nix+3−1
pkgs/applications/networking/gftp/default.nixnew file+56
@@ -0,0 +1,56 @@
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, autoconf
5+, automake
6+, gettext
7+, gtk
8+, intltool
9+, libtool
10+, ncurses
11+, openssl
12+, pkg-config
13+, readline
14+}:
15+
16+stdenv.mkDerivation rec {
17+ pname = "gftp";
18+ version = "2.7.0b";
19+
20+ src = fetchFromGitHub {
21+ owner = "masneyb";
22+ repo = pname;
23+ rev = version;
24+ hash = "sha256-cIB3SneYKavgdI8eTtM1qsOrBJJ0c7/3CEvNPishNog=";
25+ };
26+
27+ nativeBuildInputs = [
28+ autoconf
29+ automake
30+ gettext
31+ intltool
32+ libtool
33+ pkg-config
34+ ];
35+ buildInputs = [
36+ gtk
37+ ncurses
38+ openssl
39+ readline
40+ ];
41+
42+ hardeningDisable = [ "format" ];
43+
44+ preConfigure = ''
45+ ./autogen.sh
46+ '';
47+
48+ meta = with lib; {
49+ homepage = "https://github.com/masneyb/gftp";
50+ description = "GTK-based multithreaded FTP client for *nix-based machines";
51+ license = licenses.gpl2Plus;
52+ maintainers = with maintainers; [ AndersonTorres ];
53+ platforms = platforms.unix;
54+ };
55+}
56+# TODO: report the hardeningDisable to upstream
pkgs/tools/networking/gftp/default.nixdeleted−25
@@ -1,25 +0,0 @@
1−{ lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkg-config }:
2−
3−stdenv.mkDerivation rec {
4− pname = "gftp";
5− version = "2.0.19";
6−
7− src = fetchurl {
8− url = "https://www.gftp.org/gftp-${version}.tar.bz2";
9− sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk";
10− };
11−
12− postPatch = ''
13− sed -i -e '/<stropts.h>/d' lib/pty.c
14− '';
15−
16− nativeBuildInputs = [ pkg-config ];
17− buildInputs = [ gtk2 readline ncurses gettext openssl ];
18−
19− meta = {
20− description = "GTK-based FTP client";
21− homepage = "http://www.gftp.org";
22− license = lib.licenses.gpl2Plus;
23− platforms = lib.platforms.unix;
24− };
25−}
pkgs/top-level/all-packages.nix+3−1
@@ -5147,7 +5147,9 @@ in
51475147
51485148 gexiv2 = callPackage ../development/libraries/gexiv2 { };
51495149
5150− gftp = callPackage ../tools/networking/gftp { };
5150+ gftp = callPackage ../applications/networking/gftp {
5151+ gtk = gtk2;
5152+ };
51515153
51525154 gfbgraph = callPackage ../development/libraries/gfbgraph { };
51535155