1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-14 00:25:24 +00:00
Commit graph

435 commits

Author SHA1 Message Date
Mario Rodas 1b1f9584e5
dune_2: init at 2.1.0
Changelog:
- https://github.com/ocaml/dune/releases/tag/2.0.0
- https://github.com/ocaml/dune/releases/tag/2.0.1
- https://github.com/ocaml/dune/releases/tag/2.1.0
2019-12-21 10:03:41 -05:00
Mario Rodas 86d06ee968
ocamlPackages.utop: use buildDunePackage 2019-12-18 04:23:00 -05:00
Mario Rodas d07842589d
ocamlPackages.ocp-index: use buildDunePackage 2019-12-18 04:22:00 -05:00
Mario Rodas 000f19ff08
ocamlPackages.cppo: 1.6.5 -> 1.6.6 2019-11-27 04:20:00 -05:00
Vincent Laporte 788148f93c ocaml-top: 1.1.5 → 1.2.0-rc 2019-12-15 08:11:56 +01:00
Vincent Laporte 2cf477f28d ocamlPackages.merlin: 3.3.2 → 3.3.3 2019-12-11 09:58:21 +01:00
Théo Zimmermann d1685e81ef ocamlformat: 0.11.0 -> 0.12 2019-12-09 15:08:07 +01:00
Vincent Laporte 7132e6b573 ocaml-crunch: init at 3.1.0 2019-12-06 06:17:14 +00:00
Matthew Bauer 0505c5125c
Merge branch 'master' into static-fixes 2019-12-02 13:34:24 -05:00
Alexander Bantyev 81ca7cc0a7
js_of_ocaml: fix dependencies 2019-11-26 18:03:50 +03:00
Frederik Rietdijk be7125dde7 Merge master into staging-next 2019-11-16 11:45:07 +01:00
c0bw3b 9367367dfd Treewide: fix URL permanent redirects
Permanent redirects on homepages and/or source URLs
as reported by Repology
2019-11-16 01:41:23 +01:00
John Ericson bca2e8255e treewide: CAML_LD_LIBRARY_PATH may be undefined 2019-11-14 13:44:07 -05:00
Frederik Rietdijk c6e31d0767 Merge master into staging-next 2019-11-14 13:31:39 +01:00
Théo Zimmermann 72ef651f55
ocamlPackages.utop: fix source
By using the provided tbz file instead of the auto-generated GitHub
tarball, we ensure that strings like %%VERSION%% have been properly
generated.
2019-11-12 13:24:44 +01:00
Frederik Rietdijk 73b88e17dd Merge staging-next into staging 2019-11-11 12:09:26 +01:00
Yorick van Pelt 4550405ac9
ocaml-modules: replace buildInputs with nativeBuildInputs where appropriate
The default has been to use buildInputs for build dependencies.
This doesn't work when cross-compiling.
2019-11-11 11:10:14 +03:00
John Ericson f7fdc997bf Merge commit 'afa48f16f265fd3e88073bca7929e1e103bd3dc3' into bash-no-undef-vars 2019-11-08 13:58:27 -05:00
John Ericson 6fb526b32c findlib setup hook: createFindlibDestdir may not be defined 2019-11-08 13:28:59 -05:00
John Ericson 67cc85ec67 OCaml findlib: OCAMLPATH could be undefined 2019-11-08 13:24:20 -05:00
Matthew Bauer 5ebd36403e
Merge pull request #70641 from maggesi/rename-z77z-into-maggesi
Rename z77z into maggesi
2019-11-07 17:18:20 -05:00
Vincent Laporte a2f7fc9a5c ocamlPackages.ocp-indent: 1.7.0 → 1.8.1 2019-11-04 07:32:17 +00:00
John Ericson 2811b032d6 treewide: Make still dont* Variables are optional in most cases
Go beyond the obvious setup hooks now, with a bit of sed, with a skipped case:

 - cc-wrapper's `dontlink`, because it already is handled.

Also, in nix files escaping was manually added.

