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

Commits on Apr 11, 2020

  1. zoneminder: 1.34.3 -> 1.34.9 

    Also removed workaround which was included in ZoneMinder/zoneminder#2867
    @danielfullmer
    danielfullmer committed Apr 11, 2020
    Copy the full SHA
    fae01fa View commit details

  2. Merge pull request #85011 from danielfullmer/zoneminder-1.34.9 

    zoneminder: 1.34.3 -> 1.34.9
    @garbas
    garbas authored Apr 11, 2020

    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
    dc75767 View commit details
Showing with 2 additions and 6 deletions.
  1. +2 −6 pkgs/servers/zoneminder/default.nix
8 changes: 2 additions & 6 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.3";
version = "1.34.9";

src = fetchFromGitHub {
owner = "ZoneMinder";
repo = "zoneminder";
rev = version;
sha256 = "0jp7950v36gxxzkwdp5i0312s26czhfsl5ixdxfzn21cx31hhlg0";
sha256 = "1xvgfsm260a3v0vqgbk7m9jzayhcs4ysyadnnxajyrndjhn802ic";
};

patches = [
@@ -170,10 +170,6 @@ in stdenv.mkDerivation rec {
"-DZM_CONFIG_DIR=${placeholder "out"}/etc/zoneminder"
"-DZM_WEB_USER=${user}"
"-DZM_WEB_GROUP=${user}"

# Workaround issue in CMakeLists.txt where ZM_CGIDIR set to ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin
# But CMAKE_INSTALL_LIBEXECDIR is already an absolute path from cmake setup-hook
"-DZM_CGIDIR=${placeholder "out"}/libexec/zoneminder/cgi-bin"
];

passthru = { inherit dirName; };