Commit Graph

188 Commits

Author SHA1 Message Date
Vincent Laporte
eef4b5175f ocaml-ng.ocamlPackages_4_10.ocaml: 4.10.0+β2 → 4.10.0+rc1 2020-02-12 10:55:00 +01:00
Damien Bihel
9f64b84739 ber_metaocaml: fix install order.
Indeed, all standard modules with compiler-libs are not included (
eg. Optcompile).

closes #77680
2020-02-04 16:06:24 -06:00
Vincent Laporte
4c83d61f12 ocaml-ng.ocamlPackages_4_10.ocaml: 4.10.0+β1 → 4.10.0+β2 2020-02-02 20:35:10 +01:00
Vincent Laporte
bd5a596868 ocaml-ng.ocamlPackages_4_10.ocaml: init at 4.10.0+beta1 2020-01-20 17:46:13 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Vincent Laporte
120102de65 OCaml: optionally enable AFL support 2019-11-30 08:34:36 +00:00
Vincent Laporte
9b76c5e17a OCaml: fix configure flags for flambda support
The configure program for OCaml has been using a new set of command-line
arguments from version 4.08. This is a small refactoring to ease dealing with
the two sets.
2019-11-30 08:34:36 +00:00
Vincent Laporte
4ca445c722 ocaml-ng.ocamlPackages_latest: 4.08.1 -> 4.09.0 2019-09-27 07:45:18 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Vincent Laporte
3a4aab967b ocaml: 4.08.0 -> 4.08.1
Bugfix release.

Announcement: https://inbox.ocaml.org/caml-list/0978f74a-9b8c-e9a3-e3a1-c110af4a2f04@inria.fr/T/#u
2019-08-13 12:37:56 +00:00
Vincent Laporte
d2c3c1f2bb ocaml-ng.ocamlPackages_4_08: 4.08.0+rc2 -> 4.08.0 2019-07-10 05:26:42 +00:00
Vincent Laporte
bfef52d95f ocaml-ng.ocamlPackages_4_08.ocaml: 4.08.0+rc1 -> 4.08.0+rc2 2019-06-14 06:53:34 +00:00
Vincent Laporte
ad31729226 ocaml-ng.ocamlPackages_4_08.ocaml: 4.08.0+beta3 -> 4.08.0+rc1 2019-06-03 12:13:14 +02:00
Vincent Laporte
ce714f2b04 ocaml: 4.08.0+beta2 -> 4.08.0+beta3 2019-04-25 08:45:57 +02:00
Vincent Laporte
6e4b622cb4 ocaml: 4.08.0+beta1 -> 4.08.0+beta2 2019-03-12 18:01:36 +01:00
Vincent Laporte
390ed4a626 ocaml-4.08: disable “strictoverflow” hardening 2019-02-19 09:44:04 +01:00
Vincent Laporte
1753b20648 ocaml: init at 4.08.0+beta1 2019-02-19 09:44:04 +01:00
Lengyel Balazs
f4a53ff3bc treewide/xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
Vincent Laporte
585b741cb7 ocaml: fix build when X11 is not available 2018-12-17 17:46:46 +00:00
Austin Seipp
3e6abb633c ber_metaocaml: cleanup, tweaks
This puts MetaOCaml on more equal footing with the normal OCaml
packages, which have a few passthru's and expect to have more 'meta'
information available (such as 'platforms').

With these changes, you can use the ber_metaocaml package along with
ocaml-ng.mkOcamlPackages in order to create a full package set with
Native MetaOCaml support, though this currently isn't implemented (you
have to do this yourself).

