JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,172 Commits 2 Branches 0 Tags 13 GiB
7ca2ab26c6
Commit Graph

9615 Commits

Author SHA1 Message Date
Jaka Hudoklin
f4b3007ef9 Add re2, an efficient, principled regular expression library 2013-08-22 10:08:07 +02:00
Gergely Risko
e8a37d3d41 Add ncurses haskell library 2013-08-21 23:39:07 +02:00
Bjørn Forsman
61822435fd duply: new package 
Duply is a shell front end for the duplicity backup tool
http://duplicity.nongnu.org/. It greatly simplifies it's usage by
implementing backup job profiles, batch commands and more. Who says
secure backups on non-trusted spaces are no child's play?

Homepage: http://duply.net/
 2013-08-21 22:16:20 +02:00
Evgeny Egorochkin
b25bcf853f package KDE 4.11 2013-08-21 20:41:07 +03:00
Peter Simons
b4750167e7 Merge pull request #847 from errge/master 
Add modular-arithmetic haskell library
 2013-08-21 01:28:41 -07:00
Jaka Hudoklin
d8cd75d6a1 pythonPackages.graphite_web: update to 0.9.11 2013-08-21 10:10:11 +02:00
Shea Levy
7188cc39fa Add karma nodePackage 
Required updating to npm2nix 5.1.0 for peerDependency cycle management

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-08-20 18:56:20 -04:00
Domen Kožar
e9ec76b8a7 Merge pull request #743 from bencahill/master 
Add nvpy, a Simplenote syncing note-taking application
 2013-08-20 14:36:41 -07:00
Domen Kožar
f13d2f58d3 Merge pull request #804 from lovek323/googlecl 
pythonPackages.googlecl: add expression
 2013-08-20 14:33:58 -07:00
Shea Levy
33575ab335 Update nodePackages to latest npm2nix 
This version has a much cleaner interface, should require fewer major version bumps

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-08-20 13:12:56 -04:00
Shea Levy
7cda7d5fa7 Whoops, npm2nix bugfix 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-08-20 12:06:31 -04:00
Shea Levy
a6887c5973 Update nodePackages to npm2nix 4.0.0 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-08-20 11:52:28 -04:00
Gergely Risko
fdb6ae2734 Add modular-arithmetic haskell library 2013-08-20 17:46:58 +02:00
Rickard Nilsson
310268f36d diod: New package, a 9P server implementation for Linux 2013-08-20 17:24:30 +02:00
Sander van der Burg
a6828daccc Force npm2nix not to use the 1.0.0 prerelease of swig 2013-08-20 11:57:14 +02:00
Sander van der Burg
fc7cc7a90b Add mongodb nodejs package 2013-08-20 11:25:45 +02:00
Sander van der Burg
36eba4eb9a Force npm2nix to use mongoose 3.6.x - 3.7.x is an unstable/experimental release branch 2013-08-20 11:18:04 +02:00
Lluís Batlle i Rossell
2fbbe2c1a9 Adding a glibc variant with the memusage program 2013-08-20 10:15:40 +02:00
Peter Simons
35fe1d286f haskell-pretty-show: update to version 1.6.1 2013-08-19 20:54:50 +02:00
Shea Levy
fb4b6506ee Update nodePackages again. 
Every minor release of npm2nix requires several bugfixes immediately it seems

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-08-19 12:09:20 -04:00
Shea Levy
111e03c65b Update npm2nix 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-08-19 11:38:37 -04:00
Shea Levy
c021741775 Add some yeoman generators 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-08-19 11:12:47 -04:00
Shea Levy
d8b01bb241 Update nodePackages to npm2nix 3.1.1 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-08-19 10:52:14 -04:00
Rob Vermaas
94d74753ef Add statsd 0.6.0 2013-08-19 10:40:36 +02:00
Mathijs Kwik
e4f7a1d3f5 conkeror: provide a wrapper, so plugins work 2013-08-19 07:04:18 +02:00
Mathijs Kwik
273689bcbd linux-3.10: remove the btrfs send patch 
it helps, but is incomplete.
more fixes are coming, but including these would change too much
generic btrfs code, which might cause trouble for others.

