3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

14381 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
Domen Kožar 8e02bde1a8 fix eval.. 2014-11-04 21:36:19 +01:00
Domen Kožar 9e8869102b python3Packages.fonttools: disable on py3k 2014-11-04 21:16:14 +01:00
Arseniy Seroka a20e2d8f93 Merge pull request #4779 from gavinrogers/master
frostwire: initial working package
2014-11-04 23:03:52 +03:00
William A. Kennington III cbc05e77eb bareos: Add derivation 2014-11-04 11:11:14 -08:00
Gavin Rogers cb68376fcd frostwire: initial working package
This installs from the official frostwire tarball. Similar to the
jdiskreport package. Everything works fine on the systems I've tried.

I've made myself the maintainer.
Also upgraded it to 6.0.0 as it was released stable.
2014-11-04 18:57:01 +00:00
Vladimir Kirillov 049a991bc1 awscli -> 1.5.5, botocore -> 0.69.0 2014-11-04 19:44:13 +02:00
Domen Kožar e64d5655e9 fix eval 2014-11-04 18:31:32 +01:00
Domen Kožar b598f6af59 pythonPackages.runsnakerun: add performance/memory GUI profiler for python 2014-11-04 18:19:27 +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
karsten gebbert 9cbbd93c74 add elm-reactor to the package list 2014-11-04 11:47:32 +01:00
Michael Raskin 2d196dc36b Update Pandas library 2014-11-04 12:04:43 +03:00
Michael Raskin 5854eb09eb Update NILFS2 utils 2014-11-04 12:04:42 +03:00
Georges Dubus 52017df966 Merge pull request #4718 from ehmry/picard
update picard 1.2->1.3, initial pkg for python-libdiscid
2014-11-04 09:18:33 +01:00
aszlig 0f26e580bb
xmlto: Fix eval with w3m.graphicsSupport.
Having `nixpkgs.config.w3m.graphicsSupport = true;` leads to an infinite
recursion, because xmlto needs w3m for _text_ conversion and w3m with
graphics support needs imlib2, which in turn needs xmlto.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-04 04:48:27 +01: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 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
Michael Raskin f891bc78d1 Add a binary-distribution-based Liberation fonts package 2014-11-04 00:54:15 +03:00
Michael Raskin b7f7341169 Add Nginx 1.7.7; RTMP module fails for some reason 2014-11-04 00:54:15 +03:00
John Wiegley 311c6c66bf Undo some changes only appropriate for the clang fork 2014-11-03 15:31:17 -06:00
Michael Raskin bf179ce795 Adding FontTools 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
Emery Hemingway c9282c65f4 update picard 1.2->1.3 2014-11-03 15:31:49 -05:00
karsten gebbert f646d1f6ec add elm-preprepl to package list 2014-11-03 21:31:32 +01: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 e167a3cbf1 Merge pull request #4808 from henrytill/opam
opam: update to 1.2.0
2014-11-03 20:01:06 +03:00
Henry Till 5f2e7c71a4 opam: update to 1.2.0 2014-11-03 11:55:33 -05:00
John Wiegley 198874e489 emacs24Macport: allow installing either 24.3 or 24.4 2014-11-03 10:51:29 -06: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
Arseniy Seroka e639e48c36 Merge pull request #4783 from vbgl/ocamlscript
ocamlscript: new derivation
2014-11-03 16:06:42 +03: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
Jaka Hudoklin 950780a24f Merge pull request #4540 from taku0/firefox-bin-33.0
Update firefox-bin to 33.0
2014-11-03 13:43:53 +01:00
Evgeny Egorochkin 1e388a118c Remove old and unused gegl and babl versions 2014-11-03 13:08:12 +02:00
Evgeny Egorochkin 3f21e952f2 python34Packages.autopep8: update from 1.0.3 to 1.0.4 2014-11-03 12:58:07 +02:00
karsten gebbert 61fe82ccae Adds the hsc3-server haskell package to the tree. 2014-11-03 11:29:18 +01:00
codyopel 512e33bcbd x265: new package 2014-11-02 17:23:02 -08:00
William A. Kennington III a9c472d16e boost: Fix incompatible applications 2014-11-02 17:22:28 -08:00
William A. Kennington III 8f8712b1e1 qbittorrent: Refactor 2014-11-02 17:22:28 -08:00
William A. Kennington III 4c0d152d1e libtorrent-rasterbar: Add generic builder and 0.16.x derivation 2014-11-02 17:22:28 -08:00
William A. Kennington III 1df867f008 boost: Remove old boost 2014-11-02 17:22:27 -08:00
William A. Kennington III 5ae216558f jfsrec: Remove derivation 2014-11-02 17:22:27 -08:00
William A. Kennington III 94f80e66d3 boost: Remove legacy users 2014-11-02 17:22:27 -08:00
William A. Kennington III 9b9f716df2 Make boost 156 the default 2014-11-02 17:22:26 -08:00
Markus Kohlhase 8efce598ff nodejs: added some packages 2014-11-02 22:42:09 +01:00