Merge pull request #220514 from figsoda/csvquote

authored by figsoda and committed by GitHub d4f33014 69326363

+63
+14
pkgs/tools/text/csvquote/csvquote-path.patch
···
··· 1 + --- a/csvheader 2 + +++ b/csvheader 3 + @@ -29,10 +29,6 @@ while getopts "d:tq:r:" arg; do 4 + esac 5 + done 6 + 7 + -CSVQUOTE=`which csvquote` || CSVQUOTE="./csvquote" 8 + -if [ ! -f $CSVQUOTE ]; then 9 + - echo "csvquote program not found. exiting" 10 + - exit 1 11 + -fi 12 + +CSVQUOTE=@out@/bin/csvquote 13 + 14 + $CSVQUOTE $@ | head -n 1 | tr "$DEL" '\n' | nl -ba | $CSVQUOTE -u -d "$DEL" -q "$QUO" -r "$REC"
+47
pkgs/tools/text/csvquote/default.nix
···
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , patsh 5 + }: 6 + 7 + stdenv.mkDerivation rec { 8 + pname = "csvquote"; 9 + version = "0.1.5"; 10 + 11 + src = fetchFromGitHub { 12 + owner = "dbro"; 13 + repo = "csvquote"; 14 + rev = "v${version}"; 15 + hash = "sha256-847JAoDEfA9K4LB8z9cqSw+GTImqmITBylB/4odLDb0="; 16 + }; 17 + 18 + patches = [ 19 + # patch csvheader to use csvquote from the derivation 20 + ./csvquote-path.patch 21 + ]; 22 + 23 + nativeBuildInputs = [ 24 + patsh 25 + ]; 26 + 27 + makeFlags = [ 28 + "BINDIR=$(out)/bin" 29 + ]; 30 + 31 + preInstall = '' 32 + mkdir -p "$out/bin" 33 + ''; 34 + 35 + postInstall = '' 36 + substituteAllInPlace $out/bin/csvheader 37 + patsh $out/bin/csvheader -fs ${builtins.storeDir} 38 + ''; 39 + 40 + meta = with lib; { 41 + description = "Enables common unix utlities like cut, awk, wc, head to work correctly with csv data containing delimiters and newlines"; 42 + homepage = "https://github.com/dbro/csvquote"; 43 + license = licenses.mit; 44 + maintainers = with maintainers; [ figsoda ]; 45 + platforms = platforms.all; 46 + }; 47 + }
+2
pkgs/top-level/all-packages.nix
··· 4317 4318 csvkit = callPackage ../tools/text/csvkit { }; 4319 4320 csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { }; 4321 4322 csv2latex = callPackage ../tools/misc/csv2latex { };
··· 4317 4318 csvkit = callPackage ../tools/text/csvkit { }; 4319 4320 + csvquote = callPackage ../tools/text/csvquote { }; 4321 + 4322 csvtool = callPackage ../development/ocaml-modules/csv/csvtool.nix { }; 4323 4324 csv2latex = callPackage ../tools/misc/csv2latex { };