Commit Graph

45609 Commits

Author SHA1 Message Date
Vladimír Čunát
5979d428b4 Merge recent master into x-updates
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
Vladimír Čunát
73ad32e1d9 freetype: flatten include to fix several builds
I just wonder why freetype-2.5 needed to move headers around.
2014-07-09 22:03:31 +02:00
Vladimír Čunát
4b263946dd qt3, graphicsmagick137, fox, neverball: fix build
Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
2014-07-09 21:52:04 +02:00
Vladimír Čunát
9a00938334 mesa: bugfix update 2014-07-09 20:47:47 +02:00
Vladimír Čunát
10fe63c05a pixman: bugfix update, remove withPNG option
The option seemed useless.
2014-07-09 20:46:53 +02:00
Peter Simons
1ecae5c2c1 Merge pull request #3189 from aherrmann/pr_licenses
License meta-data for numexpr, tables, and szip
2014-07-07 11:33:47 +02:00
Peter Simons
6ccf8cbfeb haskell-packages.nix: delete obsolete 'gtk2hsC2hs' alias 2014-07-07 11:15:41 +02:00
Peter Simons
27ff2eeb77 haskell-gtkglext: re-generate with cabal2nix 2014-07-07 11:15:16 +02:00
Peter Simons
357429247f haskell-hlibgit2: re-generate with cabal2nix 2014-07-07 11:08:41 +02:00
Shea Levy
8f33899dd2 Set default kernel to 3.14
It is the latest longterm http://permalink.gmane.org/gmane.linux.kernel/1738612
2014-07-06 19:27:37 -04:00
John Wiegley
74d51f0b4e Merge pull request #3197 from wavewave/gitlib
Haskell packages, hlibgit2, gitlib, gitlib-test, gitlib-libgit2
2014-07-06 15:19:19 -05:00
Ian-Woo Kim
90dacd685d Haskell packages, hlibgit2, gitlib, gitlib-test, gitlib-libgit2 added. Low/High-level API for git 2014-07-06 22:03:38 +02:00
cillianderoiste
5e83d2b7ab Merge pull request #3190 from cstrahan/watchman
watchman: new package
2014-07-06 17:34:03 +02:00
Luca Bruno
873832ab6d telepathy-gabble: build on hydra 2014-07-06 11:50:30 +02:00
Luca Bruno
1b7d5ff469 empathy: fix icons 2014-07-06 11:31:09 +02:00
lethalman
789c9508c2 Merge pull request #2582 from chexxor/feature/add-znc-module
Add ZNC module
2014-07-06 11:23:08 +02:00
Charles Strahan
6b16c2ec34 watchman: new package
This adds `watchman`, a CLI utility that watches files and takes action when
they change.
2014-07-06 01:34:11 -04:00
Andreas Herrmann
af8ec93e6a szip: Provide meta-data
The license is set to "unfree" as commercial use is not permitted by the
license [1].

[1]: http://www.hdfgroup.org/doc_resource/SZIP/Commercial_szip.html
2014-07-05 21:41:04 +02:00
Andreas Herrmann
0e1eac04bb szip: Indentation 2014-07-05 21:41:04 +02:00
Andreas Herrmann
ddfdd85171 tables: Define license 2014-07-05 21:41:04 +02:00
Andreas Herrmann
01e2ed000b numexpr: Define license 2014-07-05 21:41:04 +02:00
Luca Bruno
1c1747be0d Add gnome shell extensions plugin for browsers 2014-07-05 21:16:31 +02:00
Luca Bruno
55dc58d7d0 evolution-data-server: wrap all libexec executables 2014-07-05 19:52:39 +02:00
Luca Bruno
9ec0a105d3 gnome-shell: enable parallel building 2014-07-05 19:52:38 +02:00
Bjørn Forsman
e658ae9694 Revert "haskell-gtkglext: update to version 0.12.5.0"
Because it breaks nixpkgs evaluation:

$ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace
error: while querying the derivation named `haskell-gtkglext-ghc7.6.3-0.12.5.0':
while evaluating the attribute `propagatedNativeBuildInputs' of the derivation `haskell-gtkglext-ghc7.6.3-0.12.5.0' at /home/bfo/nixpkgs/pkgs/build-support/cabal/default.nix:70:13:
infinite recursion encountered

