diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-10-10 23:41:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-10 23:41:09 +0200 |
| commit | 13da7123469d44f6759137059369c789b49ba7db (patch) | |
| tree | a5cf536682bb5093138ca2f99b3498ee8844beba /pkgs/servers | |
| parent | 5314192d1bece042e758d45e32eb79bb686b85f2 (diff) | |
| parent | 5bc6d8ae75f708aa7dc5a031b01c882dff61f3b1 (diff) | |
Merge pull request #195232 from risicle/ris-zoneminder-1.36.28
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/zoneminder/default.nix | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index a698c2e9f7bfa..e790108327e02 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -41,27 +41,6 @@ # around it. let - modules = [ - { - path = "web/api/app/Plugin/Crud"; - src = fetchFromGitHub { - owner = "ZoneMinder"; - repo = "crud"; - rev = "3.1.0-zm"; - sha256 = "061avzyml7mla4hlx057fm8a9yjh6m6qslgyzn74cv5p2y7f463l"; - }; - } - { - path = "web/api/app/Plugin/CakePHP-Enum-Behavior"; - src = fetchFromGitHub { - owner = "ZoneMinder"; - repo = "CakePHP-Enum-Behavior"; - rev = "1.0-zm"; - sha256 = "0zsi6s8xymb183kx3szspbrwfjqcgga7786zqvydy6hc8c909cgx"; - }; - } - ]; - addons = [ { path = "scripts/ZoneMinder/lib/ZoneMinder/Control/Xiaomi.pm"; @@ -78,13 +57,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.36.15"; + version = "1.36.28"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - sha256 = "1qlsg7gd9kpjdbq9d5yrjmc7g1pbscrg4sws7xrdln1z8509sv50"; + sha256 = "sha256-x00u7AWMNS+wAO/tdWi7GYbMZZM7XnszCO57ZDlm0J0="; fetchSubmodules = true; }; @@ -94,11 +73,6 @@ in stdenv.mkDerivation rec { ]; postPatch = '' - ${lib.concatStringsSep "\n" (map (e: '' - rm -rf ${e.path}/* - cp -r ${e.src}/* ${e.path}/ - '') modules)} - rm -rf web/api/lib/Cake/Test ${lib.concatStringsSep "\n" (map (e: '' |