Commit Graph

23676 Commits

Author SHA1 Message Date
Orivej Desh
ca4f822fd8 qmake4Hook: enable parallel building with qmake4Hook by default 2017-12-07 08:52:42 +00:00
Vincent Laporte
d3e488c3a3
nettle: remove at 3.3 2017-12-06 20:39:41 +00:00
Chris Martin
c29db1d172 libu2f-host: fix typo in description 2017-12-06 07:42:31 +01:00
Vladimír Čunát
9ab5848335
Merge branch 'master' into staging
Haskell updates.  Hydra: ?compare=1416248
2017-12-06 02:23:46 +01:00
Jan Tojnar
884376e7a8
gegl_0_3: 0.3.18 → 0.3.24 2017-12-06 00:19:27 +01:00
Jan Tojnar
062a284770
babl: 0.1.34 → 0.1.38 2017-12-06 00:14:27 +01:00
Lancelot SIX
11f6566b31 glpk: 4.63 -> 4.64
See http://lists.gnu.org/archive/html/info-gnu/2017-12/msg00002.html
for release information
2017-12-05 20:51:08 +01:00
Austin Seipp
827142a7fa nixpkgs: add unicorn-emulator library 1.0.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-12-05 10:09:22 -06:00
Vladimír Čunát
689d6303e8
Merge branch 'master' into staging
The haskell split got reverted (again).
Hydra: ?compare=1416012
2017-12-05 13:07:26 +01:00
adisbladis
537f4af06c
libp11: 0.4.4 > 0.4.7 2017-12-05 11:06:12 +08:00
Tuomas Tynkkynen
5490e580f5 v8: Fix aarch64 build
https://hydra.nixos.org/build/65224506

Besides dontUpdateAutotoolsGnuConfigScripts, the 'arch' assignment was
wrong and resulted in "x64" (stdenv.isArm is not true on AArch64).
2017-12-05 03:43:07 +02:00
Orivej Desh
2a230dd64d libunistring: fix build and enable tests on darwin 2017-12-04 23:04:34 +00:00
Orivej Desh
a5c832f1af gettext: add setup hook populating GETTEXTDATADIRS
Fixes #32296

(cherry picked from commit f727aeb4505a9646eb7f7d67ed0fd411900b570c)
2017-12-04 15:26:52 +00:00
Lancelot SIX
4c9f27c9ab
libunistring: 0.9.7 -> 0.9.8
See http://lists.gnu.org/archive/html/info-gnu/2017-12/msg00001.html
for release information
2017-12-04 14:03:44 +01:00
Jan Tojnar
c03896e0ae
libinput: 1.9.2 → 1.9.3 2017-12-04 02:07:57 +01:00
Jan Tojnar
b303e5fe74
cairomm: 1.12.0 → 1.12.2 2017-12-04 02:07:57 +01:00
Jan Tojnar
9c62cc74b9
at_spi2_atk: 2.26.0 → 2.26.1 2017-12-04 02:07:56 +01:00
Jan Tojnar
562687401b
at_spi2_core: 2.26.0 → 2.26.2 2017-12-04 02:07:56 +01:00
Jan Tojnar
77a8e8e167
atk: 2.26.0 → 2.26.1 2017-12-04 02:07:56 +01:00
Jan Tojnar
2754d63cec
glib_networking: 2.54.0 → 2.54.1 2017-12-04 02:07:55 +01:00
Jan Tojnar
66c5f850e0
libaccounts-glib: 1.18 → 1.23 2017-12-04 02:07:55 +01:00
Ben Gamari
92d3c5689d libtasn1: Enable cross-compilation
[dezgeg amended out a doCheck change]
2017-12-03 01:50:42 +02:00
Tuomas Tynkkynen
2da5de5479 ncurses: 6.0-20170902 -> 6.0-20171125 2017-12-03 01:50:42 +02:00
Orivej Desh
a1b77bfe5f Revert "qt5: 5.9.1 -> 5.9.3"
KDE frameworks 5.40 are not compatible with Qt 5.9.3: #32253

