Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b0c285807d6a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b88ff468e985
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 28, 2020

  1. rt: fix build error 

    ZHF: #80379
https://hydra.nixos.org/build/113061284

Added requiredPerlModules as suggested for similar problem as described for
similar problem here:
NixOS/nixpkgs#72783 (comment)

(cherry picked from commit 3e50e26)
    @stigtsp @mmilata
    stigtsp authored and mmilata committed Mar 28, 2020
    Copy the full SHA
    fd6c92e View commit details

  2. perlPackages.CryptSSLeay: 0.72 -> 0.73_06 

    dependencies:
perlPackages.BytesRandomSecure: init at 0.29
perlPackages.CryptRandomSeed: init at 0.03
perlPackages.CryptRandomTESHA2: init at 0.01

(cherry picked from commit 3aade16)
    @stigtsp @mmilata
    stigtsp authored and mmilata committed Mar 28, 2020
    Copy the full SHA
    f336139 View commit details

  3. Merge pull request #83565 from mmilata/perl-crypt-ssleay-0.73_06-20.03 

    [20.03] perlPackages.CryptSSLeay: 0.72 -> 0.73_06
    @bhipple
    bhipple authored Mar 28, 2020
    Copy the full SHA
    4ea297d View commit details

  4. Merge pull request #83566 from mmilata/rt-build-fix-20.03 

    [20.03] rt: fix build error
    @bhipple
    bhipple authored Mar 28, 2020
    Copy the full SHA
    b88ff46 View commit details
Showing with 51 additions and 5 deletions.
  1. +1 −1 pkgs/servers/rt/default.nix
  2. +50 −4 pkgs/top-level/perl-packages.nix
2 changes: 1 addition & 1 deletion pkgs/servers/rt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
perl
(buildEnv {
name = "rt-perl-deps";
paths = (with perlPackages; [
paths = with perlPackages; (requiredPerlModules [
ApacheSession BusinessHours CGIEmulatePSGI CGIPSGI
CSSMinifierXS CSSSquish ConvertColor CryptEksblowfish
CryptSSLeay DBDSQLite DBDmysql DBIxSearchBuilder DataGUID
54 changes: 50 additions & 4 deletions pkgs/top-level/perl-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1195,6 +1195,21 @@ let
};
};

BytesRandomSecure = buildPerlPackage {
pname = "Bytes-Random-Secure";
version = "0.29";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DA/DAVIDO/Bytes-Random-Secure-0.29.tar.gz";
sha256 = "53bbd339e6a11efca07c619a615c7c188a68bb2be849a1cb7efc3dd4d9ae85ae";
};
propagatedBuildInputs = [ CryptRandomSeed MathRandomISAAC ];
meta = {
description = "Perl extension to generate cryptographically-secure random bytes";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};

CacheCache = buildPerlPackage {
pname = "Cache-Cache";
version = "1.08";
@@ -3557,6 +3572,22 @@ let
};
};

CryptRandomSeed = buildPerlPackage {
pname = "Crypt-Random-Seed";
version = "0.03";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DA/DANAJ/Crypt-Random-Seed-0.03.tar.gz";
sha256 = "593da54b522c09cc26bbcc0e4e49c1c8e688a6fd33b0726af801d722a5c8d0f1";
};
propagatedBuildInputs = [ CryptRandomTESHA2 ];
meta = {
homepage = "https://github.com/danaj/Crypt-Random-Seed";
description = "Provide strong randomness for seeding";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
maintainers = [ maintainers.sgo ];
};
};

CryptRandomSource = buildPerlModule {
pname = "Crypt-Random-Source";
version = "0.14";
@@ -3572,6 +3603,20 @@ let
};
};

CryptRandomTESHA2 = buildPerlPackage {
pname = "Crypt-Random-TESHA2";
version = "0.01";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DA/DANAJ/Crypt-Random-TESHA2-0.01.tar.gz";
sha256 = "a0912b42c52be173da528d5527e40d967324bc04ac78d9fc2ddc91ff16fe9633";
};
meta = {
homepage = "https://github.com/danaj/Crypt-Random-TESHA2";
description = "Random numbers using timer/schedule entropy, aka userspace voodoo entropy";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};

CryptRC4 = buildPerlPackage {
pname = "Crypt-RC4";
version = "2.02";
@@ -3764,14 +3809,15 @@ let

CryptSSLeay = buildPerlPackage {
pname = "Crypt-SSLeay";
version = "0.72";
version = "0.73_06";
src = fetchurl {
url = mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz;
sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm";
url = "mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.73_06.tar.gz";
sha256 = "0b159lw3ia5r87qsgff3qhdnz3l09xcz04rbk4ji7fbyr12wmv7q";
};

makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl.dev}/include";
buildInputs = [ PathClass ];
propagatedBuildInputs = [ LWPProtocolHttps ];
propagatedBuildInputs = [ LWPProtocolHttps BytesRandomSecure ];
};

CSSDOM = buildPerlPackage {