Commit Graph

3444 Commits

Author SHA1 Message Date
Arseniy Seroka
e024f7fec9 Merge pull request #11409 from FlorentBecker/kcov
kcov: fix issue #11399
2015-12-03 16:28:45 +03:00
Florent Becker
fa8586495d kcov: fix issue #11399 2015-12-02 22:20:01 +01:00
Luca Bruno
e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
William Casarin
bc698428aa multi-ghc-travis: init at git-2015-11-04 2015-11-29 17:39:34 -08:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Vladimír Čunát
f2ad4a47e8 cmake: remove conditional patch that no longer applies
Close #11290. The patch will no longer apply on *any* platform.
2015-11-29 08:58:39 +01:00
Vincent Laporte
6a622acc87 merlin: 2.3 -> 2.3.1 2015-11-28 10:42:08 +01:00
Nikolay Amiantov
2472e19914 Merge pull request #11278 from abbradar/gdb-guile
gdb: use system zlib, fix guile support
2015-11-27 02:09:13 +03:00
Tobias Geerinckx-Rice
2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Domen Kožar
67e03d0c50 Merge branch 'buildPythonPackage+wheels' 2015-11-26 17:38:35 +01:00
Nikolay Amiantov
d96f7128e1 gdb: use system zlib, fix guile support 2015-11-26 16:43:44 +03:00
Pascal Wittmann
765afaec88 sslmate: make meta.maintainers a list 2015-11-25 23:06:09 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Joachim Fasting
6ccf87defe bam: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Vladimír Čunát
13eca6f79a Merge #11067: SmartOS updates
I amended some commits slightly.
2015-11-23 14:45:44 +01:00
Danny Wilson
baf7fdcb75 SmartOS: bison: make help2man target specific dependency 2015-11-23 11:42:01 +01:00
Danny Wilson
d510109c54 SmartOS: texinfo: Fix build and make configureFlags target optional. 2015-11-23 11:42:00 +01:00
Danny Wilson
1752268aed SmartOS: Fix pkgconfig 0.29 build 2015-11-23 00:01:55 +01:00
Arseniy Seroka
c89f058b4a Merge pull request #11191 from volhovM/fix/gradle-update
gradle: refactor
2015-11-22 22:40:49 +03:00
Pascal Wittmann
0773d7b576 checkstyle: 6.11.2 -> 6.12.1 2015-11-22 14:07:53 +01:00
Mikhail Volkhov
bc05b570e6 gradle: refactor 2015-11-22 12:46:10 +03:00
Aristid Breitkreuz
77e07fbbd9 add working lsof mirror 2015-11-21 23:48:41 +01:00
Domen Kožar
704c8bab41 buildPythonPackage: fix standalone applications using it 2015-11-21 21:44:12 +01:00
Shea Levy
db995a95ee Merge remote-tracking branch 'origin/master' into staging 2015-11-21 07:46:55 -05:00
Jude Taylor
852988348d Merge branch 'staging' of https://github.com/NixOS/nixpkgs into sandbox-profiles 2015-11-20 19:58:46 -08:00
Pascal Wittmann
815e9f5af2 help2man: 1.47.2 -> 1.47.3 2015-11-20 17:21:23 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Pascal Wittmann
35f32d0fda Merge pull request #10971 from ericbmerritt/trv-package
trv: init at 0.1.3
2015-11-20 14:26:24 +01:00
William A. Kennington III
22bf2d0bf3 flex: 2.5.39 -> 2.6.0 2015-11-18 17:50:27 -08:00
Pascal Wittmann
dd81844322 Merge pull request #11120 from vizanto/pr-boot
boot: 2.2.0 -> 2.4.2
2015-11-18 13:39:24 +01:00
Danny Wilson
1ebc5bfa21 boot: 2.2.0 -> 2.4.2 2015-11-18 11:48:04 +01:00
Pascal Wittmann
c283a3da68 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-18 11:34:09 +01:00
Ricardo M. Correia
2b694c237b cargo, cargoSnapshot: add rustc runtime dependency
It turns out that cargo implicitly depends on rustc at runtime: even
`cargo help` will fail if rustc is not in the PATH.

This means that we need to wrap the cargo binary to add rustc to PATH.
However, I have opted into doing something slightly unusual: instead of
tying down a specific cargo to use a specific rustc (i.e., wrap cargo so
that "${rustc}/bin" is prefixed into PATH), instead I'm adding the rustc
used to build cargo as a fallback rust compiler (i.e., wrap cargo so
that "${rustc}/bin" is suffixed into PATH). This means that cargo will
prefer to use a rust compiler that is in the default path, but fallback
into the one used to build cargo only if there wasn't any rust compiler
in the default path.

The reason I'm doing this is that otherwise it could cause unexpected
effects. For example, if you had a build environment with the
rustcMaster and cargo derivations, you would expect cargo to use
rustcMaster to compile your project (since rustcMaster would be the only
compiler available in $PATH), but this wouldn't happen if we tied down
cargo to use the rustc that was used to compile it (because the default
cargo derivation gets compiled with the stable rust compiler).

That said, I have slightly modified makeRustPlatform so that a rust
platform will always use the rust compiler that was used to build cargo,
because this prevents mistakenly depending on two different versions of
the rust compiler (stable and unstable) in the same rust platform,
something which is usually undesirable.

Fixes #11053
2015-11-18 02:41:45 +01:00
Pascal Wittmann
7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
Jaka Hudoklin
be067811ff Merge pull request #11048 from offlinehacker/pkgs/influxdb/update_0.9.4
influxdb: 0.8.3 -> 0.9.4, fix module
2015-11-17 17:18:24 +01:00
lethalman
ca186286d7 Merge pull request #10986 from teh/master
update flow + new go binary (codesearch)
2015-11-16 20:45:10 +01:00
Danny Wilson
bcc7d8add9 Texinfo requires GNU awk, mainly during make check.
This fixes build on SmartOS.
2015-11-16 17:20:16 +01:00
Danny Wilson
ee56b6aa24 Doxygen: fix build on SmartOS 2015-11-16 17:20:14 +01:00
Danny Wilson
15c676fd30 SmartOS: Make pkgconfig use proper i18n. 2015-11-16 17:20:13 +01:00
Danny Wilson
a93f883556 Fix bison build on Illumos. 2015-11-16 17:20:11 +01:00
Jaka Hudoklin
9c1943fb6f influxdb: 0.8.3 -> 0.9.4, fix module 2015-11-16 14:22:08 +01:00
Domen Kožar
4755afc385 Merge commit 'b666ac3e9ff3f08b120d068770768be580e67f76' (staging)
Merge rest of the fixes from staging
2015-11-16 11:23:06 +01:00
Florent Becker
7ff5826e08 kcov : init at 29 2015-11-15 18:07:48 +01:00
William A. Kennington III
050bebb8c4 cmake: 3.3.2 -> 3.4.0 2015-11-13 15:55:44 -08:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Bjørn Forsman
30313d5c6e jenkins: 1.637 -> 1.638 (important security fixes)
I fat fingered the previous update, *this* is the real important
security updates:

https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-11-11
2015-11-12 13:40:09 +01:00
Bjørn Forsman
7a1c4ab324 jenkins: 1.636 -> 1.637 (security fixes)
https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-11-11
2015-11-12 13:34:44 +01:00
Eric Merritt
be301b345f trv: init at 0.1.3
This adds the trv ocaml build tool to the system
2015-11-11 19:10:19 -08:00
Tom Hunger
14efaba4c8 flow: 0.17.0 -> 0.18.1 2015-11-11 15:28:56 +00:00
Vladimír Čunát
1e6097f00a stace: add libunwind support (fixes #10515)
I think it's not worth making such a small library optional as in the PR.
2015-11-11 15:04:47 +01:00
Pascal Wittmann
f38170b40c Merge pull request #10960 from dochang/gradle
gradle: 2.6 -> 2.8
2015-11-11 12:11:55 +01:00
Domen Kožar
fba69ef35a Merge pull request #10940 from msteen/flow
flow: added Linux support
2015-11-11 12:03:32 +01:00
Desmond O. Chang
b9c11de2a8 gradle: 2.6 -> 2.8 2015-11-11 16:45:19 +08:00
Pascal Wittmann
d8c5f4dd56 Merge pull request #10655 from spacefrogg/dialog
dialog: updated to 1.2.20150920
2015-11-10 17:25:49 +01:00
Matthijs Steen
67c4c5fd16 flow: added Linux support
Changed the build inputs to only include the additional Darwin inputs when building for Darwin.
2015-11-10 16:23:20 +01:00
Michael Raitza
01038feea0 dialog: 1.2-20150225 -> 1.2.20150920 2015-11-10 13:27:48 +00:00
Edward Tjörnhammar
38ca909811 maven: 3.2.5 -> 3.3.3 2015-11-10 08:46:14 +01:00
Chris Martin
d03cee22c4 parse: init at 3.0.1 2015-11-09 04:22:34 -05:00
William Roe
3c8f2fc9a7 exercism: migrate to go-packages, 1.9.2 -> 2.2.1 2015-11-09 01:17:57 +00:00
William A. Kennington III
a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
Domen Kožar
4f44172f49 Merge pull request #10855 from ryanartecona/jq-oniguruma
jq: build with oniguruma for regex support
2015-11-07 20:01:19 +01:00
Ryan Artecona
76e99d76ce jq: build with oniguruma for regex support 2015-11-07 13:54:45 -05:00
Aristid Breitkreuz
c35e349409 rename make->gnustep-make to avoid people installing it accidentally 2015-11-07 16:08:17 +01:00
Pascal Wittmann
fcb4627695 Merge pull request #9980 from wavewave/gradle25
add gradle 2.5.
2015-11-06 17:17:28 +01:00
Ian-Woo Kim
3d5f95d61b gradle: reinit at 2.5.
For some projects (especially using android ndk), we still need to keep 2.5.
2015-11-06 07:31:58 -08:00
William A. Kennington III
2837a5e091 Merge branch 'master.upstream' into staging.upstream 2015-11-05 10:07:28 -08:00
Nicolas B. Pierron
13a379cfa2 Merge pull request #10672 from wizeman/u/upd-rr
rr: 3.0.0 -> 4.0.0
2015-11-05 14:21:25 +00:00
Eelco Dolstra
3e44182487 Merge remote-tracking branch 'origin/systemd-219' into staging 2015-11-04 15:37:28 +01:00
William A. Kennington III
4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
Ricardo M. Correia
84afac6b89 cargo: 0.5.0 -> 0.6.0 2015-11-03 20:32:12 +01:00
Jude Taylor
137cadb66b darwin purity: flow 2015-11-03 04:53:25 -08:00
Jude Taylor
135b32f2a0 darwin purity: doxygen 2015-11-02 14:37:10 -08:00
Ricardo M. Correia
2ede3e6ddd rustfmt: 2015-10-17 -> 2015-10-28
... which also fixes the build.
Also, I've switched the compiler to the stable channel since rustfmt
supports it now.
2015-11-02 15:44:42 +01:00
Bjørn Forsman
eeced1bc51 jenkins: 1.633 -> 1.636 2015-11-02 10:39:16 +01:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Eelco Dolstra
81f6c62004 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-30 15:47:37 +01:00
Vincent Laporte
7cb6dbc3d0 merlin: 2.2 -> 2.3 2015-10-29 21:35:41 +01:00
Ricardo M. Correia
3136a17834 rr: 3.0.0 -> 4.0.0 2015-10-28 23:20:42 +01:00
Pascal Wittmann
36a529e566 icmake: 7.22.01 -> 7.23.02 2015-10-28 17:43:41 +01:00
Vladimír Čunát
1d921ad3a7 cmake-2.8: fix build with multiple outputs 2015-10-28 13:30:50 +01:00
Domen Kožar
8f977608f4 add sslmate: easy to buy, deploy, and manage your SSL certs 2015-10-26 12:57:27 +01:00
goibhniu
f84cbe2a70 Merge pull request #10592 from AndersonTorres/eweb
eweb: init at 9.10
2015-10-25 15:52:06 +01:00
goibhniu
20d530bc7d Merge pull request #10440 from AndersonTorres/funnelweb
Funnelweb: init at 3.20
2015-10-25 15:51:15 +01:00
AndersonTorres
55bdc98c3d Funnelweb: init at 3.20 2015-10-25 03:40:50 -02:00
AndersonTorres
4a3a6866fd eweb: init at 9.10 2015-10-25 03:30:07 -02:00
Cillian de Róiste
e42e4cfbd9 Meson: tidy up, untabify 2015-10-24 12:50:15 +02:00
goibhniu
f8af597f0c Merge pull request #10504 from brandonedens/meson-build
Meson build package
2015-10-24 12:40:14 +02:00
Charles Strahan
a9c3950f2d watchman: 3.0.0 -> 4.1.0 2015-10-23 14:03:30 -04:00
Vladimír Čunát
4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
goibhniu
b784494577 Merge pull request #10395 from dochang/editorconfig-core-c
editorconfig-core-c: init at 0.12.0
2015-10-22 23:26:26 +02:00
goibhniu
d673bf7ed3 Merge pull request #10429 from anderspapitto/master
rtags: init at 9fed420
2015-10-21 18:31:37 +02:00
Brandon Edens
6774b09af7 Add meson build system package. 2015-10-21 09:08:48 -07:00
Domen Kožar
156f164677 Merge pull request #10432 from lancelotsix/update_pkgs.complexity
pkgs.complexity: 0.4 -> 1.3
2015-10-21 11:06:23 +02:00
Anders Papitto
8af5e2ef01 rtags: init at 9fed420 2015-10-18 13:49:23 -07:00
Robin Gloster
5815b95176 flow: 0.14.0 -> 0.17.0 2015-10-18 10:22:47 +00:00
Ricardo M. Correia
ef8b078ce7 rustfmt: 2015-09-23 -> 2015-10-17
Also convert from fetchgit to fetchFromGitHub.
2015-10-18 04:12:11 +02:00
Lancelot SIX
f4c250f76f pkgs.complexity: 0.4 -> 1.3
See https://lists.gnu.org/archive/html/info-gnu/2015-10/msg00004.html
for announcement
2015-10-17 10:22:12 +02:00
Pascal Wittmann
280621778a Merge pull request #10403 from rehno-lindeque/heroku-3.42.20
heroku: 3.32.0 -> 3.42.20
2015-10-15 22:22:37 +02:00
Rehno Lindeque
bbfae3c013 heroku: 3.32.0 -> 3.42.20 2015-10-15 20:03:07 +00:00
William A. Kennington III
8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Desmond O. Chang
739724b4b0 editorconfig-core-c: init at 0.12.0 2015-10-15 08:26:55 +08:00
Utku Demir
57ad847982 jenkins: 1.631 -> 1.633 2015-10-14 21:21:12 +03:00
Vincent Laporte
37d731790b ocp-index: requires OCaml >= 4 2015-10-14 19:27:33 +02:00
Vincent Laporte
92e2e18fbb ocaml-ocp-indent: 1.4.2b -> 1.5.2 2015-10-14 19:26:38 +02:00
Vincent Laporte
621b66c3df js_of_ocaml: fix for OCaml < 4.0 2015-10-14 19:25:58 +02:00
Vladimír Čunát
783c40eb68 dbus: split into multiple outputs and fix referrers 2015-10-13 20:19:01 +02:00
Vladimír Čunát
99e4371526 curl: split into multiple outputs
Also use pkgconfig to be safer and fix (some) referrers.
2015-10-13 20:18:48 +02:00
Vladimír Čunát
91407a8bdf ncurses: split into multiple outputs
Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
2015-10-13 20:18:44 +02:00
Timofei Kushnir
43c906ea0b oprofile: 1.0.0 -> 1.1.0 2015-10-13 13:27:50 +03:00
Peter Simons
35059e73ff Merge pull request #10346 from tk-ecotelecom/develop
oprofile: depend on kernel headers to correctly compile 'operf' util.
2015-10-13 11:12:55 +02:00
Peter Simons
1f172c6e7b Merge pull request #10339 from AndersonTorres/nuweb
Nuweb: init at 1.58
2015-10-13 01:07:57 +02:00
AndersonTorres
da77f21e5f Nuweb: init at 1.58 2015-10-12 18:39:17 -03:00
Michael Raskin
7671360e91 Force SLimerJS Gecko compatibility even higher 2015-10-13 00:21:44 +03:00
Edward Tjörnhammar
c10caef1a2 Merge pull request #10062 from gebner/sbt-loader-package
sbt: use sbt-launcher-package.
2015-10-12 23:02:58 +02:00
Timofei Kushnir
aefa4a181f oprofile: depend on kernel headers to correctly compile 'operf' util. 2015-10-12 17:50:13 +03:00
Timofei Kushnir
d7eb1dd8d0 oprofile: depend on kernel headers to correctly compile 'operf' util. 2015-10-12 15:02:01 +03:00
Timofei Kushnir
6ea8f649e6 Create kernel headers dependency to correctly compile 'operf' util. 2015-10-12 13:05:04 +03:00
Tobias Geerinckx-Rice
e8ca6b7a62 ccache 3.2.3 -> 3.2.4
Bug fixes:
- Fixed build error related to zlib on systems with older make versions
  (regression in ccache 3.2.3).
- Made conversion-to-bool explicit to avoid build warnings (and potential
  runtime errors) on legacy systems.
- Improved signal handling: Kill compiler on SIGTERM; wait for compiler to
  exit before exiting; die appropriately.
- Minor fixes related to Windows support.
- The correct compression level is now used if compression is requested.
- Fixed a bug where cache cleanup could be run too early for caches larger
  than 64 GiB on 32-bit systems.
2015-10-09 21:59:51 +02:00
Casey Ransom
8b8f87cf21 jq: 1.4 -> 1.5 2015-10-08 17:13:32 -04:00
Domen Kožar
b4603f8275 Merge pull request #10137 from davidak/kibana-fix-url
kibana: fix url and hash
2015-10-08 12:23:30 +02:00
Pascal Wittmann
9d37d4cc9d checkstyle: 6.10.1 -> 6.11.2 2015-10-06 13:13:57 +02:00
Vladimír Čunát
38313d5d87 libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
2015-10-05 13:44:16 +02:00
Vladimír Čunát
f8c211fd2b fontconfig: split into multiple outputs
Fixed all 'fontconfig}' references as well, hopefully, ugh!
2015-10-05 12:23:56 +02:00
Vladimír Čunát
b44d846990 udev: complete rework
- systemd puts all into one output now (except for man),
  because I wasn't able to fix all systemd/udev refernces
  for NixOS to work well
- libudev is now by default *copied* into another path,
  which is what most packages will use as build input :-)
