Skip to content

Ocsigen#2930

Closed
FlorentBecker wants to merge 19 commits intoNixOS:masterfrom
FlorentBecker:ocsigen
Closed

Ocsigen#2930
FlorentBecker wants to merge 19 commits intoNixOS:masterfrom
FlorentBecker:ocsigen

Conversation

@FlorentBecker
Copy link
Copy Markdown
Contributor

@FlorentBecker FlorentBecker commented Jun 13, 2014

Adds a bunch of derivations in ocaml-land to get a working eliom framework (http://ocsigen.org). The ocsigenserver webserver is not nixosified yet.

@FlorentBecker
Copy link
Copy Markdown
Contributor Author

FlorentBecker commented Jun 15, 2014

This needs to be rebased over #2923

FlorentBecker and others added 17 commits July 21, 2014 10:56
@FlorentBecker
Update ocaml-pcre to version 7.1.1
d1bbd56
@drozv @FlorentBecker
Fix x11 include and lib parameters for configure script.
29d5629
@FlorentBecker
Make x11 optionnal for ocaml
c598193
@FlorentBecker
Add a derivation for ocaml-text
31cd2ac
@FlorentBecker
Add myself to the maintainer list
b8e5ea3
@FlorentBecker
Update ocaml-react to 1.1.0
32a3946
@FlorentBecker
Update ocaml_lwt to version 2.4.5 (from git)
0a0e24f
@FlorentBecker
Use propagated inputs in lwt
43249a5
@FlorentBecker
Add a derivation for ocaml-calendar
2aa449e
@FlorentBecker
Add a derivation for ocaml-optcomp
591b7ed
@FlorentBecker
Add a derivation for deriving (ocaml instance derivation à la Haskell)
ad76e35
@FlorentBecker
add ocaml-ipaddr
ab5cf7e
@FlorentBecker
Add a derivation for js_of_ocaml
a6ab2bf
@FlorentBecker
Reexport ocaml data notation in the ocaml-oasis derivation
7be3819
@FlorentBecker
Add tyxml (XML library for ocaml)
3bc70a7
@FlorentBecker
Add a derivation for the ocsigen server (ocaml webserver)
4a05127
@FlorentBecker
Add a derivation for eliom (ocaml web framework)
1b579d0
@FlorentBecker
Copy link
Copy Markdown
Contributor Author

FlorentBecker commented Jul 21, 2014

done (though it's now rebased over #3330 instead)

@vcunat
Copy link
Copy Markdown
Member

vcunat commented Aug 12, 2014

  • It would be nicer if the new meta.license records were from stdenv.lib.licenses (and more precise, as in the case of "LGPL").
  • ocsigen-deriving is missing version (presumably 0.6.2 by the tag).

Otherwise it seems fine to me.

@7c6f434c
Copy link
Copy Markdown
Member

7c6f434c commented Sep 3, 2014

@FlorentBecker: which commits from this PR are not yet applied? I tried to do git am and found that most are.

@FlorentBecker
Copy link
Copy Markdown
Contributor Author

FlorentBecker commented Sep 5, 2014

They are applied until 43249a5, ocaml-calendar and onwards are new.

@7c6f434c
Copy link
Copy Markdown
Member

7c6f434c commented Sep 6, 2014

Merged most of this. Please add meta for eliom and ocaml-ipaddr. Please recheck ocsigenserver license.

@7c6f434c
Copy link
Copy Markdown
Member

7c6f434c commented Sep 15, 2014

@FlorentBecker So, is the ocsigenserver license correct?

@FlorentBecker
Copy link
Copy Markdown
Contributor Author

FlorentBecker commented Sep 16, 2014

yes it is correct.

@7c6f434c 7c6f434c closed this Sep 18, 2014
@7c6f434c
Copy link
Copy Markdown
Member

7c6f434c commented Sep 18, 2014

I think meta for eliom can be added separately…

@FlorentBecker FlorentBecker deleted the ocsigen branch October 20, 2016 08:01
@Janik-Haag Janik-Haag added the 12.first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023
@shaynekellyii shaynekellyii mentioned this pull request Feb 11, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

9.needs: reporter feedback This issue needs the person who filed it to respond 12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@FlorentBecker @vcunat @7c6f434c @Janik-Haag @drozv