From 559047c67f2b7c0c135cc14197a71fa8e35d6839 Mon Sep 17 00:00:00 2001 From: Jesper Geertsen Jonsson Date: Sun, 11 Feb 2018 16:14:54 +0100 Subject: [PATCH 1/3] Adds Jesper as maintainer :) --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 9ff2d53b4668..f41b4560b5bb 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -757,6 +757,7 @@ y0no = "Yoann Ono "; yarr = "Dmitry V. "; yegortimoshenko = "Yegor Timoshenko "; + yesbox = "Jesper Geertsen Jonsson "; ylwghst = "Burim Augustin Berisa "; yochai = "Yochai "; yorickvp = "Yorick van Pelt "; From 4cb393cf12e53a0a1a9a6b5693616a0e9c30d81f Mon Sep 17 00:00:00 2001 From: Jesper Geertsen Jonsson Date: Sun, 11 Feb 2018 16:16:00 +0100 Subject: [PATCH 2/3] Adds license "BSD Zero Clause License" --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 0086bd63ebd9..70f4571423ec 100644 --- a/lib/licenses.nix +++ b/lib/licenses.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''; From 0312fe48825019669c69251f004426cfd3defdce Mon Sep 17 00:00:00 2001 From: Jesper Geertsen Jonsson Date: Sun, 11 Feb 2018 16:16:46 +0100 Subject: [PATCH 3/3] bfs: init at 1.2.1 --- pkgs/tools/system/bfs/default.nix | 38 +++++++++++++++++++++++++++++++ pkgs/tools/system/bfs/tests.patch | 10 ++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 50 insertions(+) create mode 100644 pkgs/tools/system/bfs/default.nix create mode 100644 pkgs/tools/system/bfs/tests.patch diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix new file mode 100644 index 000000000000..2e4133124c11 --- /dev/null +++ b/pkgs/tools/system/bfs/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/tools/system/bfs/tests.patch b/pkgs/tools/system/bfs/tests.patch new file mode 100644 index 000000000000..a30291d7095f --- /dev/null +++ b/pkgs/tools/system/bfs/tests.patch @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92f81ee28613..82f7450af3eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1390,6 +1390,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 {