Commit graph

14560 commits

Author SHA1 Message Date
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
Peter Simons 56d325550b Revert "Revert "haskell-pandoc-citeproc: drop obsolete versions 0.4 and 0.5"".
This reverts commit dddea7f0d1. @jwiegley, Hakyll builds just fine with
pandoc-citeproc 0.6. See http://hydra.cryp.to/build/239248, for example. If you
have trouble compiling that package, then please share a build log that shows
the error message instead of reverting my commits, please.
2014-11-11 21:17:14 +01:00
cillianderoiste d12d84bf78 Merge pull request #4946 from puffnfresh/package/lightum
Add Lightum package: MacBook light sensor daemon
2014-11-11 20:54:59 +01:00
John Wiegley 68f3d56880 Drop reference to old shelly from haskell-defaults.nix 2014-11-11 12:50:22 -06:00
John Wiegley dddea7f0d1 Revert "haskell-pandoc-citeproc: drop obsolete versions 0.4 and 0.5"
This reverts commit d3b2c3f46c.

@peti I'm reverting this commit until a resolution is found that allows
Hakyll to build.  I've confirmed that reverting it here fixes the build
error.
2014-11-11 12:49:33 -06:00
Brian McKenna e9b6ad43a6 Add Lightum package: MacBook light sensor daemon
Also a NixOS service could make sense but the daemon puts
configuration under the Xdg user path.
2014-11-11 10:22:08 -07:00
Eelco Dolstra 19e5c3c306 firefox-13.0: Remove
It's outdated, insecure and not used anywhere in Nixpkgs.
2014-11-11 15:37:58 +01:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
vbgl 0e309af732 Merge pull request #4933 from sjmackenzie/ndn
new package: ndn-cxx
2014-11-11 12:46:50 +00:00
Peter Simons 2650bdf417 Merge pull request #4894 from peti/haskell-updates
Drop obsolete versions of Haskell Platform ...
2014-11-11 13:42:03 +01:00
Stewart Mackenzie 23d0af8f34 new package: ndn-cxx 2014-11-11 18:22:18 +08:00
Eelco Dolstra aa17cbf0a8 Remove unnecessary override 2014-11-11 10:38:48 +01:00
Domen Kožar 43be15a89c fix quake3game build 2014-11-11 09:34:40 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Brian McKenna a6bacd4d81 Add "light" package and setuid wrapper 2014-11-09 19:45:43 -07:00
Luca Bruno 2e380c0070 Revert "add back wayland 1.5 for cogl 1.18"
This reverts commit 9c997fe446.
2014-11-10 01:03:32 +01:00
Luca Bruno 65e6449faa Revert "Use wayland 1.5 also for cogl 1.16"
This reverts commit c2ab75c47b.
2014-11-10 01:03:27 +01:00
Luca Bruno c2ab75c47b Use wayland 1.5 also for cogl 1.16 2014-11-10 00:39:44 +01:00
Luca Bruno 9c997fe446 add back wayland 1.5 for cogl 1.18
Wayland 1.6 removed wayland-egl.pc
2014-11-10 00:13:53 +01:00
koral bc1166c021 ncmpcpp: removed old beta. 2014-11-09 20:57:48 +01:00
Michael Raskin 6dcab5d1ed Merge pull request #4913 from offlinehacker/pythonPackages/jrnl/add
pythonPackages: add jrnl, a simple journal application for your command line
2014-11-09 19:36:40 +03:00
Michael Raskin b6203b804b Mark binary distribution of Mozart/Oz 2.0 as such 2014-11-09 19:26:55 +03:00
Francesco Lazzarino 6e508a61e7 new package – libtomcrypt 2014-11-09 18:50:15 +03:00
Jaka Hudoklin 8b80daeab2 pythonPackages: add jrnl, a simple journal application for your command line 2014-11-09 16:49:20 +01:00
Michael Raskin 67317f4bf6 Fix fetchurl references — Fixes \#4421 2014-11-09 18:34:27 +03:00
Nathaniel Baxter a0fc4263e3 pythonPackages: set guessit and babelfish as python 2.x only 2014-11-09 18:32:47 +03:00
Nathaniel Baxter 3e7d52434d flexget: Use dateutils 1.5 instead of 2.1 for python 2.x support 2014-11-09 18:32:47 +03:00
Nathaniel Baxter 8612f15a68 flexget: Bump version to 1.2.201 Added dateutil_2_1, guessit and bablefish dependencies 2014-11-09 18:32:47 +03:00
Michael Raskin ffbd1d011b Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist 2014-11-09 18:31:46 +03:00
Michael Raskin 0fb2c3e85a Add unstable NodeJS — Fixes #4264 (mostly merges the PR from Bodil Stokke) 2014-11-09 18:18:56 +03:00
Jaka Hudoklin 3d2f1c3385 Merge pull request #4854 from offlinehacker/pkgs/libguestfs/add
Add augex, hivex and libguestfs
2014-11-09 16:09:51 +01:00
Michael Raskin 6d0518fbdf Merge pull request #4282 from sztupi/crashplan
Crashplan