- pkgs.udev = [ libudev.out libudev.dev ]; because there are too many
  references that just put `udev` into build inputs (to rewrite them all),
  also this made "${udev}/foo" fail at *evaluation* time
  so it's easier to catch and change to something more specific
2015-10-04 10:03:53 +02:00
Tuomas Tynkkynen
ad1eb36dac binutils: Don't use multiple-outputs when cross compiling 2015-10-03 16:43:23 +02:00
Tuomas Tynkkynen
0da9c49303 autogen: Split into multiple outputs
In particular, this avoids runtime-depending on guile.
2015-10-03 14:08:55 +02:00
Vladimír Čunát
2b67ba2ad2 pkgconfig: post-merge fixup 2015-10-03 14:08:48 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vincent Laporte
de84782ded ocaml-deriving: drop legacy package 2015-10-03 08:26:42 +02:00
Vladimír Čunát
33373d939a Merge: staging with systemd 2015-10-02 10:24:41 +02:00
Eelco Dolstra
b23038dd80 Merge remote-tracking branch 'origin/master' into systemd-219 2015-10-01 14:17:46 +02:00
William A. Kennington III
e7bb9e1023 Merge branch 'master.upstream' into staging.upstream 2015-09-30 13:26:04 -07:00
Bjørn Forsman
f35de8ea64 jenkins: 1.594 -> 1.631 2015-09-30 17:25:39 +02:00
William A. Kennington III
5c7ba8c971 pkgconfig: 0.28 -> 0.29 2015-09-29 16:12:06 -07:00
William A. Kennington III
271972de0a Merge branch 'master.upstream' into staging.upstream 2015-09-29 15:54:33 -07:00
David Kleuker
a2e6d9a4da kibana: fix url and hash 2015-09-29 20:17:22 +02:00
vbgl
b02c07641b Merge pull request #10014 from vbgl/camlp5-6.13
camlp5: 6.12 → 6.14
2015-09-29 19:43:15 +02:00
Jude Taylor
48a791d270 darwin purity: doxygen 2015-09-28 18:32:41 -07:00
Tobias Geerinckx-Rice
8ce79e0ef0 d-feet: remove unused arguments 2015-09-29 03:21:34 +02:00
Edward Tjörnhammar
c351c22db5 ihaskell: make sure the wrapped binaries pick up the python path 2015-09-28 21:26:17 +02:00
Eelco Dolstra
5b52b3589c valgrind: Update to 3.11.0 2015-09-28 15:52:31 +02:00
Thomas Tuegel
2e0589b4ca kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Lancelot SIX
a4158cbe94 autoconf-archive: 2015.02.24 -> 2015.09.25
See https://lists.gnu.org/archive/html/info-gnu/2015-09/msg00007.html
for announcement
2015-09-27 08:41:01 +00:00
Bjørn Forsman
3f27be8e5d dbench: move loadfiles from $out/share/ to $out/share/loadfiles/
Seems cleaner.

