diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-30 08:09:11 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-30 08:09:11 +0200 |
| commit | 20b8e4b4cfc8881fd00c400e7def97e71b800010 (patch) | |
| tree | 22dd0ae07beea66d24967817d6fb384a6b9010b5 /pkgs/top-level | |
| parent | 69e24c044aba1c0a3dc4e70d0f988ec1f3e6fb73 (diff) | |
| parent | 9ea8535fa7e7f57f6e26c2bcf3893db4254bae68 (diff) | |
| download | nixlib-20b8e4b4cfc8881fd00c400e7def97e71b800010.tar nixlib-20b8e4b4cfc8881fd00c400e7def97e71b800010.tar.gz nixlib-20b8e4b4cfc8881fd00c400e7def97e71b800010.tar.bz2 nixlib-20b8e4b4cfc8881fd00c400e7def97e71b800010.tar.lz nixlib-20b8e4b4cfc8881fd00c400e7def97e71b800010.tar.xz nixlib-20b8e4b4cfc8881fd00c400e7def97e71b800010.tar.zst nixlib-20b8e4b4cfc8881fd00c400e7def97e71b800010.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c04cd248841..971c939957aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -997,6 +997,8 @@ with pkgs; f3 = callPackage ../tools/filesystems/f3 { }; + facedetect = callPackage ../tools/graphics/facedetect { }; + facter = callPackage ../tools/system/facter { boost = boost160; }; @@ -1909,7 +1911,7 @@ with pkgs; ferm = callPackage ../tools/networking/ferm { }; fgallery = callPackage ../tools/graphics/fgallery { - inherit (perlPackages) ImageExifTool JSON; + inherit (perlPackages) ImageExifTool CpanelJSONXS; }; flannel = callPackage ../tools/networking/flannel { }; @@ -13452,9 +13454,7 @@ with pkgs; batti = callPackage ../applications/misc/batti { }; - baudline = callPackage ../applications/audio/baudline { - jack = jack1; - }; + baudline = callPackage ../applications/audio/baudline { }; bazaar = callPackage ../applications/version-management/bazaar { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e7234018508e..0ce439376853 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2483,6 +2483,18 @@ let self = _self // overrides; _self = with self; { }; }; + CpanelJSONXS = buildPerlPackage rec { + name = "Cpanel-JSON-XS-3.0237"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz"; + sha256 = "da86fffdbe6c1b7a023e95e2b8db7d6b45a08871c8312f23e45253c78e662d07"; + }; + meta = { + description = "CPanel fork of JSON::XS, fast and correct serializing"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CPANChanges = buildPerlPackage rec { name = "CPAN-Changes-0.400002"; src = fetchurl { |