public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into master

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-10-21 08:37:30 +02:00
parent 04ce4c3e42 ca6ee8f519
commit 86c7662be0
423 changed files with 9084 additions and 6323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/misc/intltool/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, gettext, perl, perlXMLParser }:
{ stdenv, fetchurl, fetchpatch, gettext, perlPackages }:
stdenv.mkDerivation rec {
name = "intltool-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "12q2140867r5d0dysly72khi7b0mm2gd7nlm1k81iyg7fxgnyz45";
})];
propagatedBuildInputs = [ gettext perl perlXMLParser ];
propagatedBuildInputs = [ gettext ] ++ (with perlPackages; [ perl XMLParser ]);
meta = with stdenv.lib; {
description = "Translation helper tool";

6
pkgs/development/tools/misc/ninka/default.nix
View File

@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, perl, perlPackages, buildPerlPackage }:
{ stdenv, fetchFromGitHub, perl, perlPackages }:
assert stdenv ? glibc;
buildPerlPackage rec {
perlPackages.buildPerlPackage rec {
name = "ninka-${version}";
version = "2.0-pre";
@@ -12,7 +12,7 @@ buildPerlPackage rec {
rev = "b89b59ecd057dfc939d0c75acaddebb58fcd8cba";
sha256 = "1grlis1kycbcjvjgqvn7aw81q1qx49ahvxg2k7cgyr79mvgpgi9m";
};
buildInputs = with perlPackages; [ perl TestOutput DBDSQLite DBI TestPod TestPodCoverage SpreadsheetParseExcel ];
doCheck = false; # hangs