Frederik Rietdijk
98ef78326d
Merge staging-next into staging
2019-08-31 18:07:33 +02:00
Frederik Rietdijk
96e5474329
Merge master into staging-next
2019-08-31 18:04:31 +02:00
Averell Dalton
c4adeddb5f
opencv: dont try cuda on 32 bit
...
config.cudaSupport can be true and cudatoolkit doesn't work with i686,
which can happen inside pkgsi686Linux wrapping.
2019-08-31 15:55:18 +02:00
volth
08f68313a4
treewide: remove redundant rec
2019-08-28 11:07:32 +00:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
...
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
2019-08-24 08:55:37 +02:00
Marek Mahut
589405a563
opencv: CVE-2019-14493
2019-08-23 20:36:31 +02:00
volth
46420bbaa3
treewide: name -> pname (easy cases) ( #66585 )
...
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
2019-08-15 13:41:18 +01:00
Orivej Desh
b5d1d50aa9
google-gflags: move to aliases.nix
...
google-gflags were renamed to gflags in 2012:
https://github.com/gflags/gflags/#25-january-2012
gflags.name will be updated in staging.
2019-07-25 09:18:32 +00:00
Daiderd Jordan
2f9a546b96
opencv: remove cf-private
2019-07-03 22:20:15 +02:00
Bas van Dijk
baf54b6b8b
opencv: 4.0.1 -> 4.1.0
2019-06-15 16:17:51 +02:00
Matthew Bauer
9a0ced7e45
opencv: disable QTKit backend
...
QTKit was removed in macOS 10.12
2019-06-06 01:00:40 -04:00
Jan Malakhovski
8e929441a9
opencv3, opencv4: move defaults to package file
2019-02-03 15:33:15 +00:00
Bas van Dijk
e36ab216ec
opencv4: opencv_contrib: 4.0.0 -> 4.0.1
2018-12-24 23:37:12 +01:00
Bas van Dijk
8347028c21
opencv4: 4.0.0 -> 4.0.1
2018-12-22 17:26:12 +01:00
Bas van Dijk
6267a02d9c
opencv4: fix OpenCV issue 13207
...
This is the same fix as for opencv3 in commit:
2572dd11accf701feeefd6fd4ee45be98cb47016
2018-12-20 10:49:40 +01:00
Bas van Dijk
2b87ed7c32
opencv4: init at 4.0.0
2018-11-30 22:45:57 +01:00
