6705f30e2c
Merge branch 'master' into staging
2017-11-27 15:09:53 +01:00
f71dfabad3
Merge #31891 : gtk3: propagate gsettings_desktop_schemas
2017-11-27 13:57:13 +01:00
9642fb40e8
glib: maintenance 2.54.1 -> 2.54.2
2017-11-27 13:54:15 +01:00
c465185bb7
cmake: maintenance 3.9.4 -> 3.9.6
2017-11-27 13:36:14 +01:00
6eb4a86954
pango: maintenance 1.40.12 -> 1.40.14
2017-11-27 13:30:59 +01:00
6a71852630
mesa: maintenance 17.2.4 -> 17.2.6
2017-11-27 13:05:52 +01:00
f37443483e
libdrm: 2.4.84 -> 2.4.88
2017-11-27 13:05:07 +01:00
529c5c50b1
gnutls: 3.5.15 -> 3.6.1
...
No breaking changes expected, as the ABI is still 3.4.0.
2017-11-27 12:42:11 +01:00
40a2973f14
Merge #31853 : nettle: 3.3 -> 3.4
2017-11-27 12:24:16 +01:00
6345089ca0
Merge #29392 : gnome3: 3.24 -> 3.26
...
It might be slightly confusing that a couple of the changes will be twice
in the history, but let's merge this way.
2017-11-27 12:19:01 +01:00
6589519174
Merge #31453 : meson: library install paths for g-ir-scanner
2017-11-27 12:13:34 +01:00
299e3228a4
nodePackages.html-minifier: init at 3.5.7
2017-11-27 05:10:39 -05:00
337e900c3d
Merge #31683 : glib: Add variable for overriding schemas
2017-11-27 10:54:19 +01:00
d0f3035e48
iozone: 3.434 -> 3.471
2017-11-27 09:37:14 +00:00
1c44d5efc6
Merge pull request #32098 from obsidiansystems/binPrefix
...
treewide: Use `targetPrefix` instead of `prefix` for platform name prefixes
2017-11-27 03:20:53 -05:00
e755a8a27d
treewide: Use `targetPrefix` instead of `prefix` for platform name prefixes
...
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
2017-11-27 03:15:50 -05:00
bef4379b7d
Merge @orivej's master history cleanup commit into staging
...
This is a good commit, and so I want it to be the most recent common ancester
of master and staging. Almost no files are changed; the point is history.
2017-11-27 02:42:07 -05:00
63428868af
microsoft_gsl: fix crossSystem build support
...
cmake needs to be part of nativeBuildInputs, otherwise you get a very unhelpful
debugging trace.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-11-27 01:40:31 -06:00
40e08aa870
stm32flash: use ${name} in fetchurl to keep DRY
2017-11-27 08:02:01 +01:00
45e41b75f7
stm32flash: 1.0 -> 0.5
...
This version is newer. 1.0 was given as a placeholder, I presume,
because that sourcetree wasn't versioned.
[Bjørn: extend commit message.]
2017-11-27 08:01:15 +01:00
64413dec3e
ocamlPackages.ppx_deriving_yojson: 3.0 -> 3.1
2017-11-27 05:07:22 +00:00
8aab940a85
Merge pull request #32003 from risicle/ris-cf-cli
...
cloudfoundry-cli: init at 6.32.0
2017-11-26 23:07:11 +00:00
77a3331a10
cloudfoundry-cli: init at 6.32.0
2017-11-26 23:06:27 +00:00
3cb310a231
sbt: 1.0.3 -> 1.0.4
2017-11-26 17:21:06 -05:00
ab48481f06
Merge pull request #31073 from peterromfeldhk/jazzy
...
jazzy: init at 0.9.0
2017-11-26 21:32:14 +00:00
620b93f10a
ocamlPackages.ppx_import: 1.1 -> 1.4
2017-11-26 20:52:17 +00:00
50ad43bd39
libqmatrixclient: init at 0.1
2017-11-26 23:35:00 +08:00
747d0f50ee
Merge pull request #32041 from ck3d/libftdi1-1.4
...
libftdi1: 1.3 -> 1.4
2017-11-26 20:45:58 +08:00
8fa05d7eef
Merge pull request #32071 from adisbladis/libu2f-host-1_1_4
...
libu2f-host: 1.1.1 -> 1.1.4
2017-11-26 11:55:07 +00:00
5ca1c4007e
libu2f-host: 1.1.1 -> 1.1.4
2017-11-26 18:56:56 +08:00
3b21645529
usbredir: Fix ARM build
...
The error from -Wformat happens on all 32-bit plaforms, not just i686.
2017-11-26 11:13:20 +02:00
f689a6d1c6
snappy: 1.1.4 -> 1.1.7
...
Fixes build on ARM
2017-11-26 11:13:20 +02:00
9d2fcd33ea
agg: do not enable parallel building
2017-11-26 07:40:21 +00:00
d1c525bc49
Merge pull request #32043 from ck3d/fix-missing-x11-in-vaapi-intel
...
vaapi-intel: fix missing depency to get X11 backend
2017-11-26 12:32:19 +08:00
4920d4fff2
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 overridden 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-26 03:11:00 +01:00
289134fddf
meson: pass library install paths to g-ir-scanner
...
We are patching g-ir-scanner to produce absolute paths in the GIR
files. When an application uses an internal library placed in a
non-standard path (e.g. $out/lib/gnome-shell), the scanner needs
to be informed. For autotools-based apps, the full path was
obtained from libtool-wrapped files; with Meson, this is no longer
possible – we need to pass the path information some way.
This commit channels the --fallback-library-path option added
to g-ir-scanner in aforementioned patch.
2017-11-26 03:10:55 +01:00
5a4320ab59
gnome3: get rid of extraneous NIX_CFLAGS_COMPILE
2017-11-26 03:10:53 +01:00
c8b58a47fc
gvfs: Rely on XML_CATALOG_FILES variable
2017-11-26 03:10:52 +01:00
5a3b7ef2e7
gnome3: use the same version of Vala
2017-11-26 03:10:50 +01:00
1c1d677149
gnome3: dependency tweaks
2017-11-26 03:10:49 +01:00
60dbe7eea4
granite: 0.4.0.1 → 0.4.1
2017-11-26 03:10:48 +01:00
29b2984b0c
Merge pull request #31987 from jtojnar/devhelp-devdoc
...
stdenv: Move devhelp books to outputDevdoc
2017-11-25 23:14:47 +00:00
c97ea96860
python.pkgs.bokeh: add myself to maintainers
2017-11-25 22:35:14 +00:00
fc303d2e25
Merge pull request #32032 from knedlsepp/upgrade-eccodes
...
eccodes: 2.2.0 -> 2.5.0
2017-11-25 21:55:46 +00:00
592488c657
Merge pull request #32033 from knedlsepp/upgrade-grib-api
...
grib-api: 1.19.0 -> 1.24.0
2017-11-25 21:55:35 +00:00
fa9b33aac3
vaapi-intel: fix missing depency to get X11 backend
2017-11-25 22:30:39 +01:00
442b73f559
libftdi1: 1.3 -> 1.4
2017-11-25 22:17:03 +01:00
6e52c1f7ba
python3Packages.bash_kernel: init at 0.7.1
2017-11-25 19:10:43 +00:00
4a643ce7db
pythonPackages.pexpect: 4.2.1 -> 4.3.0
2017-11-25 19:10:30 +00:00
5b190bef0c
grib-api: 1.19.0 -> 1.24.0
2017-11-25 17:59:48 +01:00
Vladimír Čunát
Chris Martin
Joerg Thalheim
John Ericson
John Ericson
Austin Seipp
Bjørn Forsman
Eric Litak
Vincent Laporte
Orivej Desh
Robert Scott
Tim Steinbach
Jörg Thalheim
Peter Hoeg
adisbladis
adisbladis
Tuomas Tynkkynen
Jan Tojnar
Joachim F
Christian Kögler
zimbatm
Josef Kemetmüller