EMP
2019-11-01 14:44:44 -04:00
Vincent Laporte 0361ae2230 ocamlPackages.camlp4: fix evaluation for OCaml ≥ 4.09 2019-10-25 07:09:42 +00:00
Marco Maggesi 24d0bd37b5
Merge branch 'master' into rename-z77z-into-maggesi 2019-10-13 18:06:23 +02:00
Mario Rodas 5e716c80f2 dune: 1.11.3 -> 1.11.4
Changelog: https://github.com/ocaml/dune/releases/tag/1.11.4
2019-10-11 12:10:18 +02:00
Marco Maggesi ff1ed720e2 Rename z77z into maggesi
Make the "handle" of the maintainer match the name of the github account.
Also update the email address.
2019-10-07 17:05:25 +02:00
Vincent Laporte 348c8947e0 ocamlPackages.utop: 2.4.1 → 2.4.2
Ensures compatibility with OCaml 4.09
2019-09-26 17:27:11 +00:00
Jörg Thalheim 94bd708252
Merge pull request #69337 from vbgl/ocamlformat-0.11.0
ocamlformat: 0.8 → 0.11.0
2019-09-24 10:54:25 +01:00
Vincent Laporte 9c427a0c1e
ocamlformat: 0.8 → 0.11.0 2019-09-24 05:53:06 +00:00
Vincent Laporte 0c0e63d211
ocamlPackages.camlp5: 7.08 → 7.10 2019-09-21 03:35:39 +00:00
Vincent Laporte 5fed98e862 ocamlPackages.js_of_ocaml*: 3.3.0 -> 3.4.0
Ensures compatibility with OCaml 4.08
2019-09-14 06:54:35 +00:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Frederik Rietdijk ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Vincent Laporte f7387ad383 ocamlPackages.utop: 2.3.0 -> 2.4.1
ocamlPackages.zed: 1.6 -> 2.0.3

