Orivej Desh
7c58e8dfc2
Merge branch 'master' into staging
...
* master: (125 commits)
scummvm: fix eval
tinycc: 0.9.27pre-20171016 -> 0.9.27
Update terraform provider versions
vscode: 1.18.1 -> 1.19.0
linux: 4.14.6 -> 4.14.7
scummvm: 1.9.0 -> 2.0.0
cmst: 2017.03.18 -> 2017.09.19
albert: 0.14.7 -> 0.14.14
obs-studio: fix vlc plugin
ffmpeg, ffmpeg-full: 3.4 -> 3.4.1
uchiwa: 0.26.3 -> 1.1.0
linux-testing: 4.15-rc3 -> 4.15-rc4
steam: override nss, nspr, fixes #32781
ponyc: 0.20.0 -> 0.21.0
pythonPackages.pwntools: disable tests
gnome3.gnome-tweak-tool: 3.26.3 → 3.26.4
vim-rhubarb: init at 2017-06-28
atom: depend on libsecret
nvidia-settings: Make sure binary can find libXv.so
backblaze-b2: 0.6.2 -> 1.1.0
...
2017-12-18 15:56:03 +00:00
Joachim Fasting
3b367119ee
tinycc: 0.9.27pre-20171016 -> 0.9.27
2017-12-18 16:06:42 +01:00
Joachim F
5450c225ae
Merge pull request #32775 from kamilchm/ponyc
...
ponyc: 0.20.0 -> 0.21.0
2017-12-18 12:36:52 +00:00
Kamil Chmielewski
860ce9e386
ponyc: 0.20.0 -> 0.21.0
...
https://github.com/ponylang/ponyc/issues/2379
2017-12-17 21:52:11 +01:00
Jörg Thalheim
0643952fa5
Merge pull request #32375 from volth/oracle-jdk-remove-redundand-asserts
...
oraclejdk: remove redundant asserts
2017-12-16 23:20:45 -08:00
Orivej Desh
1b3f837002
Merge pull request #32640 from Ralith/vulkan
...
vulkan-loader: 1.0.42.2 -> 1.0.61.1
2017-12-17 01:00:57 +00:00
Orivej Desh
08ff5462ed
edk2 add short-circuit-the-transfer-of-an-empty-S3_CONTEXT.patch
...
as requested by @lukeadams in
https://github.com/NixOS/nixpkgs/pull/32724#issuecomment-352140119
2017-12-16 03:07:42 +00:00
Luke Adams
237cf9e21f
edk2: 2014-12-10 -> 2017-12-05
...
src was at vUDK2017 tag (2017-06-13), updated to the latest commit in UDK2017 branch.
2017-12-16 03:01:38 +00:00
Vladimír Čunát
24d81d6332
Merge branch 'master' into staging
2017-12-15 21:40:23 +01:00
Evan Hanson
58f3e8e9e4
chicken: 4.11.0 -> 4.13.0
...
Also update the chicken-ssql egg dependency version for ugarit and
ugarit-manifest-maker from 0.2.2 to 0.2.4 to include a fix for an issue
uncovered by chicken-4.13.0 (see [1] and [2] for more info).
[1]: https://bitbucket.org/DerGuteMoritz/ssql/pull-requests/1
[2]: https://salmonella-linux-x86-64.call-cc.org/chicken-4/gcc/linux/x86-64/2017/04/19/yesterday-diff/log2/install/ssql.html
2017-12-15 12:14:20 +13:00
Franz Pletz
cd7c8e42c6
cudatoolkit: fix build with newer glibc versions
...
Packages that use CUDA would fail to build with missing defines.
2017-12-14 16:03:08 +01:00
Tim Steinbach
3f3e548312
kotlin: 1.1.60-b55 -> 1.2.10
2017-12-14 08:29:16 -05:00
John Ericson
a0b1ebeee9
Merge remote-tracking branch 'upstream/staging' into binutils-wrapper
2017-12-13 16:14:47 -05:00
John Ericson
84fb59e0be
clang multi: Fix post bintools wrapper
2017-12-13 16:08:46 -05:00
John Ericson
7ef4448c97
Merge commit '9d8f9b2e531bf95a700a949d879927fb6996ffc9' into binutils-wrapper
2017-12-13 16:08:36 -05:00
John Ericson
12e0672d88
gcc: Adjust builder.sh to find some things in bintools-wrapper instead
2017-12-13 16:08:19 -05:00
John Ericson
2bba929062
bintools-wrapper: Import separately from cc-wrapper
2017-12-13 16:08:18 -05:00
Benjamin Saunders
775d35d0b2
vulkan-loader: 1.0.42.2 -> 1.0.61.1
2017-12-13 11:18:11 -08:00
volth
45121d9dfc
Merge branch 'master' into oracle-jdk-remove-redundand-asserts
2017-12-13 07:02:42 +00:00
Graham Christensen
105d9519c1
Merge remote-tracking branch 'origin/master' into staging
2017-12-12 20:06:36 -05:00
Graham Christensen
e5629dc51a
Merge pull request #32365 from vcunat/p/check-meta
...
check meta, treewide
2017-12-12 18:55:23 -05:00
Vladimír Čunát
3a110ea3f9
treewide platform checks: abort
-> throw
...
They aren't meant to be critical (uncatchable) errors.
Tested with nix-env + checkMeta:
[ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
2017-12-12 18:08:10 -05:00
Vladimír Čunát
c2b679516f
Merge branch 'master' into staging
2017-12-12 21:08:16 +01:00
Joachim F
1354099daf
Merge pull request #32189 from yrashk/ats2-0.3.7
...
ats2: 0.3.0 -> 0.3.7
2017-12-11 23:27:27 +00:00
Orivej Desh
7d14f812ab
mono50: disable parallel building
2017-12-11 10:46:15 +00:00
zimbatm
6371439e0b
lazarus: 1.6.0-0 -> 1.8.0
2017-12-11 10:33:39 +00:00
Vladimír Čunát
e9c12f6936
Merge older staging
...
There are some regressions, but not that many and I want
the security update of openssl fast.
2017-12-11 09:49:56 +01:00
John Ericson
9f1ab7cac7
Merge pull request #32549 from obsidiansystems/gcc-without-lib-output
...
gcc: Don't choke if there is no lib output
2017-12-10 18:55:42 -05:00
John Ericson
4e4520a0f3
gcc: Don't choke if there is no lib output
2017-12-10 17:36:15 -05:00
Orivej Desh
dd604d575f
Merge branch 'master' into staging
...
* master: (39 commits)
pythonPackages: rename dns -> dnspython
awesome: fix LUA_PATH/LUA_CPATH to lgi [now for version 3.5]
qt4: fix qmake on darwin and delete custom install phase
python.buildEnv: always include the $out output
nix-bash-completions: lazy load aware install
borg: 1.1.1 -> 1.1.3
nixos/programs/bash: document that /etc/bash_completion.d is obsolete
ocamlPackages.markup: 0.7.4 -> 0.7.5
hhvm: 3.21 -> 3.23.2
ocamlPackages.ulex: 1.1 -> 1.2
notmuch: 0.25.2 -> 0.25.3
gmime3: 3.0.1 -> 3.0.5
qt4: fix darwin install phase
nixos/programs/bash: Let bash-completion lazy load scripts
Revert "gmime: 3.0.1 -> 3.0.5"
rawtherapee: delete unused files
pythonPackages: rename dns -> dnspython
nixpkgs: remove sqlite/kyotocabinet deps for leveldb
tor-browser-bundle-bin: 7.0.10 -> 7.0.11
networkmanager: remove restart after suspend from resume
...
2017-12-10 15:24:30 +00:00
Orivej Desh
166536e152
Merge pull request #32535 from Gerschtli/update/hhvm
...
hhvm: 3.21 -> 3.23.2
2017-12-10 11:50:41 +00:00
Tobias Happ
d5d7220770
hhvm: 3.21 -> 3.23.2
2017-12-10 11:50:15 +00:00
Vincent Laporte
d98d944d5d
Merge pull request #32494 from mpickering/ber-metaocaml2
...
ber_metaocaml: (re)init at 104
2017-12-10 12:36:30 +01:00
Orivej Desh
926aaa4870
Merge pull request #32215 from dtzWill/feature/clang-multilib
...
multilib-capable clang, multilib tests
2017-12-09 21:41:54 +00:00
Vladimír Čunát
2309acf723
Merge branch 'master' into staging
2017-12-09 21:00:07 +01:00
Peter Simons
73d85455e4
Merge pull request #32503 from mpickering/ghc-head-updates-8.5
...
ghcHEAD: 8.3.20170808 -> 8.5.20171209
2017-12-09 19:27:04 +01:00
Matthew Pickering
9a072a466c
Remove broken ber-metaocaml-003 attribute
2017-12-09 12:18:06 +00:00
Matthew Pickering
08dfb95673
ber_metaocaml: (re)init at 104
2017-12-09 12:18:05 +00:00
dywedir
b53567e78f
ocamlPackages.reason: 3.0.3 -> 3.0.4
2017-12-09 12:42:56 +01:00
Matthew Pickering
e7a327da5c
ghcHEAD: 8.3.20170808 -> 8.5.20171208
2017-12-09 11:04:31 +00:00
Orivej Desh
0a41fc6b7c
mono46, mono48: disable parallel building
...
See #32386
mono46: https://hydra.nixos.org/build/65617511
mono48: https://hydra.nixos.org/build/65600645
2017-12-09 10:53:16 +00:00
Joachim F
f5f6d8e393
Merge pull request #32481 from ThomasMader/dlang
...
dmd, ldc, dub: Inherit buildInput and meta from build derivation
2017-12-08 23:50:33 +00:00
John Ericson
0271644491
Merge pull request #32403 from obsidiansystems/gcc-modernize-builder
...
gcc: Modernize builder
2017-12-08 14:42:10 -08:00
Thomas Mader
b2e76afa99
dmd, ldc, dub: Inherit buildInput and meta from build derivation
2017-12-08 22:12:11 +01:00
Vladimír Čunát
cdde22aef5
Merge branch 'staging' (older one)
2017-12-08 10:22:31 +01:00
Austin Seipp
90bcfc78c3
nixpkgs: no parallel builds for mono 4.4
...
See #32386 -- while Mono in general should build correctly with parallel
building, it seems the 4.4 branch has broken.
Instead, allow parallel build support to be overridden by individual
versions, and default to true.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-12-07 17:30:27 -06:00
Vladimír Čunát
6f5d989478
treewide: checkMeta fixes for x86_64-linux
2017-12-07 07:50:47 -05:00
Jörg Thalheim
2b91fc0c24
Merge pull request #32402 from volth/oraclejdk8-fix-arm-hashes
...
oraclejdk8: fix armv7l hashes
2017-12-07 10:10:56 +00:00
John Ericson
a1e1e437df
Merge branch 'master' into staging
...
Need base branch for GCC PR
2017-12-07 02:22:27 -05:00
John Ericson
3afe325a3e
Merge commit '43d5c5d6db3ce33f3cf1d17ba43c7374257466ec' into gcc-modernize-builder
2017-12-07 02:19:04 -05:00