Hm, there are also loadfiles in $out/share/doc/dbench/loadfiles/
(installed by the upstream build system), but there is no iscsi/
directory in there.
2015-09-26 15:26:17 +02:00
Bjørn Forsman
dc06278641 dbench: expression clean-up
Whitespace, ordering, add meta attributes.
2015-09-26 15:08:50 +02:00
Bjørn Forsman
8e7ce3de00 dbench: 20101121 -> 2013-01-01 (latest)
This fixes the build (the old version has wrong hash now).
2015-09-26 15:01:39 +02:00
Gabriel Ebner
98be4ed5e8 sbt: use sbt-launcher-package. 2015-09-25 16:54:35 +02:00
Robin Gloster
4ed66c9f02 rustfmt: fix build
rustfmt now needs to have llvm in its buildInputs since rust does not bundle it
and rustfmt needs to link to it.
2015-09-24 09:00:55 +00:00
Robin Gloster
2d3537fbf2 racer: git-2015-05-18 -> 1.0.0 2015-09-24 08:58:43 +00:00
William A. Kennington III
d5395b0506 Merge pull request #10024 from mayflower/update-rust
Update rust and dependants
2015-09-23 22:43:25 -07:00
William A. Kennington III
5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
Robin Gloster
760be9cf70 rustfmt: git-2015-09-05 -> git-2015-09-23 2015-09-23 21:16:16 +00:00
Robin Gloster
feda2925f7 cargo: 0.3.0 -> 0.5.0 2015-09-23 21:16:16 +00:00
Vincent Laporte
399a9da2ae camlp5: 6.12 -> 6.14 2015-09-23 19:05:02 +02:00
Peter Simons
5c1afdd5f6 cabal2nix: update to version 20150922 2015-09-23 15:08:19 +02:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Eelco Dolstra
e7631452e9 texinfo: Disable tests
These appear to fail randomly:

  http://hydra.nixos.org/build/26194907/nixlog/325/raw
