nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 10:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,686 Commits 258 Branches 124 Tags 8.2 GiB
eb3a5a3002
Commit Graph

826 Commits

Author SHA1 Message Date
Aristid Breitkreuz
158e4ffd9c mathematica package patchPhase does not like set -e 2015-11-30 21:08:30 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Arseniy Seroka
c6932509b8 Merge pull request #11302 from fkz/sad 
add package: system for automated deduction
 2015-11-27 22:25:44 +03:00
Fabian Schmitthenner
dc164dc2ee system for automated deduction: init at 2.3-25 2015-11-27 15:12:09 +00:00
Domen Kožar
67e03d0c50 Merge branch 'buildPythonPackage+wheels' 2015-11-26 17:38:35 +01:00
John Wiegley
2b8ef119c5 Revert "coq: 8.5b2 -> 8.5b3" 
This reverts commit c111b0cd4d.

@oconnorr I will restore this once there is more ecosystem to support it.
 2015-11-25 12:58:07 -08:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Nikolay Amiantov
5ee5b5ba82 R: add curl for https support 2015-11-25 11:39:28 +01:00
Joachim Fasting
6d4ff90207 gap: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Joachim Fasting
4229525eac spass: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Joachim Fasting
0a4e12c0e2 opensmt: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Joachim Fasting
c6d645803a iprover: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Joachim Fasting
a228252b69 cvc3: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Joachim Fasting
022bbe1c0c singular: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Joachim Fasting
42fc03411f drgeo: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Domen Kožar
4b23328e39 buildPythonPackage: fix more wheels failures 2015-11-21 21:44:12 +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
Russell O'Connor
c111b0cd4d coq: 8.5b2 -> 8.5b3 2015-11-19 00:10:22 -05:00
Pascal Wittmann
7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
Marco Maggesi
a487b3326b Update HOL Light to version 2015-11-02 2015-11-03 15:24:56 +01:00
Vladimír Čunát
fd1619cf60 yices: use correct static gmp 
It still won't build due to trying to use /sbin/ldconfig,
but gmp-related things do seem OK.
 2015-10-28 11:50:05 +01:00
Vladimír Čunát
148e03b2f1 gmp: split into multiple outputs 2015-10-28 10:15:49 +01:00
Vladimír Čunát
cba6641623 cairo, pango: fix some string references 2015-10-13 20:18:51 +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
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
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
Karn Kallio
87b75c33ce R: advance to version 3.2.2. 
A test failing without recommended packages has been patched.
 2015-10-02 22:15:14 +02:00
Peter Simons
ccd3e52b60 Merge pull request #9917 from FlorentBecker/sage 
Update sage to 6.8
 2015-09-30 17:28:36 +02:00
Vincent Laporte
9a1245280d hol_light: add support for camlp5 > 6.12 2015-09-23 19:04:51 +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
Florent Becker
b860b106c5 sage: 6.1.1 -> 6.8 2015-09-22 09:01:33 +00:00
Gabriel Ebner
5493dccfbb metis-prover: init at 2.3 2015-09-21 21:42:20 +02:00
Erik Rybakken
64c1a9a2e2 perseus: init at 4-beta 2015-09-19 00:56:24 +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
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
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly 
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
 2015-09-15 12:08:24 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Marco Maggesi
cb2a05b826 HOL Light: findlib is not necessary (nor actually used). Remove dependency. 2015-09-13 18:08:20 +02:00
Russell O'Connor
4cc5f5dbb6 coq: Add csdp dependency 
The csdp program is invoked for some uses of Micromega tactics.
 2015-09-10 11:50:38 -04:00
Russell O'Connor
772ec9cae3 csdp: init at 6.1.1 2015-09-10 11:50:18 -04:00
Domen Kožar
f2627f9c81 Merge pull request #9752 from FRidh/maintainer 
add myself as maintainer
 2015-09-09 15:27:34 +02:00