so the best advice is not to use btrfs send yet and wait for 3.11 or 3.12
 2013-08-19 07:04:18 +02:00
Mathijs Kwik
467c581811 new package: haskell-pcap-enumerator 2013-08-19 07:04:17 +02:00
Mathijs Kwik
a50a9481f9 new package: haskell-pcap 2013-08-19 07:04:17 +02:00
Shea Levy
d9397ed2b6 Add yo nodePackage 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-08-18 19:31:07 -04:00
Shea Levy
67eb2c8ad3 Handle peerDependencies in nodePackages 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-08-18 19:28:51 -04:00
Shea Levy
b0320f130a Update node-packages-generated to latest npm2nix format 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-08-18 19:28:18 -04:00
Song Wenwu
6ae213d3ae add gtk-engines 2.20.2 2013-08-18 19:17:19 +02:00
Peter Simons
d2194a294e mpack: add version 1.6 2013-08-17 14:42:06 +02:00
Peter Simons
0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Peter Simons
76244ac2e2 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
 2013-08-16 22:51:13 +02:00
Peter Simons
a940651968 liblapack: add myself as a maintainer and enable Hydra builds (in stdenv-updates) 2013-08-16 22:45:30 +02:00
Shea Levy
595b8dbab9 Revert "Make all node packages available at the top level via their real name/version" 
This makes attributes visible to nix-env that can't actually be
specified with -A, which is why there is a separate top-level in the
first place, duh.

This reverts commit ddb8b7f831.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-08-16 15:30:49 -04:00
Gergely Risko
a7a9676e60 Add unix-bytestring haskell library 2013-08-16 17:55:34 +02:00
Vladimir Still
eb97daf88d networking: Add bwm-ng expression. 2013-08-16 14:57:16 +02:00
Eelco Dolstra
6175954271 Revert "libav: major update and refactoring" 
This reverts commit b003138081 because
it breaks Nixpkgs evaluation with "error: attribute `cross.config'
missing".

http://hydra.nixos.org/build/5725600
 2013-08-16 13:39:02 +02:00
Eelco Dolstra
a0d4c09445 Fix Nixpkgs evaluation 
http://hydra.nixos.org/build/5722962
 2013-08-16 11:52:10 +02:00
Vladimír Čunát
b8d00ac153 ghostscript: minor update, a little refactoring 
Builds fine, I tried running some apps depending on it.
 2013-08-15 20:48:14 +02:00
Eelco Dolstra
3a008f7a1d tango-icon-theme: Add 2013-08-15 18:01:16 +02:00
Eelco Dolstra
50b2e52988 hicolor-icon-theme: Move to data/icons 2013-08-15 16:53:40 +02:00
Rob Vermaas
47c9825c2d Update boto to 2.9.9 2013-08-15 16:01:36 +02:00
Shea Levy
ddb8b7f831 Make all node packages available at the top level via their real name/version 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-08-15 09:57:07 -04:00
Rok Garbas
48e89259b1 pypi2nix should only be avaliable for python27 2013-08-15 14:33:24 +02:00
Evgeny Egorochkin
1af650355b Merge pull request #831 from the-kenny/avra-1.3.0 
avra-1.3.0: Assember for the Atmel AVR microcontroller family
 2013-08-14 21:20:02 -07:00
