alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
46467 commits 217 branches 116 tags 4 GiB
Commit graph

1007 commits

Author SHA1 Message Date
Vladimír Čunát 1b169722a3 Merge branch 'x-updates' 
Close #3147.
The only major update is freetype-2.5, I think (it cost lots of work).
 2014-08-03 11:29:01 +02:00
Cillian de Róiste d4fb2e83db kde4_next.kde_wacomtablet: update from 2.0 to 2.0.2, potentially fixes CVE-2012-4514, CVE-2012-4514 2014-08-02 11:33:06 +02:00
Vladimír Čunát 4d6503e5b5 blender: fix parallel builds 
(cherry picked from commits f63fb3fda0 + 5fa61a2904)
 2014-08-02 11:17:25 +02:00
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates 
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
 2014-08-02 05:08:07 +02:00
Pascal Wittmann bb153cfe72 calibre: update from 1.46.0 to 1.47.0 2014-08-01 11:17:00 +02:00
Bjørn Forsman 62d0a320b3 Revert "Remove obsolete jackaudio version 1." 
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
 2014-07-31 12:52:29 +02:00
Peter Simons 5cc55e9523 Partially revert 7a45996 some more. 
Removing more references to the non-existent license "stdenv.lib.licenses.perl5".
Thanks to @FlashKorten for catching those.
 2014-07-28 20:52:47 +02:00
Peter Simons 8e6c0afd0f haskell-nc-indicators: update to version 0.3 2014-07-28 20:32:52 +02:00
Peter Simons bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Domen Kožar e3319eb73d doc: modernize meta attributes documentation 2014-07-27 13:54:37 +02:00
Pascal Wittmann 50510d1985 calibre: update from 1.45.0 to 1.46.0 2014-07-25 11:16:24 +02:00
Bjørn Forsman f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2' 
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
 2014-07-23 20:22:14 +02:00
Bjørn Forsman 3a060bbcc6 Add missing 's' in remaining meta.maintainer(s) attrs 2014-07-22 23:49:21 +02:00
Vladimír Čunát 5fa61a2904 blender: use permanent URL for the patch 
No hash changes.
 2014-07-22 18:06:42 +02:00
Vladimír Čunát 9b02635faa Merge recent master into x-updates 
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
 2014-07-21 12:05:57 +02:00
Vladimír Čunát f63fb3fda0 blender: fix parallel builds 2014-07-21 09:57:16 +02:00
Cillian de Róiste 2405a94701 KDE Connect 0.7 -> 0.7.2 2014-07-19 18:02:17 +02:00
Pascal Wittmann a49e2f866d calibre: update from 1.44.0 to 1.45.0 2014-07-18 16:20:00 +02:00
Vladimír Čunát 16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Eelco Dolstra 327c2061d1 blender: Don't use system openjpeg 
It was ignored anyway (instead using the internal openjpeg copy).
 2014-07-15 23:34:34 +02:00
Eelco Dolstra 12fb52b08a blender: Enable ocean modifier 2014-07-15 23:34:24 +02:00
Eelco Dolstra 457e539048 blender: Fix jackaudio dependency 2014-07-15 23:33:09 +02:00
Eelco Dolstra 2d8e880c82 blender: Update to 2.71 2014-07-15 23:31:55 +02:00
Vladimír Čunát 0ef81572d8 Merge pull request #3263 from cstrahan/finalterm 
finalterm: New package
 2014-07-15 14:50:25 +02:00
Peter Simons d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Charles Strahan cd8063c4b2 finalterm: Add package 2014-07-13 19:36:43 -04:00
Pascal Wittmann e8ef98cea2 calibre: update from 1.35.0 to 1.44.0 2014-07-11 22:57:59 +02:00
Peter Simons 61b60fb1ad cdrtools: mark as broken 
https://github.com/NixOS/nixos/issues/231
 2014-07-10 13:11:32 +02:00
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
Peter Simons 99c6b978a7 haskell-arbtt: update to version 0.8.1 2014-07-04 11:45:43 +02:00
Peter Simons 20a931aa8b xmobar: set the proper home page url 2014-07-03 16:52:23 +02:00
Vladimír Čunát aceb30cd93 Merge master into x-updates 
Adds the mass-rebuilding python update.
 2014-07-02 22:54:41 +02:00
_1126 5cc1245a11 xmobar: Updated to 0.21 2014-07-02 01:30:49 +02:00
Oliver Charles 37e8ebc456 Merge pull request #3144 from wmertens/source-missing-fixes 
Source missing fixes
 2014-07-01 08:43:27 +01:00
Mihaly Barasz c3c41f4ba0 nc-indicators 0.1 -> 0.2 2014-06-30 16:16:38 +02:00
Wout Mertens ea4207f7a3 makeself: bump to 2.2.0 2014-06-30 16:10:04 +02:00
John Wiegley 79aaef4846 Merge pull request #3038 from bennofs/fetch-rev-attr 
fetchbzr, fetchdarcs, fetchhg: use `rev` attr
 2014-06-28 17:04:04 -07:00
Cillian de Róiste 009196d02c KDE Connect 0.5.2 -> 0.7 2014-06-28 21:11:10 +02:00
Benno Fünfstück e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr 
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
 2014-06-28 21:06:10 +02:00
Vladimír Čunát dfd80a1b7e Merge recent master into x-updates 
Hydra eval: 1131611
 2014-06-26 22:05:15 +02:00
John Wiegley d3790c569f Merge pull request #3067 from cstrahan/camlistore 
add camlistore package
 2014-06-24 15:21:12 -07:00
Charles Strahan 79e805e281 add camlistore package 2014-06-23 06:26:56 -04:00
Vladimír Čunát 6ca980f0b4 llpp: fix freetype include path 
Fixes build, probably after freetype-2.5 update.
 2014-06-22 14:11:46 +02:00
Nikita Mikhailov d851ce331d st: 0.4.1 -> 0.5 2014-06-22 17:25:49 +07:00
Cillian de Róiste 15166ca5c2 Add KDE Connect: A tool to connect and sync your devices with KDE 2014-06-22 10:56:43 +02:00
Bjørn Forsman 7911072947 sweethome3d: remove '.' at end of description 2014-06-15 13:49:55 +02:00
Edward Tjörnhammar 97f45b1e11 Adding SweetHome3D, TexturesLibraryEditor, FurnitureLibraryEditor 2014-06-15 13:04:59 +02:00
Michael Raskin 64274e9981 MuPDF: Add an auto-updater script and update to the latest version. 2014-06-13 13:37:12 +04:00
Arvin Moezzi 0dfd7efd36 calibre: upgrade from 1.31.0 to 1.35.0 2014-06-12 09:30:39 +02:00