Vladimír Čunát
0b192a0976
Merge branch 'master' into staging
...
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Eelco Dolstra
a0f89ee509
xf86-video-intel: 2015-11-14 -> 2016-05-22
...
This fixes compositing in KDE on a Intel HD Graphics 530 for me.
2016-05-22 23:05:47 +02:00
Eelco Dolstra
600cd79f1e
xkeyboard-config: 2.16 -> 2.17
2016-05-22 23:05:42 +02:00
Eelco Dolstra
c7d92f9485
xf86-video-modesetting: Remove
...
This driver is part of xorg-server now, so we were using an outdated
version.
2016-05-22 23:05:30 +02:00
Vladimír Čunát
69ed132f82
xorg: various updates
...
It would cost quite some work to split this into more commits sensibly,
and there would probably be little gain.
2016-05-22 12:10:39 +02:00
Vladimír Čunát
f4eb808554
xf86-input-synaptics: split dev output
2016-05-22 12:10:38 +02:00
Vladimír Čunát
c4661e9643
Merge: make dev output references explicit
...
This is a rebase of most commits from #14766 ,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Alexander Ried
3e0943d5ba
ripple-rest: mark as broken
...
development is frozen as of Nov 2015
author recommends migrating to RippleAPI
2016-05-21 18:04:17 +02:00
Vladimír Čunát
019e9a9aa6
Merge #15421 : mariadb: wrap mysqld with --basedir
2016-05-20 10:50:13 +02:00
Tuomas Tynkkynen
7fb29bfa73
treewide: Make explicit that 'dev' output of zlib is used
2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
e80e4ba2bb
treewide: Make explicit that 'dev' output of sqlite is used
2016-05-19 10:04:34 +02:00
Tuomas Tynkkynen
8d473f107c
treewide: Make explicit that 'dev' output of readline is used
2016-05-19 10:03:35 +02:00
Tuomas Tynkkynen
d42e94472d
treewide: Make explicit that 'dev' output of pcre is used
2016-05-19 10:02:28 +02:00
Tuomas Tynkkynen
2a73de6e6c
treewide: Make explicit that 'dev' output of openssl is used
2016-05-19 10:02:23 +02:00
Tuomas Tynkkynen
5eb01cd0ad
treewide: Make explicit that 'dev' output of openldap is used
2016-05-19 10:00:50 +02:00
Tuomas Tynkkynen
d7071caba5
treewide: Make explicit that 'dev' output of libssh2 is used
2016-05-19 10:00:45 +02:00
Tuomas Tynkkynen
674eb400ef
treewide: Make explicit that 'dev' output of libevent is used
2016-05-19 10:00:40 +02:00
Tuomas Tynkkynen
4e0307dcfc
treewide: Make explicit that 'dev' output of cyrus_sasl is used
2016-05-19 10:00:30 +02:00
Tuomas Tynkkynen
d298b52fd3
treewide: Make explicit that 'dev' output of aprutil is used
2016-05-19 10:00:25 +02:00
Tuomas Tynkkynen
29694b43b6
treewide: Make explicit that 'dev' output of apr is used
2016-05-19 10:00:24 +02:00
Tuomas Tynkkynen
16cc4ac83b
treewide: Make explicit that 'dev' output of apacheHttpd is used
2016-05-19 10:00:23 +02:00
Tuomas Tynkkynen
ff24ce23c9
bind: Fix references to openssl in *.la files
...
Avoids reference to the OpenSSL development headers.
2016-05-18 23:05:51 +03:00
Joachim Fasting
134a9c6ad3
Merge pull request #15521 from cerana/consul-0.6.4
...
consul: 0.5.2 -> 0.6.4 (using go 1.6)
2016-05-18 04:00:45 +02:00
Joachim Fasting
55e92350e9
Merge pull request #15523 from sargon/master
...
owncloud: 9.0.0 -> 9.0.2
2016-05-18 03:21:40 +02:00
Nahum Shalman
fe07537efb
consul: 0.5.2 -> 0.6.4 (using go 1.6)
...
consul: 0.5.2 -> 0.6.4 (using go 1.6)
consul-ui: 0.5.2 -> 0.6.4 (using go 1.6)
consul-alerts: 2015-08-09 -> 0.3.3 (using go 1.6)
consul-template: 0.9.0 -> 0.14.0 (using go 1.6)
vault: 0.2.0 -> 0.5.2 (using go 1.6)
2016-05-17 20:22:30 +00:00
Domen Kožar
b49bf121b8
rename iElectric to domenkozar to match GitHub
2016-05-17 13:00:47 +01:00
Daniel Ehlers
52c5fabfbb
owncloud: 9.0.0 -> 9.0.2
2016-05-17 11:39:09 +02:00
Vladimír Čunát
e429a4012e
Merge #15360 : xscreensaver: Fix xscreensaver-text
2016-05-17 09:13:59 +02:00
Peter Simons
8e462995ba
Bring my stdenv.lib.maintainers user name in line with my github nick.
2016-05-16 22:49:55 +02:00
Michael Raskin
b8c0726fc2
apache-jena-fuseki: 2.3.1 -> 2.4.0
2016-05-15 23:49:44 +02:00
Michael Raskin
80fc8542ff
apache-jena: 3.0.1 -> 3.1.0
2016-05-15 23:49:44 +02:00
Sebastián Bernardo Galkin
edaecb41db
postgis: fix build after output splits
...
Fixes #15236
Two changes were needed:
- pg_config from postgresql package wasn't reporting the correct location for
the pgxs extension system, after the output split
- json_c is now split in dev and out outputs, postgis configure doesn't find the
library location properly
Closes #15470
2016-05-15 11:49:59 +02:00
Tuomas Tynkkynen
0561e14c3b
bind: Split into multiple outputs
...
A patch is needed to make bind not print its configure flags on
'named -V'.
2016-05-14 22:12:59 +03:00
Tuomas Tynkkynen
e460267737
bind: Attempt to fix Darwin OpenSSL linking
...
Issue #15279 reports:
````
Checking for OpenSSL library... using OpenSSL from /nix/store/c6kijfc5py2805lmqczvmcws5cm9jg1l-openssl-1.0.2g-dev/lib and /nix/store/c6kijfc5py2805lmqczvmcws5cm9jg1l-openssl-1.0.2g-dev/include
checking whether linking with OpenSSL works... no
configure: error: Could not run test program using OpenSSL from
/nix/store/c6kijfc5py2805lmqczvmcws5cm9jg1l-openssl-1.0.2g-dev/lib and /nix/store/c6kijfc5py2805lmqczvmcws5cm9jg1l-openssl-1.0.2g-dev/include.
Please check the argument to --with-openssl and your
shared library configuration (e.g., LD_LIBRARY_PATH).
builder for ‘/nix/store/54nni99j4ycwws6zfjwcvv8vxsdk895i-bind-9.10.4.drv’ failed with exit code 1
````
2016-05-13 23:31:30 +03:00
Franz Pletz
6d1fe178c3
mpd: 0.19.12 -> 0.19.15
2016-05-13 17:45:39 +02:00
Franz Pletz
6b633b15e9
sslh: 1.17 -> 1.18
2016-05-13 17:27:58 +02:00
Vladimír Čunát
3e387c3e00
Merge branch 'staging'
...
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Franz Pletz
df8958435e
grafana: 2.6.0 -> 3.0.1 ( #15395 )
...
* grafana: 2.6.0 -> 3.0.1
* grafana module: Fix anonymous auth & add analytics config
2016-05-13 02:28:24 +02:00
Phil Wetzel
6ce89e174f
mariadb: wrap mysqld with --basedir
2016-05-12 18:22:53 -04:00
Robert Irelan
a64c572948
subsonic: 5.3 -> 6.0
2016-05-11 22:35:26 -07:00
Vladimír Čunát
6c2fbfbd77
Merge branch 'master' into staging
2016-05-12 04:53:38 +02:00
Tristan Helmich
61c52af99e
squid: 3.5.17 -> 3.5.19 ( #15385 )
2016-05-11 14:49:18 +02:00
Alexey Lebedeff
02ce05d1cc
appres: init at 1.0.4
2016-05-10 18:31:27 +03:00
Vladimír Čunát
65a9fa8cdc
Merge branch 'master' into staging
2016-05-08 21:24:48 +02:00
Domen Kožar
0adf2b25a1
4store: 1.1.5 -> 1.1.6 (convert from builderDefsPackage)
2016-05-08 18:29:40 +01:00
Tobias Geerinckx-Rice
ab6e0861d4
nginx: restore .upstream files
...
07d9de713a
2016-05-06 15:37:22 +02:00
Tobias Geerinckx-Rice
b0f8349d95
nginxUnstable: alias to nginx until next unstable release
2016-05-06 13:47:36 +02:00
Tobias Geerinckx-Rice
07d9de713a
nginx: remove .upstream files
2016-05-06 13:47:12 +02:00
Robin Gloster
9820cb1bf2
use dontBuild instead of hacks
...
changes:
* buildPhase = "true"
* buildPhase = ":"
2016-05-04 10:11:04 +00:00
Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00