Eelco Dolstra
68469ca342 releaseTools.aggregate: Rename ‘members’ to ‘constituents’ 2013-08-15 02:29:08 +02:00
Moritz Ulrich
f15af7c8e6 avra-1.3.0: Assember for the Atmel AVR microcontroller family 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-08-14 23:37:17 +02:00
aszlig
23a53b8dfa
windowmaker: New package in version 0.95.4. 
Packaged this for @devhell sometime ago and adding it here so maybe it's
useful for other people using Nix(OS).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-14 20:50:59 +02:00
aszlig
f67392cbca
paramiko: Correctly call the test suite. 
Using setup.py, the test suite isn't run at all, because it's not
referenced there. So let's call it directly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-14 20:50:59 +02:00
aszlig
e8eea6c2c0
acoustid-fingerprinter: Add new package, v0.6. 
This is the commandline tool for interacting with the chromaprint
library and it's needed for Picard version 1.2 (as it no longer has
support for AmpliFIND/PUIDs).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-14 20:50:58 +02:00
aszlig
d5487fc684
chromaprint: Add new package in version 0.7. 
This is the core component of the AcoustID project and is the library
for extracting/querying of audio fingerprints.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-14 20:50:57 +02:00
Peter Simons
48ff02f369 haskell-monad-par: update to version 0.3.4.4 2013-08-14 11:53:06 +02:00
Domen Kožar
c51e9e7fad substanced: bump git rev 2013-08-14 10:52:26 +02:00
Domen Kožar
963bde70bd Mako: 0.7.3 -> 0.8.1 (python3 support) 2013-08-14 10:52:26 +02:00
Domen Kožar
ff2338d2a7 fix evaluation error (for real) 2013-08-14 08:17:03 +02:00
Evgeny Egorochkin
2d056f9307 Merge pull request #811 from the-kenny/erlang-elixir 
Update erlang to R16B1, add elixir and rebar
 2013-08-13 21:56:04 -07:00
Evgeny Egorochkin
91e082a241 Merge pull request #828 from iyzsong/tiled-qt 
add tiled-qt 0.9.1
 2013-08-13 18:35:45 -07:00
Eelco Dolstra
b3642c3673 Move the AMD microcode to the microcode directory 2013-08-14 03:26:04 +02:00
Eelco Dolstra
5c208844e9 Remove more duplicate firmware 2013-08-14 03:24:58 +02:00
Song Wenwu
40cfa15513 add tiled-qt 0.9.1 2013-08-14 09:23:15 +08:00
Eelco Dolstra
0b086080f9 Typo fix 
Doesn't fix evaluation though...
 2013-08-14 02:34:45 +02:00
Eelco Dolstra
4d7d5ba69c Delete the Intel firmware packages 
The Debian firmware package (firmwareLinuxNonfree) contains all of
these so there is no reason to keep them.
 2013-08-14 02:32:12 +02:00
Domen Kožar
4cbf9f3f19 fix nixpkgs eval 2013-08-14 00:43:14 +02:00
Vladimír Čunát
b003138081 libav: major update and refactoring 
Also leaving 0_8 branch, as it's compatible with older ffmpeg versions.
I'm planning that all expressions will be able to switch easily
between ffmpeg and libav (whatever default we choose, but I prefer libav).
 2013-08-13 20:08:26 +02:00
Domen Kožar
558067676d python-magic: git -> 0.4.3 2013-08-13 15:13:56 +02:00
Domen Kožar
ab1c1773e2 python: fix alot by having magic and python_magic packages 2013-08-13 14:49:42 +02:00
Rok Garbas
425ea2ce9b Merge pull request #815 from garbas/pypi2nix 
pypi2nix - generating packages from pypi
 2013-08-13 02:42:50 -07:00
Domen Kožar
1974c55d91 add python application substanced and it's dependencies 2013-08-13 11:14:24 +02:00
Justin Bedo
9ab74cd977 Add expression for flpsed 2013-08-13 08:20:08 +02:00
Rok Garbas
bea6a51986 updated beautifulsoup4 and waitress 2013-08-13 01:33:51 +02:00
Rok Garbas
274f26620a json wasnt formatted correctly and updating pypi2nix script 2013-08-13 01:26:30 +02:00
Jaka Hudoklin
941055dae9 curl: Add support for c-ares, asynchronous dns resolver 2013-08-12 19:53:08 +02:00
Sander van der Burg
e502b3867b express-form needs express, but it does not get extracted by npm2nix. Fixing it manually 2013-08-12 15:20:49 +02:00
Sander van der Burg
d77bbbae82 Merge branch 'master' of github.com:NixOS/nixpkgs 2013-08-12 14:57:24 +02:00
Sander van der Burg
5a0c7f3077 Added express-form and updates nodejs package 2013-08-12 14:57:00 +02:00
Eelco Dolstra
adefbee815 Forks::Super: Disable checks 2013-08-12 14:22:16 +02:00
Rok Garbas
7fdf26231f pypi2nix packaged, Distutils2 added to generated python packages 2013-08-12 10:10:44 +02:00
Rok Garbas
a646dee027 removing existing plone packages 2013-08-12 10:10:44 +02:00
Rok Garbas
92443dea6c generated python packages for Plone and Pyramid 2013-08-12 10:10:44 +02:00
Karn Kallio
91358d6529 racket: libpng 1.6 now supported 2013-08-12 01:19:07 +02:00
Evgeny Egorochkin
27dcd771c3 Merge pull request #802 from wizeman/kernel_update 
Kernel update
 2013-08-11 15:08:45 -07:00
