Commit graph

8181 commits

Author SHA1 Message Date
Shea Levy 5e434ef318 Merge branch 'p/selinux' of git://github.com/vcunat/nixpkgs
This branch adds libcap-ng and updates SELinux. It doesn't seem like
anyone is actually using SELinux from nixpkgs, but everything compiles
and looks right.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 18:00:16 -05:00
Shea Levy e13c058fd2 Merge branch 'makemkv.130223.0' of git://github.com/jcumming/nixpkgs
This adds the proprietary makemkv package to convert dvd and blu-ray
videos to mkv.

I've tested that it builds, nothing more.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:26:53 -05:00
Shea Levy 66ad165829 Merge branch 'add-opam-0.9.5' of git://github.com/orbitz/nixpkgs
This adds the opam ocaml package, and also adds orbitz as a maintainer.
I've tested that it builds, nothing more.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-08 17:10:54 -05:00
Shea Levy 1670244f80 Merge branch 'vlada/xfce-notg' of git://github.com/vcunat/nixpkgs
This branch refactors xfce and updates it to 4.10. I had been hoping to
find someone besides Vlada to test this (I don't use xfce), but no one
has come forward yet in 2 weeks so if this breaks something they can
make an issue or fix it. It all looks good by inspection.
2013-03-08 17:03:22 -05:00
orbitz fd48192018 Add opam 0.9.5 2013-03-08 22:42:22 +01:00
Shea Levy f2c79c4542 Remove some references to non-existent packages 2013-03-08 16:36:59 -05:00
Peter Simons cf53885d84 haskell-syb: update to version 0.4.0 2013-03-08 13:43:35 +01:00
Peter Simons d7bc87693f haskell-quickcheck: update to version 2.6 2013-03-08 13:43:21 +01:00
orbitz 6da29419e4 Add opam 0.9.4 2013-03-08 11:56:50 +01:00
Eelco Dolstra 234c6b74c6 Merge remote-tracking branch 'origin/stdenv-updates' 2013-03-07 23:09:05 +01:00
Lluís Batlle i Rossell 78e71242d7 Adding idle3-tools (for WD Green HDDs) 2013-03-07 21:40:28 +01:00
Eelco Dolstra 674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Peter Simons 4fd407bab5 haskell-QuickCheck: add version 2.6 2013-03-07 16:57:52 +01:00
Peter Simons 95ff746654 haskell-syb: add version 0.4.0 2013-03-07 16:57:33 +01:00
Rob Vermaas 03519851bc Add elasticsearch 0.20.5 2013-03-07 12:36:29 +01:00
aszlig 7d273f07ea
oracle-xe: Add new package, version 11.2.0.
This is the Oracle Database which they give out for free, therefore it's called
Express Edition.

Well, I pretty much packaged this in vain as I finally found out that i don't
need that Oracle Database stuff at all. And my original purpose was to do SQL
query/constraint testing.

So before I'm going to throw this away (forever, oh no!), maybe someone else
might have a use case for this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-03-07 10:24:18 +01:00
Michael Raskin 536db80abf Add Sodium cryptography library 2013-03-07 10:59:03 +04:00
Cillian de Róiste 43e8e7763b Add MyPaint: A graphics application for digital painters 2013-03-06 23:08:30 +01:00
Michael Raskin b72134dc11 Linux: Add 3.9-rc1 as lowPrio (it has a regression fix 3.8.2 lacks) 2013-03-06 23:59:49 +04:00
Vladimír Čunát da437144fa webkit(_gtk2): clean, unify and enable parallel building
This should make webkit_gtk2 build.
2013-03-06 18:16:23 +01:00
Cillian de Róiste 6254091950 Add rncbc's Vee One suite: sampler, synth and drum kit 2013-03-06 01:06:16 +01:00
Ludovic Courtès c00225bcae cross-gcc: disable `langCC' when targeting MinGW 2013-03-06 00:01:10 +01:00
Florian Friesdorf 2e21e4fadc fix pythondocs (missing lib, doc instead of docs) 2013-03-05 12:28:48 +01:00
Mathijs Kwik 4d4b045d95 ffmpeg: remove unused 1.0 version 2013-03-04 22:26:13 +01:00
Rickard Nilsson 4d181e526e mopidy: Add some more dependencies needed for the HTTP frontend 2013-03-03 20:53:48 +01:00
Sander van der Burg 9455f23d22 eduke32: Bumped to rev 3542 - very important 2013-03-03 19:34:59 +01:00
Cillian de Róiste 266e283faf Add jack_oscrolloscope: a waveform viewer for JACK 2013-03-03 17:43:15 +01:00
Vladimír Čunát e6143c35e2 Merge pull request #344 from ierton/zathura-improve
zathura: fix manpages, include .desktop icon
2013-03-03 05:21:03 -08:00
Florian Friesdorf e9f13b9c3b python-ldap-2.4.10 2013-03-03 13:20:58 +01:00
Vladimír Čunát d9a2b1f520 ardour(2): fix and minor update.
- use fetchurl from Gentoo mirror instead of failing SVN fetch
- minor version update
- use system libraries as much as possible
- fix building
2013-03-02 21:17:30 +01:00
Shea Levy 0bdd926a32 linux/manual-config: put build and source trees into a separate 'dev' output.
This makes it possible to still build out-of-tree modules without making a system using this kernel depend on the full source and build tree at runtime.

Note that references to the source tree are removed from kernel modules after build.
Ideally, this would be accomplished by modifying the Makefile that puts the reference there in the first place, but I haven't tracked that down yet.
2013-03-02 09:54:08 -05:00
Shea Levy 5d952411c6 Remove duplication in linuxPackagesFor
It's silly to pass in self when we can do let self = whatever; in self.
2013-03-02 09:10:01 -05:00
Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Vladimír Čunát a920c50cfb linux_2_6_32: disable patch which no longer appies 2013-03-02 10:02:36 +01:00
Vladimír Čunát 97b24ed95a linux_2_6_32: disable patch which no longer appies 2013-03-02 10:01:44 +01:00
Florian Friesdorf 0314b8b00f add python docs 2013-03-02 05:42:26 +01:00
viric 5097ff2b1a Merge pull request #347 from iyzsong/fvwm
add fvwm-2.6.5
2013-03-01 11:30:17 -08:00
Peter Simons 8f83550939 haskell-zlib: add version 0.5.4.1 2013-03-01 10:41:43 +01:00
Song Wenwu f5bd4f720a add fvwm-2.6.5 2013-03-01 13:48:33 +08:00
Cillian de Róiste bb5f60fec1 Add Jalv: an LV2 host for Jack
This allows LV2 audio plugins to be connected to Jack applications
2013-03-01 01:33:08 +01:00
aszlig 94fe64b3eb
manual-kernel: Add bc to buildNativeInputs.
As timeconst.pl was replaced by a bc script in the merge window for kernel 3.9,
we also need bc during build time, for more information about the reasons,
please have a look at the following commit:

torvalds/linux@70730bca13

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-02-28 18:57:03 +01:00
Vladimír Čunát bd4c0e7cd1 graphicsmagick137: fix by using older libpng
ToDo: is this still needed by someone?
2013-02-28 15:54:15 +01:00
Peter Simons 5207a4e01f haskell-Safe: drop obsolete library, use haskell-safe instead 2013-02-28 10:40:40 +01:00
Sergey Mironov 061627feed zathura: fix man pages; include .desktop icon 2013-02-28 12:08:36 +04:00
Eelco Dolstra c3b759d3d3 Catalyst::Plugin::Captcha: Add 2013-02-27 14:35:56 +01:00
Rickard Nilsson ad76386ff7 Add mkpasswd, an overfeatured front end to crypt 2013-02-27 12:14:09 +01:00
Peter Simons 55b67195d4 haskell-packunused: add version 0.1.0.0 2013-02-27 12:00:52 +01:00
Rickard Nilsson 566d5d3fb5 Add mopidy, a music server supporting spotify and the mpd protocol 2013-02-26 19:42:57 +01:00
Patrick Lee 4105b593a5 upgrading uglify to 2.2.5, optimist to 0.3.5, upgrading source-map to 0.1.7, and adding amdefine
Fixes #337
2013-02-26 09:45:43 -05:00
Eelco Dolstra 5847037d84 nix: Update to 1.4 2013-02-26 14:41:02 +01:00