Frederik Rietdijk
cd5a9afeac add myself as maintainer 2015-09-09 15:25:49 +02:00
Austin Seipp
d8858e48e2 nixpkgs/jonprl: minor touchups 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-09-09 07:48:55 -05:00
Brian McKenna
e9bdf0fc07 JonPRL: init at 0.1.0 2015-09-09 21:23:48 +10: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
Marco Maggesi
97b27e69c0 Update HOL Light to svn r244. 2015-09-01 16:30:27 +02:00
Eelco Dolstra
8fc039188e Mark some packages with undownloadable source as broken 2015-09-01 12:00:04 +02:00
Vladimír Čunát
a839a48b0a root: fix build by -lX11 
The pkgconfig change didn't help, but I'd leave it in.
 2015-09-01 08:23:00 +02:00
Arseniy Seroka
a3fab58287 Merge pull request #9583 from pjones/pkg/geda 
geda: init at 1.8.2-20130925
 2015-09-01 04:42:34 +03:00
Peter Jones
1d4135eab9 geda: init at 1.8.2-20130925 2015-08-31 15:09:58 -06:00
Gabriel Ebner
6b42cd852a qalculate-gtk: init at 0.9.7 2015-08-31 19:20:29 +02:00
Austin Seipp
16b47aff4b nixpkgs: saw-tools 0.1-20150609 -> 0.1.1-20150731 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-30 02:58:47 -05:00
Frederik Rietdijk
dbc7e0fea5 spyder: 2.2.5 -> 2.3.6 
Set environment variable to use setuptools (fixes build issue).

[Bjørn: split enabling spyder for python3 into separate commit.]
 2015-08-29 17:41:35 +02:00
Peter Simons
69b648ea95 Revert "Added K Framework package." 
This reverts commit de02110903. The package doesn't
compile: https://github.com/NixOS/nixpkgs/pull/7419#issuecomment-135972366.
 2015-08-29 15:38:33 +02:00
Gabriel Ebner
0349b05695 veriT: 201410 -> 201506 2015-08-26 09:31:39 +02:00
Austin Seipp
1239465314 nixpkgs: lean 20150328 -> 20150821 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-08-21 13:57:16 -05:00
Eelco Dolstra
f423ba3863 cbc: Enable on Darwin 2015-08-19 11:53:10 +02:00
Eelco Dolstra
80c137c7a2 Add cbc, a mixed ILP solver 2015-08-12 18:39:28 +02:00
Bjørn Forsman
6542c344bc ngspice: rename pkgname (s/ng-spice-rework/ngspice/) 
I think the previous name comes from the fact that some older versions
were distributed in tarballs named ng-spice-rework-<version>. But now
the "rework" name seems odd; most references I found on the internet
calls the package "ngspice". Fix it.
 2015-08-08 20:02:30 +02:00
Michael Raskin
6863fde515 E prover: 1.8 -> 1.9 2015-08-08 21:01:31 +03:00
lethalman
8230f0a379 Merge pull request #8908 from devhell/boinc 
boinc: 7.4.14 -> 7.4.42
 2015-07-30 18:52:34 +02:00
devhell
8d41ccf6f9 boinc: 7.4.14 -> 7.4.42 
As it turns out BOINC moved their git repository to Github sometime
shortly after the first update to this derivation. Their wiki change
makes this quite clear:
https://boinc.berkeley.edu/trac/wiki/SourceCodeGit?action=diff&version=54

Slight refactor and the changelog for this release can be found here:
https://boinc.berkeley.edu/trac/wiki/VersionHistory

Build and run were successful.
 2015-07-28 22:01:26 +01:00
Arseniy Seroka
e9b5deb973 Merge pull request #8964 from vbgl/ecm 
ecm: 6.2.3 -> 6.4.4
 2015-07-26 20:09:10 +03:00
Sergey Mironov
80d6b708ac openmodelica: Fix runtime PATHs using wrapProgram, fixes #8949 2015-07-23 20:42:42 +02:00
Sergey Mironov
9bb0fee487 openmodelica: add expression 
openmodelica.nix: add git to the list of dependencies

