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
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
Robin Gloster
c1d336dfce
qca2: explicitly require openssl_1_0_2
2019-07-29 21:25:10 +02:00
Matthew Bauer
aba9f67d7d
qca: fix on darwin
2018-08-16 22:44:07 -05:00
Matthew Pickering
4a4478bbc0
Add additional darwin dependency for qca2
2018-03-21 08:28:02 +00:00
Matthew Pickering
de6360b63e
Build qca2 on darwin
2018-03-21 08:27:59 +00:00
Andrey Golovizin
c9545d8c90
qca2 and qca-qt5: use system CA certificates
...
CMakeLists.txt looks for the system CA bundle in several locations,
including /etc/ssl/certs/ca-certificates.crt.
This works for non-sandboxed builds but fails inside a sandbox.
2018-01-08 10:31:34 +01:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud
...
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Michael Raskin
febda39df3
qca2: 2.1.1 -> 2.1.3
2017-02-19 18:38:10 +01:00
Tuomas Tynkkynen
21f17d69f6
treewide: Add lots of meta.platforms
...
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Robin Gloster
562ba76975
qca2: add patch to build with libressl 2.3
2015-12-23 22:08:33 +00:00
Thomas Tuegel
03aa8b8e12
qca2: 2.1.0 -> 2.1.1
2015-11-23 06:39:08 -06:00
aszlig
6a4370f1ba
qca2: Update to new upstream version 2.1.0.
...
This also removes qca2_ossl, because it's now bundled with the main QCA
package and we can now drop all those patches and build system fixes,
because they have switched from autotools to cmake.
Tested against a few builds like PSI and Tomahawk.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-03-31 02:13:06 +02:00
Petr Rockai
2c37c23fce
qca2: Update the source of qca-ossl.cpp to qca's git (anonsvn.kde.org no longer
...
serves it), and bump it to a latest version that builds with our qca version.
2014-02-15 12:57:45 +01:00
James Cook
de71c8bdb0
qca2: Patch for gcc 4.7+ ( close #738 ).
...
Thanks to
http://lists.pld-linux.org/mailman/pipermail/pld-cvs-commit/Week-of-Mon-20120917/347917.html
2013-07-11 11:05:32 +02:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
76ec0dd430
* Update a bunch of dependencies of kdelibs.
...
svn path=/nixpkgs/branches/kde-4.7/; revision=27702
2011-07-11 10:49:21 +00:00
Yury G. Kudryashov
efb12635d3
Qca2: do not separate debug info
...
svn path=/nixpkgs/trunk/; revision=26138
2011-03-02 18:50:00 +00:00
Yury G. Kudryashov
68299a0202
Move qca2 outside of kde-4.x
...
svn path=/nixpkgs/trunk/; revision=26053
2011-02-22 09:53:01 +00:00
