cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
47625 commits 1 branch 0 tags 3.7 GiB
Commit graph

13086 commits

Author SHA1 Message Date
Peter Simons
59e15fe815 Revert "Many minor fixes to get things building after recent compiler changes". 
This reverts the Haskell part of commit 326ca0f690, because these changes
broke the 'scientific' build with GHC 7.4.2.
 2014-08-11 14:48:35 +02:00
Mateusz Kowalczyk
6aa17c2ea9 haskell-profunctor-extras: deperecated package 
Use profunctors instead. We have no dependencies on this anyway.
 2014-08-11 13:58:40 +02:00
Mateusz Kowalczyk
e8b13a9586 haskell-vty-ui: explicitly use vty 4.7.5 
https://github.com/jtdaugherty/vty-ui/issues/55
 2014-08-11 13:58:39 +02:00
Mateusz Kowalczyk
06d8dfaf40 haskell-base64-conduit: remove package 
The package has been deprecated by upstream and we have nothing that
depends on it.
 2014-08-11 13:56:12 +02:00
Jascha Geerds
24f3070a85 Fix default icon location in 'wrapFirefox' 2014-08-11 10:20:17 +02:00
Mateusz Kowalczyk
9cb34308da haskell-PastePipe: add version 1.5 2014-08-11 07:03:19 +02:00
John Wiegley
ef171fe543 libusb1: build using clangStdenv ... on darwin 2014-08-10 23:25:33 -05:00
John Wiegley
3dea766731 libusb1: build using clangStdenv 2014-08-10 23:25:06 -05:00
John Wiegley
326ca0f690 Many minor fixes to get things building after recent compiler changes 2014-08-10 23:18:57 -05:00
Bjørn Forsman
b9bd655b16 ucspi-tcp: new package 
ucspi-tcp is command-line tools for building TCP client-server
applications.

http://cr.yp.to/ucspi-tcp.html
 2014-08-10 23:00:42 +02:00
Peter Simons
4f17e39137 Merge pull request #3521 from pavelkogan/haskell-xml-conduit-writer 
haskell-xml-conduit-writer: add version 0.1.1.1
 2014-08-10 22:43:15 +02:00
Peter Simons
43fd39de43 Merge pull request #3520 from pavelkogan/SourceGraph 
new packages: SourceGraph + dependency
 2014-08-10 22:42:56 +02:00
Pavel Kogan
e1b139372c haskell-xml-conduit-writer: add version 0.1.1.1 2014-08-10 16:27:29 +01:00
Pavel Kogan
a00209a38e Add SourceGraph: Haskell code analysis tool 2014-08-10 16:13:35 +01:00
Pavel Kogan
51a2e36f20 haskell-Graphalyze: add version 0.14.1.0 2014-08-10 16:13:34 +01:00
Daniel Peebles
d18ec20878 Change junit to actually compile from source rather than download binaries 2014-08-09 20:53:36 -04:00
Eelco Dolstra
40602a666c Merge branch 'staging' 2014-08-09 23:41:58 +02:00
Eelco Dolstra
be399bf245 Hack to fix llvm/clang build on Darwin 
(Or at least restore it to the same level as brokenness as before the
staging merge. I.e. it depends on gcc-apple, which doesn't build on
standard 10.9 systems.)
 2014-08-09 23:31:00 +02:00
lethalman
8f34fda081 Merge pull request #3495 from geerds/virtualenvwrapper 
Fix virtualenvwrapper shell scripts
 2014-08-09 23:06:33 +02:00
