1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Commit graph

20362 commits

Author SHA1 Message Date
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
Vladimír Čunát c0e2aceef4 fontconfig: patch and document 2014-11-05 12:12:30 +01:00
Eelco Dolstra 0a6bae16cf Hack to fix libc++abi build 2014-11-05 00:21:42 +01:00
Vincent Laporte 06eec57450 libcaca: update from 0.99β18 to 0.99β19 2014-11-04 19:15:17 +00:00
Domen Kožar b598f6af59 pythonPackages.runsnakerun: add performance/memory GUI profiler for python 2014-11-04 18:19:27 +01:00
Vincent Laporte ca9097335d lablgtk: update from 2.18.2 to 2.18.3 2014-11-04 16:58:29 +00:00
Vladimir Still 351c18b4fd aspell: Add Slovak dictionary. 2014-11-04 16:18:20 +01:00
Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Michael Raskin 18ac683bbc Fix Boost 1.55 build 2014-11-04 15:21:33 +03:00
Arseniy Seroka a323744ada Merge pull request #4827 from krgn/add-elm-reactor
add elm-reactor to the package list
2014-11-04 14:31:26 +03:00
Michael Raskin 05c8f5c102 Disable parallel building of Guile for now 2014-11-04 14:24:23 +03:00
karsten gebbert 9cbbd93c74 add elm-reactor to the package list 2014-11-04 11:47:32 +01:00
Michael Raskin c874dc7d9d Merge pull request #4517 from FlorentBecker/eliom
ocsigen 2014-10
2014-11-04 12:41:59 +03:00
Rob Vermaas 6d79132553 php: update from 5.4.33 to 5.4.34, potentially fixes CVE-2014-3668, CVE-2014-3669, CVE-2014-3670 2014-11-04 10:16:14 +01:00
Michael Raskin 19645e229c Update PicoLisp 2014-11-04 12:04:43 +03:00
Michael Raskin 55c0354180 Update OpenCSG 2014-11-04 12:04:43 +03:00
lethalman 4380b5e357 Merge pull request #4821 from titanous/fix-libcec-dlopen
libcec: patch dlopen path
2014-11-04 09:51:25 +01:00
cillianderoiste 7e5eea005a Merge pull request #4815 from vbgl/lwt
ocaml-lwt: fixes build with OCaml 3.12 and 4.02
2014-11-04 09:41:16 +01:00
cillianderoiste 969039d995 Merge pull request #4819 from vbgl/oasis-45
ocaml-oasis: update from 0.4.4 to 0.4.5
2014-11-04 09:40:38 +01:00
John Wiegley a4ee94b741 boost: correct the install names for darwin
This also makes the recent change for ledger unnecessary.
2014-11-04 02:28:35 -06:00
Jonathan Rudenberg af8da57242 libcec: patch dlopen path 2014-11-03 22:02:25 -05:00
Vincent Laporte be8209b93f ocaml-oasis: update from 0.4.4 to 0.4.5 2014-11-04 00:08:58 +00:00
Mateusz Kowalczyk de96fb7cc7 sxiv: update to 1.3-git and fix runtime behaviour
The fix involves using imlib2 built with giflib instead of a libungif.
Initially I split imlib2 into two but other distros seem to build imlib2
with giflib already and everything still builds with giflib version so I
migrated imlib2 to giflib all together.

Closes #4622
2014-11-03 23:03:51 +00:00
Peter Simons 52585d55dc haskell-ghc-mod: update to version 5.2.1.1 2014-11-03 23:14:26 +01:00
Peter Simons 671adbafaf haskell-cairo: re-generate version 0.12.5.3 with cabal2nix 2014-11-03 23:07:41 +01:00
Peter Simons b5fed52c43 Merge pull request #4238 from wkennington/master.boost
Make boost 156 the default
2014-11-03 23:03:01 +01:00
Peter Simons 0346efdabf Merge pull request #4813 from bosu/fix-hscope
haskell: update to hscope 0.4.1
2014-11-03 23:01:37 +01:00
Peter Simons 030a044800 Merge pull request #4812 from krgn/elm-repl
add elm-preprepl to package list
2014-11-03 23:00:50 +01:00
Vincent Laporte e4655f0b45 ocaml-lwt: fixes build with OCaml 3.12 and 4.02 2014-11-03 21:55:35 +00:00
Michael Raskin 0f183c29b6 Update libmwaw 2014-11-04 00:37:43 +03:00
Michael Raskin bf3dedc5b0 Update lib-re 2014-11-04 00:37:43 +03:00
Michael Raskin 7a78648c20 Update mdds library 2014-11-04 00:37:43 +03:00
Michael Raskin f1f5ac184f Update GCL 2014-11-04 00:37:42 +03:00
Michael Raskin e4c64a6805 Update Lazarus 2014-11-04 00:37:42 +03:00
John Wiegley 4219c27632 threadscope: allow building with GHC 7.8.3, and on recent OS X 2014-11-03 15:27:31 -06:00
Boris Sukholitko 68183b8f5f Update to hscope 0.4.1 2014-11-03 23:04:10 +02:00
Cillian de Róiste 3a6a3815e9 kdeconnect: upgrade from 0.7.2 to 0.7.3 add new dependency: libfakekey
libfakekey is an X virtual keyboard library
2014-11-03 21:59:20 +01:00
karsten gebbert 9868f13799 add elm-get to haskell packages 2014-11-03 21:46:20 +01:00
karsten gebbert f646d1f6ec add elm-preprepl to package list 2014-11-03 21:31:32 +01:00
William A. Kennington III 8d605dafc6 boost: Pass arguments to generic.nix 2014-11-03 11:14:08 -08:00
Peter Simons 984b0cbd8a uhc: remove broken package
https://github.com/NixOS/nixpkgs/issues/3565
2014-11-03 18:33:02 +01:00
Arseniy Seroka 0c7a0f31f9 Merge pull request #4810 from vbgl/merlin
merlin: update from 1.7.1 to 2.0
2014-11-03 20:04:10 +03:00
Arseniy Seroka e167a3cbf1 Merge pull request #4808 from henrytill/opam
opam: update to 1.2.0
2014-11-03 20:01:06 +03:00
Mateusz Kowalczyk 9b507ccf02 ffmpeg: 2.4.2 -> 2.4.3 2014-11-03 16:56:03 +00:00
Henry Till 5f2e7c71a4 opam: update to 1.2.0 2014-11-03 11:55:33 -05:00
Arseniy Seroka 2d47366e4c Merge pull request #4756 from iyzsong/guile-sdl
add guile-sdl and bump guile to 2.0.11
2014-11-03 17:09:57 +03:00
Michael Raskin 063ee53190 Update afflib 2014-11-03 16:54:39 +03:00
Michael Raskin 1e99e7c30e Update OGRE library 2014-11-03 16:54:39 +03:00
Michael Raskin 420cadca9f Use Firefox instead of xulrunner in SlimerJS 2014-11-03 16:54:38 +03:00
Peter Simons 1378807966 haskell-sdl2: update to version 1.2.0 2014-11-03 14:42:15 +01:00