OK, it is an external service with unfree client, so let's declare that ensuring usability of the service is not our headache.
2014-11-09 18:09:33 +03:00
Michael Raskin 41ff7d75fd Add mutt sidebar patch — Fixes #3222 (a PR by Leon Waldman) 2014-11-09 17:55:19 +03:00
Jaka Hudoklin 25b2d2d9b0 Add libguestfs, tools for accessing and modifying virtual machine images 2014-11-09 15:24:25 +01:00
Jaka Hudoklin 7dc7ccbe5b Add hivex, windows registry hive extraction library 2014-11-09 15:24:08 +01:00
Peter Simons 3b96e0c752 Switch the default version of GNU Privacy Guard back to 2.0.
This patch effectively undoes @wkennington's update from 850da18. The problem
with GnuPG 2.1 is that its built-in 1.x compatibility differs from the one
provided in version 2.0, and these changes break 'gpg1compat in ways we don't
understand yet.

Commit 4c84621 attempted to remedy that issue by fixing gpg1compat to GPG 2.0,
but this caused further trouble because the GPG agent from versions 2.0 and 2.1
are incompatible, so users of the GPG 1.x interface (who were using GPG 2.0)
could not talk to their X session's agent (which comes from GPG 2.1).

The corresponding ticket is https://github.com/NixOS/nixpkgs/issues/4888.
2014-11-09 14:36:14 +01:00
Jaka Hudoklin cc3ba83055 Add augeas, configuration editing tool 2014-11-09 14:32:08 +01:00
Mateusz Kowalczyk 57a84615c6 vite: fix and update package 2014-11-09 12:59:51 +00:00
Mateusz Kowalczyk ce4f49cec1 EZTrace: new package 2014-11-09 12:05:44 +00:00
Edward Tjörnhammar c329e5bbd9 i2pd: added package, service 2014-11-09 09:55:35 +01:00
Cray Elliott 6349ff15b1 add xwiimote, a linux-only userspace driver for wiimotes 2014-11-08 20:44:25 -08:00
ambrop7@gmail.com 45aeaf6938 Add conntrack-tools and missing dependencies. 2014-11-09 00:28:21 +01:00
Arseniy Seroka 417216aa57 Revert "Add conntrack-tools and missing dependencies." 2014-11-09 02:12:04 +03:00
Arseniy Seroka c66a63e45c Merge pull request #4900 from ambrop72/conntrack
Add conntrack-tools and missing dependencies.
2014-11-09 02:10:59 +03:00
Maciek Starzyk f72c460abf ocaml: 4.02.0 -> 4.02.1 2014-11-08 23:15:53 +01:00
ambrop7@gmail.com 085b5ec48c Add conntrack-tools and missing dependencies. 2014-11-08 23:06:09 +01:00
Michael Raskin bf184758a6 Adding Fish-Fillets-NG game 2014-11-08 22:35:06 +03:00
Domen Kožar c1d6a4a8fb remove unused pythonLinkmeWrapper 2014-11-08 20:19:55 +01:00
Aristid Breitkreuz 928177aa91 Merge pull request #4834 from offlinehacker/pkgs/flannel/add
Add flannel, etcd backed network fabric for containers
2014-11-08 19:56:16 +01:00
Aristid Breitkreuz 392f828c5d Merge pull request #4822 from abbradar/crawl
crawl: fix, update, add console version
2014-11-08 19:42:23 +01:00