Jascha Geerds
efbb5de1c5 Refactoring 2014-08-09 22:56:07 +02:00
Eelco Dolstra
a6d1013e66 redis: Build with default gcc 2014-08-09 21:49:09 +02:00
Eelco Dolstra
9f08904c8d gnuplot: Use default compiler on Darwin 2014-08-09 19:53:09 +02:00
Peter Simons
8ede29197f GHC 7.6.x requires older attoparsec to build with aeson 0.7.x. 2014-08-09 19:48:47 +02:00
Eelco Dolstra
6c5186cf9b gnuplot: Reduce dependency bloat a bit 2014-08-09 19:30:48 +02:00
Peter Simons
0d2463a24b GHC 7.6.x required scientific 0.2.x to build aeson 0.7.x. 2014-08-09 19:16:45 +02:00
Eelco Dolstra
a7c1541a21 emacs: Fix building on Darwin with recent versions of GCC 
This gets rid of the "unexec: unrecognized section __static_data in
__DATA segment" error while dumping Emacs.
 2014-08-09 19:08:37 +02:00
Peter Simons
d0e37eff7b GHC 7.6 and earlier cannot compile aeson 0.8.x. 2014-08-09 19:02:56 +02:00
lethalman
05eb5bf913 Merge pull request #3503 from lethalman/platforms 
Make platforms.allBut accept a list rather than a single platform
 2014-08-09 14:22:09 +02:00
Peter Simons
01a059ee80 haskell-filepath: drop this package, it's been part of GHC forever 2014-08-09 13:49:24 +02:00
Peter Simons
f44346d077 haskell-fay: build with aeson 0.7.x to fix build errors 2014-08-09 13:49:23 +02:00
Peter Simons
c00e814202 HaRe: remove broken package until it supports GHC 7.8.3 2014-08-09 13:49:23 +02:00
Peter Simons
ad42c60b91 haskell-token-utils: remove broken package until it supports GHC 7.8.3 
https://github.com/alanz/haskell-token-utils/issues/1#issuecomment-51681623
 2014-08-09 13:49:23 +02:00
Peter Simons
3531038008 haskell-aeson: update to version 0.8.x 2014-08-09 13:49:23 +02:00
Eelco Dolstra
be3fc3ae2f Prevent an unnecessary evaluation of lib 2014-08-09 12:45:18 +02:00
Luca Bruno
b331ae33d7 Make platforms.allBut accept a list rather than a single platform 2014-08-09 12:31:33 +02:00
Georges Dubus
8de8d5a639 nox: Added expression 2014-08-09 12:30:38 +02:00
Georges Dubus
abf2f3fcc5 Added expressions for dogpile.core and dogpile.cache 2014-08-09 12:04:58 +02:00
John Wiegley
db8ab2191d Merge pull request #3216 from cstrahan/libuv 
add libuv package
 2014-08-09 01:04:09 -05:00
John Wiegley
16ffd0638b Merge pull request #3266 from cstrahan/mesos 
[WIP] mesos: Add package
 2014-08-09 01:03:58 -05:00
John Wiegley
83cf279452 Add an expression for building Coq HEAD 2014-08-08 18:11:00 -05:00
Peter Simons
c2b405e06c haskell-{alex,BNFC}-meta: remove broken packages 2014-08-09 00:39:52 +02:00
Pascal Wittmann
0cb0ad27be Merge pull request #3211 from ttuegel/adobe-fonts 
Adobe Source fonts
 2014-08-08 21:52:59 +02:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra
777617f987 ncurses: Build with standard gcc 2014-08-08 19:28:24 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Jascha Geerds
67820820a6 Fix virtualenvwrapper shell scripts 2014-08-08 17:30:35 +02:00
Peter Simons
45b9b6f2cf haskell-haskintex: add version 0.5.0.0 2014-08-08 16:10:00 +02:00
Peter Simons
86418382d5 haskell-HaTeX: add version 3.13.1.0 2014-08-08 16:10:00 +02:00
Peter Simons
5c8765d662 haskell-matrix: add version 0.3.3.0 2014-08-08 16:09:59 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Frerich Raabe
bdf5f45356 Enable perl-libwww-perl-6.05 on OS X 
I see no reason not to enable it, and doing so enables installing
git.
 2014-08-08 09:32:48 +02:00
Joel Taylor
d8cca3d624 fail2ban: systemd support 
- upgrade fail2ban to 0.9
- override systemd to enable python support and include sqlite3 module
- make fail2ban enablable
 2014-08-08 00:10:19 +02:00
