Commit graph

1826 commits

Author SHA1 Message Date
aszlig
c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx.
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
2014-03-12 10:16:51 +01:00
aszlig
5eb3dd8a1b
cmake: Add patch for fixing Darwin cross-builds.
This is an upstream patch and will eventually get into the next release.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:49 +01:00
Peter Simons
d765d5ddbb haskell-keter: update to version 1.2.0 2014-03-11 13:50:50 +01:00
Peter Simons
2273294b50 haskell-HaRe: update to version 0.7.1.4 2014-03-11 13:50:50 +01:00
Michael Raskin
6cfbc75bc1 Fix CL-Launch source link 2014-03-09 12:47:33 +04:00
Bjørn Forsman
b9d7780ced saleae-logic: install udev rules
So that they can easily be activated in NixOS:

  services.udev.packages = [ pkgs.saleae-logic ];
2014-03-08 21:46:13 +01:00
Bjørn Forsman
12e00b5eeb openocd: install udev rules
So that they can easily be activated in NixOS:

  services.udev.packages = [ pkgs.openocd ];
2014-03-08 21:46:13 +01:00
Michael Raskin
4376d70c61 Update CL-Launch to 4.0.2.2 2014-03-08 21:13:00 +04:00
Michael Raskin
dc4d698e22 Update LuaRocks 2014-03-08 21:13:00 +04:00
Peter Simons
f521a47663 haskell-cpphs: update to version 1.18.3 2014-03-08 11:27:41 +01:00
Peter Simons
56e0e7492c haskell-HaRe: update to version 0.7.1.3 2014-03-08 11:27:40 +01:00
Bjørn Forsman
34caf106da swig: add meta.platforms (set to linux)
So that Hydra will build swig. This provides binary packages to users
and build breakage detection.
2014-03-07 23:59:30 +01:00
Moritz Ulrich
be64949688 leiningen: Hardcode path to java.
...by setting JAVA_CMD in the wrapper.
2014-03-07 13:32:10 +01:00
Moritz Ulrich
29a906b2d8 dfu-programmer: New package. 2014-03-07 13:28:33 +01:00
Domen Kožar
2f77de37d3 Merge pull request #1825 from iyzsong/gradle
gradle: update to 1.11
2014-03-07 13:20:00 +01:00
Domen Kožar
6d1ca3bc6c Merge pull request #1887 from berdario/vagrant
Updated vagrant to 1.4.3
2014-03-06 22:52:32 +01:00
Peter Simons
a2f90518a9 cppcheck: update from 1.63 to 1.64 2014-03-05 15:32:15 +01:00
Peter Simons
bc3008846d scons: update from 2.3.0 to 2.3.1 2014-03-03 11:10:26 +01:00
Evgeny Egorochkin
399269e6e0 help2man: update from 1.43.3 to 1.44.1 2014-03-01 05:26:44 +02:00
Eelco Dolstra
6c77e15f19 doxygen: Remove 1.7
Current 1.8 seems to generate LaTeX output fine.
2014-02-28 18:33:45 +01:00
Eelco Dolstra
ed4fd067bc doxygen: Update to 1.8.6 2014-02-28 16:18:31 +01:00
Domen Kožar
c23ec33c77 Add selenium-server-standalone (submitted by coreyoconnor) 2014-02-27 13:06:33 +01:00
Eelco Dolstra
db9d204d33 Merge remote-tracking branch 'origin/master' into glibc-2.19 2014-02-26 12:42:03 +01:00
Eelco Dolstra
77a49e5813 valgrind: Support Glibc 2.19 2014-02-26 12:39:46 +01:00
Peter Simons
ec09c7d34e haskell-cpphs: update to version 1.18.2 2014-02-25 00:25:28 +01:00
Song Wenwu
3db6fc36f6 gradle: update to 1.11 2014-02-24 17:30:40 +08:00
Peter Simons
0b290b03e2 Merge pull request #1805 from bennofs/new-ghc-events-analyze
New expression: ghc-events-analyze
2014-02-24 09:59:29 +01:00
aszlig
ba8b0e8af9
binutils-cross: Remove unreferenced package.
This package wasn't imported by anything in the package tree and also
isn't used for cross-builds. So in order to avoid confusion, it's better
to remove it as it is outdated as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:22 +01:00
Malcolm Matalka
83c5d12d4c Add opam 1.1.1 2014-02-22 19:08:54 +01:00
Benno Fünfstück
9ad8ce91a3 New expression: ghc-events-analyze 2014-02-22 00:55:26 +01:00
Vladimír Čunát
ae5d8f6768 Merge master into x-updates 2014-02-20 20:55:31 +01:00
Peter Simons
2a1f4c82b2 haskell-cabal2nix: update to version 1.60 2014-02-19 16:07:35 +01:00
Peter Simons
029967dca6 haskell-cpphs: update to version 1.18.1 2014-02-18 19:56:13 +01:00
Dario Bertini
4247a34463
Updated vagrant to 1.4.3 2014-02-18 15:23:16 +01:00
Evgeny Egorochkin
c67f562d5e add branch info 2014-02-18 04:13:45 +02:00
Moritz Ulrich
53b6744646 teensy-loader: New package
Firmware uploader for the teensy microcontroller board family.
2014-02-18 01:02:47 +01:00
Peter Simons
ba9cc84ad0 gnulib: update to version 0.1-83-g8008cac 2014-02-17 17:11:58 +01:00
Vladimír Čunát
96f07fa74e Merge master into x-updates 2014-02-16 11:45:02 +01:00
Petr Rockai
abd8059802 cmake: Update to latest upstream (2.8.12.2). 2014-02-15 10:27:38 +01:00
Cillian de Róiste
25a7190336 Chromedriver: fix download URL, update from 2.0 to 2.9, add a required lib 2014-02-14 23:37:08 +01:00
Evgeny Egorochkin
cf3d2e0a17 add repositories.git to several packages 2014-02-14 09:34:30 +02:00
Rok Garbas
671a369634 add phantomjs to darwin platform 2014-02-12 00:51:11 +00:00
Peter Simons
f687687e7d haskell-cpphs: update to version 1.18 2014-02-10 20:54:55 +01:00
Vladimír Čunát
dfdf164f87 Merge master into x-updates
Conflicts (trivial):
	pkgs/games/spring/default.nix
2014-02-10 19:15:58 +01:00
Moritz Ulrich
18a03d7285 Leiningen: Update to 2.3.4 2014-02-08 21:48:50 +01:00
Moritz Ulrich
93f45ad2e5 Rebar: update to 2.2.0 2014-02-08 18:54:34 +01:00
Vladimír Čunát
9b69117fec Merge master into x-updates 2014-02-08 09:12:51 +01:00
Peter Simons
190a01eb43 haskell-hlint: update to version 1.8.57 2014-02-05 20:40:27 +01:00
Peter Simons
8cefbfcb1f haskell-hasktags: update to version 0.68.7 2014-02-05 20:40:27 +01:00
Eelco Dolstra
eed3c8a6ec lcov: Don't warn about missing source files
Another upstream patch for compatibility with current GCCs.
2014-02-05 20:17:01 +01:00
Eelco Dolstra
d7cb2f5712 lcov: Apply upstream patch for GCC >= 4.7 compatibility 2014-02-05 19:46:48 +01:00
Vladimír Čunát
be70104a3a Merge master into x-updates
Conflicts (taken master):
	pkgs/development/compilers/llvm/3.4/llvm.nix
2014-02-04 22:00:09 +01:00
Peter Simons
422eda499e haskell-hlint: update to version 1.8.56 2014-02-02 22:36:13 +01:00
Bjørn Forsman
662039802a lttng-tools: use absolute path to modprobe
Instead of relying on it being available in $PATH.
2014-02-02 14:00:09 +01:00
Vladimír Čunát
6e2d3b9847 Merge master into x-updates 2014-02-02 10:05:25 +01:00
Marco Maggesi
f3a49abf08 Add OCaml Oasis
OCaml Oasis is a configure/build/install system for OCaml proget (like
Cabal for Haskell).

This commit also add a few small dependencies that where missing

  -  OCaml Data Notation (odn)
  -  ocamlify
  -  ocamlmod
2014-01-31 12:01:32 +01:00
Vladimír Čunát
5888f27c56 automake-1.10: remove, probably vulnerable CVE-2012-3386
The only user was xorg ATM, which I would remove from anyway.
2014-01-30 13:49:22 +01:00
Peter Simons
557b14bc89 haskell-HaRe: update to version 0.7.1.2 2014-01-29 20:04:02 +01:00
Petr Rockai
4124bb9ff5 Adopt more packages. 2014-01-28 18:11:00 +01:00
Petr Rockai
6f5be260b4 Adopt packages. 2014-01-28 17:31:17 +01:00
Peter Simons
134d52cb5f haskell-HaRe: update to version 0.7.1.1 2014-01-28 14:59:47 +01:00
Peter Simons
dc354b0beb haskell-HaRe: update to version 0.7.1.0 2014-01-28 14:59:46 +01:00
Eelco Dolstra
d92dc9bb3e gdb: Build on Darwin
Note that it doesn't actually work unless you run it as root, because
the Darwin kernel disallows unsigned debuggers (you'll get an error
message "please check gdb is codesigned").
2014-01-28 11:03:01 +01:00
Rok Garbas
8741ff387d phantomjs: update to 1.9.7 2014-01-28 00:39:20 +00:00
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
Peter Simons
95d31aa306 haskell-HaRe: update to version 0.7.0.9 2013-12-19 11:35:26 +01:00
Nixpkgs Monitor
05288d3ad5 findbugs: update from 1.3.2 to 2.0.3 2013-12-18 18:18:27 +02:00
Nixpkgs Monitor
8d2d9f6d21 docutils: update from 0.10 to 0.11 2013-12-18 18:18:25 +02:00
Nixpkgs Monitor
32b2973807 ccache: update from 3.1.7 to 3.1.9 2013-12-18 18:18:21 +02:00
Nixpkgs Monitor
fe6522309e bison3: update from 3.0 to 3.0.2 2013-12-18 18:18:19 +02:00
Nixpkgs Monitor
37d39237ab avrdude: update from 5.11 to 6.0.1 2013-12-18 18:18:18 +02:00
Nixpkgs Monitor
8970fb09ab autogen: update from 5.17 to 5.18 2013-12-18 18:18:17 +02:00
Peter Simons
45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Jason "Don" O'Conal
2b65900e75 vagrant: update to 1.4.0 2013-12-16 04:50:22 +00:00
Nixpkgs Monitor
53754a0397 help2man: update from 1.40.8 to 1.43.3 2013-12-15 13:03:15 +02:00
Nixpkgs Monitor
38803914d6 doxygen: update from 1.8.3.1 to 1.8.5 2013-12-15 12:32:24 +02:00
Nixpkgs Monitor
680a6380c8 cppcheck: update from 1.53 to 1.62 2013-12-15 12:26:24 +02:00
Nixpkgs Monitor
202ea363c4 astyle: update from 2.02.1 to 2.04 2013-12-15 11:25:54 +02:00
Nixpkgs Monitor
672999a3d4 oprofile: update from 0.9.8 to 0.9.9 2013-12-14 17:59:57 +02:00
Vladimír Čunát
0fe37b7519 Merge #1269: add vagrant 2013-12-14 11:03:21 +01:00
Nixpkgs Monitor
537a5d4b70 gdb: update from 7.6.1 to 7.6.2 2013-12-14 04:36:56 +02:00
Nixpkgs Monitor
904ee6d5d2 re2c: update from 0.13.5 to 0.13.6 2013-12-14 00:41:47 +02:00
Petr Rockai
f9d66c239e lcov: Update to 1.10 as 1.9 fails with gcc 4.7 .gcno files. 2013-12-13 20:56:36 +02:00
Nixpkgs Monitor
e0ae2b01e6 gnome.gnome_doc_utils: update from 0.20.7 to 0.20.10 2013-12-12 03:11:35 +02:00
Nixpkgs Monitor
8cfaf0697c global: update from 6.2.2 to 6.2.9 2013-12-12 03:11:34 +02:00
Nixpkgs Monitor
57826becea gengetopt: update from 2.22.5 to 2.22.6 2013-12-12 03:11:34 +02:00
Peter Simons
2bc29e4e6d Merge branch 'master' into stdenv-updates. 2013-12-10 22:29:20 +01:00
Peter Simons
a47b25da5b haskell-keter: update to version 1.1.0.1 2013-12-10 20:41:39 +01:00
Peter Simons
486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Peter Simons
6dfc18dc00 gnumake: add version 4.0 2013-12-09 16:14:41 +01:00
Peter Simons
aa58b5f571 gnumake: clean up directory structure; no functional change 2013-12-09 16:09:33 +01:00
Pascal Wittmann
799062bcb6 Fixed sbt options 2013-12-08 20:03:17 +01:00
Jason "Don" O'Conal
1d7108d5f5 drush: add expression 2013-12-05 04:38:35 +00:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Peter Simons
fd5f6e81f6 haskell-cabal2nix: update to version 1.56 2013-12-03 22:23:22 +01:00
Peter Simons
64feb74f44 happy: update to version 1.19.2 2013-12-03 22:23:19 +01:00
Peter Simons
07ce265406 alex: update to version 3.1.3 2013-12-03 22:23:19 +01:00
Eelco Dolstra
bc3c49ce9b valgrind: Update to 3.9.0 2013-12-03 09:17:49 -05:00
Peter Simons
066c03f5a1 haskell-hlint: update to version 1.8.55 2013-12-02 16:26:24 +01:00
Jason "Don" O'Conal
b3504c7bf5 complexity: fix build 2013-11-28 23:52:49 +00:00
Jason "Don" O'Conal
c5bc23a259 vagrant: add expression 2013-11-27 23:05:14 +00:00