Commit graph

1662 commits

Author SHA1 Message Date
Eelco Dolstra 1b598da460 Drop unnecessary setting of java.home 2014-01-25 03:04:46 +01:00
Eelco Dolstra e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01:00
Eelco Dolstra 230a00f644 findbugs: Clean up packaging
Most stuff is now hidden under $out/libexec/findbugs, with only a few
JARs exported via $out/share/java.  Also, the setup hook sets
FINDBUGS_HOME.
2014-01-23 14:17:44 +01:00
Vladimír Čunát ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Peter Simons f0740ac2bc happy: add version 1.19.3 2014-01-20 18:28:02 +01:00
Peter Simons 5333854aa4 haskell-cabal2nix: re-generate with cabal2nix 2014-01-20 18:06:05 +01:00
Peter Simons c6be3dbf1d scons: add pythonPath attribute to ensure that the python-wrapper recognizes this package as providing a python library 2014-01-20 13:29:36 +01:00
Mathijs Kwik 9878037603 haskell-hasktags: upgrade to 0.68.6 2014-01-19 16:06:18 +01:00
Marco Maggesi 389da8b64c Update camlp5 to version 6.11 2014-01-18 20:56:44 +00:00
Marco Maggesi cf6ac40585 Update OCaml findlib to version 1.4 2014-01-18 20:56:44 +00:00
Vladimír Čunát 0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Peter Simons 0915582af9 haskell-hasktags: update to version 0.68.5 2014-01-17 11:59:16 +01:00
Eelco Dolstra 7a6255e4e1 patchelf: Update to 0.8
This fixes a segfault in building Eclipse and the Android SDK.
2014-01-14 14:21:27 +01:00
Peter Simons 6e04eb3d54 haskell-hasktags: update to version 0.68.4 2014-01-13 17:57:47 +01:00
Nixpkgs Monitor 3aaffe26ea cppcheck: update from 1.62 to 1.63 2014-01-13 17:05:45 +01:00
Nixpkgs Monitor 88953a5799 automake114x: update from 1.14 to 1.14.1 2014-01-13 17:05:44 +01:00
Eelco Dolstra 6fb27abf33 Merge branch 'java' 2014-01-13 13:16:17 +01:00
Vladimír Čunát a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Peter Simons ed3ca23cb1 happy-1.19.2: remove import of "Data.Monoid (<>)" from Setup.lhs to fix build with GHC 7.2.2
This patch works around <https://github.com/simonmar/happy/issues/16>.
2014-01-11 12:03:41 +01:00
Peter Simons 03b17fdab2 haskell-cabal2nix: update to version 1.58 2014-01-11 12:03:41 +01:00
Domen Kožar 73252021bb icon-naming-utils: add librsvg dependency and meta.platforms 2014-01-10 01:45:32 +01:00
Eelco Dolstra 113265b6d3 apacheAntGcj: Remove
No need to keep two different versions of Ant around.  The default Ant
works fine with GCJ (and doesn't pull in OpenJDK).
2014-01-09 13:06:51 +01:00
Eelco Dolstra 16e626a80d Replace lib/java -> share/java 2014-01-09 13:01:38 +01:00
Eelco Dolstra 4e29062fbc ant: Support the OpenJRE (without OpenJDK) and the GNU JVM
For instance, a package can now say:

  buildInputs = [ ant jre ecj ];

which would cause the Eclipse compiler to be used with the OpenJRE.
Similarly:

  buildInputs = [ ant gcj ];

uses the GNU JVM with the GNU Java compiler.
2014-01-09 11:14:36 +01:00
Eelco Dolstra ffd6557dc6 patchelf: Update to 0.7 2014-01-07 17:44:03 +01:00
Eelco Dolstra 1e986d8de3 binutils: Use dynamic instead of shared libraries
This reduces the size of binutils from 29 to 17 MiB.
2014-01-07 15:01:59 +01:00
Eelco Dolstra 4b31f920b6 binutils: Get rid of a redundant copy of gold 2014-01-07 14:55:55 +01:00
Eelco Dolstra dfc62c9084 bison: Don't run the tests
All this accomplishes is to make bison depend on flex, which in turn
depends on bison.  (So as a result, during the stdenv bootstrap, bison
gets built 6 (!) times.)
2014-01-07 14:25:42 +01:00
Eelco Dolstra 320498d529 flex: Clean up expression 2014-01-07 14:24:59 +01:00
Eelco Dolstra 320209a618 Merge deterministicStdenv into the default stdenv
This means that (on Linux) strip uses
"--enable-deterministic-archives" and ld uses the
BFD_DETERMINISTIC_OUTPUT flag.
2014-01-07 13:57:42 +01:00
Eelco Dolstra e36427fd4e ant: Add to the channel 2014-01-06 14:36:14 +01:00
Tomasz Kontusz fc55c71fb8 Add platforms and maintainers to d-feet. 2014-01-06 00:48:23 +01:00
Tomasz Kontusz a504b97e3e Add d-feet, a DBus debugger 2014-01-05 23:57:59 +01:00
Shea Levy 139f8949e6 Merge branch 'merge-kernel-builds' into upstream-master
This is a second attempt at unifying the generic and manual-config
kernel builds (see #412 for the last time).

The set of working kernel packages is a superset of those that work on
master, and as the only objection last time was the size of the $dev
closure and now both $out and $dev combined are 20M smaller than $out on
master (see message for ac2035287f), this
should be unobjectionable.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-05 07:13:19 -05:00
Vladimír Čunát 9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Eelco Dolstra 54d1721414 ant: Update to 1.9.3
Also, Ant no longer has a build-time dependency on a particular JDK.
It finds the JDK via $JAVA_HOME or $PATH (by looking up javac).  This
way, we don't need to have separate packages like apacheAntOpenJDK and
apacheAntOracleJDK.  It also seems reasonable: after all, installing
GNU Make doesn't give you a C compiler either.  It does mean that
instead of

  buildInputs = [ ant ];

you now need to write something like

  buildInputs = [ ant jdk ];
2014-01-03 13:29:06 +01:00
Eelco Dolstra b13b146150 jikespg: Cleanup 2014-01-03 11:56:41 +01:00
Bjørn Forsman 4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Shea Levy 6b7ede300f systemtap: Remove from linuxPackagesFor
It doesn't seem to depend on the kernel in any way.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-02 00:03:49 -05:00
Michael Raskin a3843455c5 Re-add HTTP/HTTPS support back to Subversion by adding serf. Tested. 2013-12-30 23:33:22 +04:00
Michael Raskin 64361fd269 Update SlimerJS to 0.9.0 release 2013-12-30 23:33:22 +04:00
Peter Simons ac692ddb50 haskell-cabal2nix: update to version 1.57 2013-12-29 12:26:07 +01:00
Peter Simons a5d046d007 cabal2nix: the test suite compiles only on GHC 7.6.x or later
See <https://github.com/sol/doctest-haskell/issues/69> for further details.
2013-12-29 12:26:07 +01:00
Vladimír Čunát e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Moritz Ulrich e87515e519 Opam 1.1: Constrain supported ocaml versions.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-25 14:43:23 +01:00
Malcolm Matalka 545216ee02 Opam: Update to 1.1.0
Also keeps 1.0 for backwards compatibility.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-25 14:18:28 +01:00
Peter Simons 47816b4bd4 haskell-uuagc: update to version 0.9.50.2 2013-12-23 22:30:43 +01:00
Peter Simons 44a9fc6fcb haskell-timeplot: update to version 1.0.23 2013-12-23 22:30:43 +01:00
Mathijs Kwik cf9cc60a8d bison: use gz tarball, early stdenv does not have xz 2013-12-23 10:25:17 +01:00
Peter Simons cd73e1cefa haskell-uuagc: update to version 0.9.50.1 2013-12-20 10:45:56 +01:00