Commit graph

15586 commits

Author SHA1 Message Date
Rickard Nilsson
6b634673f9 Add remarkjs 0.6.4, a markdown-driven slideshow tool
Also, add required node packages (and update generated node pkgs).
2014-04-21 01:27:23 +02:00
Eelco Dolstra
4e8c2f0ff9 Merge branch 'systemd-update' 2014-04-20 19:31:01 +02:00
Vladimír Čunát
cb83796abb elfutils: update 0.155 -> 0.158 2014-04-20 18:24:11 +02:00
Vladimír Čunát
b4df087f14 elfutils: fix CVE-2014-0172
Patch taken from upstream mailing-list.
2014-04-20 18:24:11 +02:00
Shea Levy
88e531d8dc Fix gcc bug 58800.
See #2330 for details, except I needed to remove the Changelog change from the patch
2014-04-20 09:46:21 -04:00
Shea Levy
2364bd807d Revert "Merge branch 'gcc-fix' of git://github.com/ambrop72/nixpkgs"
The patch doesn't apply

This reverts commit 094eea8f6a, reversing
changes made to 552d66cd9e.
2014-04-20 09:36:15 -04:00
Shea Levy
094eea8f6a Merge branch 'gcc-fix' of git://github.com/ambrop72/nixpkgs
Description from ambrop72:

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58800

I have not been able to test this due to nix wanting to rebuild lots of
things before building gcc.
Patch was created with: svn diff -r 203872:203873
http://gcc.gnu.org/svn/gcc/branches

This should fix a crash in OpenSCAD: openscad/openscad#514
2014-04-20 09:32:50 -04:00
ambrop7@gmail.com
7eeb94e8dc Add patch for GCC bug 58800. 2014-04-20 12:40:32 +02:00
Matt Whiteley
552d66cd9e Add swig-3.x 2014-04-20 11:30:31 +01:00
Vladimír Čunát
4160e65931 mediastreamer: fix build by updating
Probably broken by major ffmpeg update.
2014-04-19 22:06:22 +02:00
Rok Garbas
805ec7e54a Merge pull request #2320 from iyzsong/unmaintain
drop my maintainship of orc and vala
2014-04-19 19:55:24 +01:00
宋文武
6da2470034 drop my maintainship of orc and vala 2014-04-19 23:21:51 +08:00
Marco
d6aee89fd7 Fix build of MLton on Linux i686 2014-04-19 14:30:39 +01:00
Marco Maggesi
3737ec7c74 Enable compilation of MLton on darwin 2014-04-19 14:30:39 +01:00
Vladimír Čunát
c8f633564e orc: bugfix update (mainly memory leaks), doCheck 2014-04-19 13:59:18 +02:00
Domen Kožar
060a3da168 Merge pull request #2290 from ttuegel/ffmpeg
ffmpeg 2.1.4 -> 2.2.1
2014-04-19 13:09:55 +02:00
John Wiegley
599c2775dd Add expression for xml-lens 2014-04-19 11:21:15 +01:00
Jaka Hudoklin
d0c0132fb0 node_webkit: fix hash for i686-linux 2014-04-19 10:45:03 +01:00
Domen Kožar
85992ec738 Merge pull request #1507 from offlinehacker/pkgs/node_webkit/add
Add node-webkit, app runtime based on Chromium and node.js
2014-04-19 05:35:20 +02:00
Sander van der Burg
e9a1b1e18c Add allowUnfree parameter to allow Java builds to work 2014-04-18 20:05:39 +02:00
Michael Raskin
3c8311aae6 Merge pull request #2306 from jwiegley/logging
Update logging expression to 1.4.0
2014-04-18 10:46:59 -07:00
Michael Raskin
f45bcfb5e9 Merge pull request #2298 from jwiegley/hfsevents
Add hfsevents expression, and make fsnotify use it on darwin
2014-04-18 10:42:16 -07:00
Michael Raskin
d31cf5329e Merge pull request #2075 from iyzsong/webkit
get rid of old webkit packages
2014-04-18 10:10:29 -07:00
Cillian de Róiste
e70602e12b #492 python-virtualenv: make modules of the python wrapper available
Note: simply calling `virtualenv .` will not produce a ./bin/python
which can import e.g. sqlite3, using `virtualenv --python=python2.7`
will, if python2.7 is python27Full (the wrapped python). I'm not sure
if this is a bug or a feature.
2014-04-18 18:08:49 +02:00
John Wiegley
1be71ec4a2 Update logging expression to 1.4.0 2014-04-17 21:48:05 -05:00
Rok Garbas
47d783ce9d sqlite: update to 3.8.4.3 2014-04-17 13:51:36 +01:00
Peter Simons
b6429a6aa4 Merge pull request #2291 from ttuegel/alsa-mixer
haskell-alsa-mixer 0.2.0.1 -> 0.2.0.2
2014-04-17 11:34:07 +02:00
John Wiegley
0556bc0fcb Add hfsevents expression, and make fsnotify use it on darwin 2014-04-16 16:43:32 -05:00
Peter Simons
2fcc5da447 Merge pull request #2255 from jwiegley/timeparsers
The timeparsers library requires convertible == 1.0.*
2014-04-16 20:59:54 +02:00
John Wiegley
df56712700 The timeparsers library requires convertible == 1.0.* 2014-04-16 13:09:31 -05:00
John Wiegley
78d452c93c Change aspell configure to use $out/lib/aspell 2014-04-16 12:59:27 -05:00
Domen Kožar
3a9f28ee08 Merge pull request #2185 from lethalman/gnome3
tracker, licenses.cc-by-30, gnome-user-docs, upgrade sushi, gnome-keyring service, gnome-user-share, gnome-tweak-tool, gnome-shell-extensions, xdg-user-dirs
2014-04-16 18:08:00 +02:00
Oliver Charles
3b3f7d2595 haskellPackages.digestiveFunctorsAeson: Update to 1.1.7 2014-04-16 16:39:12 +01:00
Thomas Tuegel
0b84d35175 Assume maintainership of alsa-mixer 2014-04-16 07:58:12 -05:00
Thomas Tuegel
d809a27859 haskell-alsa-mixer 0.2.0.1 -> 0.2.0.2 2014-04-16 07:51:38 -05:00
Thomas Tuegel
922e4f3858 ffmpeg 2.1.4 -> 2.2.1 2014-04-16 07:49:51 -05:00
Lluís Batlle i Rossell
44bda71b88 Adding ghdl 0.31 mcode flavour
This allows having a recent ghdl, without building it with gcc.
The major drawback is the speed.
2014-04-16 10:35:45 +02:00
Peter Simons
d4097e4e0e Merge pull request #2273 from jwiegley/cabal-delete
Add expression for cabal-delete
2014-04-16 10:17:29 +02:00
Peter Simons
9657f1f624 Merge pull request #2276 from jwiegley/lua52
Patch lua52 to build on Darwin
2014-04-16 10:16:26 +02:00
Peter Simons
d510eea7b0 Merge pull request #2277 from jwiegley/flex
Fix flex for building on darwin systems
2014-04-16 10:16:04 +02:00
Eelco Dolstra
ee9c068b0c systemd: Update to 212
Note that systemd no longer depends on dbus, so we're rid of the
cyclic dependency problem between systemd and dbus.