2015-09-22 12:46:58 +02:00
Eelco Dolstra
fbaaa9cccc swig2: Enable on Darwin 2015-09-22 11:59:39 +02:00
Jaka Hudoklin
0d32d4cd84 kibana: 4.2.0 -> 4.1.2
Kibana needs to be downgraded, so it works with current stable elasticsearch
2015-09-22 00:30:19 +02:00
William A. Kennington III
7040350f34 swig: 3.0.6 -> 3.0.7 2015-09-21 14:38:49 -07:00
Tobias Geerinckx-Rice
ee7df6a566 dub: 0.9.23 -> 0.9.24
Use fetchFromGitHub, and drop a seemingly spurious 'unzip' dependency
(I can find no reference to it in either the source or the resulting
binary).
2015-09-21 19:22:14 +02:00
William A. Kennington III
3fcbd5a829 Merge branch 'master.upstream' into staging.upstream 2015-09-20 14:54:53 -07:00
William A. Kennington III
5ba050a1a3 cmake: 3.3.1 -> 3.3.2 2015-09-20 14:08:22 -07:00
William A. Kennington III
222f5454a0 Merge pull request #9892 from benley/swig3-darwin
swig3: re-enable darwin builds
2015-09-19 16:30:26 -07:00
William A. Kennington III
6e09223627 Merge branch 'master.upstream' into staging.upstream 2015-09-18 17:16:27 -07:00
Jaka Hudoklin
5baac1e962 kibana: 3.1.1 -> 4.2.0 2015-09-19 00:33:35 +02:00
Tobias Geerinckx-Rice
7cfa918aac lemon: init at 1.0 2015-09-18 03:46:06 +02:00
Vladimír Čunát
a418096d6a Merge branch 'master' into staging 2015-09-17 20:07:20 +02:00
Lancelot SIX
bed1eb3260 autogen: 5.18.5 -> 5.18.6 (close #9885)
See http://lists.gnu.org/archive/html/info-gnu/2015-09/msg00006.html for
announcement
2015-09-17 19:55:34 +02:00
Eelco Dolstra
f81982e779 gdb: Update to 7.10 2015-09-17 15:56:42 +02:00
Eelco Dolstra
e636e0a532 gdb: Look for debug info in /run/current-system/sw/lib/debug
The previous default was $out/lib/debug, which wasn't very useful.

This ensures that you can do

  environment.systemPackages = [ pkgs.hello.debug ];

to install debug info.
2015-09-17 15:56:37 +02:00
Benjamin Staffin
cc1af6640c swig3: re-enable darwin builds 2015-09-16 16:28:13 -04:00
Andreas Wagner
937741c9f3 teensy-loader-cli: consistent naming, version bump 2015-09-16 19:14:01 +02:00
Pascal Wittmann
c748c0fb41 global: 6.5 -> 6.5.1 2015-09-15 23:47:18 +02:00
William A. Kennington III
773b4deb7c Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
William A. Kennington III
8dc7073546 Merge branch 'master.upstream' into staging.upstream 2015-09-15 12:04:41 -07:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Peter Simons
e1bbc6f35c cabal2nix: fix version number 20180903 to 20150903
Thanks to @drvink for pointing this out.
2015-09-14 13:46:16 -07:00
goibhniu
529fad3fcf Merge pull request #9691 from samuelrivas/update-argyllcms
Update argyllcms
2015-09-14 10:01:36 +02:00
Pascal Wittmann
d65776b6a6 help2man: 1.47.1 -> 1.47.2 2015-09-12 12:07:28 +02:00
Pascal Wittmann
b7dd128a7a intel-gpu-tools: 1.11 -> 1.12 2015-09-12 11:58:57 +02:00
Peter Simons
6b682a9e37 haskell-language-nix: pull this library in from Hackage 2015-09-11 10:28:30 +02:00
Peter Simons
f6fd6defa5 haskell-nix-paths: pull the library in from Hackage now that it's been published 2015-09-11 10:28:30 +02:00
Peter Simons
10d196c7f1 sqldeveloper: update to version 4.1.1.19.59
I also switched the build to depend on openjdk instead of Oracle's proprietary
one. I'm open to suggestions on how to determine the proper value of $JAVA_HOME
in a jdk-agnostic fashion. Right now, I just hard-coded the proper choice for
openjdk.

* pkgs/development/tools/database/sqldeveloper/default.nix:
2015-09-10 16:47:43 +02:00
Peter Simons
1e5e17eeac haskell-nix-paths: initial version 1 2015-09-09 11:31:14 +02:00
Nikolay Amiantov
57c33c1c54 lambdabot: rework custom modules and configuration 2015-09-08 17:50:55 +03:00
Pascal Wittmann
7ed4046d90 checkstyle: 6.9 -> 6.10.1 2015-09-08 13:53:28 +02:00
Arseniy Seroka
c32727fa08 Merge pull request #9653 from gfxmonk/gup
gup: new package
2015-09-08 13:47:39 +03:00
Tim Cuthbertson
9dfef9ff26 gup: init at version 0.5.1 2015-09-08 20:45:20 +10:00
Arseniy Seroka
91339593be Merge pull request #9702 from ardumont/add-github-release
[new] github-release
2015-09-08 13:29:01 +03:00
Antoine R. Dumont
280c896a94 github-release: init at 0.6.2 2015-09-08 07:43:41 +02:00
Peter Simons
ca9158fa82 cabal2nix: fix version number 20180903 to 20150903
Thanks to @drvink for pointing this out.
2015-09-07 23:35:45 +02:00
Peter Simons
06a7b22985 cabal2nix: fix https://github.com/NixOS/cabal2nix/issues/203 some more 2015-09-07 17:34:59 +02:00
Peter Simons
d4f7bf9c29 cabal2nix: re-generate the build files to make sure all dependencies are listed correctly
Fixes https://github.com/NixOS/cabal2nix/issues/203.
2015-09-07 16:03:28 +02:00
Bjørn Forsman
afdbfd9552 grabserial: drop pythonX.Y- name prefix
It's an application, not a library/module.
2015-09-07 15:54:00 +02:00
Arseniy Seroka
c8904b593d Merge pull request #9677 from mayflower/init-rustfmt
Init rustfmt
2015-09-07 16:24:38 +03:00
Robin Gloster
7a90c8daa8 rustfmt: init at git-2015-09-05 2015-09-07 12:07:00 +00:00
Samuel Rivas
4ef2d19981 jam: add yacc as build input
I am not sure why do I need this locally, it seems to be passing in hydra
anyway...
2015-09-07 11:37:18 +02:00
ts468
054be41e04 Revert "ocaml-modules: fix naming: "_" -> "-"" 2015-09-06 21:15:10 +02:00
Vladimír Čunát
8f33b8cc93 mass rewrite of find parameters to cross-platform style
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
2015-09-06 10:26:30 +02:00
Bob van der Linden
b5da2e0237 node-webkit: added nwjs 0.12.3 2015-09-05 16:01:37 +02:00
William A. Kennington III
31f5bbdaff go-repo-root: Move to go-packages 2015-09-05 00:38:42 -07:00
William A. Kennington III
7baf0e734e gotags: Move to go-packages 2015-09-05 00:27:16 -07:00
William A. Kennington III
9a5d1d85af goimports: Move to go-packages 2015-09-05 00:16:56 -07:00
William A. Kennington III
8c6088c0ce gocode: Move to go-packages 2015-09-05 00:15:02 -07:00
Peter Simons
fcb0bdbaa0 Merge pull request #9639 from k0ral/scons
scons: 2.3.5 -> 2.3.6
2015-09-03 21:08:32 +02:00
koral
bfe09b88fc scons: 2.3.5 -> 2.3.6 2015-09-03 17:37:56 +00:00
Peter Simons
65a415a1b2 cabal2nix: update to version 20180903 2015-09-03 17:53:24 +02:00
Daniel Brockman
06b6648770 flow: 0.13.1 -> 0.14.0, fixes #9321 2015-09-03 13:51:08 +02:00
Peter Simons
ada81b80fd cabal2nix: update to version 20150824-66-gd281a60
This patch fixes https://github.com/NixOS/nixpkgs/issues/9599.
2015-09-02 17:46:39 +02:00
Thomas Strobel
616aa2bdda ocaml modules: fix some CamelCase and under_scores 2015-09-02 09:14:59 +02:00
Eelco Dolstra
6cadec8906 ant: Update to 1.9.6 2015-09-01 12:00:04 +02:00
Tobias Geerinckx-Rice
cfe12c7edd yodl: Sourceforge -> (fetchFrom)GitHub
Cosmetic tweaks; maintain.

CC@ pSub
2015-09-01 05:42:12 +02:00
Tobias Geerinckx-Rice
687d60ec73 icmake: Sourceforge -> (fetchFrom)GitHub
Also add myself as a maintainer.

CC@ pSub
2015-09-01 05:28:53 +02:00
Tobias Geerinckx-Rice
f4193da388 flexc++: 2.02.00 -> 2.03.00
Good-bye Sourceforge, hello (fetchFrom)GitHub. Please stay nice.
2015-09-01 03:28:19 +02:00
Peter Simons
b2c3c58476 cabal2nix: add myself as a maintainer 2015-08-30 12:49:45 +02:00
Aycan iRiCAN
523cd395c7 cabal2nix: fixed sha256 hash 2015-08-30 11:47:25 +03:00
Eelco Dolstra
4e41b64511 valgrind: Separate doc output 2015-08-27 19:07:44 +02:00
Luca Bruno
c91d360cec pidginsipe: add nss and nspr (ZHF) 2015-08-27 12:29:45 +02:00
Bjørn Forsman
3c67f86211 openocd: enable support for CMSIS-DAP debuggers
I.e., add 'hidapi' to buildInputs. Build tested.
2015-08-26 22:06:08 +02:00
Bjørn Forsman
1a13d28151 openocd: 0.8.0 -> 0.9.0
Build tested.
2015-08-26 22:01:07 +02:00
Peter Simons
b106fbfb4f cabal2nix: update to version 20150824 2015-08-25 17:15:41 +02:00
Domen Kožar
e4644a5b58 Merge branch 'staging' 2015-08-25 14:14:54 +02:00
Tobias Geerinckx-Rice
e8a55a43cf ccache: update 3.2.2 -> 3.2.3 2015-08-25 05:03:05 +02:00
Thomas Tuegel
90a72bd177 Merge branch 'master' into staging 2015-08-23 10:29:12 -05:00
Thomas Tuegel
06717667cc Revert "autogen: don't write temp files outside build dir"
This reverts commit 1ea4ea1375.
2015-08-23 10:28:48 -05:00
Thomas Tuegel
1ea4ea1375 autogen: don't write temp files outside build dir 2015-08-23 10:26:29 -05:00
Desmond O. Chang
ef721079ca gradle: 2.2.1 -> 2.6 2015-08-23 12:07:16 +02:00
Aycan iRiCAN
afe6f05310 cabal2nix: fixed sha256 hash
I was getting below error:
output path ‘/nix/store/i73iz0id6ap6qg1p6jaqadl053h2cgfz-cabal2nix-9f58996’ should have r:sha256 hash ‘1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d’, instead has ‘0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv’
2015-08-22 11:04:09 +03:00
William A. Kennington III
64cd711f5c Merge branch 'master.upstream' into staging.upstream 2015-08-21 15:17:26 -07:00
Jude Taylor
65dd349574 update mysteriously varying git hashes 2015-08-21 12:00:35 -07:00
Eelco Dolstra
aba76f23a5 Revert "add Darwin's flavor of lsof"
This reverts commit 7024b4dc62. It
breaks evaluation (possibly related to earlier reverts):

http://hydra.nixos.org/build/24887643
2015-08-21 12:05:06 +02:00
Michael Raskin
a2b718fc80 Switch to the git version for now to get Gecko 40 compatibility 2015-08-21 09:28:23 +03:00
Eelco Dolstra
6769633b64 autogen: Fix build outside of chroot
http://hydra.nixos.org/build/24870256
2015-08-20 20:42:41 +02:00
William A. Kennington III
2138f789bc Merge branch 'master.upstream' into staging.upstream 2015-08-20 10:32:29 -07:00
Jascha Geerds
50d90a2538 gtkdialog: Add missing dependency on hicolor_icon_theme (#9369) 2015-08-20 16:03:58 +02:00
William A. Kennington III
901482ad99 Merge branch 'master.upstream' into staging.upstream 2015-08-19 13:54:48 -07:00
William A. Kennington III
c3592084cf golint: Update to 2015-06-23 2015-08-19 13:51:09 -07:00
Moritz Ulrich
2ffc2099be leiningen: 2.5.1 -> 2.5.2. 2015-08-19 12:25:50 +02:00
William A. Kennington III
2ac70270e8 Merge branch 'master.upstream' into staging.upstream 2015-08-18 11:36:32 -07:00
Austin Seipp
55e5bd4e9b nixpkgs: arcanist 20150707 -> 20150817
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-17 17:18:10 -05:00
William A. Kennington III
a106080623 Merge branch 'master.upstream' into staging.upstream 2015-08-14 13:22:00 -07:00
William A. Kennington III
6fccef2be0 cmake: 3.3.0 -> 3.3.1 2015-08-14 00:12:59 -07:00
William A. Kennington III
952def0e3c Merge branch 'master.upstream' into staging.upstream 2015-08-13 11:55:02 -07:00
William A. Kennington III
257db17ee9 Revert "Revert "texinfo: 5.2 -> 6.0""
This reverts commit dc74a81129.

This doesn't actually break gcc.
2015-08-13 11:33:00 -07:00
Szczyp
cbe6badab9 rhc: init at 1.36.4
OpenShift client tools
Add szczyp as a maintainer
2015-08-13 18:02:55 +02:00
William A. Kennington III
78377e02c5 autogen: 5.18 -> 5.18.5 2015-08-12 17:02:14 -07:00
Eelco Dolstra
dc74a81129 Revert "texinfo: 5.2 -> 6.0"
This reverts commit b1ed04ad1d. It breaks gcc:

http://hydra.nixos.org/build/24651204
2015-08-12 13:25:15 +02:00
Rickard Nilsson
cef8f0180d Merge pull request #9213 from j-keck/sbt0.13.9
sbt: 0.13.8 -> 0.13.9
2015-08-12 11:02:42 +02:00
j-keck
5e7d2e2003 sbt: 0.13.8 -> 0.13.9 2015-08-12 07:45:25 +02:00
William A. Kennington III
b1ed04ad1d texinfo: 5.2 -> 6.0 2015-08-10 23:42:17 -07:00
William A. Kennington III
6e698f9c61 Merge branch 'master.upstream' into staging.upstream 2015-08-09 13:34:18 -07:00
Peter Simons
e8e206aa42 Merge pull request #9148 from Profpatsch/sbt-java-home
wrap sbt with $JAVA_HOME
2015-08-09 00:45:44 +02:00
Profpatsch
062cdfb3a1 sbt: add JAVA_HOME to sbt script 2015-08-08 20:08:00 +02:00
Michael Raskin
bd09d75b96 CL-Launch: 4.1.3.3 -> 4.1.4 2015-08-08 21:01:31 +03:00
Pascal Wittmann
6f5c2ec311 checksyle: update from 6.8.2 to 6.9 2015-08-08 00:08:50 +02:00
Peter Simons
3dbfcdc3d4 cabal2nix: make the package visible from the top-level
This means that "nix-env -i cabal2nix" suffices to install this package.
2015-08-07 23:08:13 +02:00
Peter Simons
13dc24f5c3 cabal2nix: update to version 20150807-6-g9f58996
The generated shell.nix file accepts a string argument called "compiler" that
determines the package set used to instantiate the generated expression. For
example, running "nix-shell --argstr compiler ghc7102" would evaluate the build
inside of "pkgs.haskell.packages.ghc7102". Earlier versions of cabal2nix had the
current default compiler hard-coded in the expression, but after this change this
is no longer the case. When "compiler" remains unspecified, it defaults to
"default", and this value causes evaluation in "pkgs.haskellPackages", which is
the package set most people would like to use by default. That change has to
benefits:

 1) Generated expression no longer contain any particular compiler version. The
    choice of the default compiler depends on the version of Nixpkgs that's used
    to build the expression.

 2) When the default compiler is used, overrides configured for the default
    package set apply, which was not the case in earlier versions.
