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
0e4edca603
Merge pull request #32161 from adisbladis/curl-7_57_0
...
curl: 7.56.1 -> 7.57.0
2017-11-29 11:28:02 +00:00
adisbladis
b7e6fd3b3a
curl: 7.56.1 -> 7.57.0
...
Fixes CVEs:
CVE-2017-8816
CVE-2017-8817
CVE-2017-8818
2017-11-29 11:19:37 +00:00
Orivej Desh
3cb0103818
Merge branch 'master' into staging
...
* master:
libretro.mame: fix parallel building
gnome3: add jtojnar as maintainer
libskk: fix build
gencfsm: fix build
wkhtmltopdf: fix build
gutenprint: fix build
ghc-8.2.2: drop obsolete gold linker patch
git-annex: update hash for new version 6.20171124
hackage-packages.nix: automatic Haskell package set update
hackage2nix: disable failing builds
hackage2nix: keep language-c-0.7.0 around in the package set for c2hs hack
brotli: 0.6.0 -> 1.0.1
brotliUnstable: delete
libbrotli: delete
libbrotli: 1.0 -> 1.0.1.2017-10-30
nginxModules.brotli: 2015-11-18 -> 2016-12-02
2017-11-29 11:18:49 +00:00
Orivej Desh
4cbbecc85d
libretro.mame: fix parallel building
2017-11-29 11:18:14 +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
Jan Tojnar
6254f59488
gnome3: add jtojnar as maintainer
2017-11-29 11:46:36 +01:00
Orivej Desh
6c82383370
libskk: fix build
2017-11-29 10:30:03 +00:00
Orivej Desh
d6431833be
gencfsm: fix build
2017-11-29 10:27:24 +00:00
Orivej Desh
7375e49f58
wkhtmltopdf: fix build
...
by not appling parallel-build.patch from
a88146d308fb5fa8e3cc466fffecaf0fe9ff9a2e
2017-11-29 10:19:00 +00:00
Orivej Desh
c905d9351c
gutenprint: fix build
...
after "gnutls: 3.5.15 -> 3.6.1" became independent from zlib.
2017-11-29 10:08:37 +00:00
Peter Simons
b58cb3fa28
ghc-8.2.2: drop obsolete gold linker patch
...
Pointed out by @basvandijk in b1a0f91afe
2017-11-29 10:47:08 +01:00
Peter Simons
cf1e09013e
git-annex: update hash for new version 6.20171124
2017-11-29 10:47:07 +01:00
Peter Simons
f2dd899a67
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.7 from Hackage revision
7428a6b894
2017-11-29 10:47:03 +01:00
Peter Simons
98bf2860e4
hackage2nix: disable failing builds
2017-11-29 10:47:01 +01:00
Peter Simons
6610c3557d
hackage2nix: keep language-c-0.7.0 around in the package set for c2hs hack
2017-11-29 10:45:36 +01:00
Orivej Desh
6c6fb4f6ce
Merge branch 'master' into staging
...
* master: (32 commits)
qt4: fix parallel building of moc_qtgradientviewdialog.o
qt4: enable parallel building in the configure phase
aseprite-unfree: 1.2.2 -> 1.2.4
peek: disable on darwin, add optional dependencies
vdrsymbols: init at 20100612
xorg.bitmap: provide resource search path
xorg.bitmap: init at 1.0.8
firefox-devedition-bin: 58.0b7 -> 58.0b7
firefox-beta-bin: 58.0b7 -> 58.0b7
lua-mpack: fix darwin build
lua5_1: provide version
libmpack: fix darwin build
libamqpcpp: init at 2.7.4
nano: fix darwin build
gnome3.gnome-software: enable parallel building
dbus-broker: 3 -> 8
nix-exec: mark as broken
peek: init at 1.2.0
gnucash: use nativeBuildInputs
gnucash: 2.6.12 -> 2.6.18-1
...
2017-11-29 09:15:53 +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
Orivej Desh
0e6ca9e85d
Merge pull request #31970 from The-M1k3y/master
...
nixos/factorio: add stateDir and requireUserVerification option
2017-11-29 08:36:52 +00:00
Orivej Desh
937b4821fe
aseprite-unfree: 1.2.2 -> 1.2.4
2017-11-29 08:18:12 +00:00
Orivej Desh
31a96a3b44
Merge pull request #30837 from rnhmjoj/bitmap
...
xorg.bitmap: init at 1.0.8
2017-11-29 08:15:23 +00:00
Orivej Desh
3db6d699d6
peek: disable on darwin, add optional dependencies
2017-11-29 07:50:40 +00:00
Daiderd Jordan
4cf3a494cc
Merge pull request #31759 from LnL7/darwin-libmpack
...
libmpack: fix darwin build
2017-11-29 08:07:48 +01:00
Orivej Desh
898aedcc04
Merge pull request #32048 from ck3d/vdrsymbols
...
vdrsymbols: init at 20100612
2017-11-29 06:54:05 +00:00
Christian Kögler
0f570807fc
vdrsymbols: init at 20100612
2017-11-29 06:53:32 +00:00
Orivej Desh
4549190441
xorg.bitmap: provide resource search path
2017-11-29 04:29:43 +00:00
rnhmjoj
69450d8ce3
xorg.bitmap: init at 1.0.8
2017-11-29 04:26:24 +00:00
adisbladis
700fc57f34
firefox-devedition-bin: 58.0b7 -> 58.0b7
2017-11-29 12:21:36 +08:00
adisbladis
e5d561a580
firefox-beta-bin: 58.0b7 -> 58.0b7
2017-11-29 12:21:26 +08:00
Daiderd Jordan
b7ed086650
lua-mpack: fix darwin build
2017-11-29 03:01:15 +00:00
Orivej Desh
00ced68a9e
lua5_1: provide version
2017-11-29 03:01:15 +00: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
Orivej Desh
b8ddde411c
Merge pull request #32060 from elitak/ipfs
...
ipfs: add swarmAddress option
2017-11-29 01:59:08 +00:00
Orivej Desh
ea3daaaefd
Merge pull request #32073 from MikePlayle/add-libamqpcpp
...
libamqpcpp: init at 2.7.4
2017-11-29 01:55:21 +00:00
Mike Playle
3aecf95548
libamqpcpp: init at 2.7.4
2017-11-29 01:54:32 +00:00
Orivej Desh
14ec308514
nano: fix darwin build
...
Broken by 366f1525ff47bfbee398eeac0cec0edd85e999ac in #32140 .
2017-11-29 01:24:20 +00:00
Orivej Desh
db0c2be112
Merge pull request #32118 from crawford/ct
...
container-linux-config-transpiler: 0.4.1 -> 0.5.0
2017-11-29 01:04:26 +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
2a0e757fb8
brotli: 0.6.0 -> 1.0.1
2017-11-29 00:59:46 +00:00
Orivej Desh
7584d1c3bd
brotliUnstable: delete
2017-11-29 00:59:46 +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
Orivej Desh
6de0380378
nginxModules.brotli: 2015-11-18 -> 2016-12-02
...
This version bundles brotli.
2017-11-29 00:59:46 +00:00
Orivej Desh
204aa4b077
gnome3.gnome-software: enable parallel building
2017-11-29 00:59:14 +00:00
Peter Hoeg
226c5699e7
dbus-broker: 3 -> 8
2017-11-29 08:42:44 +08:00
Orivej Desh
d202a0ce67
nix-exec: mark as broken
...
It has not been compatible with nix unstable since 2017-05.
2017-11-29 00:20:34 +00:00
Orivej Desh
630a9a29ca
Merge pull request #32124 from yegortimoshenko/patch-11
...
rambox: remove comment with email address
2017-11-28 23:59:34 +00:00
Orivej Desh
1229d32a26
Merge pull request #32125 from earldouglas/jenkins-2.92
...
jenkins: 2.91 -> 2.92
2017-11-28 23:57:46 +00:00
