diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-22 14:15:32 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-22 14:15:32 +0200 |
commit | db6c38a075fbac96fabcc7759aa6e6ddd5526b0c (patch) | |
tree | 77e9e366af73273bcec75e089999824a39f08496 /pkgs/tools/text | |
parent | 16dec3974696dd2a83865f017402ac9fdfb8cf8a (diff) | |
parent | 62cb4f72282b228a9072452448b0574170bebc06 (diff) | |
download | nixpkgs-db6c38a075fbac96fabcc7759aa6e6ddd5526b0c.tar nixpkgs-db6c38a075fbac96fabcc7759aa6e6ddd5526b0c.tar.gz nixpkgs-db6c38a075fbac96fabcc7759aa6e6ddd5526b0c.tar.bz2 nixpkgs-db6c38a075fbac96fabcc7759aa6e6ddd5526b0c.tar.lz nixpkgs-db6c38a075fbac96fabcc7759aa6e6ddd5526b0c.tar.xz nixpkgs-db6c38a075fbac96fabcc7759aa6e6ddd5526b0c.tar.zst nixpkgs-db6c38a075fbac96fabcc7759aa6e6ddd5526b0c.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/bcat/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/kytea/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/papertrail/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/text/papertrail/shell.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/text/reckon/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/text/ripgrep/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/ruby-zoom/default.nix | 6 |
7 files changed, 28 insertions, 29 deletions
diff --git a/pkgs/tools/text/bcat/default.nix b/pkgs/tools/text/bcat/default.nix index 72fb8aa8e2e..e8000f17cde 100644 --- a/pkgs/tools/text/bcat/default.nix +++ b/pkgs/tools/text/bcat/default.nix @@ -1,15 +1,17 @@ -{ lib, bundlerApp }: +{ lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "bcat"; gemdir = ./.; exes = [ "bcat" "btee" "a2h" ]; + passthru.updateScript = bundlerUpdateScript "bcat"; + meta = with lib; { description = "Pipe to browser utility"; homepage = http://rtomayko.github.com/bcat/; license = licenses.mit; - maintainers = [ maintainers.jraygauthier ]; + maintainers = with maintainers; [ jraygauthier nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix index eb537c67a63..7254660cb1a 100644 --- a/pkgs/tools/text/kytea/default.nix +++ b/pkgs/tools/text/kytea/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { patches = [ ./gcc-O3.patch ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + meta = with stdenv.lib; { homepage = http://www.phontron.com/kytea/; description = "General toolkit developed for analyzing text"; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ ericsagnes ndowens ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index a02ca1cd3dd..05213ff1a87 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -1,7 +1,6 @@ -{ stdenv, bundlerEnv, ruby}: +{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }: let - # To update, just run `nix-shell` in this directory. papertrail-env = bundlerEnv rec { name = "papertrail-env"; inherit ruby; @@ -18,4 +17,14 @@ in stdenv.mkDerivation { mkdir -p $out/bin ln -s ${papertrail-env}/bin/papertrail $out/bin/papertrail ''; + + passthru.updateScript = bundlerUpdateScript "papertrail"; + + meta = with stdenv.lib; { + description = "Command-line client for Papertrail log management service"; + homepage = http://github.com/papertrail/papertrail-cli/; + license = licenses.mit; + maintainers = with maintainers; [ nicknovitski ]; + platforms = ruby.meta.platforms; + }; } diff --git a/pkgs/tools/text/papertrail/shell.nix b/pkgs/tools/text/papertrail/shell.nix deleted file mode 100644 index 55a7a18f57b..00000000000 --- a/pkgs/tools/text/papertrail/shell.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs ? import <nixpkgs> {} }: - -pkgs.stdenv.mkDerivation { - name = "papertrail"; - src = ./.; - - buildInputs = with pkgs; [ - bundix - bundler - ruby - ]; - - shellHook = '' - truncate --size 0 Gemfile.lock - bundle install --path=vendor/bundle - rm -rf vendor .bundle - bundix - ''; -} diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index b97ffc7c58a..9e3e4d5b41d 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, bundlerEnv, makeWrapper }: +{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper }: stdenv.mkDerivation rec { name = "reckon-${version}"; - version = "0.4.4"; + version = (import ./gemset.nix).reckon.version; env = bundlerEnv { name = "${name}-gems"; @@ -19,9 +19,12 @@ stdenv.mkDerivation rec { makeWrapper ${env}/bin/reckon $out/bin/reckon ''; + passthru.updateScript = bundlerUpdateScript "reckon"; + meta = with lib; { description = "Flexibly import bank account CSV files into Ledger for command line accounting"; license = licenses.mit; + maintainers = with maintainers; [ nicknovitski ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 1563fe744ef..311767a786f 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt , Security -, withPCRE2 ? false, pcre2 ? null +, withPCRE2 ? true, pcre2 ? null }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/text/ruby-zoom/default.nix b/pkgs/tools/text/ruby-zoom/default.nix index b939e1500e4..c3953840836 100644 --- a/pkgs/tools/text/ruby-zoom/default.nix +++ b/pkgs/tools/text/ruby-zoom/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerEnv, ruby, stdenv }: +{ lib, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv { pname = "ruby-zoom"; @@ -6,11 +6,13 @@ bundlerEnv { inherit ruby; gemdir = ./.; + passthru.updateScript = bundlerUpdateScript "ruby-zoom"; + meta = with lib; { description = "Quickly open CLI search results in your favorite editor!"; homepage = https://gitlab.com/mjwhitta/zoom; license = with licenses; gpl3; - maintainers = with stdenv.lib.maintainers; [ vmandela ]; + maintainers = with maintainers; [ vmandela nicknovitski ]; platforms = platforms.unix; }; } |