openmodelica: generate library sourcelist with hashes

openmodelica: generate library sources (part 2)

openmodelica: fix fakegit

openmodelica: fix libraries issues

openmodelica: add GTK

openmodelica: successful build
 2015-07-23 20:42:35 +02:00
Sergey Mironov
dcdd7a37f6 lp_solve: add the expression 2015-07-23 20:42:35 +02:00
Vincent Laporte
08750f988a ecm: 6.2.3 -> 6.4.4 2015-07-23 19:22:03 +02:00
Luca Bruno
62092ef4e7 kicad: fix download urls (ZHF) 2015-07-22 10:23:34 +02:00
Austin Seipp
337bd6a190 nixpkgs: verilator 3.872 -> 3.874 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-07-20 21:50:29 -05:00
Lluís Batlle i Rossell
026f09cea5 Updating gtkwave 3.3.64 to 3.3.66 2015-07-17 18:24:35 +02:00
Peter Simons
7f9cc5dc61 stellarium: build with qt5Full to fix run-time crashes 
The build with the modularized qt expression succeeded, but the resulting binary
would crash immediately, complaining about the lack of a "qt.labs.shader" module.
This patch works around that issue.
 2015-07-14 22:39:34 +02:00
Peter Simons
48f5247342 stellarium: update to version 0.13.3 2015-07-12 20:32:16 +02:00
William Casarin
8ead9cf0c5 caffe: init at rev 77d66dfc 
Initial version of the Caffe deep learning framework from Berkeley
 2015-07-08 10:07:10 -07:00
Michael Raskin
178014373e E prover: switch to the new location 2015-07-05 18:52:42 +03:00
Michael Raskin
d7dae65b5c pari: update 2.7.3 -> 2.7.4 2015-07-05 00:32:53 +03:00
vbgl
5c537f3bdd Merge pull request #8296 from vbgl/ocamlp4 
OCaml-4.02: fix ocamlbuild rules for camlp4
 2015-06-25 23:54:13 +02:00
Vincent Laporte
715f78be7e E prover: do not build the manual 2015-06-25 23:21:25 +02:00
Vincent Laporte
1d72ce49cf coq-8.3: fix (needs make 3) 2015-06-25 08:55:31 +02:00
Vincent Laporte
f7dc2df7c0 acgtk: fix build with OCaml 4.02 2015-06-25 08:55:30 +02:00
Vincent Laporte
5beebaca58 fix glsurf 2015-06-25 08:55:29 +02:00
Pascal Wittmann
cf13409313 fityk: update 1.2.9 to 1.3.0 2015-06-24 11:15:44 +02:00
laMudri
723cd518b9 hol: k.8 -> k.10, closes #8477 2015-06-24 10:04:54 +02:00
Tobias Geerinckx-Rice
655cda730d eagle 6.5.0 -> 6.6.0 
CC @bjornfor:

Version 6.5.0 has disappeared from Cadsoft's FTP site. This is the
closest version that's still available. Not extensively tested, but
works fine here.

Current version is 7.3.0. I leave that to someone more interested.
 2015-06-22 07:13:54 +02:00
