Commit graph

1186 commits

Author SHA1 Message Date
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
David Rusu 67f8da419a added sync support to taskwarrior 2014-10-25 21:08:00 -04:00
Arseniy Seroka 4a1b6f8f0b termite: update to v8 2014-10-25 16:45:00 +02:00
Pascal Wittmann 4ecacf55b9 calibre: update from 2.6.0 to 2.7.0 2014-10-24 16:39:54 +02:00
Nikolay Amiantov 21dae01ea6 rxvt_unicode: add some plugins and a wrapper 2014-10-24 12:03:58 +02:00
Charles Strahan 28fab5baf3 dmenu2: new package 2014-10-24 02:27:53 +02:00
rejuvyesh 136813d219 zathura-pdf-mupdf: correct patch 2014-10-24 01:42:23 +05:30
me@vikramverma.com e6f7910551 zathura: 0.2.9 -> 0.3.1; girara: 0.2.2 -> 0.2.3 2014-10-23 19:03:19 +02:00
Eelco Dolstra 2ed8458cf2 blender: Update to 2.72b 2014-10-22 22:22:39 +02:00
Michael Raskin d5658da944 Merge pull request #4589 from bosu/k2pdfopt
New package: k2pdfopt - mobile PDF/DJVU optimizer
2014-10-19 12:25:23 +04:00
Boris Sukholitko f9c2cb6b27 Add k2pdfopt: mobile PDF/DJVU optimizer 2014-10-19 10:55:06 +03:00
Michael Raskin 441cc2fc22 Add qpdfview PDF viewer with tabs. It also supports DjVu and some PostScript files. 2014-10-18 21:47:49 +04:00
Pascal Wittmann cd223ad0ac calibre: update from 2.5.0 to 2.6.0 2014-10-17 18:22:52 +02:00
Domen Kožar 74fde7c388 Merge pull request #4495 from NixOS/pythonFull_improvements
PythonFull improvements
2014-10-16 13:24:18 +02:00
Peter Simons a558fdca16 haskell-taffybar: update to version 0.4.3 2014-10-14 17:39:28 +02:00
Domen Kožar a2a7abc67c pythonFull -> python with all modules, pythonFullWithPkgs -> buildEnv 2014-10-13 21:35:21 +02:00
Peter Simons 950adbe487 Merge pull request #4498 from robberer/remove/md5
change md5sum to sha256sum for a few packages
2014-10-12 16:20:10 +02:00
Longrin Wischnewski 6e7de2155b change md5sum to sha256sum for a few packages 2014-10-12 16:13:21 +02:00
Peter Simons 258a47fcc7 haskell-xmobar: update to version 0.22.1 2014-10-12 16:12:27 +02:00
Pascal Wittmann a1cf6de6c8 Merge pull request #4446 from nathanielbaxter/dev/keepass
keepass: Bump version to 2.28
2014-10-11 21:00:29 +02:00
rejuvyesh 36f29dfeb9 Update xmobar to 0.22 2014-10-11 18:38:06 +02:00
Moritz Ulrich ed62f798b2 gphoto2: update from 2.5.3 to 2.5.5 2014-10-11 01:57:57 +02:00
Moritz Ulrich a58961d0c0 cura: update from 14.07 to 14.09 2014-10-11 01:57:57 +02:00