This reverts commit 6ba32aa8bd.
2014-07-05 16:12:06 +02:00
Rok Garbas
f3439fcfd4 Revert "nodePackages.couchapp: added & and node packages updated"
This reverts commit 8cf2cd5d11.
2014-07-05 14:30:53 +01:00
cillianderoiste
dd826b86a8 Merge pull request #3186 from geerds/plasma-nm
Packaging plasma-nm and its dependencies
2014-07-05 15:24:37 +02:00
Bjørn Forsman
ae5501f44e Fix nixpkgs evaluation
'banshee' doesn't exist (yet) in nixpkgs. I think it was accidentally
added in commit 5dc9730a63 (gnome-music
3.12: add totem-pl-parser to dependencies).
2014-07-05 15:00:01 +02:00
Bjørn Forsman
3950f2582d openocd: fix symlink to udev rules file
I made an error last time I touched this line. Fix it (.udev => .rules).
2014-07-05 14:56:10 +02:00
Jascha Geerds
28322c8d58 Packaging plasma-nm and its dependencies 2014-07-05 13:54:01 +02:00
Luca Bruno
5dc9730a63 gnome-music 3.12: add totem-pl-parser to dependencies 2014-07-05 13:52:29 +02:00
Luca Bruno
ac711a705e dfeet: fix icons 2014-07-05 12:18:17 +02:00
Oliver Charles
6365987e53 Merge pull request #3178 from tomberek/haskell_hastePerch
Haskell haste perch
2014-07-05 10:59:22 +01:00
Oliver Charles
2fc5d3c243 Merge pull request #3181 from vbgl/yojson
Adds yojson.
2014-07-05 10:58:47 +01:00
Rok Garbas
fac41b58ca couchdb: update to 1.6.0 2014-07-05 09:18:42 +01:00
Vincent Laporte
9256136635 Adds yojson.
Yojson is an optimized parsing and printing OCaml library for the JSON
format, contributed by Martin Jambon.

Webpage: http://mjambon.com/yojson.html
2014-07-05 09:00:12 +02:00
John Wiegley
67e4df75dd Revert "mutt: update to 1.5.23"
This reverts commit 6a7d60c01a.
2014-07-04 15:48:14 -05:00
Michael Raskin
01d9778625 Update boinc 2014-07-04 22:18:49 +04:00
Michael Raskin
94e11b2f91 Update autocutsel 2014-07-04 21:51:43 +04:00
Michael Raskin
b243ef6bef maven: update from 3.0.4 to 3.1.1, potentially fixes CVE-2013-0253 2014-07-04 21:45:30 +04:00
Michael Raskin
cb84c4d6a4 babeld: update from 1.4.3 to 1.5.0 2014-07-04 21:45:07 +04:00
Michael Raskin
5aef461e72 asio: update from 1.10.1 to 1.10.2 2014-07-04 21:42:48 +04:00
Michael Raskin
3329d68199 aria2: update from 1.18.1 to 1.18.5 2014-07-04 21:42:31 +04:00
Michael Raskin
0b9a382fc8 Apparently nobody ever noticed that aria was already packaged when packaging it once more; merging expressions 2014-07-04 21:42:14 +04:00
Michael Raskin
db88d93335 accountsservice: update from 0.6.35 to 0.6.37 2014-07-04 21:36:12 +04:00
Michael Raskin
57890e2921 Mark allegro as allegro-4.* 2014-07-04 21:33:59 +04:00
Michael Raskin
5e066f9741 Update acpi_call 2014-07-04 21:30:11 +04:00
Michael Raskin
ca6dba33ad Add Botan unstable branch - 1.11.9 release 2014-07-04 21:23:09 +04:00
tomberek
ce5c883ecf jailbreak haste-perch for base==4.6 req 2014-07-04 12:16:12 -04:00
Rickard Nilsson
03a3246bc1 Merge pull request #3177 from ip1981/master
Updated Mediawiki to 1.23.1
2014-07-04 18:11:32 +02:00