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: 0d3256564447
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f1c65de110f7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 4, 2020

  1. zoneminder: 1.34.16 -> 1.34.22

    @andir
    andir committed Nov 4, 2020
    Copy the full SHA
    4d563ba View commit details

  2. Merge pull request #99907 from andir/zoneminder-CVE-2020-25729 

    zoneminder: fix CVE-2020-25729
    @mweinelt
    mweinelt authored Nov 4, 2020
    Copy the full SHA
    f1c65de View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/servers/zoneminder/default.nix
6 changes: 3 additions & 3 deletions pkgs/servers/zoneminder/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, substituteAll, cmake, makeWrapper, pkgconfig
{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkgconfig
, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages
, polkit, utillinuxMinimal, x264, zlib
, coreutils, procps, psmisc, nixosTests }:
@@ -78,13 +78,13 @@ let

in stdenv.mkDerivation rec {
pname = "zoneminder";
version = "1.34.16";
version = "1.34.22";

src = fetchFromGitHub {
owner = "ZoneMinder";
repo = "zoneminder";
rev = version;
sha256 = "azQbm8EkbypBf2NjplDVCb6duEC476hhKDA0EGqxxWE=";
sha256 = "1144j9crm0q5pwxnkmy3ahw1vbkddpbk2ys2m2pxxxiqifdhll83";
};

patches = [