This reverts commit bd71d3aef7 (#32100).
2017-12-02 17:22:17 +00:00
Daiderd Jordan
0017479abb
Merge pull request #32100 from bkchr/qt_5_9_3
qt5: 5.9.2 -> 5.9.3
2017-12-02 11:12:38 +01:00
Vladimír Čunát
33300c7316
Merge branch 'master' into staging
Hydra: ?compare=1415329
2017-12-02 09:37:07 +01:00
Joachim F
e4c22e4f5a
Merge pull request #32035 from knedlsepp/upgrade-armadillo
armadillo: 7.800.1 -> 8.300.0
2017-12-01 20:45:41 +00:00
Bastian Köcher
bd71d3aef7 qt5: 5.9.2 -> 5.9.3 2017-12-01 18:34:54 +01:00
Pascal Wittmann
a941856f01 udunits: use https instead of http for homepage url 2017-12-01 10:44:04 +01:00
Vladimír Čunát
9f8c3f77ea
Merge branch 'master' into staging
Hydra: ?compare=1415011
2017-12-01 09:18:58 +01:00
Vladimír Čunát
da3679c160
libsoup: maintenance 2.60.0 -> 2.60.2 + patch 2017-12-01 08:27:31 +01:00
Orivej Desh
45cf0b0da4 fenics: restrict to Darwin
It has never been building on Linux.
2017-12-01 07:17:15 +00:00
Vladimír Čunát
5cc70518bf
Merge #32162: libmicrohttpd: 0.9.55 -> 0.9.57 2017-12-01 08:11:18 +01:00
Orivej Desh
eb32f08bc0 widertiger: mark as broken
It is not maintained, and not used since 480b289f5b.
2017-12-01 00:47:46 +00:00
Orivej Desh
1f99fd6965 libminc: fix build after hdf5 upgrade by using hdf5_1_8 2017-12-01 00:37:29 +00:00
Vladimír Čunát
d477bc353c
ocamlnet: fixup build by bringing back nettle-3.3 2017-11-30 12:28:35 +01:00
Orivej Desh
6b4f0b5bf4 qt4: fix parallel building
qmake needs uic to extract dependency information from .ui files.  In -fast mode
qmake generates Makefiles for each subproject after the previous subproject is
built, and by the time it encounters subprojects with .ui files, uic is
available to provide dependency information.  In -no-fast mode qmake builds
subprojects in the same order, but generates all Makefiles beforehand, without
uic, and they miss dependencies.
2017-11-30 09:51:14 +00:00
Orivej Desh
c8d822252b qt4: delete parallel-build.patch to replace with a generic fix 2017-11-30 09:51:14 +00:00
Orivej Desh
64f945efd2 Revert "qt48: use tabs in the Makefile patch"
to apply a different fix, since the current one does not apply to Darwin.

This reverts commit bfaf7ae5ae.
2017-11-30 07:42:07 +00:00
Will Dietz
bfaf7ae5ae qt48: use tabs in the Makefile patch
Fixes application of the patch to a differently configured Qt.
2017-11-29 15:29:31 +00:00
Orivej Desh
11520e812c
Merge pull request #32123 from kosta/master
brotli: 0.6.0 -> 1.0.1
2017-11-29 11:16:53 +00:00
Lancelot SIX
858ed1fc30
libmicrohttpd: 0.9.55 -> 0.9.57
See http://lists.gnu.org/archive/html/info-gnu/2017-11/msg00011.html
for release information
2017-11-29 11:30:51 +01:00
Orivej Desh
6c82383370 libskk: fix build 2017-11-29 10:30:03 +00:00
Orivej Desh
a88146d308 qt4: fix parallel building of moc_qtgradientviewdialog.o
Previously the last of these commands:

```
make -j sub-tools-bootstrap
make -j sub-uic sub-moc sub-rcc
make -C tools/designer/src/lib .obj/release-shared/moc_qtgradientviewdialog.o
```

failed with this error:

```
In file included from .uic/release-shared/ui_qtgradientviewdialog.h:63:0,
                 from .moc/release-shared/../../../../../shared/qtgradienteditor/qtgradientviewdialog.h:47,
                 from .moc/release-shared/moc_qtgradientviewdialog.cpp:9:
../../../shared/qtgradienteditor/qtgradientview.h:47:31: fatal error: ui_qtgradientview.h: No such file or directory
```

because uic did not ensure that the build of moc_qtgradientviewdialog.o happens
after the build of moc_qtgradientview.o.
2017-11-29 09:08:44 +00:00
Orivej Desh
8b0ef2a564 qt4: enable parallel building in the configure phase 2017-11-29 09:06:42 +00:00
Vladimír Čunát
5f020d5627
Merge branch 'staging'
There are security fixes in multiple packages /cc #32117,
so I'm merging a little earlier, with a few thousand jobs
still not finished on Hydra for x86_64-darwin and aarch64-linux.
2017-11-29 10:02:40 +01:00
Daiderd Jordan
d7039d5029 libmpack: fix darwin build
On darwin we need the correct prefix during the buildPhase, otherwise
the dynamic libraries have an incorrect install_name.
2017-11-29 02:38:16 +00:00
Mike Playle
3aecf95548 libamqpcpp: init at 2.7.4 2017-11-29 01:54:32 +00:00
Orivej Desh
0238e5ca93
Merge pull request #32108 from yuriaisaka/pr-libskk-init
libskk: init at 1.0.2
2017-11-29 01:03:40 +00:00
Orivej Desh
e8b6a11aba libbrotli: delete
Its functionality was incorporatad into brotli.
2017-11-29 00:59:46 +00:00
Orivej Desh
486625e0fe libbrotli: 1.0 -> 1.0.1.2017-10-30 2017-11-29 00:59:46 +00:00
Vladimír Čunát
8b53b2ec2c
Merge branch 'master' into staging 2017-11-28 21:06:44 +01:00
Vladimír Čunát
e0368f5076
gnutls: use mirror://gnupg (fix #32147)
ftp.gnutls.org stopped working with curl; it's not clear yet why.
2017-11-28 20:43:56 +01:00
Vladimír Čunát
fac570a71d
Re-merge #32126: ffmpeg-3.4: fix CVE CVE-2017-16840
I'm sorry, I merged older version of the PR by accident.
2017-11-28 19:22:59 +01:00
Vladimír Čunát
c917950c05
Merge #32126: ffmpeg-3.4: fix CVE CVE-2017-16840 2017-11-28 19:00:43 +01:00
Andreas Rammhold
fe1f228580
ffmpeg-full-3.4: apply patch for CVE-2017-16840 2017-11-28 18:41:53 +01:00
Vladimír Čunát
e6a7a2e1fd
Merge #32134: pcre2: Patch for CVE-2017-8786 2017-11-28 18:20:01 +01:00
Vladimír Čunát
addd20e6f9
Merge branch 'master' into staging 2017-11-28 18:19:34 +01:00
Vladimír Čunát
d70d5c9ddb
gnutls: force rebuild
If you have fixed-output derivation with correct hash but bad builder
on Hydra, it seems really difficult to restart it with a good builder.
2017-11-28 09:38:05 +01:00
Vladimír Čunát
7393665803
gnutls: fixup download URL after update
I'm sorry about that; I forgot 3.5 in there.
Still, I don't know why their ftp won't work well with curl;
wget is perfectly OK.
2017-11-28 07:58:08 +01:00
adisbladis
93294fc5c8
pcre2: Patch for CVE-2017-8786 2017-11-28 12:47:37 +08:00
Mateusz Kowalczyk
c289d95aba
Merge pull request #32093 from peterhoeg/u/libao
libao: 1.2.0 -> 1.2.2
2017-11-27 23:48:09 +00:00
Andreas Rammhold
64d8cc7fc4
ffmpeg-full-3.4: apply patch for CVE-2017-16840 2017-11-28 00:24:02 +01:00
Andreas Rammhold
2492f45565
ffmpeg-3.4: apply fix CVE CVE-2017-16840
Details at [1].

[1] http://git.videolan.org/?p=ffmpeg.git;a=commit;h=a94cb36ab2ad99d3a1331c9f91831ef593d94f74
2017-11-28 00:14:05 +01:00
Orivej Desh
78af59354c glew: fix darwin install name 2017-11-27 15:59:50 +00:00
Orivej Desh
4a8caddb6e SDL2_image: support darwin 2017-11-27 15:59:50 +00:00
Orivej Desh
6c8763e0ca ftgl: enable darwin 2017-11-27 15:59:50 +00:00
Orivej Desh
90ab4ef5a8 ftgl212: delete
It is no longer used and ftgl 2.1.3 is newer.
2017-11-27 15:22:16 +00:00
Vladimír Čunát
b800aa18fe
harfbuzz: 1.5.1 -> 1.7.1 2017-11-27 15:10:06 +01:00
Vladimír Čunát
6705f30e2c
Merge branch 'master' into staging 2017-11-27 15:09:53 +01:00
Yuri Aisaka
42002eace9 libskk: init at 1.0.2 2017-11-27 22:46:35 +09:00
Vladimír Čunát
f71dfabad3
Merge #31891: gtk3: propagate gsettings_desktop_schemas 2017-11-27 13:57:13 +01:00
Vladimír Čunát
9642fb40e8
glib: maintenance 2.54.1 -> 2.54.2 2017-11-27 13:54:15 +01:00
Vladimír Čunát
6eb4a86954
pango: maintenance 1.40.12 -> 1.40.14 2017-11-27 13:30:59 +01:00
Vladimír Čunát
6a71852630
mesa: maintenance 17.2.4 -> 17.2.6 2017-11-27 13:05:52 +01:00
Vladimír Čunát
f37443483e
libdrm: 2.4.84 -> 2.4.88 2017-11-27 13:05:07 +01:00
Vladimír Čunát
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
Vladimír Čunát
40a2973f14
Merge #31853: nettle: 3.3 -> 3.4 2017-11-27 12:24:16 +01:00
Vladimír Čunát
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
Vladimír Čunát
337e900c3d
Merge #31683: glib: Add variable for overriding schemas 2017-11-27 10:54:19 +01:00
John Ericson
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
John Ericson
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
Austin Seipp
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
Peter Hoeg
d28c21bd6d libao: 1.2.0 -> 1.2.2 2017-11-27 12:25:24 +08:00
Peter Hoeg
50ad43bd39 libqmatrixclient: init at 0.1 2017-11-26 23:35:00 +08:00
adisbladis
747d0f50ee
Merge pull request #32041 from ck3d/libftdi1-1.4
libftdi1: 1.3 -> 1.4
2017-11-26 20:45:58 +08:00
Jörg Thalheim
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
adisbladis
5ca1c4007e
libu2f-host: 1.1.1 -> 1.1.4 2017-11-26 18:56:56 +08:00
Tuomas Tynkkynen
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
Tuomas Tynkkynen
f689a6d1c6 snappy: 1.1.4 -> 1.1.7
Fixes build on ARM
2017-11-26 11:13:20 +02:00
Orivej Desh
9d2fcd33ea agg: do not enable parallel building 2017-11-26 07:40:21 +00:00
adisbladis
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
Jan Tojnar
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
Jan Tojnar
5a4320ab59
gnome3: get rid of extraneous NIX_CFLAGS_COMPILE 2017-11-26 03:10:53 +01:00
Jan Tojnar
c8b58a47fc
gvfs: Rely on XML_CATALOG_FILES variable 2017-11-26 03:10:52 +01:00
Jan Tojnar
5a3b7ef2e7
gnome3: use the same version of Vala 2017-11-26 03:10:50 +01:00
Jan Tojnar
1c1d677149
gnome3: dependency tweaks 2017-11-26 03:10:49 +01:00
Jan Tojnar
60dbe7eea4
granite: 0.4.0.1 → 0.4.1 2017-11-26 03:10:48 +01:00
Orivej Desh
29b2984b0c
Merge pull request #31987 from jtojnar/devhelp-devdoc
stdenv: Move devhelp books to outputDevdoc
2017-11-25 23:14:47 +00:00
Joachim F
fc303d2e25
Merge pull request #32032 from knedlsepp/upgrade-eccodes
eccodes: 2.2.0 -> 2.5.0
2017-11-25 21:55:46 +00:00