This commit incorporates from wkennington's systemd branch
(203dcff45002a63f6be75c65f1017021318cc839,
1f842558a95947261ece66f707bfa24faf5a9d88).
2014-04-16 00:59:26 +02:00
Peter Simons
cd64124f46 Merge pull request #2238 from bennofs/haskell-jailbreak-pipes-network
haskell: jailbreak pipes-network
2014-04-15 16:11:10 +02:00
Benno Fünfstück
0ae505179b haskell-pipes-network: add maintainers attribute again 2014-04-15 15:13:12 +02:00
John Wiegley
bc08fa99f1 Fix flex for building on darwin systems 2014-04-15 05:04:27 -05:00
John Wiegley
b18dc38dc1 Patch lua52 to build on Darwin 2014-04-15 04:46:14 -05:00
John Wiegley
f2690384c9 Three new Haskell tools: rehoo, una, cabal-meta 2014-04-15 04:32:06 -05:00
John Wiegley
00d5f3ab79 Add expression for cabal-delete 2014-04-15 04:16:55 -05:00
Peter Simons
abdd87da3c haskell-text-icu: don't run test suite on Darwin
https://github.com/bos/text-icu/issues/6
https://github.com/NixOS/nixpkgs/pull/2254
2014-04-15 11:04:23 +02:00
Peter Simons
dd87cb0f12 Merge pull request #2261 from jwiegley/lua5
Allow lua5 to build as a dylib on Darwin
2014-04-15 10:49:46 +02:00
Lukas Toth
f5fa89f198 haskellPackages.Unixutils: New expression 2014-04-15 10:43:38 +02:00