Peter Simons
1ccc0025e4 haskell-union-find: add version 0.2 2013-08-11 23:56:02 +02:00
Peter Simons
9547cdaadc haskell-language-c: drop obsolete version 0.3.2.1 2013-08-11 23:50:05 +02:00
Peter Simons
39f336b92f haskell-numeric-extras: add version 0.0.3 2013-08-11 23:50:05 +02:00
Peter Simons
35221e2be3 haskell-intervals: add version 0.2.2 2013-08-11 23:50:05 +02:00
Peter Simons
ea27769a61 haskell-securemem: add version 0.1.2 2013-08-11 23:50:04 +02:00
Peter Simons
0700209478 haskell-crypto-cipher-types: add version 0.0.1 2013-08-11 23:50:04 +02:00
Peter Simons
60a58dda25 haskell-crypto-cipher-tests: add version 0.0.1 2013-08-11 23:50:04 +02:00
Domen Kožar
1cdc07296d update deform,colander,translationstring python modules 2013-08-11 14:29:40 +02:00
Domen Kožar
cc2c757fc2 Merge pull request #818 from iyzsong/orc 
add orc 0.4.17
 2013-08-11 04:32:01 -07:00
Jaka Hudoklin
50021ebb0a pythonPackages: fix graphite_web, make it usable 2013-08-11 12:05:02 +02:00
Domen Kožar
a5a9ccffc9 Merge pull request #816 from offlinehacker/pycurl2 
Add pycurl2, a Python interface to libcurl
 2013-08-10 20:23:12 -07:00
Domen Kožar
007f563124 Merge pull request #817 from offlinehacker/pythonPackages.carbon 
pythonPackages: fix carbon, move dependecies to propagated build inputs
 2013-08-10 20:22:53 -07:00
Song Wenwu
4705462a2f add libvisual 0.4.0 2013-08-11 11:15:07 +08:00
Song Wenwu
094ffb2b08 add orc 0.4.17 2013-08-11 11:00:45 +08:00
Evgeny Egorochkin
3065a7686b torbutton: package version 1.6.1 2013-08-10 20:09:18 +03:00
Michael Raskin
15637cf207 Add HTTPS support to Midori 2013-08-10 21:00:14 +04:00
Jaka Hudoklin
46d887aca9 pythonPackages: fix carbon, move dependecies to propagated build inputs 2013-08-10 15:27:25 +02:00
Jaka Hudoklin
cf4e29b916 Add pycurl2, a Python interface to libcurl 2013-08-10 15:06:01 +02:00
Bjørn Forsman
70ea99cfa8 lttng-modules: new package 
Add linux kernel modules needed to do kernel tracing with LTTng.

To make them available to lttng in NixOS, add this to configuration.nix:

  boot.extraModulePackages = [ pkgs.linuxPackages.lttngModules ];
 2013-08-10 14:47:55 +02:00
Bjørn Forsman
5a3a82d81c lttv: new package 
Linux Trace Toolkit Viewer is a GUI program to visualize LTTng trace
files. (An alternative to this program is the LTTng plugin for the
Eclipse IDE.)
 2013-08-10 14:32:57 +02:00
Bjørn Forsman
1eb38f2ccb babeltrace: new package 
Babeltrace is a command-line tool and library to read and convert LTTng
tracefiles. Give it a (binary) trace file/dir path and it will print a
human readable event log to standard out.
 2013-08-10 14:32:57 +02:00