ocamlPackages.lambdaTerm: 1.13 -> 2.0.2
2019-08-28 06:36:57 +00:00
Frederik Rietdijk 5061fe0c2c Merge staging-next into staging 2019-08-28 08:26:42 +02:00
volth 35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Mario Rodas f7c9670cd8 dune: add marsam as maintainer 2019-08-23 12:33:38 +00:00
Mario Rodas 2898679f15 dune: 1.11.1 -> 1.11.3 2019-08-23 12:33:38 +00:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +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 957a0ae2a7 ocamlPackages.camlp5: 7.07 -> 7.08 2019-08-12 14:36:38 +00:00
Mario Rodas 246c223e87 dune: 1.11.0 -> 1.11.1 2019-08-09 11:45:38 +00:00
Jon 62a916defd ocamlPackages_latest.camlp4: init at 4.08+1 (#66343) 2019-08-09 06:40:59 +00:00
Vincent Laporte 0a477846af ocamlPackages.findlib: 1.8.0 -> 1.8.1
Also remove unused legacy version 1.7.3
2019-08-07 12:26:34 +00:00
Vincent Laporte c75b84a7c4 dune: disable for OCaml < 4.02 2019-07-30 16:18:39 +00:00
Mario Rodas 236d744df7 dune: 1.10.0 -> 1.11.0 2019-07-24 15:20:40 +00:00
Mario Rodas d3a5c2a114
Merge pull request #64790 from marsam/update-opam
opam: 2.0.4 -> 2.0.5
2019-07-15 21:00:38 -05:00
Mario Rodas f9843befd1 ocamlPackages.merlin: 3.3.1 -> 3.3.2 2019-07-15 16:11:22 +02:00
Mario Rodas a61db6075f
opam: 2.0.4 -> 2.0.5 2019-07-15 04:20:00 -05:00
Mario Rodas 88c2586958 dune: 1.9.2 -> 1.10.0 (#62256)
* dune: 1.9.2 -> 1.10.0

* ocamlPackages.camomile: use jbuilder executable

* ocamlPackages.sqlexpr: fix build

* ocamlPackages.lwt_camlp4: fix build
2019-07-05 12:28:06 +00:00
Mario Rodas 4f7a080f48
ocamlPackages.merlin: 3.3.0 -> 3.3.1 2019-06-17 10:20:00 -05:00
Mario Rodas ddaf94d804 ocamlPackages.merlin: 3.2.2 -> 3.3.0 2019-06-03 17:13:37 +02:00
R. RyanTM 388300b6fb ocsigen-i18n: 3.1.0 -> 3.4.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ocsigen-i18n/versions
2019-05-22 01:05:27 -07:00
R. RyanTM 569aff03ab dune: 1.9.1 -> 1.9.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dune/versions
2019-05-04 22:54:09 -07:00
Vincent Laporte 2406c06ae0 ocamlPackages.tyxml: 4.2.0 -> 4.3.0
ocamlPackages.eliom: 6.4.0 -> 6.7.0
ocamlPackages.js_of_ocaml: 3.2.1 -> 3.3.0
2019-04-28 17:42:36 +02:00
Daniel Schaefer bac4d95aa2 treewide: Change URLs to HTTPS
Lots of URLs were HTTP redirect to HTTPS. Changed those and checked them
if there's actual content. Inspired by
https://github.com/NixOS/nixpkgs/issues/60004
2019-04-22 10:19:54 +02:00
Bas van Dijk ced565b3d3
Merge pull request #59606 from vbgl/dune-1.9.1
dune: 1.9.0 -> 1.9.1
2019-04-16 11:37:32 +02:00
Mario Rodas a5a56e516c opam: 2.0.2 -> 2.0.4 2019-04-16 11:15:28 +02:00
Vincent Laporte f3982b644a
dune: 1.9.0 -> 1.9.1 2019-04-16 08:30:26 +00:00
Théo Zimmermann fdcce208ab
dune: 1.8.2 -> 1.9.0 2019-04-10 14:39:07 +02:00
Vincent Laporte 0c0954781e ocamlPackages.camlp5: remove legacy version (7.06) 2019-04-06 11:03:29 +02:00
Silvan Mosberger b92431831e
Merge pull request #57346 from r-ryantm/auto-update/opaline
opaline: 0.3.1 -> 0.3.2
2019-03-28 20:37:31 +01:00
Vincent Laporte 7a2426ca77 dune: move into ocamlPackages 2019-03-26 14:17:50 +01:00
Sarah Brofeldt a7a4fc2efe
Merge pull request #57118 from umazalakain/opam-nix-user-path
opam: put the whole /nix in OPAM_USER_PATH_RO
2019-03-23 20:58:38 +01:00
Vincent Laporte 9af5a9a595
dune: 1.6.2 -> 1.8.2 2019-03-18 04:43:01 +00:00
Vincent Laporte ff43f0a7b5 ocamlPackages.ocp-index: 1.1.8 -> 1.1.9 2019-03-18 05:39:11 +01:00
R. RyanTM fe83591d68 opaline: 0.3.1 -> 0.3.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/opaline/versions
2019-03-11 00:29:40 -07:00
Uma Zalakain 83e6a1c996
opam: put the whole /nix in OPAM_USER_PATH_RO
Some symlinks point to /nix/var/profiles/per-user/…, these have be
readable too.
2019-03-11 01:02:43 +01:00
Vincent Laporte 6c614a626e
obelisk: 0.3.0 -> 0.4.0 2019-03-04 16:01:00 +00:00
Vincent Laporte 0379e97193 ocamlPackages.ocamlbuild: 0.12.0 -> 0.14.0 2019-03-03 10:57:18 +01:00
Vincent Laporte 74d519b234
ocamlPackages.utop: disable for OCaml ≤ 4.02 2019-02-22 17:04:57 +00:00
Ryan Mulligan 64b05b8733
Merge pull request #55236 from r-ryantm/auto-update/utop
ocamlPackages.utop: 2.2.0 -> 2.3.0
2019-02-15 07:10:53 -08:00
R. RyanTM 3e70c0b4e2 ocamlPackages.cppo: 1.6.4 -> 1.6.5
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cppo/versions
2019-02-10 19:05:09 +01:00
Vincent Laporte f833a3e881 ocamlPackages.ocp-index: 1.1.7 -> 1.1.8 2019-02-08 07:35:52 +01:00
R. RyanTM c9a28dcaa6 ocamlPackages.utop: 2.2.0 -> 2.3.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/utop/versions
2019-02-04 14:59:21 -08:00
Yucheng Zhang 1f433e51b6 opam: 2.0.0 -> 2.0.2 2019-01-25 12:15:16 +08:00
Vincent Laporte a18ac72b4a
ocamlPackages.ocp-indent: 1.6.1 -> 1.7.0 2019-01-09 16:37:39 +00:00
Théo Zimmermann 958a6c6dd3 dune: 1.5.1 -> 1.6.2 2018-12-13 17:39:28 +00:00
c0bw3b dd3e576654 Treewide: use https for src.fedoraproject.org 2018-11-24 23:53:27 +01:00
Vincent Laporte e481df83b1 ocamlPackages.camlp5: 7.06 -> 7.07
Keeping the legacy (7.06) version around, needed by hol_light
2018-11-21 05:59:49 +00:00
Vincent Laporte 60907c7a6f ocamlPackages.ocp-index: 1.1.6 -> 1.1.7 2018-11-20 07:50:57 +00:00
Mario Rodas 2e89de61c5 dune: 1.4.0 -> 1.5.0 (#49848)
* dune: 1.4.0 -> 1.5.1

* reason: use dune installPhase
2018-11-09 12:26:18 +00:00
Théo Zimmermann 794158fcd5
buildDunePackage: new support function; use it to refactor some OCaml derivations 2018-11-07 10:08:03 +01:00
R. RyanTM baa4483a65 ocamlPackages.merlin: 3.2.1 -> 3.2.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/merlin/versions
2018-10-27 06:24:22 -07:00
Timo Kaufmann eb3240f112
Revert "ocamlPackages.ocamlbuild: 0.12.0 -> 0.13.0" 2018-10-25 09:40:39 +02:00
Théo Zimmermann cea4806bc5 ocamlformat: init at 0.8 2018-10-23 14:22:59 +00:00
Timo Kaufmann dd00db3c63
Merge pull request #46992 from r-ryantm/auto-update/ocamlbuild
ocamlPackages.ocamlbuild: 0.12.0 -> 0.13.0
2018-10-20 23:12:04 +02:00
R. RyanTM 82b925c0d4 dune: 1.3.0 -> 1.4.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dune/versions
2018-10-16 00:21:05 -07:00
Vincent Laporte 1c7c1be1a8 ocamlPackages.merlin: 3.1.0 -> 3.2.1 2018-10-10 17:15:45 +00:00
Théo Zimmermann cf1f8b2d04
camlp5: remove old version 5.15 2018-10-08 21:09:59 +02:00
Vincent Laporte d4ba6c0bc4
dune: 1.2.1 -> 1.3.0 2018-09-27 07:33:59 +00:00
Théo Zimmermann d1b97bcbe8
dune: 1.1.1 -> 1.2.1 2018-09-22 16:11:34 +00:00
R. RyanTM d8178831b0 ocamlPackages.ocamlbuild: 0.12.0 -> 0.13.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ocamlbuild/versions
2018-09-20 07:53:11 -07:00
R. RyanTM c9a8631201 ocamlPackages.js_of_ocaml: 3.2.0 -> 3.2.1 (#46263)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
js_of_ocaml
2018-09-18 18:10:42 +02:00
Vincent Laporte fc19401d67 jbuilder: 1.0.1 -> dune: 1.1.1 2018-09-15 19:32:32 +00:00
xplat 3fc7c5b591 opam: 1.2.2 -> 2.0.0 (#45806) 2018-09-06 19:18:34 +02:00