From 185fd61631e1521225bdcf10da112450424db56c Mon Sep 17 00:00:00 2001
From: "Milan Pässler (work)" <mil@nyantec.com>
Date: Mon, 2 Sep 2019 23:39:57 +0200
Subject: treewide: remove uses of doBuild and doConfigure

doBuild and doConfigure are not actually used by any builders, they were
probably added by mistake and just confuse people.
---
 pkgs/servers/unifi/default.nix | 2 --
 1 file changed, 2 deletions(-)

(limited to 'pkgs/servers/unifi')

diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index eb7a072799d..660a7050e9c 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -19,8 +19,6 @@ let
       runHook postUnpack
     '';
 
-    doConfigure = false;
-
     installPhase = ''
       runHook preInstall
 
-- 
cgit 1.4.1


From b85f48c3511386bd71e2939bb242cf9745cc9c4a Mon Sep 17 00:00:00 2001
From: "Milan Pässler (work)" <mil@nyantec.com>
Date: Mon, 2 Sep 2019 23:57:33 +0200
Subject: unifi: remove unifiTesting

The testing branch is not updated anymore and all mentions have been
removed from the Ubiquiti website.
---
 pkgs/servers/unifi/default.nix  | 7 -------
 pkgs/top-level/all-packages.nix | 3 +--
 2 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'pkgs/servers/unifi')

diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index eb7a072799d..834f169b475 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -54,11 +54,4 @@ in rec {
     version = "5.11.39";
     sha256 = "0v1gnvdazxa3bcbq8hl6796yw0mxzki2xn4s5im5k5ngmfmnswyj";
   };
-
-  # TODO: update as it is outdated
-  unifiTesting = generic {
-    version = "5.11.18";
-    suffix = "-996baf2ca5";
-    sha256 = "14yyfn39ix8bnn0cb6bn0ly6pqxg81lvy83y40bk0y8vxfg6maqc";
-  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ccdb4e25cd9..443fab68846 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15253,8 +15253,7 @@ in
 
   inherit (callPackages ../servers/unifi { })
     unifiLTS
-    unifiStable
-    unifiTesting;
+    unifiStable;
   unifi = unifiStable;
 
   virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { };
-- 
cgit 1.4.1