Shea Levy 127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging ...

Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix

2015-02-11 19:37:22 -05:00

..

apulse

apulse: update from 0.1.2 to 0.1.4

2014-11-18 20:36:46 +01:00

beep

beep: set meta.platforms

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

cups

Change occurrences of gcc to the more general cc

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

drivers

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00

emulators

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05: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

gxemul

Fix license attribute of many bsd-like licensed packages

2014-12-21 00:00:35 +01:00

jackaudio

update jack2 to version 1.9.10

2015-02-07 10:37:54 +01:00

lilypond

lilypond: updated from 2.16.2 to 2.18.2

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

my-env

Change occurrences of gcc to the more general cc

2014-12-26 11:06:21 -06: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

Add xss-lock

2015-02-01 10:07:01 -08: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

orion: add GTK3 theme

2015-01-26 20:59:51 -06:00

uboot

clean up git revision handling in several packages

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

vim-plugins

vimplugins: update vim2nix and VAM

2015-02-09 01:43:24 +03: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