mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 22:20:51 +00:00
Code Issues Wiki Activity
53637 commits 339 branches 124 tags 6.9 GiB
Commit graph

196 commits

Author SHA1 Message Date
Vincent Laporte 9f82cc2684 ocaml-cil: update from 1.3.2 to 1.7.3 2014-11-22 22:51:04 +00:00
Vincent Laporte f9432af1e2 ocaml-cmdliner: update from 0.9.5 to 0.9.6 2014-11-18 14:34:08 +00:00
Vincent Laporte 099d145590 Adds ocaml-camlpdf-1.7.2 
OCaml library for reading, writing and modifying PDF files

Homepage: https://github.com/johnwhitington/camlpdf
 2014-11-16 08:42:55 +00:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
 2014-11-11 23:48:08 +01:00
Vincent Laporte 9bfa208621 ocaml-sqlite3: update from 2.0.4 to 2.0.7 2014-11-11 20:08:37 +00:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Vincent Laporte 83e376e4bb ocsigen-deriving: adds dependency to camlp4 2014-11-09 01:49:37 +00:00
Vincent Laporte cac51e4e09 ocaml-optcomp: adds dependency to camlp4 2014-11-09 01:49:37 +00: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 f895d68c90 ocaml-http: update from 0.1.3 to 0.1.5 2014-11-08 07:26:03 +00:00
Vincent Laporte 2f38372f73 ocamlnet: update from 3.7.6 to 3.7.7 2014-11-08 07:19:40 +00:00
Vincent Laporte fbbd88017f zarith: propagate build input gmp 2014-11-07 09:50:39 +00: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
Vladimír Čunát 52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
Vincent Laporte ca9097335d lablgtk: update from 2.18.2 to 2.18.3 2014-11-04 16:58:29 +00:00
Michael Raskin c874dc7d9d Merge pull request #4517 from FlorentBecker/eliom 
ocsigen 2014-10
 2014-11-04 12:41:59 +03:00
Vincent Laporte e4655f0b45 ocaml-lwt: fixes build with OCaml 3.12 and 4.02 2014-11-03 21:55:35 +00:00
cillianderoiste 926cffa400 Merge pull request #4731 from jirkamarsik/vg 
Added ocaml-vg-0.8.1 and deps ocaml-otfm-0.2.0 and ocaml-gg-0.9.0
 2014-11-03 13:59:26 +01:00
Vladimír Čunát ed867a50eb iconv: remove usage on Linux in several packages 
This fixes builds after #4419. Thanks to @vbgl for the original commit;
I changed that as I'm not sure whether passing null values to buildInputs is clean.

CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
 2014-11-03 12:58:54 +01:00
Peter Simons a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
Vincent Laporte c216448075 camlimages: update from 4.0.1 to 4.1.2 
Previous version 4.0.1 is kept for OCaml 3.12
 2014-11-01 08:37:40 +00:00
cillianderoiste b73816d26b Merge pull request #4751 from jirkamarsik/ocaml-cairo2 
Added ocaml-cairo2-0.4.6
 2014-10-31 14:33:23 +01:00
Jirka Marsik 257f629c1e Added ocaml-cairo2-0.4.6 2014-10-31 14:14:17 +01:00
Peter Simons b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00
Jirka Marsik d9f0e16883 Added ocaml-vg-0.8.1 2014-10-29 21:15:50 +01:00
Jirka Marsik 0832152742 ocaml-uutf as propagatedBuildInput of ocaml-otfm 2014-10-29 20:50:27 +01:00
Jirka Marsik d48dd17c5e Added gg-0.9.0 2014-10-29 20:15:39 +01:00
Jirka Marsik fc43239c56 Added ocaml-otfm-0.2.0 2014-10-29 19:35:23 +01:00
Jiri Marsik 50fccd0347 Added bolt-1.4 2014-10-28 14:03:14 +01:00
Jiri Marsik c6fa8d0fd3 Added ansiterminal-0.6.5 2014-10-28 14:00:48 +01:00
Florent Becker 10eb4786fd Use propagatedBuildInputs in eliom 2014-10-19 18:48:40 +02:00
Florent Becker 8c9bbe00ac Use opam to actually install eliom 2014-10-19 18:47:18 +02:00
Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
 2014-10-16 15:16:50 +02:00
Florent Becker cfeb42b8eb Adapt the derivation for the update of eliom to 4.1 2014-10-15 11:14:34 +02:00
Florent Becker 407c762f18 Make uutf a *propagated*BuildInput of ocamlPackages.tyxml 2014-10-15 11:13:04 +02:00
Florent Becker bd8ce96ccb Update eliom to 4.1.0 2014-10-14 13:18:08 +02:00
Florent Becker cf5e915bde Updgrade ocsigen-server to 2.5 2014-10-14 13:14:57 +02:00
Florent Becker e8b24eb63e update tyxml to version 3.3.0 2014-10-14 13:09:53 +02:00
Vincent Laporte 8320bbaaa3 ocaml-macaque: new package 
MaCaQue (or macaque) is a DSL for SQL Queries in Caml.

Homepage: https://github.com/ocsigen/macaque
 2014-10-11 00:54:35 +01:00
Vincent Laporte 33bba5f0b3 ocaml-pgocaml: new package 
PG'OCaml provides an interface to PostgreSQL databases for OCaml
applications.

Homepage: http://pgocaml.forge.ocamlcore.org/
 2014-10-11 00:49:50 +01:00
Vincent Laporte cdf3dc2793 ocaml-reactivedata: new package 
reactiveData is an OCaml module for functional reactive programming
(FRP) based on React.

Homepage: https://github.com/hhugo/reactiveData
 2014-10-11 00:49:34 +01:00
Aristid Breitkreuz 26dd5dd6a4 Merge pull request #4460 from vbgl/zarith 
zarith: update from 1.2.1 to 1.3
 2014-10-10 22:51:08 +02:00
Vincent Laporte 977f172fee ocaml-lablgl: adds missing dependency to camlp4 2014-10-10 17:00:30 +01:00
Vincent Laporte 35c92ec1ac ocaml-http: adds missing dependency to camlp4 2014-10-10 17:00:30 +01:00
Vincent Laporte 7bfe6144c6 ocaml-data-notation: adds missing dependency to camlp4 2014-10-10 17:00:29 +01:00
Vincent Laporte d99ea69225 zarith: update from 1.2.1 to 1.3 2014-10-10 14:47:33 +01:00
Aristid Breitkreuz a01a64e5a4 Revert "ocamlPackages.twt: update from 0.93.2 to 0.931" 
This reverts commit 684a9e22a1.
 2014-10-08 20:44:22 +02:00
Vincent Laporte 59a184824f lablgtk: update 2.16.0 -> 2.18.2 2014-10-08 20:24:41 +02:00