Profpatsch
062cdfb3a1
sbt: add JAVA_HOME to sbt script
2015-08-08 20:08:00 +02: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
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
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
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
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
Tobias Geerinckx-Rice
6c6201a99b
Remove unnecessary rec{s from "my" packages
2015-07-31 02:02:07 +02:00
William A. Kennington III
af6d8b5182
etcdctl: Use goPackages version of etcd
...
cc @cstrahan
2015-07-29 18:32:09 -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
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