Peter Simons
b0f5c885ec Merge pull request #3479 from pavelkogan/haskell-webkit 
haskell-webkit: add version 0.13.0.0
 2014-08-07 22:52:48 +02:00
Aycan iRiCAN
16b3955b42 Merge pull request #3483 from monocell/haskell-xorshift 
new package: haskell xorshift
 2014-08-07 18:49:48 +03:00
Aycan iRiCAN
f82cdd49be Merge pull request #3481 from Twey/sodium 
Add derivation for Sodium (Haskell FRP library)
 2014-08-07 18:29:25 +03:00
Peter Simons
c6d3075d69 haskell-attoparsec: update to version 0.12.1.1 2014-08-07 12:41:15 +02:00
Emil Rangden
356bd34b86 new package: haskell xorshift 2014-08-07 10:34:07 +02:00
Nicolas Dietrich
c2760bbb03 pythonPackages.meld3: Update to 1.0.0 
license change from ZPL to Repoze (BSD-style)
 2014-08-07 09:00:46 +02:00
System administrator
f3739e2aca added astromenace: Hardcore 3D space shooter 2014-08-07 01:54:41 +02:00
taku0
74ce1a016f add peco: Simplistic interactive filtering tool 2014-08-07 01:34:28 +02:00
William A. Kennington III
0450b0ad0a intel-gpu-tools: Add derivation 2014-08-07 01:32:43 +02:00
William A. Kennington III
f1abc8f8ba intelgen4asm: Remove obsolete package 2014-08-07 01:32:43 +02:00
William Roe
5ea8192704 Bump pythonPackages.boto to 2.32.0 
Amongst other things, this brings the ability to assign public IP
addresses to EC2 instances booted up inside a VPC/subnet.
 2014-08-07 01:28:36 +02:00
Emery Hemingway
420f18ef5b xscruiser: initial package expression 
http://xcruiser.sourceforge.net/
 2014-08-07 01:24:25 +02:00
NOTtheMessiah
9e9e628417 Added gcolor2 2014-08-07 01:17:01 +02:00
José Romildo Malaquias
ba9bfd39ad New packages: libgksu, gksu 2014-08-07 01:10:11 +02:00
Jason \"Don\" O'Conal
297599a299 bindfs: add expression 2014-08-07 01:07:34 +02:00
James ‘Twey’ Kay
10feef08ae Add derivation for Sodium (Haskell FRP library) 2014-08-06 21:43:10 +01:00
Pavel Kogan
ffae2ce039 haskell-webkit: add version 0.13.0.0 2014-08-06 16:44:35 +01:00
Rob Vermaas
34e6cb5083 Merge pull request #3476 from wkennington/master.unifi 
Add support for the unifi access point controller
 2014-08-06 17:00:54 +02:00
Rob Vermaas
b2f601234e Merge pull request #3478 from geerds/stevedore 
Add missing runtime dependency for python-stevedore
 2014-08-06 16:56:30 +02:00
Jascha Geerds
498fb83a68 Add missing runtime dependency for stevedore 2014-08-06 16:09:57 +02:00
Damien Cassou
8efdaa0aa2 Add the Pharo language and IDE package 
http://pharo.org

I'm one of the developers of Pharo and the creator and maintainer of the
Ubuntu PPA : https://launchpad.net/~pharo/+archive/stable.
 2014-08-06 13:53:33 +02:00
Peter Simons
b6e2a52b72 Merge pull request #3418 from peti/drop-obsolete-agda-version 
Agda: drop obsolete version 2.3.2.2
 2014-08-06 13:39:30 +02:00