Bjørn Forsman
6a4f068b9e lttng-tools: new package 
This is the Linux Trace Toolkit. Included in this package:

Command-line client:
  lttng
Tracing daemons:
  lttng-sessiond (automatically started by lttng)
  lttng-relayd   (remote trace collection daemon)

Userspace tracing can be done by using liblttng-ust. To do kernel
tracing we also need the LTTng kernel modules.

I've added a patch that changes "/sbin/modprobe" to just "modprobe".
 2013-08-10 14:32:57 +02:00
Bjørn Forsman
33d78777a3 lttng-ust: new package 
This is the user space library for LTTng. It is needed to do user space
tracing, as opposed to kernel space tracing.
 2013-08-10 14:32:56 +02:00
Bjørn Forsman
4e8dfe71d3 liburcu: new package 
liburcu is a userspace RCU (read-copy-update) library that is used by
LTTng - Linux Trace Toolkit (next generation).
 2013-08-10 14:32:56 +02:00
Mathijs Kwik
59025453e7 linux-3.10: backport a fix for "btrfs send" 
It has been submitted for inclusion in mainline, so it will probably
make it into 3.11 (or 3.12 as 3.11 is fairly close to release).

It is very local, only affecting people who use the "send" feature.
Without it, send is unstable/unsafe to use incrementally.

It can probably be applied to 3.9 and 3.8 as well, but as I only
tested it against 3.10, so I didn't bother.
 2013-08-10 13:53:17 +02:00
Michael Raskin
7701b22977 Merge pull request #814 from garbas/vifm-update 
vifm: update to 0.7.5 and enabling new options
 2013-08-10 04:03:01 -07:00
Rok Garbas
24a0e6ad5f callPackage automatically inherits from xlibs 2013-08-10 13:00:43 +02:00
Carles Pagès
4d853ae94f steam: revert adding amd64 version. 
It turns out that the .deb only contains the changelog and some other docs.
Revert back to using the i686 version, but keep the double url for the future.
 2013-08-10 06:08:18 +03:00
Carles Pagès
97ea8d61e6 steam: add amd64 version and point url to fix version (as suggested by aristid). 
Valve has a repository with fixed version packages, so use that instead of the
steam.deb I was using. They also have amd64 packages there.
 2013-08-10 06:08:18 +03:00
Carles Pagès
2725cbef42 Add libtxc_dxtn-1.0.1. 
I thought this was needed by Steam, but it only applies when not using
propietary drivers, and even then it doesn't look like well supported.
 2013-08-10 06:08:17 +03:00
Carles Pagès
3cd37b550b Steam: first attempt at adding the beta client. 
The script installed with this expression only copies a boostrapper and another
script to the user's home folder. Those also need to be patched to get on with
the installation.
 2013-08-10 06:08:15 +03:00
Rok Garbas
3c6b2f7501 vifm: update to 0.7.5 and enabling new options 2013-08-10 02:32:21 +02:00
Bodil Stokke
14c5f6bd74 Adding ponysay. 2013-08-10 01:21:25 +02:00
Eelco Dolstra
9845e6ec5c Kernel module aggregator: Use kmod instead of module-init-tools 2013-08-09 18:48:52 +02:00
Eelco Dolstra
d9a4706f73 linux: Use kmod instead of module-init-tools 2013-08-09 18:48:51 +02:00
Moritz Ulrich
ceb96b7312 Package elixir and rebar. 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-08-09 16:29:01 +02:00
Moritz Ulrich
e32b26c222 Add erlang R16B1 
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
 2013-08-09 16:29:01 +02:00
Sander van der Burg
4be1055c40 Upgraded nodejs packages 2013-08-09 13:37:27 +02:00
aszlig
9040af06e3
nixpart: Add an alias called nixpart0. 
The reason behind this is to avoid breaking NixOps while releasing
version 1.0 of nixpart. We could also use nixpart and nixpart1, but the
goal is to have nixpart as a generic part of NixOS instead of being only
used specifically for the Hetzner backend of NixOps.

