diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 12:04:17 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 12:04:17 -0400 |
commit | 42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7 (patch) | |
tree | cab0fe05c485a9a8cfb51ac63a5260bc8eeee5a6 /pkgs/top-level | |
parent | ad838f6f91fcc89a2c9b1a6b85e7551181c30f95 (diff) | |
parent | 28b2f48ba9c04bfe8cebffd6b3ea47a78a5e18e6 (diff) | |
download | nixlib-42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7.tar nixlib-42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7.tar.gz nixlib-42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7.tar.bz2 nixlib-42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7.tar.lz nixlib-42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7.tar.xz nixlib-42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7.tar.zst nixlib-42f6e7c4e4275e2ea4b1e7ac17b7f73032dcc1d7.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 32 |
2 files changed, 36 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cd162cfabef..a6cb7cfbef2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8509,6 +8509,8 @@ with pkgs; backward-cpp = callPackage ../development/libraries/backward-cpp { }; + bamf = callPackage ../development/libraries/bamf { }; + bctoolbox = callPackage ../development/libraries/bctoolbox { mbedtls = mbedtls_1_3; }; @@ -16960,6 +16962,8 @@ with pkgs; pijul = callPackage ../applications/version-management/pijul {}; + plank = callPackage ../applications/misc/plank { }; + planner = callPackage ../applications/office/planner { }; playonlinux = callPackage ../applications/misc/playonlinux { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 22733443ed19..9a23eff2e7ff 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2064,6 +2064,19 @@ let self = _self // overrides; _self = with self; { }; }; + ClassEHierarchy = buildPerlPackage rec { + name = "Class-EHierarchy-2.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/${name}.tar.gz"; + sha256 = "8498baaf7539eaa3422c6fe1055a0fc9a0c02e94dad0c63405373528e622bacb"; + }; + meta = { + description = "Base class for hierarchally ordered objects"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.limeytexan ]; + }; + }; + ClassFactory = buildPerlPackage { name = "Class-Factory-1.06"; src = fetchurl { @@ -11954,6 +11967,25 @@ let self = _self // overrides; _self = with self; { }; }; + Paranoid = buildPerlPackage rec { + name = "Paranoid-2.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/${name}.tar.gz"; + sha256 = "583dfa0279733531f360795ad1cf4aa652d537b2b0bbd3c6925d0c8d75cbb3df"; + }; + patches = [ ../development/perl-modules/Paranoid-blessed-path.patch ]; + preConfigure = '' + # Capture the path used when compiling this module as the "blessed" + # system path, analogous to the module's own use of '/bin:/sbin'. + sed -i "s#__BLESSED_PATH__#${pkgs.coreutils}/bin#" lib/Paranoid.pm t/01_init_core.t + ''; + meta = { + description = "General function library for safer, more secure programming"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.limeytexan ]; + }; + }; + PARDist = buildPerlPackage { name = "PAR-Dist-0.49"; src = fetchurl { |