Bjørn Forsman
560a235c95 python-robotframework: update from 2.8.4 to 2.8.5 2014-08-05 23:23:53 +02:00
William A. Kennington III
0652ee16e4 unifi: Add derivation 2014-08-05 16:18:41 -05:00
Peter Simons
953de80aad haskell-data-fin: add version 0.1.1.2 2014-08-05 19:56:27 +02:00
Peter Simons
6103824dd7 haskell-prelude-safeenum: add version 0.1.1.1 2014-08-05 19:56:16 +02:00
Oliver Charles
7a6ebb5420 haskellPackages.genericsSop: New expression 2014-08-05 17:12:19 +01:00
Jascha Geerds
eaad8d6923 Packaging PyCharm IDE 2014-08-05 07:15:43 +02:00
Thomas Tuegel
cab7fd67ce firefox: bring back version 30.0 for zotero 2014-08-04 13:43:58 -05:00
Michael Raskin
e27a887440 Give up for now: roll back SBCL to 1.2.0, as: 1.2.2 fails on i686; 1.2.1 fails everywhere 2014-08-04 19:57:01 +04:00
Peter Simons
9023cea859 Merge pull request #3268 from codygman/master 
dom-selector: add version 0.2.0.1
 2014-08-04 16:57:08 +02:00
Peter Simons
ec87968ba2 haskell-auto-update: add version 0.1.0.0 2014-08-04 16:52:26 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Pascal Wittmann
19fb472d5a Merge pull request #3458 from svenkeidel/paperkey 
added paperkey package
 2014-08-04 15:10:09 +02:00
Aycan iRiCAN
f20f30af2c Merge pull request #3457 from luke-clifton/lc-haskell-ad 
Adding Haskell Package AD for automatic differentiation
 2014-08-04 14:16:25 +03:00
Sven Keidel
36d339b74e added paperkey package 2014-08-04 13:11:29 +02:00
Luke Clifton
1501536dcd Adding Haskell Package AD for automatic differentiation 2014-08-04 18:21:25 +08:00
Peter Simons
fde5b8488b Merge pull request #3450 from cbpark/haskell_probability 
Add haskell-probability
 2014-08-04 10:52:33 +02:00
Rok Garbas
ba6c76f264 pythonPackage.gunicorn: update to 19.1.0 2014-08-04 10:11:52 +02:00
aszlig
f40fc0624d
haskell/yi: Build against vty 4.7.5. 
Probably jailbreak would do as well, but the version constraints are:

vty >= 4.7.4 && <5

I suppose the upcoming release of Yi will fix this, so I'm not using
jailbreak here (apart from the fact that Yi doesn't build successfully
using VTY >= 5).

Thanks to @bb010g for reporting.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-04 07:51:11 +02:00
aszlig
4834717507
linux-kernel: Add new upstream version 3.16. 
Also set linux_latest to it as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-04 02:41:54 +02:00
cbpark
65949e7415 Add haskell-probability 2014-08-04 00:58:17 +02:00
Michael Raskin
77389a5bcb Update LiquidWar6 to 0.4 2014-08-03 15:59:21 +04:00
Vladimír Čunát
6295a3ca36 Merge recent master into x-updates 
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-08-02 05:08:07 +02:00
Shea Levy
b0c8769c84 Add tornadokick python package 2014-08-01 15:14:38 -04:00
Rob Vermaas
64561b437d Remove broken flag for xen, build with gcc45. 2014-08-01 17:18:27 +02:00
Eelco Dolstra
688824cc60 Add a bunch of Hydra dependencies to the channel 2014-08-01 16:11:33 +02:00
Pascal Wittmann
0baac649aa Merge pull request #3188 from vbgl/merlin 
Adds merlin
 2014-08-01 13:39:27 +02:00
Vladimír Čunát
c92a8584ee fix eval after cf6bb72c6 2014-08-01 10:04:08 +02:00
aszlig
57781346d7
Merge branch 'i3-tests'. 
The reason I went through this whole journey of gathering dependencies
and debugging just in order to get i3 tests working was because I wanted
to supply test cases to a small patch I wrote for the upstream project.

This adds/updates quite a few Perl packages and a X dummy helper, which
are all needed in order to successfully run the test suite.
 2014-08-01 05:51:57 +02:00
