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

Commits on Nov 4, 2020

  1. zoneminder: 1.34.16 -> 1.34.22 

    (cherry picked from commit 4d563ba)
    @andir
    andir committed Nov 4, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d50bb39 View commit details

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

    [20.09] zoneminder: fix CVE-2020-25729
    @mweinelt
    mweinelt authored Nov 4, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c156dc7 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/servers/zoneminder/default.nix
4 changes: 2 additions & 2 deletions pkgs/servers/zoneminder/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = [