Commit Graph

5645 Commits

Author SHA1 Message Date
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
David Tulig
ead4eca0b6 backblaze-b2: 0.6.2 -> 1.1.0 2017-12-17 14:13:42 +00: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
Vladimír Čunát
24d81d6332
Merge branch 'master' into staging 2017-12-15 21:40:23 +01:00
Orivej Desh
0ea7ad1547 scalafmt: change deps name to invalidate negative cache on Hydra [#32442] 2017-12-15 19:37:16 +00:00
Jan Tojnar
1e60ccdf47 meson: 0.43.0 → 0.44.0 2017-12-14 22:56:35 +00:00
Jörg Thalheim
0d9343bd4e
Merge pull request #32668 from dtzWill/feature/retdec
retdec: init at 3.0(.0)
2017-12-14 13:38:36 -08:00
Orivej Desh
f9849698a8 coursier: fix shebang
Do not override phases for the fixupPhase to patching the script interpreter of .coursier-wrapped.

Fixes the sandboxed build of scalafmt: https://github.com/NixOS/nixpkgs/pull/32442#issuecomment-351742204
2017-12-14 15:41:42 +00:00
Franz Pletz
da8bf8e0bc
jenkins: 2.94 -> 2.95 (security)
See https://jenkins.io/security/advisory/2017-12-14/.
2017-12-14 16:03:09 +01:00
Will Dietz
31ea4edf00 retdec: init at 3.0(.0) 2017-12-14 08:50:47 -06:00
Pascal Wittmann
b11254d377
Merge pull request #32442 from markus1189/scalafmt-130
scalafmt: 0.6.8 -> 1.3.0
2017-12-14 09:06:27 +01:00
Orivej Desh
fe61c3b84e bloaty: update path to c++filt after #29396 2017-12-14 00:53:23 +00:00
Joachim F
ea15e43693
Merge pull request #32601 from earldouglas/jenkins-2.94
jenkins: 2.93 -> 2.94
2017-12-14 00:40:34 +00:00
John Ericson
a0b1ebeee9 Merge remote-tracking branch 'upstream/staging' into binutils-wrapper 2017-12-13 16:14:47 -05:00
John Ericson
cebe1b4c08 darwin binutils: Better handling of man pages and info 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
Pascal Wittmann
941e0e4f43 epm: 4.2 -> 4.4 2017-12-13 11:20:28 +01: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
James Earl Douglas
8699ccb8ac
jenkins: 2.93 -> 2.94 2017-12-12 08:05:01 -07:00
Vincent Laporte
594b7be89d
ocp-indent: 1.6.0 -> 1.6.1 2017-12-11 13:38:39 +00:00
Maxime Dénès
ec28cab25f ocamlPackages.merlin: 3.0.3 -> 3.0.5 2017-12-11 14:35:00 +01: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
Tim Steinbach
4ff0429662
sbt-extras: Add JDK dependency
The derivation would use `java` from the PATH. This fixed the behaviour.
2017-12-10 13:48:23 -05:00
Markus Hauck
614a6d43a7 scalafmt: 0.6.8 -> 1.3.0 2017-12-10 17:02:40 +01:00
Maximilian Bode
377cd99e4b gradle: 4.3.1 -> 4.4 2017-12-09 21:08:41 +01:00
Vladimír Čunát
2309acf723
Merge branch 'master' into staging 2017-12-09 21:00:07 +01:00
Jörg Thalheim
09dea4c2e9
Merge pull request #32457 from volth/patch-79
coursier: 1.0.0-RC3 -> 1.0.0-RC13
2017-12-09 08:10:35 +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
Thomas Mader
b2e76afa99 dmd, ldc, dub: Inherit buildInput and meta from build derivation 2017-12-08 22:12:11 +01:00
volth
e2ffc97054
coursier: 1.0.0-RC3 -> 1.0.0-RC13
minor version bump, required for https://github.com/NixOS/nixpkgs/pull/32442#issuecomment-350334285
2017-12-08 18:22:58 +00:00
Vladimír Čunát
cdde22aef5
Merge branch 'staging' (older one) 2017-12-08 10:22:31 +01:00
Tom Lazar
a02691a44b chefdk: 2.3.4 -> 2.4.17 (#32412) 2017-12-07 16:36:31 +00:00
Vladimír Čunát
6f5d989478
treewide: checkMeta fixes for x86_64-linux 2017-12-07 07:50:47 -05:00
Joerg Thalheim
14df60d0db rr: limit platforms to x86_64
related to #32326
2017-12-07 10:22:42 +00:00
Jörg Thalheim
9874d1b5de
Merge pull request #32398 from volth/patch-78
electron: 1.7.5 -> 1.8.1
2017-12-07 10:22:00 +00:00
Orivej Desh
c9a03d9b48 premake5: fix build on darwin 2017-12-07 09:41:46 +00:00
Orivej Desh
46f57dbc14 meson: enable parallel building of meson projects by default 2017-12-07 08:52:42 +00:00
Orivej Desh
031138b7f0 cmake: enable parallel building of cmake projects by default 2017-12-07 08:52:42 +00:00
Orivej Desh
da516f0404 cmake: generate for Ninja when the build phase is Ninja
This is overridable by providing a custom build phase or setting
dontUseNinjaBuild = true.
2017-12-07 08:52:42 +00:00
Orivej Desh
2c7cd2455e ninja: support disabling parallel building
but keep it enabled by default
2017-12-07 08:52:42 +00:00
Orivej Desh
ef151343e5 editorconfig-core-c: disable parallel building 2017-12-07 08:52:42 +00:00
volth
680f3ad465
electron: 1.7.5 -> 1.8.1
- [x] version bump
 - [x] added "i686-linux" "armv7l-linux" "aarch64-linux" (binaries compiled by upstream)
2017-12-07 05:40:00 +00:00
Austin Seipp
0d82c7ec18 nixpkgs: add pkgconfig to icestorm nativeBuildInputs
This helps iceprog find libftdi appropriately on its own, without a
bunch of gross errors in the build process (which should not be a
problem, but may *look* like one!)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-12-06 22:16:39 -06:00
Austin Seipp
a209f93cf4 nixpkgs: icestorm 2017.11.05 -> 2017.12.06
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2017-12-06 22:07:14 -06:00
Vladimír Čunát
9ab5848335
Merge branch 'master' into staging
Haskell updates.  Hydra: ?compare=1416248
2017-12-06 02:23:46 +01:00
Will Dietz
5ad30374e9 radare2: 2.0.1 -> 2.1.0
* drop patch, now included
* drop r2-docker/r2-indent fixups, no longer installed
  (see a09d6dae92)
2017-12-05 09:20:31 -06:00
Jörg Thalheim
7e6068c353
Merge pull request #32335 from makefu/pkgs/devpi-common/update
init devpi-server at 4.3.1, bump devpi-client
2017-12-05 12:44:02 +00:00
makefu
7e39ecba68
devpi-client: enable tests 2017-12-05 13:31:55 +01:00
makefu
29672cf7ce
devpi-client: 3.1.0rc1 -> 3.1.0
enable tests with packaged devpi-server
2017-12-05 13:31:55 +01:00