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: 4c6be1f00c33
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e913308b11bc
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 16, 2019

  1. perlPackages.ClassStdFast: init at 0.0.8

    @peterhoeg
    peterhoeg committed Feb 16, 2019
    Copy the full SHA
    b2cb983 View commit details

  2. zoneminder: add some missing dependencies for ONVIF

    @peterhoeg
    peterhoeg committed Feb 16, 2019
    Copy the full SHA
    fe86416 View commit details

Commits on Mar 18, 2019

  1. Merge pull request #55870 from peterhoeg/f/zm 

    zoneminder: add some of the missing ONVIF dependencies
    @peterhoeg
    peterhoeg authored Mar 18, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e913308 View commit details
Showing with 19 additions and 2 deletions.
  1. +3 −2 pkgs/servers/zoneminder/default.nix
  2. +16 −0 pkgs/top-level/perl-packages.nix
5 changes: 3 additions & 2 deletions pkgs/servers/zoneminder/default.nix
View file
Original file line number Diff line number Diff line change
@@ -142,9 +142,10 @@ in stdenv.mkDerivation rec {
curl ffmpeg glib libjpeg libselinux libsepol mp4v2 mysql pcre perl polkit x264 zlib
utillinuxMinimal # for libmount
] ++ (with perlPackages; [
# build-time dependencies
DateManip DBI DBDmysql LWP SysMmap
# runtime dependencies not checked at build-time
JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate
# run-time dependencies not checked at build-time
ClassStdFast DataDump JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate
]);

nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
16 changes: 16 additions & 0 deletions pkgs/top-level/perl-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2185,6 +2185,22 @@ let
};
};

ClassStdFast = buildPerlModule rec {
name = "${pname}-${version}";
pname = "Class-Std-Fast";
version = "0.0.8";
src = fetchurl {
url = "mirror://cpan/authors/id/A/AC/ACID/${pname}-v${version}.tar.gz";
sha256 = "1057rz95jsr66gam472i4zdv04v7bmzph3m3jwq1hwx3qrikgm0v";
};
propagatedBuildInputs = [ ClassStd ];
checkInputs = [ TestPod TestPodCoverage ];
meta = with stdenv.lib; {
description = "Faster but less secure than Class::Std";
license = with licenses; [ artistic1 gpl1Plus ];
};
};

ClassUnload = buildPerlPackage rec {
name = "Class-Unload-0.11";
src = fetchurl {