aszlig
feeb5bae23
Add new package xdummy, a dummy X server. 
This is actually a small script which just starts an X server without
any real display. Right now only needed for running the test suite of
the i3 window manager within the Nix chroot, but might be useful for
running other tests needing a DISPLAY.

Usage is just like a regular X server, so in order to start an instance
for display :666, you just run it like this:

xdummy :666

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-01 05:49:14 +02:00
aszlig
b02d72f754
perl-packages: Add new package Inline-C, v0.62. 
This is needed for running the test suite of the i3 window manager.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-01 05:49:14 +02:00
aszlig
bae7da07d8
perl-packages: Add MouseXNativeTraits to X11-XCB. 
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-01 05:49:14 +02:00
aszlig
dff91a009d
perl-packages: Add new package MouseXNativeTraits. 
This is actually needed by X11-XCB, but I only found out after hours of
digging through Perl code from the stone age.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-01 05:49:14 +02:00
aszlig
8851638ea7
perl-packages: Add new package CarpAlways, v0.13. 
This has been proven to be VERY handy for providing useful stacktraces
in Perl. Just invoke it using:

perl -MCarp::Always yourshinyscript.pl

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-01 05:49:13 +02:00
aszlig
4a412e9561
perl-packages: Update Any-Moose to version 0.24. 
This has required to update a few dependencies, including Mouse (to
version 2.3.0).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-01 05:49:13 +02:00
aszlig
d49f152513
perl-packages: Update Inline to version 0.64. 
Also tested whether all references (InlineJava, Autodia) are built
successfully.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-01 05:49:13 +02:00
aszlig
cf6bb72c6a
perl-packages: Add X11-XCB and dependencies. 
This is another requirement for running the i3 test suite.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-01 05:49:13 +02:00
aszlig
6ab0a8d0a8
perl-packages: Add AnyEvent::I3, version 0.15. 
This is needed in order to run the i3 test suite.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-08-01 05:49:13 +02:00
Austin Seipp
181cdb7cc8 Merge pull request #3412 from Ericson2314/rust-master 
Add alternative rustc package for master tip
 2014-07-31 21:51:21 -05:00
John Ericson
8f763d0539 rustc: rename rust to rustc, but keep rust attr name for backwards compat 2014-08-01 04:39:37 +02:00
John Ericson
641ccec337 rust: Refer to 0.11.nix directly in all-packages 
rather than use default.nix indirection
 2014-08-01 04:28:54 +02:00
John Ericson
584114b697 rust: Add an alternative package for the master tip 
based off of pull request #3084
 2014-07-31 20:42:20 +02:00
Mateusz Kowalczyk
ed51045f13 haskell-bencoding: 0.4.3.0 2014-07-31 19:12:43 +02:00
Bjørn Forsman
a03ec2692b lttng: fix evaluation error 
I'm giving up on the lttngModules backward compatibility attribute :-)
 2014-07-31 17:08:23 +02:00