2015-08-07 23:08:13 +02:00
William A. Kennington III
4624985561 Merge branch 'master.upstream' into staging.upstream 2015-08-07 13:40:39 -07:00
Peter Simons
29fed6f834 cabal2nix: update to version 20150807
This update greatly enhances the accuracy with which dependencies are expressed
in the generated Nix files. Previous versions distinguished dependencies for
building ("buildDepends") and testing ("testDepends"). This distinction didn't
apply to system packages or build tools, however: the fields "extraLibs" and
"buildTools" applied to the entire build. This meant that dependencies required
only for testing would be pulled in regardless of whether the test were
actually being run, etc.

These days, we distinguish dependencies for libraries, executables, and tests,
and for each of those types we distinguish dependencies on Haskell libraries,
system libraries, pkgconfig libraries, and build tools. This gives us a
whopping 12 new attributes

    xxxHaskellDepends
    xxxSystemDepends
    xxxPkgconfigDepends
    xxxToolDepends

where "xxx" is any of "library", "executable", or "test".

The old dependency attributes are no longer generated by cabal2nix. The generic
builder in Nixpkgs still accepts them, though, for the sake of backwards
compatibility. This means that you don't have to re-generate all your build
expressions with the new version, but you *should*.
2015-08-07 15:03:58 +02:00
William A. Kennington III
793cbaedf4 cmake: 3.2.2 -> 3.3.0 2015-08-06 10:15:04 -07:00
lethalman
dad54b36fb Merge pull request #9008 from philandstuff/fix-bazel
Fix bazel package
2015-08-06 11:47:54 +02:00
lethalman
00821f4046 Merge pull request #9066 from Bevaz/ccache-isGNU
ccache: set attribute isGNU = true
2015-08-06 11:46:02 +02:00
vbgl
b8a1e16f81 Merge pull request #9028 from samuelrivas/update-utop-and-camlp4
Update utop and camlp4
2015-08-06 09:11:34 +02:00
Samuel Rivas
37d0d8ac74 utop: 1.15 -> 1.17
Version 1.18 doesn't compile cleanly currently, I need to debug what is going on
there
2015-08-06 08:06:51 +02:00
Samuel Rivas
d516f12dba camlp4: 4.02.0+1 -> 4.02+6
* Remove unneeded substitution in postConfigure
   This was fixed here: 81ed5cf2e8

 * camlp4: use fetchzip

