Merge pull request #34845 from yesbox/bfs_init

bfs: init at 1.2.1
wip/yesman
Jörg Thalheim 6 years ago committed by GitHub
commit 78ab1b0a17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      lib/licenses.nix
  2. 1
      lib/maintainers.nix
  3. 38
      pkgs/tools/system/bfs/default.nix
  4. 10
      pkgs/tools/system/bfs/tests.patch
  5. 2
      pkgs/top-level/all-packages.nix

@ -79,6 +79,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = ''Beerware License'';
};
bsd0 = spdx {
spdxId = "0BSD";
fullName = "BSD Zero Clause License";
};
bsd2 = spdx {
spdxId = "BSD-2-Clause";
fullName = ''BSD 2-clause "Simplified" License'';

@ -763,6 +763,7 @@
y0no = "Yoann Ono <y0no@y0no.fr>";
yarr = "Dmitry V. <savraz@gmail.com>";
yegortimoshenko = "Yegor Timoshenko <yegortimoshenko@gmail.com>";
yesbox = "Jesper Geertsen Jonsson <jesper.geertsen.jonsson@gmail.com>";
ylwghst = "Burim Augustin Berisa <ylwghst@onionmail.info>";
yochai = "Yochai <yochai@titat.info>";
yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>";

@ -0,0 +1,38 @@
{ stdenv, fetchFromGitHub, bash }:
stdenv.mkDerivation rec {
name = "bfs-${version}";
version = "1.2.1";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
sha256 = "1dgc31l5d20i0v78c51xga4lr78b5x8dz6yzsvbhlgs0abi0nynx";
};
# Disable fstype test, tries to read /etc/mtab
patches = [ ./tests.patch ];
postPatch = ''
# Patch tests (both shebangs and usage in scripts)
for f in $(find -type f -name '*.sh'); do
substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash"
done
'';
doCheck = true;
makeFlags = [ "PREFIX=$(out)" ];
buildFlags = [ "release" ]; # "release" enables compiler optimizations
meta = with stdenv.lib; {
description = "A breadth-first version of the UNIX find command";
longDescription = ''
bfs is a variant of the UNIX find command that operates breadth-first rather than
depth-first. It is otherwise intended to be compatible with many versions of find.
'';
homepage = https://github.com/tavianator/bfs;
license = licenses.bsd0;
platforms = platforms.linux;
maintainers = with maintainers; [ yesbox ];
};
}

@ -0,0 +1,10 @@
--- a/tests.sh
+++ b/tests.sh
@@ -369,7 +369,6 @@
test_printf_nul
test_quit_after_print
test_quit_before_print
- test_fstype
test_not
test_and
test_or

@ -1396,6 +1396,8 @@ with pkgs;
bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner;
bfs = callPackage ../tools/system/bfs { };
bgs = callPackage ../tools/X11/bgs { };
biber = callPackage ../tools/typesetting/biber {

Loading…
Cancel
Save