Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e727398a2dd4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 939976a9295c
Choose a head ref
  • 1 commit
  • 4 files changed
  • 2 contributors

Commits on Apr 3, 2020

  1. parallel-full: init SQL and CSV support (#77619)

    Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
    tomberek and Mic92 authored Apr 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    939976a View commit details
Showing with 46 additions and 1 deletion.
  1. +1 −1 pkgs/tools/misc/parallel/default.nix
  2. +13 −0 pkgs/tools/misc/parallel/wrapper.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
  4. +30 −0 pkgs/top-level/perl-packages.nix
2 changes: 1 addition & 1 deletion pkgs/tools/misc/parallel/default.nix
Original file line number Diff line number Diff line change
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
homepage = "https://www.gnu.org/software/parallel/";
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ pSub vrthra ];
maintainers = with maintainers; [ pSub vrthra tomberek ];
};
}
13 changes: 13 additions & 0 deletions pkgs/tools/misc/parallel/wrapper.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{ parallel, makeWrapper , runCommand
, perlPackages
, extraPerlPackages ?
with perlPackages; [ DBI DBDPg DBDSQLite DBDCSV TextCSV ]
}:

runCommand "parallel-full" {
nativeBuildInputs = [ makeWrapper ];
} ''
mkdir -p $out/bin
makeWrapper ${parallel}/bin/parallel $out/bin/parallel \
--set PERL5LIB "${perlPackages.makeFullPerlPath extraPerlPackages}"
''
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -5730,6 +5730,8 @@ in

parallel = callPackage ../tools/misc/parallel { };

parallel-full = callPackage ../tools/misc/parallel/wrapper.nix { };

parastoo-fonts = callPackage ../data/fonts/parastoo-fonts { };

parcellite = callPackage ../tools/misc/parcellite { };
30 changes: 30 additions & 0 deletions pkgs/top-level/perl-packages.nix
Original file line number Diff line number Diff line change
@@ -4998,6 +4998,16 @@ let
};
};

DBDCSV = buildPerlPackage {
pname = "DBD-CSV";
version = "0.54";
src = fetchurl {
url = mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.54.tgz;
sha256 = "bc597cd7195e5a023e2b3413d8dc614602b9b3f279f436027881796464d4f0be";
};
propagatedBuildInputs = [ DBI TextCSV_XS SQLStatement ModuleRuntime ParamsUtil ];
};

DBDMock = buildPerlModule {
pname = "DBD-Mock";
version = "1.55";
@@ -11137,6 +11147,15 @@ let
};
};

MathBaseConvert = buildPerlPackage {
pname = "Math-Base-Convert";
version = "0.11";
src = fetchurl {
url = mirror://cpan/authors/id/M/MI/MIKER/Math-Base-Convert-0.11.tar.gz;
sha256 = "8c0971355f24c93b79e77ad54a4570090a1a598fcb9b86f5c17eba42f38b40e0";
};
};

MathLibm = buildPerlPackage {
pname = "Math-Libm";
version = "1.00";
@@ -16620,6 +16639,17 @@ let
propagatedBuildInputs = [ ClassAccessor ListMoreUtils RegexpCommon SQLTokenizer ];
};

SQLStatement = buildPerlPackage {
pname = "SQL-Statement";
version = "1.412";
src = fetchurl {
url = mirror://cpan/authors/id/R/RE/REHSACK/SQL-Statement-1.412.tar.gz;
sha256 = "65c870883379c11b53f19ead10aaac241ccc86a90bbab77f6376fe750720e5c8";
};
buildInputs = [ TestDeep ];
propagatedBuildInputs = [ Clone ModuleRuntime ParamsUtil TextSoundex MathBaseConvert ];
};

SQLTokenizer = buildPerlPackage {
pname = "SQL-Tokenizer";
version = "0.24";