Vincent Laporte
542d20384f Isabelle: fix download URL 2015-06-21 00:45:38 +02:00
Austin Seipp
a0301e9ce2 nixpkgs: saw-tools 0.1-20150609 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-06-18 11:37:51 -05:00
Michel Kuhlmann
46d46fd05a R: update to 3.2.1 2015-06-18 14:00:29 +02:00
Austin Seipp
2dfb657b94 nixpkgs: picosat 936 -> 960, add myself as a maintainer 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-06-14 19:48:12 -05:00
Austin Seipp
44ef5a3ab0 cvc4: regenerate ./configure on rebuild 
Otherwise some absurd error from ./configure crops up.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-06-14 19:48:11 -05:00
Austin Seipp
da76434dbd nixpkgs: yices 2.2.1 -> 2.3.1, now with source 
It's still under a non-commercial license, but the source build is waay
better than the binary build. Can probably work on OS X too now.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-06-14 19:48:11 -05:00
Austin Seipp
3d181a3175 nixpkgs: abc-verifier 20150406 -> 20150614 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-06-14 19:48:11 -05:00
Austin Seipp
6cfc2caaeb nixpkgs/cvc4: touchups, add myself as maintainer 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-06-14 19:48:11 -05:00
Michael Raskin
59126fb3f8 Update golly 2015-06-14 11:22:07 +03:00
Thomas Tuegel
2a2448bcb7 Merge pull request #8182 from ttuegel/openblas 
Numerical computing overhaul
 2015-06-12 08:06:03 -05:00
Thomas Tuegel
4fb98dd6a7 jags: build with openblas 2015-06-12 07:56:04 -05:00
Austin Seipp
da6eec001a nixpkgs: z3 4.3.2 -> 4.4.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-06-11 22:10:56 -05:00
Thomas Tuegel
e729a88474 R: build with openblas 
Fixes #6393.
 2015-06-04 17:42:04 -05:00
Marco
3af4c7065d Update HOL Light to svn r232 (2015-05-31) 2015-06-03 11:17:39 +02:00
Vincent Laporte
28bfbb5562 why3: update from 0.85 to 0.86.1 2015-06-01 05:57:19 +02:00
Austin Seipp
f47d22a6f1 nixpkgs: verilator 3.872 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-05-31 17:37:56 -05:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences 
And don't use square brackets on such lines.
 2015-05-28 19:20:29 +02:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix 
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
 2015-05-27 22:00:06 +02:00
Mateusz Kowalczyk
227bc88da6 Merge pull request #7991 from vbgl/gappa 
Adds gappa 1.2.0
 2015-05-26 11:14:20 +01:00
Tobias Geerinckx-Rice
7b6d9d4cff Remove arb and then-orphaned lesstif93 
Arb has been broken (and marked as such) since the removal of
GCC 4.2 in July 2014. Nothing and no-one uses it. Time to go.
 2015-05-26 11:46:41 +02:00
Vincent Laporte
9f1eb28a20 Adds gappa 1.2.0 
Gappa is a tool intended to help verifying and formally proving
properties on numerical programs dealing with floating-point or
fixed-point arithmetic.

Homepage: http://gappa.gforge.inria.fr/
 2015-05-25 19:32:09 +02:00
Tobias Geerinckx-Rice
b10cb12a93 tetgen 1.4.3 -> 1.5.0 
Keep version 1.4.3 around as `tetgen_1_4`, because the licence
changed from MIT to AGPL3+ in the meantime.
 2015-05-25 13:35:54 +02:00
Peter Simons
7d2ce8e707 qfsm: update to version 0.54.0 2015-05-23 23:04:15 +02:00
Pascal Wittmann
c944422863 lean: fixed build 2015-05-16 12:12:58 +02:00
Pascal Wittmann
9c9c586534 Fixed several "package has no version" warnings 2015-05-14 17:19:41 +02:00
Peter Simons
c1e62e9e8b maxima: update to version 5.36.1 2015-05-13 12:17:16 +02:00
Peter Simons
645b1cea6e wxmaxima: update to 15.04.0 2015-05-13 12:17:01 +02:00
Aistis Raulinaitis
4672fa43d9 z3 opt 2015-05-10 13:46:00 +02:00
William A. Kennington III
074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Peter Simons
324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Vladimír Čunát
3b9ef2c71b fix "libc}/lib" and similar references 
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
 2015-05-05 11:52:08 +02:00
William A. Kennington III
00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Joachim Fasting
bf7ad2d84f meta.description fixups 
Mostly scripted substitutions with a couple of subjective enhancements.
 2015-04-30 18:17:42 +02:00
