3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

202860 commits

Author SHA1 Message Date
John Ericson 80524db331 Merge branch 'ghcjs-cross-without-cc-19.09' into ghcjs-cross-without-cc 2019-11-25 14:11:18 +00:00
John Ericson 765d2608b6 Fix lib tests
js-ghcjs didn't fit in an existing categor.
2019-11-25 14:09:50 +00:00
John Ericson 6bc456c91c Merge remote-tracking branch 'upstream/master' into ghcjs-cross-without-cc 2019-11-25 00:23:07 +00:00
John Ericson ea9a2c5ec2 haskell genenric-builder: Make the C compiler optional
This is GHCJS, and perhaps other obscure targets.
2019-11-25 00:12:39 +00:00
John Ericson c739c420db Add support for cross compiling to js-ghcjs
This platform doesn't have a C compiler, and so relies and the changes
in the previous commit to work.
2019-11-25 00:12:38 +00:00
John Ericson 63bd851e95 stdenv: Introduce hasCC attribute
Before, we'd always use `cc = null`, and check for that. The problem is
this breaks for cross compilation to platforms that don't support a C
compiler.

It's a very subtle issue. One might think there is no problem because we
have `stdenvNoCC`, and presumably one would only build derivations that
use that. The problem is that one still wants to use tools at build-time
that are themselves built with a C compiler, and those are gotten via
"splicing". The runtime version of those deps will explode, but the
build time / `buildPackages` versions of those deps will be fine, and
splicing attempts to work this by using `builtins.tryEval` to filter out
any broken "higher priority" packages (runtime is the default and
highest priority) so that both `foo` and `foo.nativeDrv` works.

However, `tryEval` only catches certain evaluation failures (e.g.
exceptions), and not arbitrary failures (such as `cc.attr` when `cc` is
null). This means `tryEval` fails to let us use our build time deps, and
everything comes apart.

The right solution is, as usually, to get rid of splicing. Or, baring
that, to make it so `foo` never works and one has to explicitly do
`foo.*`. But that is a much larger change, and certaily one unsuitable
to be backported to stable.

Given that, we instead make an exception-throwing `cc` attribute, and
create a `hasCC` attribute for those derivations which wish to
condtionally use a C compiler: instead of doing `stdenv.cc or null ==
null` or something similar, one does `stdenv.hasCC`. This allows quering
without "tripping" the exception, while also allowing `tryEval` to work.

