Domen Kožar bb4d658f64 Merge branch 'master' into staging ...

Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix

2015-05-11 10:05:23 +02:00

..

apulse

apulse: fix sha

2015-03-31 15:11:47 +03:00

beep

beep: set meta.platforms

2014-10-25 17:24:47 +02:00

cups

cups: Use systemd files provided by CUPS

2015-05-10 13:46:32 +02:00

drivers

hplip: update to 3.15.2

2015-02-21 20:19:21 -06:00

emulators

Merge pull request #7604 from bendlas/wine64

2015-05-10 19:13:37 +03:00

foldingathome

Change occurrences of gcc to the more general cc

2014-12-26 11:06:21 -06:00

freestyle

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

frescobaldi

frescobaldi: add pygame dependency for midi support

2015-01-22 23:34:10 -06:00

ghostscript

kill libiconvOr*

2015-02-07 20:29:28 -08:00

gnuk

gnuk: Add derivation for fst-01

2015-05-02 15:54:42 -07:00

jackaudio

jack2: depend on libsndfile

2015-05-03 12:46:10 -05:00

lilypond

lilypond: updated from 2.16.2 to 2.18.2

2014-10-12 14:52:55 +02:00

my-env

myEnvFun: use stderr instead of stdout for messages

2015-03-22 18:24:35 +01:00

phabricator

Enabled access to binaries of needed tools, and worker daemons can be enabled for phabricator #3306

2014-09-03 15:46:59 +04:00

sails

Add simulator for autonomous sailing boats

2014-10-14 12:00:42 +01:00

screensavers

slock: 1.1 -> 1.2

2015-05-10 13:46:01 +02:00

seafile-shared

seafile: update client, ccnet, libsearpc and shared

2015-01-09 13:37:44 +01:00

solfege

gnome3 apps: correctly render icons

2014-02-28 01:40:21 +01:00

sound-of-sorting

Sound of Sorting: New Package

2014-10-01 02:04:36 +01:00

source-and-tags

drop myhasktags, current hackage version has everything my version had

2014-01-23 14:44:21 +01:00

themes

numix-gtk-theme: Install to $out/share/themes.

2015-03-05 15:13:04 +08:00

uboot

clean up git revision handling in several packages

2013-11-13 12:46:55 +02:00

vim-plugins

vim-plugins: wakatime 3.0.9 -> 4.0.0

2015-05-03 22:29:14 +02:00

xosd

xosd: update from 2.2.12 to 2.2.14 and added meta information

2015-02-06 15:31:32 +01:00

misc.nix

rename rubyLibs to rubyPackages

2014-11-09 22:16:58 +00:00