3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

202630 commits

Author SHA1 Message Date
adisbladis c3a0db00aa
Merge pull request #73982 from B4dM4n/cage-fix-build
cage: fix build
2019-11-23 18:45:07 +00:00
John Ericson e241c1420a
Merge pull request #73316 from Ericson2314/mingw-rocksdb
rocksdb: Build with MinGW
2019-11-23 13:37:31 -05:00
Frederik Rietdijk c3c84bbb2c kdeFrameworks: properly fix hook 2019-11-23 19:24:11 +01:00
Frederik Rietdijk c8acd48172 plasma5: properly fix hook 2019-11-23 19:24:11 +01:00
Fabian Möller f610983ead
cage: fix build
The build fails because some C headers got removed from mesa-19.2.2.
Using libGL seems to be the correct way to use GL related headers.
2019-11-23 19:04:25 +01:00
Michael Weiss d1ee508194
Merge pull request #73977 from B4dM4n/wlroots-fix-build
wlroots: fix build
2019-11-23 19:00:51 +01:00
John Ericson 505dcb3b73
Merge pull request #73946 from Ericson2314/fix-lua-env
lua wrapper: Fix bash error
2019-11-23 12:38:44 -05:00
John Ericson ae8a90554e rocksdb: Build with Ninja
This is sightly faster/simpler.
2019-11-23 17:27:16 +00:00
John Ericson 4686cfcc94 Merge remote-tracking branch 'upstream/master' into mingw-rocksdb
Can just use single commit from
https://github.com/facebook/rocksdb/pull/6076 for rocksdb!
2019-11-23 17:26:49 +00:00
Fabian Möller 320d6e3800
wlroots: fix build
add missing header that changed in mesa-19.2.2
2019-11-23 18:13:17 +01:00
Renaud 2b66f562e9
carp: fix eval 2019-11-23 17:10:17 +01:00
alva a03e31587d carp: unstable-2018-09-15 -> 0.3.0
(#68155)
2019-11-23 17:02:37 +01:00
Aaron Andersen 216f0e6ee4
Merge pull request #73928 from jamii/fix_mariadb_drivers
Fix mariadb drivers
2019-11-23 10:48:46 -05:00
Orivej Desh 7e952c3321 python: keyring: support Python 2 2019-11-23 14:52:25 +00:00
Janne Heß 576a82d6c2 rainloop-standard: Fix pname and license (#73963)
- Switched to pname
- Fixed the double dash in pname
- Changed license to unfree (they don't allow redistribution)

Fixes #73956
2019-11-23 15:36:28 +01:00
Jamie Brandon fa9a981faf unixODBCDrivers.mariadb: build against subrepo instead of libmysqlclient
For unknown reasons, building against libmysqlclient results in
unixODBC reporting an error when trying to load the driver, but
building against the subrepo works fine.

Fixes https://github.com/NixOS/nixpkgs/pull/73928
2019-11-23 13:08:12 +00:00
worldofpeace 1fc4e03225
Merge pull request #73950 from edef1c/steam-noalias
Fix steam build under `allowAliases = false`
2019-11-23 12:47:47 +00:00
Mario Rodas 7c5b287ca1
Merge pull request #73910 from marsam/update-sops
sops: 3.4.0 -> 3.5.0
2019-11-23 07:22:46 -05:00
Maximilian Bosch b451612bd9
nixos/networkd: add missing dhcpv6 and static options to IPv6PrefixDelegation 2019-11-23 12:51:38 +01:00
Mario Rodas be1ce70e6f
Merge pull request #73925 from xrelkd/update/parity
parity: 2.5.9 -> 2.5.10, parity-beta: 2.6.4 -> 2.6.5
2019-11-23 05:30:59 -05:00
Mario Rodas 988ca73c03
Merge pull request #73923 from xrelkd/update/eksctl
eksctl: 0.9.0 -> 0.10.2
2019-11-23 05:30:13 -05:00
Austin Seipp b964f4b421
vector: make some more options override-able
Unfortunately, buildRustPackage isn't very flexible right now, and most
of these attrs can't be overridden. This is needed for some general
patch work, but isn't really long term sustainable. I plan on reverting
this after Vector 0.6 is out.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-11-23 03:58:58 -06:00
Orivej Desh 2becf48fb5 python: pandas: support Python 2
pandas/2.nix is supposed to be a Python 2 expression, and 0.24.2 is the last
release that supports it.
2019-11-23 07:41:02 +00:00
Orivej Desh d71f948f03 python: tables: support Python 2
tables/3.5.nix is supposed to be frozen at 3.5.
2019-11-23 07:34:43 +00:00
Orivej Desh 0646b9f7c3 python: openpyxl: support Python 2
This fixes pandas for Python 2 since it depends on openpyxl.
2019-11-23 07:31:22 +00:00
edef 0e76e6bee8 steam: refer to unaliased gtk3 and gdk-pixbuf 2019-11-23 03:53:39 +00:00
edef a9d4cba9eb luaPackages.lgi: refer to unaliased gobject-introspection 2019-11-23 03:53:38 +00:00
Mario Rodas b339f29a27
Merge pull request #73909 from marsam/update-nodejs-13_x
nodejs-13_x: 13.1.0 -> 13.2.0
2019-11-22 22:39:18 -05:00
John Ericson 46acc245c0
Merge pull request #73903 from jonringer/fix-qtplugin-options
kde-frameworks.extra-cmake-modules: allow for unset qtPluginPrefix
2019-11-22 21:14:28 -05:00
John Ericson 069e9fd449 rocksdb: Fix MinGW Build 2019-11-23 01:25:03 +00:00
mb c9453387da rocksdb: 6.2.2 -> 6.2.4
(cherry picked from commit 0cd88820b3)
2019-11-23 01:25:03 +00:00
John Ericson a610a38cb5 lua wrapper: Fix bash error
Recently, we made it harder for external code to use some stdenv-only bash
variables by unsetting them in [1] But Lua's `withPackages` was sourcing some
setup hooks in [2], which required those bash variables.

I say great! We caught something bad: Lua should use normal dependencies, even
though that is harder with `buildEnv`. Now it works that way, and everything is
fine.

[1]: 9d3911f806/pkgs/stdenv/generic/setup.sh (L574-L578)

[2]: 9d3911f806/pkgs/development/interpreters/lua-5/wrapper.nix (L23-L27)

CC @matthewbauer
2019-11-22 19:47:27 -05:00
Silvan Mosberger 9d3911f806
beets: fix absubmit deps (#73608)
beets: fix absubmit deps
2019-11-23 00:46:36 +01:00
Maximilian Bosch ba307dd176
codimd: fix build
This package broke during the update of `nodejs-10_x` to `v10.17.0`[1]
since `node-gyp` got updated from `3.8.0` to `5.0.3` during the NPM
update to `6.10.2`[2] which is bundled in the `nodejs` release tarball.

This `node-gyp`-version is used by the build script for `codimd` to
build several dependencies such as `node-sqlite3`. Older `node-gyp`
versions expected source headers for the compilation in `~/.node-gyp`,
with `node-gyp@5.0.3`, headers are declared by using the `--nodedir`
option.

[1] 7785f49b23
[2] e2291cf805
2019-11-23 00:40:58 +01:00
worldofpeace 519448d2e3 nixos/gdm: don't raise an Exception in set-session script
https://github.com/NixOS/nixpkgs/pull/73378#discussion_r349825541
2019-11-22 18:05:31 -05:00
WilliButz be5dcb4606
Merge pull request #73933 from flokli/nixos-test-port-mongodb
nixosTests.mongodb: port to python
2019-11-22 23:58:41 +01:00
WilliButz 2e54c90c38
Merge pull request #73939 from flokli/nixos-test-port-gitlab
nixosTests.gitlab: port to python
2019-11-22 23:54:27 +01:00
worldofpeace bec88e1110
Merge pull request #73378 from worldofpeace/gdm-default-session
nixos/gdm: make desktopManager.default work
2019-11-22 22:49:15 +00:00
worldofpeace d8b50bfe47 nixos/gdm: make desktopManager.default work
Unfortunately, you can't configure the default user-session
with GDM like lightdm. I've opened a feature request [0]
but I'd like to be able to do this now.

We use a GObject Python script using bindings to AccountsService
to achieve this. I'm hoping the reliable heuristic for session names
is the file's basename. We also have some special logic for which
method to use to set the default session. It seems set_x_session is
deprecated, and thusly the XSession key, but if that method isn't used
when it's an xsession it won't be the default in GDM.

[0]: https://gitlab.gnome.org/GNOME/gdm/issues/535
2019-11-22 17:47:03 -05:00
Franz Pletz a7fa51921a
Merge pull request #73935 from flokli/nixos-test-port-mpd
nixosTests.mpd: port to python
2019-11-22 22:10:47 +00:00
Florian Klink 1d65113d41 nixosTests.gitlab: port to python 2019-11-22 23:08:06 +01:00
markuskowa 0d2fd9018f
Merge pull request #73835 from markuskowa/upd-scalapack
scalapack: 2.0.2 -> 2.1
2019-11-22 22:46:27 +01:00
Sascha Grunert 801da15e4e sonobuoy: 0.15.0 -> 0.16.1 (#70904)
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2019-11-22 22:29:01 +01:00
Daiderd Jordan 7da9844fde
Merge pull request #73826 from LnL7/darwin-git
git: disable failing test on darwin
2019-11-22 21:27:49 +01:00
Florian Klink 5121706951 nixosTests.mpd: port to python 2019-11-22 21:21:05 +01:00
Daiderd Jordan 185e30c664
git: disable failing test on darwin
The tests for null patterns where changed in 25754125cef278c7e9492fbd6dc4a28319b01f18,
it's possible utf-8 normalisation is causing different behaviour here.

    not ok 54 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>[Ð]' a
    not ok 57 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>Ð' a
    not ok 60 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>ð' a
    not ok 63 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>Ð' a
    Dubious, test returned 1 (wstat 256, 0x100)
    Failed 4/145 subtests
            (less 48 skipped subtests: 93 okay)
2019-11-22 21:02:21 +01:00
Florian Klink 86a947297a nixosTests.mongodb: port to python 2019-11-22 20:56:43 +01:00
Florian Klink c81e4f10c2
Merge pull request #73131 from 1000101/port-tests-to-python
Port tests to python
2019-11-22 20:47:24 +01:00
worldofpeace 9995881b79
Merge pull request #73876 from jtojnar/phonon-backends
Fix Plasma NixOS tests
2019-11-22 19:44:19 +00:00
Jan Hrnko bc1d542f09 nixos/miniflux: port test to python 2019-11-22 20:38:56 +01:00