Jan Tojnar
510737cca7
nixos/gnome3: override schemas using env variable
...
For some reason, the GNOME 3.26 update broke the overrides. It turns
out the overrides now need to come before the overriden schemas in the
XDG_DATA_DIRS variable. This is not possible in general due to applications
prefixing the variable (e.g. in wrapGAppsHook).
To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR
was introduced. It has greater priority than XDG_DATA_DIRS but lower
than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not
to block the built-in one for users.
2017-11-15 03:45:25 +01:00
Jan Tojnar
1f79b943c0
glib: recognize NIX_GSETTINGS_OVERRIDES_DIR variable
...
For some reason, the GNOME 3.26 update broke the overrides. It turns
out the overrides now need to come before the overriden schemas in the
XDG_DATA_DIRS variable. This is not possible in general due to applications
prefixing the variable (e.g. in wrapGAppsHook).
To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR
was introduced. It has greater priority than XDG_DATA_DIRS but lower
than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not
to block the built-in one for users.
2017-11-15 03:45:24 +01:00
Samuel Leathers
6e686ff36d
webkitgtk: 2.18.2 -> 2.18.3 (fixes multiple CVE's)
2017-11-13 10:02:40 +01:00
John Ericson
7db0b80c61
Merge remote-tracking branch 'channels/nixos-unstable' into staging
2017-11-13 00:18:03 -05:00
John Wiegley
9ea242c617
coqPackages.interval: Add bignums, now a required dependency
2017-11-12 10:21:56 -08:00
Orivej Desh
f7bb8d2dfa
Merge pull request #31537 from orivej/lkl
...
lkl: 2017-10-18 -> 2017-11-10, make-disk-image: do not fake time for cptofs
2017-11-12 18:09:34 +00:00
Vladimír Čunát
ab1859e027
Merge branch 'staging'
...
Hydra looks very good: https://hydra.nixos.org/eval/1409475?compare=1409440
There's mainly some fallout from aarch64-linux not building `go`
on the first attempt.
2017-11-12 19:08:05 +01:00
John Wiegley
a41478cebb
coqPackages.CoLoR: 1.3.0 -> 1.4.0, which now supports Coq 8.7
2017-11-12 10:03:32 -08:00
Renaud
90ffccffdc
Merge pull request #16683 from rardiol/cataclysm-dda-git2
...
cataclysm-dda-git: init at 2017-07-12
2017-11-12 18:56:26 +01:00
Vincent Laporte
16eef54eee
ocamlPackages.fileutils: 0.5.2 -> 0.5.3
2017-11-12 17:48:33 +00:00
John Wiegley
bb038283c4
coqPackages.metalib: New expression
2017-11-12 09:34:06 -08:00
John Wiegley
7d6d4af1d1
Add missing default.nix for coqPackages.equations
2017-11-12 09:33:40 -08:00
John Wiegley
dcab51c6f4
coqPackages.QuickChick: Update build for Coq 8.6 and 8.7
2017-11-12 09:17:48 -08:00
John Wiegley
f1fc74359f
coqPackages.ssreflect: Build version 0.6.4 for Coq 8.6 and 8.7
2017-11-12 08:50:37 -08:00
John Wiegley
b2418ca598
coqPackages.dpdgraph: Build version 0.6.2 for Coq 8.7
2017-11-12 08:50:36 -08:00
Orivej Desh
228dd9defb
Merge pull request #31550 from orivej/dbus-1
...
make-dbus-conf: prefer local build
2017-11-12 16:44:14 +00:00
Thomas Tuegel
605a2c944c
Merge branch 'qt-fixes' into staging
2017-11-12 09:51:56 -06:00
Thomas Tuegel
d3efa486e5
qt59.qtbase: carefully avoid applying Linux flags to Darwin build
2017-11-12 09:51:48 -06:00
Thomas Tuegel
ded18e4f47
qt59.qtbase: restore Darwin collection-types patch
2017-11-12 09:51:48 -06:00
Thomas Tuegel
2063d54c72
qt56: 5.6.2 -> 5.6.3
2017-11-12 09:51:48 -06:00
Thomas Tuegel
04ba30ef8e
qt59.qtbase: replace type with command for POSIX compatibility
2017-11-12 09:51:48 -06:00
Thomas Tuegel
3729b77531
qt5.mkDerivation: default enableParallelBuilding = true
2017-11-12 09:51:48 -06:00
Thomas Tuegel
4f72831934
qt56.qtbase: replace type with command for POSIX compatibility
2017-11-12 09:51:47 -06:00
Thomas Tuegel
9e05d61dd7
qt56: remove unused obsolete expressions
2017-11-12 09:51:47 -06:00
Thomas Tuegel
91b362c5cf
qt56.qtwebkit: fix build with ICU 59
2017-11-12 09:51:47 -06:00
Orivej Desh
5e698100b7
Merge pull request #31562 from dotlambda/braincurses
...
braincurses: init at 1.1.0
2017-11-12 14:31:20 +00:00
Robert Schütz
ebd064b761
braincurses: init at 1.1.0
2017-11-12 15:27:01 +01:00
Vincent Laporte
dd1a9fa915
ocamlPackages.nocrypto: remove spurious dependency on oasis
2017-11-12 10:19:56 +00:00
Vincent Laporte
d9dd5425b0
ocamlPackages.angstrom: remove spurious dependency on oasis
2017-11-12 10:14:51 +00:00
Vincent Laporte
45431bed57
ocamlPackages.ocaml_gettext: 0.3.5 -> 0.3.7
2017-11-12 10:14:50 +00:00
Frederik Rietdijk
74c92a341d
Merge pull request #31554 from xvapx/libnacl
...
pythonPackages.libnacl: 1.6.0 -> 1.6.1
2017-11-12 10:43:29 +01:00
Vincent Laporte
27d2eef21a
ocamlPackages.gen: 0.4.0.1 -> 0.5
2017-11-12 09:10:01 +00:00
Vincent Laporte
88389f43f7
ocamlPackages.containers: remove spurious dependency on oasis
2017-11-12 09:09:53 +00:00
Marti Serra
86ffe92e96
pythonPackages.libnacl: 1.6.0 -> 1.6.1
2017-11-12 09:49:14 +01:00
Gabriel Ebner
b7490c9702
racket: fix build by using gcc7
...
See #31017 .
2017-11-12 09:30:58 +01:00
Samuel Leathers
65424eac66
Merge pull request #31542 from c0bw3b/pkg/lftp
...
lftp: 4.8.2 -> 4.8.3
2017-11-11 23:21:57 -05:00
Orivej Desh
fb8d552026
make-dbus-conf: prefer local build
2017-11-12 03:52:21 +00:00
Renaud
d2724f1635
lftp: 4.8.2 -> 4.8.3
2017-11-11 23:37:41 +01:00
Renaud
f575062f97
Merge pull request #30516 from rnhmjoj/wireless
...
nixos/wireless: add manual network configuration
2017-11-11 23:25:49 +01:00
rnhmjoj
2918f6a3f0
nixos/wireless: add manual network configuration
2017-11-11 23:11:46 +01:00
Renaud
1503409aac
Merge pull request #30943 from csingley/nzbget
...
nzbget.service override nzbget.conf broken paths with current derivation
2017-11-11 22:04:29 +01:00
Orivej Desh
a84ce72fdc
make-disk-image: do not use faketime
...
Since https://github.com/lkl/linux/pull/394 cptofs preserves the source time,
which is 1970-01-01T00:00:01Z for /nix/store and recent for other files.
This reverts commit f5b3f2c5a7
2017-11-11 20:57:14 +00:00
Vladimír Čunát
f6655ba128
bootstrap tools test: fixup after d71833ee36
2017-11-11 21:41:42 +01:00
Orivej Desh
b8cc69b31e
lkl: 2017-10-18 -> 2017-11-10
2017-11-11 20:25:18 +00:00
Orivej Desh
f218ef647c
make-disk-image: clean up
2017-11-11 20:24:26 +00:00
John Wiegley
462b5e0d21
coqPackages.mathcomp: 1.6.1 -> 1.6.4, for Coq versions 8.6 and 8.7
2017-11-11 09:44:55 -08:00
Robert Helgesson
f1caf10ec9
perl-Config-Grammar: 1.11 -> 1.12
...
Also expand meta section.
2017-11-11 18:15:30 +01:00
Robert Helgesson
5e98876100
perl-Encode: 2.78 -> 2.93
2017-11-11 18:15:30 +01:00
Renaud
98d1f780b5
Merge pull request #31527 from hedning/nix-bash-completion-fix
...
nix-bash-completions: 0.1 -> 0.2
2017-11-11 18:13:48 +01:00
Renaud
3b647d7bbd
Merge pull request #31376 from c0bw3b/pkg/libtom
...
libtom{crypt,math}: update to 1.18.0 and 1.0.1 resp.
2017-11-11 18:11:14 +01:00
