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

..

applications

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

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

build-support

Merge pull request #6245 from edwtjo/samba-collate-urls

2015-02-08 13:38:01 -08:00

data

symbola: update to 7.19 ; fixes wrong hash.

2015-02-08 20:26:59 +01:00

desktops

e19: updates (close #6003)

2015-02-04 22:20:31 +01:00

development

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

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

games

instead: update from 2.2.1 to 2.2.2

2015-02-07 12:47:42 +01:00

misc

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

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

os-specific

Merge branch 'master' into staging.

2015-02-09 16:51:10 +01:00

servers

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

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

shells

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

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

stdenv

I add back the arm unpack script

2015-02-09 22:36:10 +01:00

test

…

tools

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

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

top-level

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

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