It is considered more reliable than fetchurl
2015-08-06 08:06:16 +02:00
William A. Kennington III
0ecc61b4d7 Merge branch 'master.upstream' into staging.upstream 2015-08-05 16:24:57 -07:00
Pascal Wittmann
d7a6e25355 Merge pull request #8683 from aflatter/phantomjs2
Add phantomjs2
2015-08-05 15:08:30 +02:00
Pascal Wittmann
bb04c579c3 fswatch: update from 1.4.7 to 1.5.0 2015-08-05 14:44:41 +02:00
Pascal Wittmann
454dc664a6 checkstyle: update from 6.8.1 to 6.8.2 2015-08-05 14:44:41 +02:00
Ragnar Dahlén
25bad2be17 boot: 2.0.0 -> 2.2.0 2015-08-05 11:54:40 +01:00
William A. Kennington III
926f073f55 Merge branch 'master.upstream' into staging.upstream 2015-08-04 15:32:43 -07:00
Arseniy Seroka
bba10d8be4 Merge pull request #9039 from Bevaz/ccache-links
ccache: create symlinks to gcc utils in ccache-links bin directory
2015-08-04 15:55:35 +03:00
William A. Kennington III
a2da9cfcaf Merge branch 'master.upstream' into staging.upstream 2015-08-03 14:27:14 -07:00
Nikolay Amiantov
4dde32b4f2 gradle: move to dedicated directory to prevent clashes with other java applications 2015-08-03 23:26:49 +03:00
Nikolay Amiantov
52fb36e7e0 maven: move to dedicated directory to prevent clashes with other java applications 2015-08-03 23:26:45 +03:00
Robert Scott
aefc8b3ddf elfutils: upgrade to 0.163 due to security
... vaguely mentioned by upstream, see e.g. FEDORA-2015-11380.
Close #9084.
2015-08-02 09:36:25 +02:00
William A. Kennington III
09b4a7cc1b Merge branch 'master.upstream' into staging.upstream 2015-07-31 17:26:20 -07:00
Jude Taylor
7024b4dc62 add Darwin's flavor of lsof 2015-07-31 11:35:42 -07:00
Anton Fedotov
09b611ee8e ccache: set attribute isGNU = true 2015-07-31 16:58:03 +03:00
Anton Fedotov
16aadf2d79 ccache: create symlinks to gcc utils in ccache-links bin directory 2015-07-31 15:56:02 +03:00
Eelco Dolstra
6310a9a3be gnum4: Fix impurity in shell handling
If gnum4 is built outside of a chroot, it will decide to use
/run/current-system/sw/bin/sh as the shell for "syscmd". (It gets this
path via "getconf PATH". Maybe our Glibc shouldn't return that path,
at least not during Nix builds...) If such a build of gnum4 is
subsequently used *inside* a chroot, it won't work because
/run/current-system doesn't exist. So specify an explicit path to the
shell.
2015-07-31 04:13:08 +02:00
Tobias Geerinckx-Rice
6c6201a99b Remove unnecessary rec{s from "my" packages 2015-07-31 02:02:07 +02:00
William A. Kennington III
7ebe164ae0 Merge branch 'master.upstream' into staging.upstream 2015-07-30 15:03:10 -07:00
Vladimír Čunát
862900e42e mass-replace deprecated usage of find -perm (Fixes #9044)
sed 's|-perm +0|-perm /0|g'
It's a mass-rebuild due to usage in stdenv's default setup hooks.
2015-07-30 10:30:17 +02:00
William A. Kennington III
af6d8b5182 etcdctl: Use goPackages version of etcd
cc @cstrahan
2015-07-29 18:32:09 -07:00
William A. Kennington III
aaef42ab8c Merge branch 'master.upstream' into staging.upstream 2015-07-29 10:23:08 -07:00
Vladimír Čunát
af3261f7a2 lsof: use a pair of URLs to work when upstream updates
Fixes #9043 for future bumps.
2015-07-29 17:46:53 +02:00
Philip Potter
76dd430cd8 bazel: fix build, make compatible with openjdk
Bazel 981b7bc1 depends on protobuf-2.5 and won't work with 2.6 (and in
bbe84fe3d upgraded straight to protobuf 3.0.0-alpha3); this commit fixes
the dependency to depend on protobuf2_5 specifically.

The bazel compile.sh needs `which` on the PATH; so this commit adds that
as a dependency.

Setting JAVA_HOME to ${jdk} broke bazel when used with openjdk, with the
message:

    Problem with java installation: couldn't find/access rt.jar in /nix/store/z9vc0vzyzhnpl5l5inmqdnvdnbxmmmg7-openjdk-8u60b24

This is because if you set JAVA_HOME, bazel will look for rt.jar in
$JAVA_HOME/lib and $JAVA_HOME/jre/lib, but the nixpkgs openjdk
distribution puts rt.jar in ${jdk}/lib/openjdk/jre/lib for some reason.

To fix this, this commit uses the ${jdk.home} passthru value to use the
appropriate JAVA_HOME for the given jdk.

As bazel now works with openjdk, and openjdk is free while oraclejdk is
not, this commit changes the default jdk for bazel to openjdk.

Since this package didn't have a listed maintainer, I'm claiming it.
2015-07-28 20:38:44 +01:00
Jude Taylor
78e6b78bc6 fix source hashes for cabal2nix and bundler 2015-07-28 12:24:14 -07:00
Tobias Geerinckx-Rice
208bd8242d apktool: set sourceRoot
Otherwise installation fails with the message that unpacking produced
no directories (which is true).
2015-07-28 02:55:55 +02:00
vbgl
93ec36702e Merge pull request #9013 from lessrest/update-flow
flow: 0.1.0 -> 0.13.1
2015-07-27 13:38:18 +02:00
Daniel Brockman
322358db03 flow: 0.1.0 -> 0.13.1 2015-07-27 12:00:54 +02:00
Vladimír Čunát
a2f16fdcff Merge branch 'staging' 2015-07-24 15:12:28 +02:00
Sergey Mironov
9944d92dff omniorb: add the expression 2015-07-23 20:42:35 +02:00
Eelco Dolstra
e7c209e5a3 gdb: Update to 7.9.1 2015-07-23 18:31:54 +02:00
Arseniy Seroka
4588557d01 Merge pull request #8952 from taktoa/taktoa-guile
g-wrap: 1.9.13 -> 1.9.15 and guile-gnome: 2.16.1 -> 2015/01/23 git
2015-07-23 13:51:46 +03:00
Vladimír Čunát
af2ab0b911 remove gcc49 overrides from various places
An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.

/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.

(cherry picked from commit 3064b6a0cc)
2015-07-23 11:53:18 +02:00
Remy Goldschmidt
d2f923341a g-wrap: 1.9.13 -> 1.9.15 2015-07-23 04:13:03 -05:00
Franz Pletz
5955f815ef dfu-util: init at 0.8
Since the website and Sourceforge are currently down, the source tarball
is fetched from Debian mirrors.
2015-07-23 10:28:45 +02:00
Vladimír Čunát
2cacf77c13 Merge branch 'master' into staging 2015-07-22 22:33:55 +02:00
Vladimír Čunát
3064b6a0cc remove gcc49 overrides from various places
An interesting thing is that: stdenv != overrideCC stdenv gcc49;
I'm not sure why that is, but it doesn't seem important.

/cc maintainers: @nckx, @garbas, @abbradar, @cstrahan, @grwlf.
2015-07-22 19:40:12 +02:00
Ricardo M. Correia
205a6b894d cargo: workaround frequent hash mismatches due to #8567
For now, let's remove `leaveDotGit`. The only visible effect I could see
was that `cargo --version` won't report the git commit anymore, but
that's only a minor issue compared to the build breaking often.

Fixes #8566 and closes #8862.
2015-07-21 21:26:02 +02:00
lethalman
b5fcbb9041 Merge pull request #8923 from retrry/vagrant-update
Vagrant: 1.7.3 -> 1.7.4 (ZHF)
2015-07-21 18:17:03 +02:00
Tadas Barzdzius
148dcf4d1c Vagrant: 1.7.3 -> 1.7.4 (ZHF) 2015-07-21 19:08:15 +03:00
Luca Bruno
bfa5df6a5e pahole: fix build (ZHF) 2015-07-21 16:01:20 +02:00
Austin Seipp
f07d5a244f nixpkgs: ninja 1.5.3 -> 1.6.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:34 -05:00
Austin Seipp
8d7dd4cf53 nixpkgs: re2c 0.14.2 -> 0.14.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:33 -05:00
William A. Kennington III
2ad250f4fa Merge branch 'staging.next' into staging.upstream 2015-07-19 02:21:28 -07:00
Vladimír Čunát
9a80550cc4 Merge branch 'staging', discussion #8844 2015-07-19 08:09:29 +02:00
Stewart Mackenzie
f46bbbce49 boot: correct sha256 2015-07-19 02:33:43 +08:00
William A. Kennington III
de8e6f6021 Merge branch 'staging.upstream' into staging.next 2015-07-17 14:34:37 -07:00
William A. Kennington III
f74c74ec40 swig3: 3.0.2 -> 3.0.6 2015-07-17 14:15:36 -07:00
William A. Kennington III
038d29121e swig2: 2.0.11 -> 2.0.12 2015-07-17 14:15:23 -07:00
Vladimír Čunát
9f37e91ec5 Merge master into staging
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
William A. Kennington III
1e2718ed51 lsof: 4.88 -> 4.89 2015-07-15 12:25:21 -07:00
Alexander Flatter
a475f99304 Add phantomjs2
This builds PhantomJS 2 from source in contrast to PhantomJS 1, for
which static binary builds are available.
2015-07-15 21:14:15 +02:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Matthias Beyer
7e3c95a0b8 sqlitebrowser: init at 3.7.0
[Bjørn: add name=... to fetchzip.]
2015-07-13 22:11:30 +02:00
lethalman
54f308c740 Merge pull request #8746 from bosu/add-pahole
pahole: init at 1decb1b
2015-07-13 16:37:47 +02:00
Boris Sukholitko
c59818f630 pahole: init at 1decb1b 2015-07-13 17:31:06 +03:00
Arseniy Seroka
5d9f0e60f5 Merge pull request #8772 from retrry/vagrant-update
vagrant: 1.7.2 -> 1.7.3
2015-07-12 22:13:51 +03:00
Tadas Barzdzius
4338031c59 vagrant: 1.7.2 -> 1.7.3 2015-07-12 14:27:17 +03:00
Jude Taylor
43c72cb6af add security-tool 2015-07-10 10:41:07 -07:00
Robert Irelan
51972d427e cargo: 2015-05-13 -> 0.3.0
Rename cargo to use a version number rather than a date because Cargo
has started releasing packages using version numbers.
2015-07-09 22:56:51 -07:00
Robert Irelan
e6ee86b941 cargoSnapshot: 2015-04-02 -> 2015-06-17, hide from nix-env
Update snapshot to avoid rust-lang/cargo#976, which otherwise breaks the
build.

Also move the `cargoSnapshot` derivation inside a set in
pkgs/top-level/all-packages.nix in order to hide the `cargo-snapshot`
packages from `nix-env -qa`, since it's only used to build the `cargo`
package.
2015-07-09 21:14:55 -07:00
Edward Tjörnhammar
2c327ca48e activator: 1.3.2 -> 1.3.5 2015-07-10 00:23:48 +02:00
Pascal Wittmann
ad41a600e5 oprofile: update from 0.9.9 to 1.0.0 (ZHF)
fixes the build with recent versions of binutils
2015-07-09 13:18:21 +02:00
William A. Kennington III
7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
Jaka Hudoklin
4b1cfd17a8 Merge pull request #8680 from offlinehacker/pkgs/compass/add
Add compass, stylesheet authoring environment
2015-07-08 12:17:19 +02:00
Austin Seipp
afb7655c68 nixpkgs: arcanist 20150525 -> 20150707
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-07 09:37:50 -05:00
Jaka Hudoklin
acc995cf41 Add compass, stylesheet authoring environment 2015-07-07 12:11:58 +02:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Michael Raskin
b280d6cbc7 scons: update 2.3.4 -> 2.3.5 2015-07-05 00:32:53 +03:00
Vincent Laporte
06efb2e937 chefdk: fix build 2015-07-04 00:39:44 +02:00
Arseniy Seroka
afa1f5ba22 Merge pull request #8586 from vbgl/ocaml-updates
Ocaml package updates
2015-07-02 12:06:29 +03:00
Tobias Geerinckx-Rice
4023da6237 ccache: drop unnecessary perl dependency
Backport a one-line patch to remove the test suite's dependency on
perl, which, while not exactly heavy, is unnecessary.
2015-07-02 03:35:35 +02:00
William A. Kennington III
7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Vincent Laporte
2663f24a48 ocp-index: 1.1.1 -> 1.1.2 2015-07-01 20:23:19 +02:00
Pascal Wittmann
f5c91c445f checkstyle: update from 6.8 to 6.8.1 2015-07-01 20:21:33 +02:00
William A. Kennington III
612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Pascal Wittmann
439ce0d07d checkstyle: update from 6.7 to 6.8 2015-06-29 12:50:34 +02:00
William A. Kennington III
ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
Pascal Wittmann
8c4fcc87f8 autobuild: 3.5 -> 5.3 2015-06-26 17:40:09 +02:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
Vincent Laporte
2727ecec37 js_of_ocaml: propagate camlp4 dependency 2015-06-25 08:55:30 +02:00
Jascha Geerds
ee2c3058fc Merge pull request #8489 from ktosiek/d-feet-0.3.10
d-feet: 0.3.9 -> 0.3.10
2015-06-24 21:28:04 +02:00
Tomasz Kontusz
5c4a6b59c3 d-feet: 0.3.9 -> 0.3.10
Also added license. This is based on COPYING inside the archive.
2015-06-24 20:57:03 +02:00
Pascal Wittmann
c8e66bb9ac autoconf-archive: update from 2014.10.15 to 2015.02.25
and use mirror://
2015-06-23 23:49:33 +02:00
Arseniy Seroka
266531b5b0 Merge pull request #8422 from travisbhartwell/update/atom-shell-to-electron
atom-shell: renamed to electron and updated 0.19.1 -> 0.28.2
2015-06-23 18:54:22 +03:00