Daiderd Jordan
36818207e9
Merge branch 'master' into staging
2017-11-17 22:45:34 +01:00
Daiderd Jordan
399a22e984
Merge pull request #31175 from yrashk/rust-1.21
...
rust: 1.20.0 -> 1.21.0
2017-11-17 22:31:49 +01:00
Daiderd Jordan
ccf7310e2d
Merge pull request #31125 from LnL7/darwin-rust-bootstrap
...
rust-bootstrap: cleanup darwin expression
2017-11-17 22:31:32 +01:00
Orivej Desh
b7734b61a0
Merge pull request #31736 from ChengCat/chengcat
...
thunar: add wrapGAppsHook
2017-11-17 20:59:47 +00:00
Orivej Desh
e283833d9c
Merge pull request #31764 from adisbladis/libmsgpack-gcc7
...
Libmsgpack gcc7 fixes
2017-11-17 20:48:42 +00:00
Orivej Desh
1352789cfc
Merge pull request #31765 from adisbladis/czmq-gcc7
...
czmq: Fix build with gcc-7
2017-11-17 20:47:57 +00:00
Nikolay Amiantov
88105ee018
gtk3: compute DPI properly when Xft options are not used
...
Taken from #25892
Fixes #25023
2017-11-17 20:45:49 +00:00
John Ericson
ccb93aee17
Merge pull request #31754 from obsidiansystems/simplify-darwin-binutils
...
cctools, darwin-bintuils: Don't always bring in headers
2017-11-17 15:31:45 -05:00
Orivej Desh
23a5f54ee5
Merge pull request #30534 from kamilchm/spark
...
spark: 2.1.0 -> 2.2.0
2017-11-17 20:24:06 +00:00
Orivej Desh
ca86a25061
Merge pull request #31400 from gnidorah/gtk3
...
gtk3: 3.22.24 -> 3.22.26
2017-11-17 20:09:35 +00:00
Thomas Tuegel
850846e132
Merge pull request #31772 from ttuegel/dropbox/versions
...
Dropbox: overwrite old versions, pass arguments, fix sign-in
2017-11-17 13:57:09 -06:00
Orivej Desh
f92f07fb14
Merge pull request #27305 from therealpxc/groff
...
groff: split out perl dependencies
2017-11-17 19:26:15 +00:00
Orivej Desh
88abcdb53a
Merge pull request #31710 from adisbladis/nodejs-9_2_0
...
nodejs: 9.0.0 -> 9.2.0 & libuv: 1.15.0 -> 1.16.1
2017-11-17 19:22:37 +00:00
Orivej Desh
881f9b32d1
Merge pull request #31718 from maiksensi/pytest-3.2
...
pytest: 3.2.3 -> 3.2.5
2017-11-17 19:17:39 +00:00
Daiderd Jordan
e677ed1c5b
Merge pull request #31771 from cstrahan/ycmd-update
...
ycmd update
2017-11-17 19:20:18 +01:00
Orivej Desh
1161741351
Merge branch 'master' into staging
...
* master: (28 commits)
go_1_9: skip flaky TestWaitGroupMisuse2
erlangR18: fix patch hashes with fetchpatch
xml2: replace dead links
nixos/pam: fix docs about path to u2f_keys file
cinelerra: add a note about parallel building
msmtp: install docs and examples (#31769 )
kernel: Fix out-of-tree modules on aarch64
nixos/tests/acme: update terms of service to fix test
gixy: init at 0.1.8
pythonPackages.ConfigArgParse: 0.9.3 -> 0.12.0, refactor, move to python-modules
mono: init at 4.8
wal-g: fix license so not to break evaluation
wal-g: init at 0.1.2
maintainers: add backuitist
nixos/prometheus: Correct documentation for external_labels
spidermonkey: replace broken links
vagrant: removed custom rake gem
vagrant: 2.0.0 -> 2.0.1
nixos/prometheus: add external_labels option
nixos/prometheus: add scrape_configs.honor_labels
...
2017-11-17 18:06:22 +00:00
Orivej Desh
73598e3787
go_1_9: skip flaky TestWaitGroupMisuse2
...
https://github.com/golang/go/issues/20072
https://hydra.nixos.org/build/64351217/nixlog/1
2017-11-17 18:05:30 +00:00
Thomas Tuegel
7dee7d6ddb
dropbox: install firefox-bin in FHS env
...
To sign in to dropbox, a browser must be available in the FHS env. We cannot
ensure that the user's browser of choice is available, so we provide Firefox as
a default.
Resolves : #31667
2017-11-17 12:00:20 -06:00
Daiderd Jordan
45b6c9c8f1
Merge pull request #31760 from LnL7/darwin-gstreamer
...
gstreamer: fix darwin build
2017-11-17 18:59:11 +01:00
Thomas Tuegel
7e7fbebed9
dropbox: pass along positional parameters to exec
2017-11-17 11:48:34 -06:00
Thomas Tuegel
9ce215862e
dropbox: overwrite existing installation if our installer is newer
2017-11-17 11:47:55 -06:00
Orivej Desh
587642bddc
erlangR18: fix patch hashes with fetchpatch
2017-11-17 17:04:23 +00:00
Orivej Desh
66239387a5
xml2: replace dead links
2017-11-17 16:54:20 +00:00
Bjørn Forsman
3f36f167e6
nixos/pam: fix docs about path to u2f_keys file
...
Looking at upstream git repo (git://github.com/Yubico/pam-u2f.git) the
docs initially said the path was ~/.yubico/u2f_keys, but it was later
changed to ~/.config/Yubico/u2f_keys (in 2015).
I have run pam_u2f.so with "debug" option and observed that the correct
path indeed is ~/.config/Yubico/u2f_keys.
2017-11-17 17:50:40 +01:00
Orivej Desh
eb36534820
Merge pull request #31767 from orivej/make-wrapper
...
makeWrapper: add --set-default
2017-11-17 16:41:27 +00:00
Orivej Desh
4be7aae5b3
cinelerra: add a note about parallel building
2017-11-17 16:41:16 +00:00
Florian Klink
7c737cb506
msmtp: install docs and examples ( #31769 )
...
* msmtp: install docs and examples
* msmtp: nitpick
2017-11-17 16:35:01 +00:00
Charles Strahan
f39c132bce
ycmd: 2017-03-27 -> 2017-11-05
2017-11-17 11:20:11 -05:00
Tuomas Tynkkynen
eb85761137
kernel: Fix out-of-tree modules on aarch64
...
https://hydra.nixos.org/build/62813493
2017-11-17 17:06:52 +02:00
Franz Pletz
00056e76d0
nixos/tests/acme: update terms of service to fix test
2017-11-17 16:05:13 +01:00
Franz Pletz
bc7c2c2c8d
Merge pull request #31574 from WilliButz/add-gixy
...
gixy: init at 0.1.8
2017-11-17 15:46:19 +01:00
WilliButz
489fd5a7ce
gixy: init at 0.1.8
2017-11-17 15:36:52 +01:00
WilliButz
c122dadb51
pythonPackages.ConfigArgParse: 0.9.3 -> 0.12.0, refactor, move to python-modules
...
- fetch with `fetchPypi`
- add license, description and myself as maintainer
2017-11-17 15:36:52 +01:00
Roman Kuznetsov
fccc81a671
mono: init at 4.8
2017-11-17 17:31:56 +03:00
Ollie Charles
b075e79c97
wal-g: fix license so not to break evaluation
2017-11-17 13:55:14 +00:00
Ollie Charles
5735aecc27
wal-g: init at 0.1.2
2017-11-17 13:45:00 +00:00
Graham Christensen
5af8c930fc
Merge pull request #31768 from andir/fix-vagrant-vbox52
...
vagrant: 2.0.0 -> 2.0.1 (fixes vagrant with virtualbox 5.2)
2017-11-17 07:59:40 -05:00
Orivej Desh
fbdc74c761
makeWrapper: delete --set-eval
...
because --run is good enough.
2017-11-17 12:53:54 +00:00
Orivej Desh
74648f7466
treewide: use --set-default and --set-eval where appropriate
2017-11-17 12:28:14 +00:00
Orivej Desh
80d1eaa01d
mesos: do not use makeWrapper with bash from bootstrap tools
...
It is too old and does not support required features. The error is:
/nix/store/...-hook/nix-support/setup-hook: line 78: export $varName=${value@Q}\${$varName:+${separator@Q}}\$$varName: bad substitution
2017-11-17 12:28:14 +00:00
Orivej Desh
d7aefea2ef
maintainers: add backuitist
2017-11-17 12:23:44 +00:00
Oliver Charles
560400773c
nixos/prometheus: Correct documentation for external_labels
...
As description is literal XML, I need to escape < and > by hand.
2017-11-17 11:06:03 +00:00
Orivej Desh
ceed4b2d12
spidermonkey: replace broken links
...
people.mozilla.org is gone
2017-11-17 11:04:28 +00:00
Orivej Desh
a50e8c8b00
Merge pull request #31626 from backuitist/i3status
...
i3status-rust: init at 0.9.0.2017-11-09
2017-11-17 10:45:10 +00:00
Orivej Desh
c0d2ee13be
Merge pull request #31730 from gnidorah/rambox
...
rambox: allow user to use other auth0 credentials
2017-11-17 10:43:52 +00:00
Andreas Rammhold
e427e8415c
vagrant: removed custom rake gem
2017-11-17 11:43:31 +01:00
Andreas Rammhold
3f4eb16799
vagrant: 2.0.0 -> 2.0.1
...
Due to the virtualbox bump to version 5.2 vagrant was no longer able to
interface with virtualbox. Version 2.0.1 supports virtualbox 5.2.
2017-11-17 11:43:30 +01:00
Oliver Charles
acb7f43db9
nixos/prometheus: add external_labels option
2017-11-17 10:16:21 +00:00
Oliver Charles
f0334c0336
nixos/prometheus: add scrape_configs.honor_labels
2017-11-17 10:15:37 +00:00
Orivej Desh
4199892768
makeWrapper: add --set-default and --set-eval
...
After #31497 starter quoting all values, there arouse the need to left some
values evaluated.
`--set-default var value` expands to `export var=${var-value}`, where value is
not evaluated and literally assigned to var unless it is already set.
`--set-eval var value` expands to `export var=$(eval echo value)`, where value
is evaluated by `eval`.
2017-11-17 10:11:01 +00:00
