Commit Graph

37564 Commits

Author SHA1 Message Date
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
4775dee8b9 openjdk: Set JAVA_HOME in a setup-hook 2014-01-09 12:50: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
c32d0180e4 Don't set $TZ
Now that Java is happy with our /etc/localtime, there is no reason to
set $TZ anymore.  (See 945849b86fe33474da569b307d7e5880877491b6, 279248f6c562eb88227d22b824c9324683980b96, 1b5e860f65607b4cc7de4b6b5db95460cf144526.)

Fixes #1463.
2014-01-06 18:27:07 +01:00
Eelco Dolstra
1b5e860f65 Make /etc/localtime a direct symlink to the zoneinfo file
Some programs (notably the Java Runtime Environment) expect to be able
to extract the name of the time zone from the target of the
/etc/localtime symlink.  That doesn't work if /etc/localtime is a
symlink to /etc/static/localtime.  So make it a direct symlink.
2014-01-06 18:23:41 +01:00
Eelco Dolstra
393b2e3b19 ecj: Add a setup hook that makes Ant use ECJ automatically 2014-01-06 14:36:15 +01:00
Eelco Dolstra
90e533b685 openjre: Propagate setJavaClassPath
Thus, any package that has the JRE or JDK in its build inputs will
automatically have $CLASSPATH set up properly.
2014-01-06 14:36:14 +01:00
Eelco Dolstra
5d6259a973 Add a setup hook that automatically sets up $CLASSPATH
All JARs in $pkg/share/java (for each $pkg in the build inputs) are
added to $CLASSPATH.  Thus, you can say

  buildInputs = [ setJavaClassPath someJavaDependency ];

and the JARs in someJavaDependency will be found automatically by
tools like javac or ant.

Note that the manual used to say that JARs should be installed in
lib/java; this is now share/java, following the Debian policy:

  http://www.debian.org/doc/packaging-manuals/java-policy/x110.html

The directory share/java makes more sense because JARs are
architecture-independent.  (Also, a quick grep shows that we were not
exactly consistent about this in Nixpkgs.)
2014-01-06 14:36:14 +01:00
Eelco Dolstra
e36427fd4e ant: Add to the channel 2014-01-06 14:36:14 +01:00
Eelco Dolstra
e1f58d2a51 ecj: Build using OpenJDK 2014-01-06 14:36:14 +01:00
Eelco Dolstra
23e277b0de ecj: Fix indentation 2014-01-06 14:36:14 +01:00
Eelco Dolstra
48701a3cef fop: Drop runtime dependency on the JDK 2014-01-06 14:36:13 +01:00
Eelco Dolstra
4728ec3f99 Fix some references to apacheAntOpenJDK 2014-01-06 14:36:13 +01:00
Eelco Dolstra
c180be8cf5 icedtea: Remove
It has apparently never worked.  Also drop xerces and xalan, which
were only used by icedtea.
2014-01-06 14:36:13 +01:00
Eelco Dolstra
cd5a9f4980 clooj: Update to 0.4.4
Also, merge the wrapper into the main package.
2014-01-06 14:36:13 +01:00
Eelco Dolstra
8398b23e10 clojure: Update to 1.5.1
Also, merge the wrapper into the main package, and get rid of the
binary variant.
2014-01-03 14:48:21 +01:00
Eelco Dolstra
b96d3ca233 hydra-ant-logger: Fix build 2014-01-03 14:33:40 +01:00
Eelco Dolstra
e9211e60ac postgresql-jdbc: Fix build 2014-01-03 14:33:17 +01:00
Eelco Dolstra
94d5776436 freenet: Fix build
Also change the name attribute from "freenet-official" to "freenet".
2014-01-03 14:32:13 +01:00
Eelco Dolstra
d150d49128 jedit: Fix build 2014-01-03 14:31:57 +01:00
Eelco Dolstra
ec685e30de kaffe: Remove
It no longer builds and doesn't seem very maintained.
2014-01-03 13:51:23 +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
e1f7144aa8 postgresql-jdbc: Update to 9.3-1100 2014-01-03 11:56:41 +01:00
Eelco Dolstra
226b3c440b hydra-ant-logger: Fix the build 2014-01-03 11:56:41 +01:00
Eelco Dolstra
b13b146150 jikespg: Cleanup 2014-01-03 11:56:41 +01:00
Eelco Dolstra
79675fad6e openjdk: Use multiple outputs
This unifies the "openjdk" and "openjre" packages.  The JDK is placed
in the "out" output, the JRE in "jre".

Also, everything is now stored in $prefix/lib/openjdk, so the JDK/JRE
no longer pollute user environments with files like
"ASSEMBLY_EXCEPTION" at top-level.
2014-01-03 11:56:40 +01:00
Eelco Dolstra
7f11ef6345 openjdk: Skip configurePhase
The build phase also runs "make sanity", so there is no need to do it
twice.
2014-01-03 11:56:40 +01:00
Eelco Dolstra
7edfe92f5f openjdk: Fix manpage cleanup 2014-01-03 11:56:40 +01:00
Eelco Dolstra
02f7e85d99 openjdk: Remove obsolete header file hack 2014-01-03 11:56:40 +01:00
Eelco Dolstra
2f31a7ccc6 openjdk: Build only once
Since javac doesn't do much optimisation, bootstrapping twice is
unlikely to produce a faster compiler.
2014-01-03 11:56:40 +01:00
Eelco Dolstra
0c93c758bf postgresql: Update to 8.4.19, 9.0.15, 9.1.11, 9.2.6
This is a critical update fixing several data corruption issues:

  http://www.postgresql.org/about/news/1492/
2014-01-03 11:54:52 +01:00
Eelco Dolstra
ca8de63797 postgresql-8.3: Remove
The 8.3 branch is no longer maintained so it shouldn't be used.
2014-01-03 11:51:02 +01:00
Eelco Dolstra
37107edafe btrfs-progs: Don't use a non-standard meta attribute 2014-01-03 11:49:38 +01:00
Lluís Batlle i Rossell
ab7069eec4 zsnes seems to work better, without stripping.
I can't understand why. Without disabling stripping, it segfaults
saving state.
2014-01-03 00:54:59 +01:00
Domen Kožar
ddda0dfc60 pythonPackages.nose: skip failing test 2014-01-02 23:38:27 +01:00
Domen Kožar
3ef95f0582 Merge pull request #1453 from ttuegel/clementine
Add clementine-1.2.1 and dependencies
2014-01-02 14:21:18 -08:00
Thomas Tuegel
ef108a8d31 add sparsehash-2.0.2 2014-01-02 14:49:23 -06:00
Thomas Tuegel
776dea8d24 add clementine-1.2.1 2014-01-02 14:49:22 -06:00
Domen Kožar
d76654a55c Merge pull request #1444 from ttuegel/qtcurve
add qtcurve-1.8.17
2014-01-02 12:31:54 -08:00
Domen Kožar
f9ad40a39b Merge pull request #1443 from ttuegel/kde-gtk-config
add kde-gtk-config-2.2.1
2014-01-02 12:29:06 -08:00
Domen Kožar
ef406e0bb6 Merge pull request #1391 from coroa/nm-applet
network-manager-applet: re-do schema generation
2014-01-02 12:20:29 -08:00
Domen Kožar
9737d898f3 Merge pull request #1416 from wkennington/matplot
Update matplotlib to use buildPythonPackage
2014-01-02 12:09:04 -08:00
Domen Kožar
4f97ab19a5 Merge pull request #1452 from ttuegel/networkmanager
Fix networkmanager-pptp
2014-01-02 12:02:53 -08:00
Moritz Heidkamp
030a4c7f5d Add chunkfs package 2014-01-02 18:31:09 +00:00
Moritz Heidkamp
482d87a9b0 Set chunksync package's NIX_LDFLAGS to "-lgcc_s"
This works around the pthread_cancel issue
2014-01-02 18:28:13 +00:00
Thomas Tuegel
28a593469f networkmanager-pptp: fix checksum 2014-01-02 11:02:40 -06:00
Thomas Tuegel
6f768bf47c networkmanager: register PPTP service 2014-01-02 11:02:29 -06:00
Bjørn Forsman
4d6605e882 Whitespace fixes in package expressions I maintain 2014-01-02 17:58:08 +01:00
Michael Raskin
7fd542fad9 Merge pull request #1445 from wizeman/u/oraclejre7
oraclejre7: Add package (as a variant of oraclejdk7)
2014-01-02 07:51:05 -08:00