about summary refs log tree commit diff
path: root/pkgs/servers/zoneminder
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2022-10-09 12:51:06 +0100
committerRobert Scott <code@humanleg.org.uk>2022-10-09 13:51:27 +0100
commit5bc6d8ae75f708aa7dc5a031b01c882dff61f3b1 (patch)
tree2fcccb4a1d46355965839f7b6ef48979baf8f0a4 /pkgs/servers/zoneminder
parent3720503cdf7197c304cf66b2f241631365c324db (diff)
zoneminder: 1.36.15 -> 1.36.28
`modules` now appears unnecessary as these dependencies all look
like they're supplied by git submodules. the ZoneMinder/crud repo
doesn't even exist anymore and we were relying on nixpkgs' cache.
Diffstat (limited to 'pkgs/servers/zoneminder')
-rw-r--r--pkgs/servers/zoneminder/default.nix30
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: ''