Shea Levy
c45372f038
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
...
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Thomas Tuegel
95829c8959
k3b: propagate cdrecord dependency
...
By default, k3b will use cdrkit, but that can be overriden by choosing
the original cdrtools.
2015-02-01 10:34:30 -06:00
Michael Raskin
a3008a638f
Update qpdfview
2015-02-01 18:41:32 +03:00
Sven Keidel
b50cabf2d4
cool-old-term: rename to cool-retro-term ( close #6071 )
...
The project has changed its name to cool-retro-term. The project also added a
dependency that is included as a submodule. I added this dependency as a
separate expression.
2015-01-31 19:23:45 +01:00
Andrey Arapov
9f623a820d
Adds a new package: cherrytree - A hierarchical note taking application
...
cherrytree - A hierarchical note taking application, featuring rich text
and syntax highlighting, storing data in a single xml or sqlite file.
This commit also adds PyGtkSourceView - a Python wrapper for the GtkSourceView widget library.
Official page http://www.giuspen.com/cherrytree
2015-01-31 02:17:00 +01:00
Pascal Wittmann
98a69c0dcb
calibre: update from 2.17.0 to 2.18.0
2015-01-30 09:04:45 +01:00
Lluís Batlle i Rossell
e3a93dc45f
gpa: using mirror url.
...
(cherry picked from commit bdc630e7e97837aa4457c7da4562f9d22e21df87)
2015-01-29 22:38:46 +01:00
Lluís Batlle i Rossell
0326fd03d4
Adding GPA, The GNU Privacy Assistant.
...
(cherry picked from commit 24a89c028a0d2988805b17f4c69c3f2b3a284b1f)
2015-01-29 20:29:58 +01:00
Wout Mertens
7e045d412a
pstree: fix direct reference to gcc
2015-01-28 12:35:54 +01:00
Peter Simons
4dac26b569
ikiwiki: update from 3.20141016.1 to 3.20150107
2015-01-27 14:04:54 +01:00
Charles Strahan
5a73cda9b5
terminal-notifier: add package
2015-01-26 17:06:20 -05:00
Edward Tjörnhammar
0691a2c915
Merge pull request #5919 from pjones/feature/pwsafe
...
New package: pwsafe (Password Safe)
2015-01-25 10:21:42 +01:00
Peter Jones
4f189f04ca
New package: Password Safe (pwsafe)
2015-01-24 16:01:32 -07:00
Jaka Hudoklin
3a2670c74a
xca: fix ssl
2015-01-24 22:49:11 +01:00
Pascal Wittmann
531578c188
calibre: update from 2.16.0 to 2.17.0
2015-01-24 12:59:26 +01:00
Eelco Dolstra
480602bea1
blender: Update to 2.73a
2015-01-23 12:20:17 +01:00
Vladimír Čunát
f484050a81
ikiwiki: maintenance update, and use a stable URL
...
CC maintainer @peti.
2015-01-20 14:05:25 +01:00
Peter Simons
ec6b82a0c2
Merge branch 'master' into staging.
2015-01-19 18:41:17 +01:00
Vincent Laporte
20d994031e
grass: tag as broken
2015-01-19 16:18:01 +01:00
Moritz Ulrich
4f17a18423
cura(engine): update to 14.12.1
2015-01-19 15:52:46 +01:00
Michael Raskin
f33979461d
Merge pull request #5815 from eduarrrd/3dfsb
...
Add 3dfsb
2015-01-19 09:20:08 +03:00
Eduard Bachmakov
9b049948fa
Add 3dfsb
2015-01-18 22:22:22 -05:00
Bjørn Forsman
02458a939a
taskwarrior: enable bash completion
...
By adding the missing link between the (already installed) completion
script and $out/etc/bash_completion.d/.
2015-01-18 14:14:36 +01:00
Robert Helgesson
b2be4092c6
Add package 'pytrainer'.
2015-01-18 13:34:02 +01:00
lethalman
127ee84d8f
Merge pull request #5784 from matthiasbeyer/add-stag
...
Add package: stag
2015-01-17 15:17:24 +01:00
Matthias Beyer
91e4ef3488
Fixup: Add platform
2015-01-16 17:18:06 +01:00
Matthias Beyer
f3f06fc1cc
Fixup: Use archive instead of git clone
2015-01-16 17:17:35 +01:00
Matthias Beyer
ddc0d43115
Add package: ctodo
2015-01-15 22:56:09 +01:00
Matthias Beyer
261f596335
Fixup: set maintainer
2015-01-15 18:38:51 +01:00
Matthias Beyer
ee06c59944
Fixup: Missing terminating quote
2015-01-15 18:38:28 +01:00
Matthias Beyer
6be4eb7a43
Add package: stag
2015-01-15 18:38:27 +01:00
Pascal Wittmann
e01d24bd72
Merge pull request #5773 from matthiasbeyer/add-cortex
...
Add cortex in applications/misc
2015-01-15 18:32:48 +01:00
Matthias Beyer
9261b976ee
Add cortex in applications/misc
2015-01-15 17:13:40 +01:00
Pascal Wittmann
99496c8346
Merge pull request #5607 from AndersonTorres/xiphos
...
Xiphos: upgrade to 4.0.0
2015-01-15 12:01:53 +01:00
Eric Seidel
88eae46455
rename occurrences of gcc.gcc to gcc.cc
2015-01-14 20:47:49 -08:00
Eric Seidel
f3c6827373
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
2015-01-14 20:27:55 -08:00
Pascal Wittmann
398d1277c6
calibre: update from 2.15.0 to 2.16.0
2015-01-14 14:23:47 +01:00
Pascal Wittmann
8fb18cf523
llpp: update to stable version 21
2015-01-14 14:23:46 +01:00
Ludovic Courtès
41b53577a8
unmaintain a bunch of packages
2015-01-13 22:33:49 +01:00
Luca Bruno
5f12045f34
blender: fix build after update to 2.73
2015-01-13 21:35:22 +01:00
devhell
5bda3e1b95
mediainfo-gui: 0.7.71 -> 0.7.72
2015-01-13 00:42:55 -08:00
devhell
c7c196de6e
mediainfo: 0.7.71 -> 0.7.72
2015-01-13 00:42:55 -08:00
Emery Hemingway
e6ed7e3030
qtbitcointrader 1.08.02 -> 1.08.03
2015-01-11 18:11:14 -05:00
Eelco Dolstra
b0321dadcb
blender: Update to 2.73
2015-01-10 12:24:18 +01:00
wyvie
6bb9295288
pgadmin3 version
2015-01-09 14:30:41 +03:00
Pavan Rikhi
323829af0a
workrave: add expression
2015-01-07 02:15:26 -05:00
Vincent Laporte
0eccb88a5c
zathura: update from 0.3.1 to 0.3.2
2015-01-06 11:05:30 +01:00
AndersonTorres
db24ed98d8
Xiphos: upgrade to 4.0.0
2015-01-05 21:14:43 -02:00
Ryan Mulligan
b59ac4601c
update Calibre to latest version 2.15.0
2015-01-04 08:31:21 -08:00
Domen Kožar
f0986011b4
k3b: 2.0.2 -> 2.0.3
...
(cherry picked from commit cb58784fb903811cf66bc1af871f15f43b538962)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-03 11:55:40 +01:00
AndersonTorres
ac4f15b282
Altcoins - a new category of applications
...
Here, I present a new level of hierarchy on Nixpkgs: the Altcoins.
The idea is to put a single cryptocurrency per file, and build them
using expressions like altcoins.bitcoin. I believe this ordering is
clearer and more maintainable that the current one.
2015-01-02 10:00:32 -02:00
Tobias Geerinckx-Rice
c64257b8e5
Fix user-facing typos (mainly in descriptions)
2014-12-30 03:31:03 +01:00
John Wiegley
28b6fb61e6
Change occurrences of gcc to the more general cc
...
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
vbgl
58c283f0dd
Merge pull request #5359 from ambrop72/printrun
...
Printrun: Update to printrun-20140801, add dependencies.
2014-12-25 23:43:38 +01:00
Vladimír Čunát
de572de4f0
blender: fix build by upstream patch
...
The freetype-2.5.4 update changed signedness of some struct fields.
2014-12-25 16:52:39 +01:00
Eelco Dolstra
49f53f63f5
blender: Add OpenCOLLADA support
2014-12-23 18:17:09 +01:00
Lluís Batlle i Rossell
8885c992fd
Updating xpdf to 3.04
...
(cherry picked from commit 0420a025e3d702df17a672f36627d32b488b4bfc)
2014-12-23 11:34:56 +01:00
Siarhei Zirukin
3bd2c4dabf
gqrx: update 2.3.0 -> 2.3.2
...
[Bjørn: use 'gqrx:' commit message prefix]
2014-12-23 10:25:46 +01:00
Henry Till
37fb8fb9ca
dunst: allow user configuration ( fixes #5222 )
...
This commit eliminates a patch which hard-coded an example configuration file as the program's default settings and prevented the program from reading a user's configuration file.
2014-12-22 12:03:59 -05:00
Michael Raskin
67a97340eb
qpdfview 0.4.12 → 0.4.13
2014-12-21 11:14:24 +03:00
devhell
e9c5b23f2b
mediainfo, libmediainfo, libzen: fix typo ( close #5413 )
2014-12-20 16:47:25 +01:00
Jaka Hudoklin
e9e4388959
Merge pull request #5406 from ehmry/electrum
...
eletrum: drop python-... prefix from name
2014-12-20 11:53:07 +01:00
Emery Hemingway
b9c096582d
eletrum: drop python-... prefix from name
2014-12-19 19:00:35 -05:00
Pascal Wittmann
e6d0bd0d5c
calibre: update from 2.12.0 to 2.13.0
2014-12-19 14:42:31 +01:00
lethalman
bff11526f1
Merge pull request #5325 from prikhi/add-gtk2fontsel
...
Add the gtk2fontsel Font Viewer
2014-12-19 10:44:07 +01:00
aszlig
ebf216bd56
Merge pull request #5389 from devhell/mediainfo.
...
Introduces a video/audio information utility, both CLI and GUI.
Thanks to @devhell.
* devhell-mediainfo:
libzen: Add --enable-shared to configureFlags.
mediainfo-gui: Add package
mediainfo: Add myself to meta.maintainers.
mediainfo: Add package and dependencies
2014-12-19 00:17:21 +01:00
devhell
162c9a5455
mediainfo-gui: Add package
2014-12-18 22:11:07 +01:00
devhell
858b5e54c7
mediainfo: Add myself to meta.maintainers.
2014-12-18 21:23:21 +01:00
aszlig
38d639745e
synergy: Update to new upstream version 1.6.2.
...
Fixes the following bugs:
* Helper tool crashes when service checks elevation state
* Zeroconf on server advertises bogus IP address
* Drag file causes client crash on Mac (10.10)
Introduces the following enhancements:
* Optional Bonjour requirement for Windows
* Automatic Bonjour download and install
* Auto-config available servers combo box
* More user friendly dialog when client is detected
* Minimize auto config message box usage
* Firewall exception for GUI (needed for Bonjour)
* Consistent naming for auto config feature
Full changelog with bug IDs can be found at:
http://synergy-project.org/changelog/
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-12-18 14:06:12 +01:00
devhell
9901537209
mediainfo: Add package and dependencies
...
Includes only the CLI version and the following dependencies:
* libzen
* libmediainfo
2014-12-17 01:28:46 +01:00
ambrop7@gmail.com
f484009e45
Printrun: Update to printrun-20140801, add dependencies.
...
3D view works now.
2014-12-16 21:59:42 +01:00
Pascal Wittmann
db44486377
k3b: fix audio cd ripping
2014-12-14 16:14:12 +01:00
Pavan Rikhi
292eb57af8
Add the gtk2fontsel Font Viewer
2014-12-13 23:37:44 -05:00
Pascal Wittmann
707ee5e0ec
llpp: fix copying text to clipboard on linux
2014-12-13 15:50:04 +01:00
Peter Simons
c55c87085d
haskell-taffybar: update to version 0.4.4
2014-12-13 12:06:02 +01:00
Jaka Hudoklin
6e7d796b54
xca: not broken anymore
2014-12-13 00:56:59 +01:00
Domen Kožar
e0e08f1465
whitespace change to fix k2pdfopt build
...
(cherry picked from commit 896036d8e5ec2ad35e74fc43da3d6305ef43b253)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 18:39:01 +01:00
Domen Kožar
94227eba3e
gosmore: fix build
2014-12-09 13:23:02 +01:00
Domen Kožar
de99c9c955
Merge branch 'staging'
2014-12-08 16:28:45 +01:00
Benno Fünfstück
f8af3e2e47
k2pdfopt: update and fix build
2014-12-07 21:54:53 +01:00
Domen Kožar
4aa3eec330
Merge branch 'master' into staging
...
Conflicts:
pkgs/development/libraries/fontconfig/default.nix
2014-12-07 14:02:48 +01:00
Bjørn Forsman
041242192c
gqrx: update 2.2.0 -> 2.3.0
...
Also install desktop file (new in this version) and icon.
2014-12-06 16:13:16 +01:00
Bjørn Forsman
f56d9e30a1
gnuradio-osmosdr: update 0.1.0 -> 0.1.4
2014-12-06 16:13:15 +01:00
Domen Kožar
8105a94e2b
eaglemode: fix build
2014-12-04 14:21:11 +01:00
Georges Dubus
e019249936
Merge pull request #5169 from AndersonTorres/altcoins
...
Altcoins
2014-12-04 13:58:00 +01:00
Bjørn Forsman
fea06f2712
gnuradio: update 3.7.5 -> 3.7.5.1
...
Build tested.
2014-12-03 07:21:22 +01:00
Bjørn Forsman
e6f59f2a22
evtest: update 1.31 -> 1.32
2014-12-02 22:59:49 +01:00
Michael Raskin
60b660b33a
Adding slmenu
2014-12-02 12:29:54 +03:00
Domen Kožar
50515b221e
Merge pull request #5090 from eduarrrd/gramps
...
Add gramps package.
2014-12-01 22:06:22 +01:00
Charles Strahan
b90b899b0c
rescuetime: add version
2014-12-01 12:19:44 +00:00
Charles Strahan
f9dbd4e1ba
rescuetime: fix typo
2014-12-01 12:11:01 +00:00
Charles Strahan
fcb173f70f
rescuetime: a time tracking service
2014-12-01 05:16:57 +00:00
AndersonTorres
b7d93fed25
Litecoin: Update to 0.9.3-preview5
...
Now Litecoin expression lives in a single file, litecoin.nix
2014-11-29 17:16:56 -02:00
Pascal Wittmann
5dd9d2d342
llpp: update to latest revision, uses now the ninja build system
2014-11-29 14:21:16 +01:00
AndersonTorres
3427552a61
Darkcoin: new package (v0.9.13.15)
...
Darkcoin is a privacy-centered crypto-currency.
2014-11-28 17:40:50 -02:00
Vladimír Čunát
cbd2305d4d
Merge branch 'master' into staging
2014-11-28 18:59:07 +01:00
Vladimír Čunát
06c6d4696d
*: fix builds by disregarding warning from new glibc
...
Also, in case of collectd, the -lgcc_s shouldn't be needed anymore,
as the library is in ${glibc}/lib/ now, which is practically always on RPATH.
In case of seyren it was some stdenv change uncovering the mistake of
putting src into buildInputs.
2014-11-28 18:42:03 +01:00
Bart Brouns
9bcf0178d6
xrandr-invert-colors, a tool to invert the colors of your screen
2014-11-28 13:39:01 +01:00
Pascal Wittmann
457d56fcec
calibre: update from 2.11.0 to 2.12.0
2014-11-28 11:08:12 +01:00
Vladimír Čunát
a9bad25ffe
Merge branch 'master' into staging
2014-11-24 22:14:25 +01:00
vbgl
d04875f83f
Merge pull request #5098 from k0ral/girara
...
girara: alternative installation that doesn't require ncurses or gcc-4.9
2014-11-24 09:03:15 +00:00
koral
222366883d
girara: provided an alternative installation that doesn't require ncurses or gcc 4.9
2014-11-23 23:37:53 +01:00
Peter Simons
656750cfcc
Merge pull request #5083 from eikek/sqliteman
...
add sqliteman package
2014-11-23 18:15:42 +01:00
Eduard Bachmakov
fd259de158
gramps: add license
2014-11-23 11:49:38 -05:00
William A. Kennington III
9a33f806ff
synergy: 1.5.1 -> 1.6.1
2014-11-22 20:25:24 -08:00
Eduard Bachmakov
1ac091712f
Add gramps package.
...
Basic functionality works. No plugins yet (TODO: GExiv2, pyICU, webkit,
osmgsmmap).
Gives error messages about errors in GTK installation regarding
localization. No impact other than the messages visible.
2014-11-22 22:24:00 -05:00
Eike Kettner
52c311547c
add sqliteman package
2014-11-23 01:35:16 +01:00
Pascal Wittmann
77fffad1ab
calibre: update from 2.10.0 to 2.11.0
2014-11-21 15:40:23 +01:00
Thomas Tuegel
ad38cdac8a
qt: upgrade to 5.3.2
...
This commit also removes the 5.2 branch in favor of 5.3. Several
components of KDE5 require Qt 5.3, so it doesn't make much sense to have
the rest of the system on an older version. Also, the application styles
may not be compatible because Qt breaks ABI compatibility between versions.
2014-11-20 11:10:06 -06:00
lethalman
f0e4b745f7
Merge pull request #5046 from abbradar/checksum-fixes
...
Checksum fixes
2014-11-19 18:02:09 +01:00
Nikolay Amiantov
a726dd7697
eaglemode: update and fix 404
2014-11-19 17:37:16 +03:00
Nikolay Amiantov
bddffb705f
gosmore: update, fix checksum
2014-11-19 15:35:33 +03:00
Cray Elliott
825e99808c
add a platform to all of my packages
2014-11-19 03:03:00 -08:00
Cillian de Róiste
71d1542c2d
redshift: update from 1.8 to 1.9.1
2014-11-18 21:52:57 +01:00
AndersonTorres
213536568b
Tilda: update to 1.2.2
2014-11-18 11:26:02 -02:00
Eelco Dolstra
9f914a3f82
perl-5.14: Remove
...
It's EOL and unmaintained. There was only one package using it which
I've marked as broken.
2014-11-18 10:42:23 +01:00
Eelco Dolstra
b205cdc8d6
hello: Update to 2.10
2014-11-16 22:41:38 +01:00
Moritz Ulrich
0fc8d92e53
slic3r: Bump to 1.2.1
...
Also adds OpenGL and WxGLCanvas to perlPackages..
OpenGL currently contains some pretty ugly hacks regarding OpenGL
feature-detection. Expect it to fail on different systems.
2014-11-15 19:22:59 +01:00
Nikolay Amiantov
5a5f732d83
epdfview: fix patches' hashes
2014-11-15 16:59:44 +03:00
Michael Raskin
a7c8d00b27
Merge pull request #4857 from abbradar/cups2
...
[WIP] Improve printing experience and update related packages
2014-11-15 15:18:35 +03:00
Vincent Laporte
25a52470f8
pcmanfm: update from 1.2.2 to 1.2.3
2014-11-14 23:28:30 +00:00
Nikolay Amiantov
237bf5443f
epdfview: fix building with cups 2.0
2014-11-14 16:30:38 +03:00
Vladimír Čunát
b4af993c3f
Merge branch 'master' into staging
...
Conflicts (simple):
pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Pascal Wittmann
ea05587309
calibre: update from 2.9.0 to 2.10.0
2014-11-14 14:05:39 +01:00
Nikolay Amiantov
7a5090d794
bitcoin(d): fix builing on hydra and with boost 1.56
2014-11-13 21:12:43 +03:00
Michael Raskin
221a78739e
Merge pull request #4964 from ehmry/qtbitcointrader
...
QtBitcoinTrader: 1.07.98 -> 1.08.02
2014-11-13 19:42:20 +03:00
Emery Hemingway
d925fcf384
QtBitcoinTrader: 1.07.98 -> 1.08.02
2014-11-13 10:21:30 -05:00
cillianderoiste
81680a17a8
Merge pull request #4214 from manveru/keybase
...
keybase-node-client: 0.7.0
2014-11-13 13:13:14 +01:00
Eelco Dolstra
f33fa1b66b
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Pascal Wittmann
8df0e0b151
Fixed many descriptions
2014-11-11 14:36:34 +01:00
Luca Bruno
83221f3886
Merge branch 'master' into staging
...
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Pascal Wittmann
647f58bfaf
calibre: update from 2.8.0 to 2.9.0
2014-11-07 09:55:21 +01:00
Eelco Dolstra
0518ccf5af
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0
Turn more licenses into lib.licenses style
...
Should eval cleanly, as far as -A tarball tells me.
Relevant: issue #2999 , issue #739
2014-11-06 00:48:16 +00:00
Cillian de Róiste
21f57b8d78
Add tessel: cli tools and node libs for tessel.io devices
2014-11-06 00:54:12 +01:00
Vladimír Čunát
52404a868d
Merge recent master into staging
...
Nixpkgs Hydra: ?compare=1157272
TODO: port e22889064f
Conflicts:
nixos/tests/gnome3_10.nix (auto-solved)
pkgs/applications/video/aegisub/default.nix
pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Michael Raskin
91435c5e28
Update ViFM
2014-11-05 11:56:19 +03:00
koral
e0b75ea5e7
termite: v8 -> v9
2014-11-04 23:50:23 +01:00
Peter Simons
b5fed52c43
Merge pull request #4238 from wkennington/master.boost
...
Make boost 156 the default
2014-11-03 23:03:01 +01:00
Cillian de Róiste
3a6a3815e9
kdeconnect: upgrade from 0.7.2 to 0.7.3 add new dependency: libfakekey
...
libfakekey is an X virtual keyboard library
2014-11-03 21:59:20 +01:00
Vladimír Čunát
ed867a50eb
iconv: remove usage on Linux in several packages
...
This fixes builds after #4419 . Thanks to @vbgl for the original commit;
I changed that as I'm not sure whether passing null values to buildInputs is clean.
CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
2014-11-03 12:58:54 +01:00
William A. Kennington III
a9c472d16e
boost: Fix incompatible applications
2014-11-02 17:22:28 -08:00
William A. Kennington III
aa3e800be7
boost: Remove boost.lib
2014-11-02 17:22:27 -08:00
Pascal Wittmann
aa28a2ded2
calibre: update from 2.7.0 to 2.8.0
2014-11-01 13:38:28 +01:00
Peter Simons
1b68c7b134
ikiwiki: update to version 3.20141016
2014-10-31 13:02:01 +01:00
Bjørn Forsman
346f20305b
rtl-sdr: add "Require: libusb-1.0" to pkg-config file
...
So that building 3rd party code works out of the box. (E.g. building
dump1090[1] works now).
[1]: https://github.com/antirez/dump1090
2014-10-30 08:33:16 +01:00
lethalman
f73f5b9e24
Merge pull request #4237 from k0ral/termite
...
Upgraded termite to v8, and its dependency vte to v0.38.0
2014-10-29 15:16:28 +01:00
Cray Elliott
a30e5e4481
add doomseeker, a server browser for multiple doom ports
2014-10-29 05:06:34 -07:00
koral
f53ba30c87
Upgraded termite to v8, and its dependency vte to v0.38.0
2014-10-29 12:32:29 +01:00
David Rusu
d73ae615c5
Merge https://github.com/NixOS/nixpkgs
2014-10-25 21:08:11 -04:00