There are also other light cleanups, for example this also removes the
old MIPS support and restricts the platforms to x86 Linux/Darwin, for
now. Other platforms can be added on a case-by-case basis.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-12-14 11:46:17 -06:00
Austin Seipp
7676dc7b9b ber_metaocaml: 104 -> 107
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-11-08 13:37:07 -06:00
Vincent Laporte
0a24919923 ocamlPackages_latest.ocaml: 4.07.0 -> 4.07.1 2018-10-30 20:33:28 +00:00
Vincent Laporte
ce03af969e ocaml ≤ 4.05: mark as broken on Aarch64 (#47010) 2018-09-20 21:18:28 +02:00
Vincent Laporte
4f3868b72d
ocaml ≤ 4.05: mark as broken on Aarch64 2018-09-15 13:17:12 +00:00
Vincent Laporte
6ca8f06b5b ocaml-4.07: 4.07.0+rc1 -> 4.07.0 2018-07-23 07:24:25 +00:00
volth
6d2857a311 [bot] treewide: remove unused 'inherit' in let blocks 2018-07-20 19:38:19 +00:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Vincent Laporte
f73859a068 ocaml: 4.07.0+beta2 -> 4.07.0+rc1 (#42257) 2018-06-24 19:43:04 +02:00
John Ericson
ba52ae5048 treewide: isArm -> isAarch32
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile
2018-04-25 15:28:55 -04:00
Vincent Laporte
5c4ee2a3ab ocaml: init at 4.07.0+beta2 2018-04-25 18:19:57 +02:00
Vincent Laporte
504bf92ee2 ocaml: 4.06.0 -> 4.06.1 2018-03-01 14:57:06 +01:00
Vincent Laporte
efcb39233d ocaml: adds an argument to enable flambda 2017-12-29 10:49:13 +01:00
Matthew Pickering
9a072a466c Remove broken ber-metaocaml-003 attribute 2017-12-09 12:18:06 +00:00
Matthew Pickering
08dfb95673 ber_metaocaml: (re)init at 104 2017-12-09 12:18:05 +00:00
Vincent Laporte
4f7c0aed38
ocaml: init at 4.06.0 2017-11-03 22:51:27 +00:00
davidak
3270aa896b replace "Mac OS X" and "OS X" with "macOS"
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
2017-08-07 21:41:30 +02:00
Vincent Laporte
bd7bf33814 ocaml: init at 4.05.0 2017-07-13 17:58:24 +00:00
Vincent Laporte
ff24bf1fb6 ocaml: 4.04.1 -> 4.04.2 2017-07-08 12:22:55 +02:00
Vincent Laporte
2230009e7d ocaml: 4.04.0 -> 4.04.1 2017-04-18 17:19:16 +00:00
Pascal Wittmann
2352099a96
ocaml-4.04: dont strip to obtain a working compiler 2017-02-03 22:12:53 +01:00
Vincent Laporte
82ab1f8408 ocaml: fix the meta.branch attribute 2017-01-24 21:13:00 +00:00
Vincent Laporte
ae047510bf ocaml: init at 4.04 2017-01-24 21:13:00 +00:00
Kirill Boltaev
ea171c39d7 metaocaml_3_09: mark as broken 2016-09-26 02:36:49 +03:00
Kirill Boltaev
3fbc40b377 ber_metaocaml_003: mark as broken 2016-09-26 02:36:49 +03:00
Kirill Boltaev
e61663a233 treewide: move to ocaml-ng system 2016-09-26 02:36:49 +03:00
Théophane Hufschmitt
acc608d88e ocaml_4_02 : Fix src
#08b85f5f9917cad7 introduced a wrong src url for ocaml 4.02 (and thus
  broke a lot of stuff),
  This restores the correct url.
2016-09-23 21:47:42 +02:00
Joachim F
ac8206e31d Merge pull request #17147 from regnat/ocamlUpdates
ocamlPackages : update some packages
2016-09-23 19:55:10 +02:00
Chris Martin
6f32f2cc25 ocaml 3.08.0: md5->sha256 2016-09-10 13:56:04 -04:00
Tuomas Tynkkynen
3364230d56 Disable bunch of non-compiling packages on Darwin
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.

softether_4_18              2015-09-20  http://hydra.nixos.org/build/39418483
lensfun                     2014-09-30  http://hydra.nixos.org/build/39394104
net_snmp                    2015-09-20  http://hydra.nixos.org/build/39410553
djview                      2015-08-11  http://hydra.nixos.org/build/39413233
libmusicbrainz2             2015-09-20  http://hydra.nixos.org/build/39410106
fox_1_6                     2014-05-07  http://hydra.nixos.org/build/39410858
libofx                      2015-09-24  http://hydra.nixos.org/build/39423507
yacas                       2014-09-30  http://hydra.nixos.org/build/39393150
iomelt                      2014-09-30  http://hydra.nixos.org/build/39408486
softether                   2015-09-20  http://hydra.nixos.org/build/39425800
mp4v2                       2014-09-30  http://hydra.nixos.org/build/39421899
virtuoso7                   2014-09-21  http://hydra.nixos.org/build/39415206
man_db                      2015-04-23  http://hydra.nixos.org/build/39404236
libdiscid                   2014-09-30  http://hydra.nixos.org/build/39412202
zabbix22.agent              2014-09-21  http://hydra.nixos.org/build/39412149
vidalia                     2015-08-06  http://hydra.nixos.org/build/39411500
libmtp                      2015-09-20  http://hydra.nixos.org/build/39419199
wxGTK29                     2015-09-20  http://hydra.nixos.org/build/39415296
ncmpcpp                     2015-11-06  http://hydra.nixos.org/build/39404455
libtorrent                  2014-09-21  http://hydra.nixos.org/build/39394646
shishi                      2014-03-21  http://hydra.nixos.org/build/39418874
ocaml_3_12_1                2014-09-30  http://hydra.nixos.org/build/39392996
djview4                     2015-08-11  http://hydra.nixos.org/build/39427799
vimNox                      2014-05-23  http://hydra.nixos.org/build/39397012
ttfautohint                 2015-08-06  http://hydra.nixos.org/build/39398330
libraw                      2015-09-24  http://hydra.nixos.org/build/39402271
wxGTK30                     2015-09-20  http://hydra.nixos.org/build/39401871
sbcl_1_2_5                  2015-09-20  http://hydra.nixos.org/build/39426091
prover9                     2014-09-30  http://hydra.nixos.org/build/39406476
rcs                         2015-08-25  http://hydra.nixos.org/build/39392037
gpac                        2015-09-24  http://hydra.nixos.org/build/39399470
virtuoso6                   2014-09-30  http://hydra.nixos.org/build/39398651
xlslib                      2015-09-24  http://hydra.nixos.org/build/39410387
ucommon                     2015-03-27  http://hydra.nixos.org/build/39414040
commoncpp2                  2014-09-30  http://hydra.nixos.org/build/39420117
virtuoso                    2014-09-21  http://hydra.nixos.org/build/39399978
miniHttpd                   2014-09-30  http://hydra.nixos.org/build/39392925
mpack                       2014-09-26  http://hydra.nixos.org/build/39399535
nbd                         2014-09-26  http://hydra.nixos.org/build/39401367
newsbeuter-dev              2014-07-29  http://hydra.nixos.org/build/39406259
gimp_2_8                    2015-09-20  http://hydra.nixos.org/build/39436271
gimp                        2015-09-20  http://hydra.nixos.org/build/39435976
zabbix20.agent              2014-09-30  http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good  2015-09-20  http://hydra.nixos.org/build/39408506
ocaml_4_00_1                2014-09-30  http://hydra.nixos.org/build/39399526
inadyn                      2014-09-30  http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad   2015-09-20  http://hydra.nixos.org/build/39392970
zabbix.agent                2014-09-30  http://hydra.nixos.org/build/39421412
cmake-2_8                   2015-09-24  http://hydra.nixos.org/build/39399443
liblastfm                   2015-08-06  http://hydra.nixos.org/build/39421812
newsbeuter                  2014-07-29  http://hydra.nixos.org/build/39396605
sdcv                        2014-09-26  http://hydra.nixos.org/build/39412928
2016-09-01 20:39:33 +03:00
Théophane Hufschmitt
08b85f5f99 ocaml : add 4.03 compiler 2016-08-19 19:07:30 +02:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Vincent Laporte
a3fa690fa2 ocaml: add local copy of the ocamlbuild patch 2015-11-28 09:48:55 +01:00
Vincent Laporte
9fa9c87485 ocaml: 4.02.2 -> 4.02.3 2015-10-03 08:26:42 +02:00
Vincent Laporte
67e38dfe23 ocaml: 4.02.1 -> 4.02.2 2015-10-03 08:26:42 +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
Vincent Laporte
d440059e7d OCaml-4.02: fix ocamlbuild
This addresses the issue described at http://caml.inria.fr/mantis/view.php?id=6605
2015-06-25 08:55:28 +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
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Maciek Starzyk
f72c460abf ocaml: 4.02.0 -> 4.02.1 2014-11-08 23:15:53 +01:00
Luca Bruno
83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Vincent Laporte
3d049938c8 Adds some “branch” meta-data 2014-11-06 19:40:50 +00:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Vincent Bernardoff
259bbdd5e4 Added OCaml release 4.02.0.
Closes #4197
2014-09-22 20:13:32 +01:00
Eric Seidel
0577499d74 fix some packages on darwin 2014-09-09 13:54:26 -07:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Vladimír Čunát
08f5932729 ocaml: refactor the useX11 check to actually work 2014-08-12 21:53:02 +02:00
Vladimír Čunát
141b5d961f Merge master into PR
Conflicts:
	pkgs/development/compilers/ocaml/4.01.0.nix
2014-08-12 21:52:20 +02:00
drozv
33fec9d04d ocaml: fix x11 include and lib parameters for configure script
Close #2923, fixes #2922.
2014-08-12 21:41:37 +02:00
Florent Becker
c59819311c Make x11 optionnal for ocaml 2014-07-21 11:27:09 +02:00
drozv
29d5629074 Fix x11 include and lib parameters for configure script. 2014-07-21 11:13:45 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Eelco Dolstra
e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01:00
Malcolm Matalka
ab744d2053 Add Ocaml 4.01.0.
Close #1065.
2013-10-19 18:07:20 +03:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Marco Maggesi
e32567bcf7 OCaml 4.00.1 2012-10-09 14:03:12 -04:00
Lluis Batlle
839f124ba1 ocaml: native code building for ARM on 3.12 and 4.00
I think it already works. I'll test more throughly tomorrow.
2012-09-25 19:38:06 +02:00
Arie Middelkoop
5bc99bc883 Adds Ocaml 4.00.0 (first attempt)
Bumps Findlib to 1.3.3 (required for ocaml 4.00)
2012-07-31 14:09:27 +02:00
Lluís Batlle i Rossell
c0832627c4 ocaml, unison: make them build on mips (native compilers)
I switch off the build of ocaml compilers to native code, and add
a 'passthru' that unison can use to see if it needs to call the native
or the bytecode compiler.
2012-07-27 22:43:40 +02:00
Marco Maggesi
cadc02cb2b Fix build of ocaml 3.12.1 on darwin
svn path=/nixpkgs/trunk/; revision=34373
2012-06-06 20:44:11 +00:00
Nicolas Pierron
82b308bf11 Add armv7l support.
svn path=/nixpkgs/trunk/; revision=33798
2012-04-15 23:41:25 +00:00
Arie Middelkoop
797c0f86fa Recovered OCaml 3.11 by using version 3.11.2 and a patch from ocaml's bugtracker.
svn path=/nixpkgs/trunk/; revision=33399
2012-03-24 22:59:08 +00:00
Eelco Dolstra
0922e0fb71 * Remove ocaml 3.11.1. It doesn't build anymore and isn't used anywhere.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32403
2012-02-19 17:12:37 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Russell O'Connor
83452ba0ab adding two versions of metaocaml
svn path=/nixpkgs/trunk/; revision=31026
2011-12-21 21:51:35 +00:00
Marco Maggesi
9819d7b26a Update OCaml 3.12.0 to 3.12.1
svn path=/nixpkgs/trunk/; revision=30923
2011-12-16 08:11:19 +00:00
Marco Maggesi
a3b617c8e3 Add platforms to OCaml 3.12.0
svn path=/nixpkgs/trunk/; revision=27298
2011-05-24 18:05:05 +00:00
Marco Maggesi
f2f1009d98 * Fix building of OCaml on Darwin. Gnu sed changed its behavior after version 4.2.1 (bug?), here we add a simple workaround
svn path=/nixpkgs/trunk/; revision=25330
2011-01-01 17:26:07 +00:00
Lluís Batlle i Rossell
b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Marco Maggesi
86e19c4888 * Narrow ocaml platforms to linux and darwin
svn path=/nixpkgs/trunk/; revision=25062
2010-12-11 14:29:37 +00:00
Lluís Batlle i Rossell
ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Marco Maggesi
9568a1bc80 * Enable hydra compilation for ocaml 3.11.1 (error in the previous commit)
svn path=/nixpkgs/trunk/; revision=25043
2010-12-09 15:44:05 +00:00
Marco Maggesi
7b49a49cbb * Enable hydra compilation for ocaml 3.11.1
svn path=/nixpkgs/trunk/; revision=25042
2010-12-09 15:41:14 +00:00
Marco Maggesi
114fa21c48 * Add ocaml 3.12.0
svn path=/nixpkgs/trunk/; revision=25040
2010-12-09 14:03:13 +00:00
Lluís Batlle i Rossell
a95eb06e26 Updating the patch for ocaml on mips.
Reported by rixed@happyleptic.org

svn path=/nixpkgs/branches/stdenv-updates/; revision=24476
2010-10-25 21:13:05 +00:00