Thomas Tuegel
1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Pascal Wittmann
f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
William A. Kennington III
d8c949cc26 Make tcl and tk versions generic 2015-04-26 21:30:01 -07:00
John Wiegley
9402a56620 coq_8_5: New expression 2015-04-26 22:29:15 -05:00
Vladimír Čunát
30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
Peter Simons
f82a287c20 R: update to 3.2.0 2015-04-17 20:02:46 +02:00
Remy Goldschmidt
de02110903 Added K Framework package. 
Closes https://github.com/NixOS/nixpkgs/pull/7419.
 2015-04-17 16:05:00 +02:00
Vincent Laporte
4b9c90c64e coq: update from 8.4pl5 to 8.4pl6 2015-04-15 07:18:08 +02:00
Thomas Tuegel
88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Aristid Breitkreuz
a7e0cb38c2 update Mathematica to 10.0.2 2015-04-09 21:53:51 +02:00
Eric Seidel
6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Austin Seipp
31f4c0c7d1 nixpkgs: abc-verifier 20140509 -> 20150406 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-06 07:57:27 -05:00
lethalman
b4824ffc5d Merge pull request #7103 from gebner/verit 
Add veriT, an SMT solver.
 2015-03-31 12:31:26 +02:00
Gabriel Ebner
20428cd90f Add veriT. 2015-03-31 09:14:38 +02:00
Ben Darwin
54dab782be twelf: fix by actually including the Twelf SML heap image in the package and referencing the SML interpreter so the smlnj package won't be gc'd 2015-03-31 01:11:57 -04:00
William A. Kennington III
fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Austin Seipp
a6813ca62d nixpkgs: add lean-20150328, a theorem prover. 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-03-28 01:47:39 -05:00
Austin Seipp
75ab87edc8 nixpkgs: z3 is now MIT licensed. 
It's also been moved to GitHub, meaning we can avoid some of the
hackiness in the original expression. This updates the Git revision, but
only so that it contains the proper license (it's otherwise equivalent
to Z3 v4.3.2)

Also, make sure the python API .py files exist besides the .pyc files.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-03-28 01:04:06 -05:00
William A. Kennington III
767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
Eric Seidel
eff828a275 z3: copy all headers into nix store 2015-03-26 13:19:41 -07:00
William A. Kennington III
2e815a7444 Merge pull request #6961 from bcdarwin/abella 
new package: abella 2.0.2
 2015-03-25 22:14:10 -07:00
Thomas Tuegel
5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Siarhei Zirukin
f4cd5a68f7 pcalc: 20120812 -> 20141224 2015-03-24 18:27:42 +01:00
Ben Darwin
172167c937 new package: abella 2.0.2 2015-03-24 00:54:03 -04:00
Peter Simons
3f7de179f5 R: update to version 3.1.3 2015-03-09 16:37:05 +01:00
Michael Raskin
0394ce7627 Update pari 2015-03-09 01:03:00 +03:00
Lluís Batlle i Rossell
aa188a27a2 Updating gtkwave to 3.3.64 2015-02-26 10:36:10 +01:00
Damien Cassou
bc58f50eab Merge pull request #6338 from DamienCassou/plm-2.5 
New package PLM: Programmer's Learning Machine
 2015-02-20 09:17:27 +01:00
Shea Levy
2f061ff16b Merge remote-tracking branch 'origin/staging' 
Darwin and haskell fixes.
 2015-02-17 13:52:37 -05:00
Marco
5f6e6b1661 Update HOL Light to r218 2015-02-17 10:23:51 +01:00
Peter Simons
600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Lluís Batlle i Rossell
569a02b725 Updating weka to 3.6.12. 
(cherry picked from commit cd417206f9)
 2015-02-13 16:22:39 +01:00
Damien Cassou
e7a161d4f2 New package PLM: Programmer's Learning Machine 2015-02-13 16:06:19 +01:00
Eric Seidel
e08b9ab8d3 kill libiconvOr* 
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
 2015-02-07 20:29:28 -08:00