public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
This commit is contained in:
Vladimír Čunát
2019-08-24 08:55:37 +02:00
parent 84a91208a9 8943fb5f24
commit 2e6bf42a22
865 changed files with 29587 additions and 14316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/unifi/default.nix
+7 -5
View File
@@ -36,24 +36,26 @@ let
description = "Controller for Ubiquiti UniFi access points";
license = licenses.unfree;
platforms = platforms.unix;
maintainers = with maintainers; [ erictapen ];
maintainers = with maintainers; [ erictapen globin ];
};
};
in rec {
# https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions
# https://community.ui.com/releases / https://www.ui.com/download/unifi
# Outdated FAQ: https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions
unifiLTS = generic {
version = "5.6.42";
sha256 = "0wxkv774pw43c15jk0sg534l5za4j067nr85r5fw58iar3w2l84x";
sha256 = "0wxkv774pw43c15jk0sg534l5za4j067nr85r5fw58iar3w2l84x";
};
unifiStable = generic {
version = "5.10.25";
sha256 = "1v03r7qd09s6lz37wwlsrqiy1jcwxnvj1q87jwpmhdipjprcjfdx";
version = "5.11.39";
sha256 = "0v1gnvdazxa3bcbq8hl6796yw0mxzki2xn4s5im5k5ngmfmnswyj";
};
# TODO: update as it is outdated
unifiTesting = generic {
version = "5.11.18";
suffix = "-996baf2ca5";