3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

121654 commits

Author SHA1 Message Date
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 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 366f1525ff 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 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
Orivej Desh 8be566df94
Merge pull request #32127 from puffnfresh/package/peek
peek: init at 1.2.0
2017-11-28 23:56:29 +00:00
Orivej Desh 72a53d5231
Merge pull request #32130 from mdorman/gnucash-fix-and-update
gnucash26: 2.6.12 -> 2.6.18-1
2017-11-28 23:54:15 +00:00
Brian McKenna a0c5d084c6 peek: init at 1.2.0 2017-11-28 23:53:55 +00:00
Orivej Desh 0707699406 gnucash: use nativeBuildInputs 2017-11-28 23:51:20 +00:00
Michael Alan Dorman 6baf21f6bb gnucash: 2.6.12 -> 2.6.18-1
This version still requires the prior test fix.
2017-11-28 23:44:02 +00:00
Michael Alan Dorman b802f1a4cb gnucash: fix breaking test
Patch taken from the upstream repository, should be fixed in next
released version.

This did require moving the invocation of `patchShebangs` from
`patchPhase` to `postpatch`, but this seems consistent with at least
some other packages.
2017-11-28 23:44:02 +00:00
Orivej Desh 7d69f11293
Merge pull request #32141 from yellowgh0st/compton
compton: adding missing xr_glx_hybrid backend
2017-11-28 23:28:56 +00:00
Orivej Desh af0be16375
Merge pull request #32144 from strout/cnijfilter2-fix
cnijfilter2: specify --datadir for cnijlgmon3
2017-11-28 23:18:58 +00:00
Orivej Desh 7bd8e1e4ab
Merge pull request #32148 from dtzWill/update/mendeley-1.17.12
mendeley: 1.17.11 -> 1.17.12
2017-11-28 23:12:44 +00:00
zimbatm 6499c311d5 direnv: 2.13.1 -> 2.13.2 2017-11-28 21:52:40 +00:00
zimbatm 55709e4a79 python3Packages.bash_kernel: allow different python interpreters 2017-11-28 21:39:55 +00:00
Vladimír Čunát 8b53b2ec2c
Merge branch 'master' into staging 2017-11-28 21:06:44 +01:00
Vladimír Čunát db6adec156
xorg.libXfont*: security update for CVE-2017-16611 2017-11-28 21:00:56 +01:00
Vladimír Čunát 98e3af04b6
xorg.libXcursor: security 1.1.14 -> 1.1.15
Fix heap overflows when parsing malicious files. (CVE-2017-16612)
2017-11-28 20:59:59 +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
Will Dietz 8a96fc87f5 mendeley: 1.17.11 -> 1.17.12 2017-11-28 13:38:18 -06:00
Vladimír Čunát 94cba39aa2
systemd resolved: patch CVE-2017-15908
fix loop on packets with pseudo dns types
https://github.com/NixOS/systemd/pull/14
2017-11-28 20:11:40 +01:00
Orivej Desh 0d7203a5c7
Merge pull request #32145 from dywedir/reason
ocamlPackages.reason: 3.0.2 -> 3.0.3
2017-11-28 18:44:10 +00:00
Joerg Thalheim 574edcd6b2 awesome: fix LUA_PATH/LUA_CPATH to lgi
Otherwise it would not start.
2017-11-28 18:37:19 +00:00
dywedir fb6f204813 ocamlPackages.reason: 3.0.2 -> 3.0.3 2017-11-28 20:28:43 +02: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