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: 0709ebba722b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dab9d404ce58
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 27, 2018

  1. ncftp: man and doc files were missing

    @peterhoeg
    peterhoeg committed Mar 27, 2018
    Copy the full SHA
    dab9d40 View commit details
Showing with 19 additions and 14 deletions.
  1. +19 −14 pkgs/tools/networking/ncftp/default.nix
33 changes: 19 additions & 14 deletions pkgs/tools/networking/ncftp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, ncurses, coreutils }:

let version = "3.2.6"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "ncftp-${version}";
version = "3.2.6";

src = fetchurl {
url = "ftp://ftp.ncftp.com/ncftp/ncftp-${version}-src.tar.xz";
@@ -11,24 +11,29 @@ stdenv.mkDerivation {

buildInputs = [ ncurses ];

enableParallelBuilding = true;

preConfigure = ''
find . -name "*.sh" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i
find . -name "*.in" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i
find . -name "*.c" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i
sed 's@/bin/ls@${coreutils}/bin/ls@g' -i configure
find . -name "*.sh" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i
find . -name "*.in" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i
find . -name "*.c" -type f | xargs sed 's@/bin/rm@${coreutils}/bin/rm@g' -i
sed 's@/bin/rm@${coreutils}/bin/rm@g' -i configure
find . -name '*.sh' -or -name '*.in' -or -name '*.c' -or -name configure | xargs sed -i \
-e 's@/bin/ls@${coreutils}/bin/ls@g' \
-e 's@/bin/rm@${coreutils}/bin/rm@g'
'';

postInstall = ''
rmdir $out/etc
mkdir -p $out/share/doc
cp -r doc $out/share/doc/ncftp
'';

configureFlags = [ "--mandir=$out/share/man/" ];
configureFlags = [
"--enable-ssp"
"--mandir=$(out)/share/man/"
];

meta = with stdenv.lib; {
description = "Command line FTP (File Transfer Protocol) client";
homepage = http://www.ncftp.com/ncftp/;
homepage = https://www.ncftp.com/ncftp/;
maintainers = with maintainers; [ bjornfor ];
platforms = platforms.unix;
maintainers = [ maintainers.bjornfor ];
};
}