No platform without a C compiler is yet wired up by default. That will
be done in a following commit.
2019-11-25 00:12:38 +00:00
Florian Klink 4273a6adcc
Merge pull request #74081 from flokli/osquery
osquery: remove
2019-11-25 00:17:46 +01:00
Florian Klink ffc82d2af8
Merge pull request #74086 from mmilata/nixos-test-port-wordpress-fix
nixosTests.wordpress: fix assertions
2019-11-25 00:15:39 +01:00
Robert Scott 817b066f4b nomacs: switch to using opencv4 (#72749)
opencv2 has known, unfixed security vulnerabilities. nomacs itself
states the minimum supported version is 3.4 & includes a script to
install opencv4, suggesting it is supported

darwin requires a patch to update its cmake file to make it less
restrictive over this
2019-11-25 00:14:51 +01:00
John Ericson 1a388b8bff
Merge pull request #74087 from Ericson2314/ghcjs-fix-deps
ghcjs-ng: The GHC source should be configured with native build inputs
2019-11-24 18:11:51 -05:00
John Ericson 5858d7229a ghcjs-ng: The GHC source should be configured with native build inputs
This matters once we start treating GHCJS as cross compilation, as we
should be.
2019-11-24 23:08:47 +00:00
Martin Milata e290dd881c nixosTests.wordpress: fix assertions 2019-11-25 00:01:51 +01:00
Renaud 35d99698ae
dislocker: replace polarssl with mbedtls
polarssl is an old alias to mbedtls
2019-11-24 23:16:01 +01:00
Florian Klink 02f869ff30 osquery: remove
osquery was marked as broken since April.

If somebody steps up to fix it, we can always revive it from the
histroy, but there's not much value in shipping completely broken things
in current master.

cc @ma27
2019-11-24 22:38:07 +01:00
WilliButz a3465d9d10
Merge pull request #73453 from mmahut/prometheus-nginxlog-exporter
prometheus-nginxlog-exporter: init at 1.3.0
2019-11-24 22:32:05 +01:00
worldofpeace e994b67a7f
Merge pull request #74080 from Ericson2314/fix-kde
plasma5: Fix setup hook some more
2019-11-24 21:29:20 +00:00
worldofpeace 38178a9a5b
Merge pull request #74030 from ckauhaus/connman-to-services.networking
connman: move "networking.connman" options to "services.connman"
2019-11-24 21:24:33 +00:00
Christian Kauhaus edbf94d2ee connman: move options to services
As part of the networking.* name space cleanup, connman should be moved
to services.connman. The same will happen for example with
networkmanager in a separate PR.
2019-11-24 16:23:32 -05:00
John Ericson 814f9104d7
Merge pull request #72657 from cleverca22/vc4
Initial implementation of vc4 cross-compile
2019-11-24 16:04:15 -05:00
Robin Gloster 3e3918d02a
Merge pull request #74055 from tfc/nixos-test-port-prometheus
nixos/prometheus: Port prometheus test to python
2019-11-24 21:59:45 +01:00
John Ericson b45938a972 plasma5: Fix setup hook some more
1. `[[...]]` is more robust wrt empty expansions than `[..]`

2. `${foo-}` is simpler and won't accidentally be a url compared to
`${foo:-}`

3. `+=` works even when the variable is undefined.
2019-11-24 15:58:51 -05:00
Franz Pletz e315f34bb3
Merge pull request #53032 from netixx/update-openvswitch-2.9.2
openvswitch: 2.5.4 -> 2.12.0
2019-11-24 20:53:44 +00:00
Florian Klink 013b9a853b
Merge pull request #74076 from filalex77/nixosTests.sudo-python
nixosTests.sudo: port to python
2019-11-24 21:48:24 +01:00
Florian Klink 2b2a7e81ea
Merge pull request #74074 from mayflower/tests-python-jenkins
nixosTests.jenkins: port to python
2019-11-24 21:47:14 +01:00
Michael Raskin 5b39722d84
Merge pull request #74043 from c0bw3b/pkg/belledonne
Refresh LinPhone ecosystem
2019-11-24 20:26:36 +00:00
Frederik Rietdijk be89ed192a Revert "yakuake: add missing kglobalaccel"
This reverts commit 88dc84c183.
2019-11-24 21:24:03 +01:00
Frederik Rietdijk ccc1286351 Revert "konsole: add missing kglobalaccel"
This reverts commit 7232ea43b6.
2019-11-24 21:23:45 +01:00
Johannes Schleifenbaum 2e7d306f2f dbeaver: 6.2.4 -> 6.2.5 2019-11-24 21:20:36 +01:00
Oleksii Filonenko 1043b55e4b
nixosTests.sudo: port to python 2019-11-24 22:11:04 +02:00
John Ericson 10a0a23c4f
Merge pull request #73756 from FRidh/kde5
WIP KDE5: fix breakage due to set -u changes
2019-11-24 15:10:34 -05:00
Mario Rodas 24f73573e5
Merge pull request #73395 from filalex77/mkcert-1.4.1
mkcert: 1.4.0 -> 1.4.1
2019-11-24 15:00:08 -05:00
Robin Gloster dde45712a7
nixosTests.jenkins: port to python 2019-11-24 20:54:10 +01:00
Robin Gloster 4572821435
Merge pull request #74069 from flokli/nixos-test-port-influxdb
nixosTests.influxdb: port to python
2019-11-24 20:46:49 +01:00
Florian Klink f8117905f1
Merge pull request #74070 from mayflower/tests-python-minio
nixosTests.minio: port to python
2019-11-24 20:32:11 +01:00
Mario Rodas 3cd94080eb
Merge pull request #74044 from marsam/add-tfsec
tfsec: init at 0.12.2
2019-11-24 14:27:48 -05:00
Mario Rodas 648c2b0bb5
Merge pull request #74059 from filalex77/spotifyd-0.2.20
spotifyd: 0.2.19 -> 0.2.20
2019-11-24 14:27:02 -05:00
Mario Rodas 8fa885e8d4
Merge pull request #74049 from anderslundstedt/master
git-subrepo: enable on Darwin
2019-11-24 14:26:32 -05:00
Florian Klink aa5f701e88 nixosTests.influxdb: port to python 2019-11-24 20:21:06 +01:00
Robin Gloster b86d62006d
nixosTests.minio: port to python 2019-11-24 20:20:32 +01:00
Daniël de Kok ba718f536e python3Packages.spacy: 2.2.2 -> 2.2.3
Changelog:

https://github.com/explosion/spaCy/releases/tag/v2.2.3
2019-11-24 11:18:35 -08:00
Daniël de Kok 6d7a29437f pythonPackages.wasabi: 0.3.0 -> 0.4.0 2019-11-24 11:18:35 -08:00
Daniël de Kok 18dd079101 pythonPackages.catalogue: init at 0.0.7 2019-11-24 11:18:35 -08:00
Robin Gloster f58069eb8e
Merge pull request #74063 from flokli/nixos-test-port-gitolite
nixosTests.gitolite: port to python
2019-11-24 20:08:45 +01:00
Robin Gloster a76eae4220
Merge pull request #74061 from flokli/nixos-test-port-uwsgi
nixosTests.uwsgi: port to python
2019-11-24 20:04:50 +01:00
Robert Scott 2482f8b8dc tightvnc: add patches for four CVEs
Security fixes for:
* CVE-2019-8287
* CVE-2019-15678
* CVE-2019-15679
* CVE-2019-15680

mostly adapted from patches fixing similar issues in the actively
maintained libvnc

(#73970)
2019-11-24 19:44:01 +01:00
John Ericson 1206faa6d5
Merge pull request #74057 from Ericson2314/wrapper-pname-support
treewide: Purge most parseDrvName
2019-11-24 13:31:35 -05:00
c0bw3b 9c4f51220e linphone: polarssl -> mbedtls
+ add bcg729 input
+ move bcunit to nativeBuildInputs
2019-11-24 19:28:44 +01:00
Florian Klink 84e32f6d9c nixosTests.gitolite: port to python 2019-11-24 19:27:34 +01:00
Florian Klink e6d71e498f nixosTests.uwsgi: port to python 2019-11-24 19:12:14 +01:00
Herwig Hochleitner a52d7674cc chromium: update vaapi patch
https://github.com/NixOS/nixpkgs/issues/73878
2019-11-24 19:07:59 +01:00