Tuomas Tynkkynen
825b953bf5
gcc48: Reduce diff to gcc49
2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
77b409b2cf
gcc49: Reduce diff to gcc5
2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
aa3d195a30
gcc5: Reduce diff to gcc6
2017-11-29 23:09:16 +02:00
Orivej Desh
0c9ba0e149
Merge pull request #32173 from dtzWill/fix/qt48-parallel-patch-tabs
...
qt48: match whitespace in context of patch to better apply on @dtzWill's tree and maybe future nixpkgs too
2017-11-29 18:59:11 +00:00
Vladimír Čunát
a4280a5e1c
mesa_noglu: use llvm-5 on aarch64 as well
2017-11-29 18:06:57 +01:00
Vladimír Čunát
6671aac6a9
Merge branch 'master' into staging
...
to fix llvm on aarch64
2017-11-29 18:05:51 +01:00
Joachim F
85b4a20db3
Merge pull request #32154 from JamesTheAwesomeDude/palemoon
...
palemoon: 27.6.0 -> 27.6.2
2017-11-29 16:11:28 +00:00
Mateusz Kowalczyk
6f8601288b
bazel: 0.7.0 -> 0.8.0
2017-11-29 16:10:53 +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
Tuomas Tynkkynen
fc26ff04b2
llvm: Include aarch64 patch in repo
...
The URL is already a dead link.
2017-11-29 17:01:17 +02:00
Orivej Desh
99bab78abd
Merge pull request #32135 from phile314/fusion-inventory
...
Fusion inventory: 2.3.18 -> 2.3.21, misc. fixes
2017-11-29 14:59:18 +00:00
Philipp Hausmann
59a737a922
FusionInventory: Patch in NixOS support
...
Adds support for the /etc/os-release file and to read installed
software from the Nix store.
2017-11-29 14:58:36 +00:00
Philipp Hausmann
5f59913c74
FusionInventory: 3.18 -> 3.21
2017-11-29 14:58:36 +00:00
Vladimír Čunát
df5600d440
Merge #32163 : qemu: patch CVE-2017-15118
2017-11-29 15:04:02 +01:00
Jörg Thalheim
4654fb6aa5
Merge pull request #32157 from womfoo/init/yq-2.3.3
...
yq: init at 2.3.3
2017-11-29 13:05:48 +00:00
Robert Helgesson
ffd7ebdd49
perl-Log-Contextual: 0.007001 -> 0.008000
2017-11-29 12:50:54 +01: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
Antoine Eiche
268d3656db
qemu: fix CVE-2017-15118
...
See https://lists.gnu.org/archive/html/qemu-devel/2017-11/msg05045.html
2017-11-29 11:19:50 +01:00
Orivej Desh
7375e49f58
wkhtmltopdf: fix build
...
by not appling parallel-build.patch from
a88146d308
2017-11-29 10:19:00 +00:00
Kranium Gikos Mendoza
131f48d0b1
yq: init at 2.3.3
2017-11-29 21:15:15 +11: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
James Edington
3741ecd57c
palemoon: 27.6.0 -> 27.6.2
...
Small security and bugfix update
2017-11-29 01:15:37 -06: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