3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

5631 commits

Author SHA1 Message Date
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
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
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
makefu 623f9c15e0
devpi-server: init at 4.3.1 2017-12-05 13:31:55 +01:00
Vladimír Čunát 689d6303e8
Merge branch 'master' into staging
The haskell split got reverted (again).
Hydra: ?compare=1416012
2017-12-05 13:07:26 +01:00
Fatih Altinok e5e32822df flow: 0.59.0 -> 0.60.1 2017-12-05 08:04:58 +01:00
Joachim F c0d7a054cb
Merge pull request #32274 from ThomasMader/dlang
Improve dlang packages
2017-12-04 23:02:11 +00:00
Orivej Desh 59bcd86640 Merge branch 'master' into staging
* master: (53 commits)
  hashcat: 4.0.0 -> 4.0.1
  vault: add nixos test
  emem: 0.2.48 -> 0.2.50
  nixos/nat: add dmzHost option (#32257)
  vulnix: 1.3.4 -> 1.4.0
  linux-4.13: mark as insecure (+required generic changes)
  vault: 0.8.3 -> 0.9.0
  gox: 20140904 -> 0.4.0
  guitarix: 0.35.6 -> 0.36.1
  geolite-legacy: 2017-10-25 -> 2017-12-02
  premake5: 5.0.0pre.alpha.11 -> 5.0.0-alpha12
  otfcc: build with ninja
  python/hetzner: 0.7.5 -> 0.8.0
  linux-testing: 4.15-rc1 -> 4.15-rc2
  Revert "linux_4_13: Remove, no longer supported."
  jenkins: 2.92 -> 2.93
  psc-package: 0.2.4 -> 0.2.5
  dino: 2017-09-26 -> 2017-12-03
  gnome3.gpaste: fix keybindings path
  plasma: 5.11.3 -> 5.11.4
  ...
2017-12-04 15:25:34 +00:00
Lancelot SIX f2b690ae2b
Merge pull request #32294 from earldouglas/jenkins-2.93
jenkins: 2.92 -> 2.93
2017-12-04 14:36:41 +01:00
adisbladis 6530159f17
gox: 20140904 -> 0.4.0 2017-12-04 16:12:40 +08:00
Orivej Desh 3eccd0b11d premake5: 5.0.0pre.alpha.11 -> 5.0.0-alpha12
The new premake fixes the issue in ebb2ca7574 for
the GNU Make target.
2017-12-04 05:55:05 +00:00
James Earl Douglas 1bb086e17d
jenkins: 2.92 -> 2.93 2017-12-03 16:44:57 -07:00
Tuomas Tynkkynen f2766b4f42 intel-gpu-tools: Broken on non-x86
https://hydra.nixos.org/build/65032931
2017-12-03 19:51:58 +02:00
Vincent Laporte 842d8e4766 frama-c: 20170501 (Phosphorus) -> 20171101 (Sulfur) 2017-12-03 12:26:02 +01:00
Thomas Mader 48dcf2620d dub: 1.5.0 -> 1.6.0
- Enable unittests by using a fixed-output derivation
- Remove substitutions because they are fixed upstream now
2017-12-03 02:52:04 +01:00
Ben Gamari ff1a8ba304 libtool: Enable cross compilation 2017-12-03 01:50:42 +02:00
Tuomas Tynkkynen 6ebb1354e6 help2man: 1.47.4 -> 1.47.5 2017-12-03 01:50:42 +02:00