Which essentially means: The partition syntax will change to be based on
attribute sets and we no longer need to use Kickstart syntax. And that's
the main reason why it will break in version 1.0.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-08 03:18:00 +02:00
Eelco Dolstra
4c77c6e232 makeModulesClosure: Use kmod instead of module-init-tools 2013-08-07 22:46:11 +02:00
Domen Kožar
d3d92c7b6d supervisor: 3.0b2 -> 3.0 2013-08-07 16:31:04 +02:00
Domen Kožar
9fad991fbb Merge pull request #806 from lovek323/pangomm 
fix pangomm build: use cairo 1.12.2
 2013-08-07 05:14:29 -07:00
Domen Kožar
ffed739441 Merge pull request #793 from lovek323/grcat 
grc: add expression
 2013-08-07 05:13:53 -07:00
Domen Kožar
3cf22b5307 Merge pull request #805 from lovek323/pass 
password-store: add expression
 2013-08-07 05:11:51 -07:00
Eelco Dolstra
3a4ef26397 Remove Linux 3.8 (EOL) 2013-08-06 12:39:50 +02:00
Eelco Dolstra
3e8812d23b Add Unix::Getrusage 2013-08-06 12:32:59 +02:00
Vladimír Čunát
b6bb1e513d mesa: attempt to fix driverLink on darwin 2013-08-06 12:20:34 +02:00
Ricardo M. Correia
36c2711f8b linux: update grsecurity patch 2013-08-06 02:21:00 +00:00
Evgeny Egorochkin
db6155fa54 xrestop: package 0.4 2013-08-06 03:56:21 +03:00
Jason "Don" O'Conal
d4ba4769b6 password-store: add expression 2013-08-06 09:46:06 +10:00
Jason "Don" O'Conal
32a3516b2c pythonPackages.googlecl: add expression 2013-08-06 09:43:57 +10:00
Jason "Don" O'Conal
f3aedccfd4 grc: add expression 2013-08-06 09:42:24 +10:00
Eelco Dolstra
2a294a582b Statistics::Descriptive: Update to 3.0605 2013-08-05 15:14:02 +02:00
Peter Simons
d65b81b36b haskell-MissingH: update to version 1.2.0.1 
Don't run the check phase to avoid depending on the obsolete testpack package.
 2013-08-05 10:56:30 +02:00
Peter Simons
d5cad473f9 bison3: mark low-prio until the check phase is fixed 2013-08-03 12:14:03 +02:00
Peter Simons
41126666a6 bison: add version 3.0 2013-08-03 10:39:07 +02:00
aszlig
4489dc729e
python-paramiko: Propagate pycrypto dependency. 
Leaving this just in buildInputs won't help here, because the project
using Paramiko will need pycrypto in any case.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-03 09:49:08 +02:00
aszlig
a672551d44
python-paramiko: Update to version 0.11.0. 
This also now uses the md5 istead of the sha256, because pypi actually
directly provides MD5 sums.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-03 09:48:54 +02:00
Vladimír Čunát
d374527509 GTK-related minor updates 2013-08-03 09:45:22 +02:00
Vladimír Čunát
625f40151b Merge branch 'master' into x-updates 
Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
 2013-08-02 18:30:53 +02:00
Mathijs Kwik
bdb525e020 add haskell-llvm-general 2013-08-02 11:47:38 +02:00
Peter Simons
4fb87e91ff Merge pull request #800 from edanaher/master 
Add simple hsetroot package.
 2013-08-02 02:32:19 -07:00
Michael Raskin
bfbbb12e35 Adding CL-Launch. CL-Launch is a wrapper for unified launching of various Lisp implementations 2013-08-02 09:39:20 +04:00
Evan Danaher
35333935d6 Add simple hsetroot package. 2013-08-01 20:16:37 +02:00
Eelco Dolstra
f155a35d7d Move kernelExtraConfig to common-config.nix (for x86) 
It's bad to have the kernel config scattered across two places.  (This
should also be done for the other architectures.)

Also, restore Xen and KVM guest support in Linux 3.10.
 2013-08-01 14:35:31 +02:00