diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-16 11:45:07 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-16 11:45:07 +0100 |
| commit | be7125dde7d3521725cf2e2ea70b3c309eebd0e4 (patch) | |
| tree | df53225733ad8ae20afffa30f06bfb64d42cf2cd /pkgs/tools/text | |
| parent | 27313767b8ed680d1dcfcfc0cb87c81562bba605 (diff) | |
| parent | 1421eee65dddd47f34c68be6374e9646fe4cf175 (diff) | |
| download | nixpkgs-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar nixpkgs-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.gz nixpkgs-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.bz2 nixpkgs-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.lz nixpkgs-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.xz nixpkgs-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.zst nixpkgs-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/grip-search/default.nix | 31 | ||||
| -rw-r--r-- | pkgs/tools/text/papertrail/default.nix | 2 |
2 files changed, 32 insertions, 1 deletions
diff --git a/pkgs/tools/text/grip-search/default.nix b/pkgs/tools/text/grip-search/default.nix new file mode 100644 index 00000000000..921691a40af --- /dev/null +++ b/pkgs/tools/text/grip-search/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, boost, pkgconfig, cmake, catch2 }: + +stdenv.mkDerivation rec { + pname = "grip-search"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "sc0ty"; + repo = "grip"; + rev = "v${version}"; + sha256 = "0bkqarylgzhis6fpj48qbifcd6a26cgnq8784hgnm707rq9kb0rx"; + }; + + nativeBuildInputs = [ pkgconfig cmake catch2 ]; + + doCheck = true; + + buildInputs = [ boost ]; + + patchPhase = '' + substituteInPlace src/general/config.h --replace "CUSTOM-BUILD" "${version}" + ''; + + meta = with stdenv.lib; { + description = "Fast, indexed regexp search over large file trees"; + homepage = "https://github.com/sc0ty/grip"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ tex ]; + }; +} diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index be85511a92b..d20727f725a 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Command-line client for Papertrail log management service"; - homepage = http://github.com/papertrail/papertrail-cli/; + homepage = https://github.com/papertrail/papertrail-cli/; license = licenses.mit; maintainers = with maintainers; [ nicknovitski ]; platforms = ruby.meta.platforms; |