Bjørn Forsman
fdba7f35fe lttng-modules: fix bad attribute reference 
Fixup error introduced in commit
410f2a9dab ("lttng: align attribute name
with package name"). lttng-modules is not a top-level attribute.
 2014-07-31 17:04:45 +02:00
Vladimír Čunát
dac1791fb5 thunderbird: major update 17.* -> 31.0 
- To fix build problems, I refactored the build process
  according to Mozilla recommendations.
- 31.0 should become the next ESR branch (31 released today).

CC @nbp @edolstra

(cherry picked from commit adc2edd5cf)
 2014-07-31 16:30:04 +02:00
Bjørn Forsman
410f2a9dab lttng: align attribute name with package name 
lttngModules => lttng-modules
lttngTools => lttng-tools
lttngUst => lttng-ust

But keep the old attributes around for backward compatibility.
 2014-07-31 16:00:04 +02:00
Peter Simons
84cf3f3de7 Agda: drop obsolete version 2.3.2.2 2014-07-31 13:58:36 +02:00
Peter Simons
7387244094 haskell-vty: update to version 5.1.4 2014-07-31 13:57:45 +02:00
Peter Simons
5f2ad413b7 haskell-xml-html-conduit-lens: add version 0.3.2.0 2014-07-31 13:57:45 +02:00
Peter Simons
689b322e10 Agda: update to version 2.4.0.2 2014-07-31 13:57:45 +02:00
Pascal Wittmann
ba273e41c2 Merge pull request #3405 from wavewave/cadaver 
added cadaver: a command-line WebDAV client for Unix
 2014-07-31 13:57:10 +02:00
Domen Kožar
e07c2c2cfd add uTox 2014-07-31 12:59:03 +02:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1." 
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
 2014-07-31 12:52:29 +02:00
Lluís Batlle i Rossell
10d4f1fac7 Setting retroshare 0.6 as lowPrio, it's unstable. 2014-07-31 10:13:20 +02:00
John Wiegley
7d90959d73 idris: 0.9.14 -> 0.9.14.1 2014-07-30 18:11:18 -05:00
John Wiegley
11dc22e3ee Agda needs an older version of haskell-equivalence 2014-07-30 18:10:59 -05:00
Ian-Woo Kim
ea43305368 added cadaver: a command-line WebDAV client for Unix 2014-07-30 16:55:44 +02:00
taku0
4ed2acc148 add source-han-sans-japanese, source-han-sans-korean, source-han-sans-simplified-chinese, source-han-sans-traditional-chinese: An open source Pan-CJK typeface 2014-07-30 16:27:20 +02:00
John Wiegley
b90e56a53c Merge pull request #3357 from fignuts/df2014 
Add dwarf fortress 2014 (unstable) version
 2014-07-29 13:20:35 -05:00
John Wiegley
867d3fbf47 Merge pull request #3372 from FlorentBecker/crawl 
Add dungeon crawl stone soup 0.14
 2014-07-29 13:20:18 -05:00
Peter Simons
d711c60c3d haskell-base-prelude: add version 0.1.3 2014-07-29 18:39:34 +02:00
Peter Simons
9d56d25673 haskell-vty: update to version 5.1.3 2014-07-28 20:32:59 +02:00
Peter Simons
0aa0b7680c haskell-parsers: update to version 0.12.1 2014-07-28 20:32:52 +02:00
Peter Simons
41ff906084 haskell-easy-file: add version 0.2.0 2014-07-28 20:32:52 +02:00
Peter Simons
c526312445 haskell-free-game: update to version 1.1.78 2014-07-28 20:32:52 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Peter Simons
eec522e69a haskell-nixpkgs.nix: update Cabal to version 1.20.0.2 2014-07-28 20:32:52 +02:00
Petr Rockai
bde992bbbc pkgsi686Linux: Use 32b kernels (x86_64 kernels can't be built with 32b gcc). 2014-07-28 20:26:13 +02:00
Rickard Nilsson
ccc22bb662 New package: mopidy-moped, a web client for the mopidy music player daemon 2014-07-28 19:51:08 +02:00
Peter Simons
4895ace127 perl-packages.nix: partially revert 7a45996233 
The commit referred to non-existent license "stdenv.lib.licenses.perl5".
 2014-07-28 13:20:54 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-07-28 11:30:49 +02:00
Joachim Schiele
d46c61b863 Merge pull request #3321 from qknight/snes9x-gtk 
added snes9x-gtk with pulseaudio support
 2014-07-27 21:38:25 +02:00
Cillian de Róiste
3447b018c2 Add SDL variant with pulseaudio enabled, this fixes choppy sound in Kdenlive 
I would rather enable pulseaudio by default for SDL as it will
probably fix issues for other programs too.
 2014-07-27 19:35:09 +02:00
Cillian de Róiste
d2193736db Remove linux_3_10_tuxonice, standard hibernate now works for me 2014-07-27 18:33:30 +02:00
Charles Strahan
5668ac61e9 bud: new package 
This adds `bud`, a TLS terminating proxy.
 2014-07-27 14:23:43 +02:00