Commit Graph

8079 Commits

Author SHA1 Message Date
Vladimír Čunát 2c700f3b4a librsvg: drop gtk2 dep. by default, add optional gtk3 dep.
Tried to build some affected packages, seems OK.
2013-02-21 21:33:49 +01:00
Vladimír Čunát bc1e83aa1c libgsf: update, streamline dependencies, drop obsolete patch
Tried to build some affected packages, seems OK.

Conflicts (buildNativeInputs):
	pkgs/development/libraries/libgsf/default.nix
2013-02-21 21:32:12 +01:00
Vladimír Čunát dbe8a69a36 libcroco: move to gnome-3, minor update 2013-02-21 21:29:05 +01:00
Vladimír Čunát 4e5fe00a1f gnome3.libgweather: update 2013-02-21 21:26:19 +01:00
Vladimír Čunát dd4a846b0f update evince, seems to work now 2013-02-21 21:19:50 +01:00
Vladimír Čunát bf4313cd88 update gsettings-desktop-schemas and make system-wide
Conflicts:
	pkgs/data/misc/gsettings-desktop-schemas/default.nix
	pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
2013-02-21 20:42:39 +01:00
Vladimír Čunát b8a44440e4 gnome3: port and update (lib)gnome-keyring 2013-02-21 20:36:20 +01:00
Vladimír Čunát 99bc034a04 gnome3.gconf: migrate 2013-02-21 20:09:10 +01:00
Vladimír Čunát 811605c3a4 gtk3: major update to 3.6.4 2013-02-21 18:17:05 +01:00
Vladimír Čunát 90fcea2a25 Merge branch 'x-updates' into vlada/gnome3-notg 2013-02-21 18:12:15 +01:00
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Shea Levy aacca1902c Merge branch 'upstream-master' into stdenv-updates 2013-02-19 10:09:39 -05:00
Eelco Dolstra 63a9eaaf72 gimp-2.8: Fix build
http://hydra.nixos.org/build/4126152
2013-02-19 13:19:31 +01:00
Peter Simons dfebdde16f texinfo: added version 5.0 2013-02-19 12:53:44 +01:00
Eelco Dolstra 79875ad9f5 digikam: Fix build
http://hydra.nixos.org/build/4128474
2013-02-19 12:40:07 +01:00
Eelco Dolstra 08819d1aed Fix evaluation 2013-02-19 11:23:28 +01:00
Rok Garbas e7f1aeb2c5 turses: update to 0.2.12 and its dependency tweepy to 2.0 2013-02-19 04:48:55 +01:00
Rok Garbas 42738b29fc alot: update to last working revision 2013-02-19 04:48:14 +01:00
Cillian de Róiste 4400a752e9 Add aespipe, an AES encrypting or decrypting pipe 2013-02-18 22:47:55 +01:00
Lluís Batlle i Rossell 9aa47b62b6 Adding snappy 1.1.0 2013-02-18 22:12:24 +01:00
Peter Simons fbe4e1af93 pynzb: fix license attribute 2013-02-18 21:10:56 +01:00
Peter Simons 7408c3babf python-progressbar: fix license attribute 2013-02-18 16:12:43 +01:00
Peter Simons 2540b66ef9 Merge pull request #325 from iyzsong/emacs-clang-complete-async
emacs: add "auto-complete-clang-async" mode
2013-02-18 05:50:34 -08:00
Rok Garbas 235921afa6 Merge pull request #323 from iElectric/flexget
Add FlexGet and dependencies
2013-02-18 05:17:17 -08:00
Rok Garbas e1480b4c62 Merge pull request #324 from iElectric/beets
Add beets and it's dependencies
2013-02-18 05:16:36 -08:00
Domen Kozar 9d73b9ca51 Add beets and it's dependencies 2013-02-18 14:08:48 +01:00
Song Wenwu 679150157b emacs: add "auto-complete-clang-async" mode (aka emacs-clang-complete-async) 2013-02-18 21:06:29 +08:00
Lluís Batlle i Rossell bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Peter Simons 4994518501 gmp: update to version 5.1.1 2013-02-18 12:01:49 +01:00
Peter Simons 9e68734d61 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-18 11:54:56 +01:00
Domen Kozar acc5d4040e Add FlexGet and dependencies 2013-02-18 11:33:24 +01:00
Peter Simons 7e8ccea899 haskell-uuid: add version 1.2.9 2013-02-18 11:20:20 +01:00
Peter Simons 40fbde7a45 haskell-maccatcher: add version 2.1.5 2013-02-18 11:20:08 +01:00
Peter Simons aa2798f870 haskell-Glob: add version 0.7.2 2013-02-18 11:19:55 +01:00
Peter Simons 9ff93714d7 haskell-monad-par: update to version 0.3.4 2013-02-18 10:48:59 +01:00
Rok Garbas 62542a1556 Merge pull request #322 from iElectric/deluge
add deluge torrent client and it's dependencies
2013-02-17 15:22:25 -08:00
Domen Kozar 77f61dd987 add deluge torrent client and it's dependencies 2013-02-18 00:00:39 +01:00
Александр Цамутали de8a9d676e tools/security/apg: New nixpkg. 2013-02-17 17:44:54 +04:00
Shea Levy c42d77aa35 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
Vladimír Čunát 9885d04033 Revert "WIP", sorry, I got confused, somehow
This reverts commit 524d9b656e.
2013-02-17 11:02:25 +01:00
Vladimír Čunát 524d9b656e WIP 2013-02-17 11:01:20 +01:00
Shea Levy 2a1c308607 Add wayland library 2013-02-16 23:06:31 -05:00
Lluís Batlle i Rossell 1eca5325eb Re-adding the raspberry pi kernel.
Removed by mistake (I guess) on Eelco's merge from trunk:
2aa6f262cb
2013-02-17 01:02:26 +01:00
Shea Levy f081cacda7 gcc: Don't symlink lib and lib64 when building multilib 2013-02-16 18:54:47 -05:00
Александр Цамутали fa7b10255c all-packages.nix: Uncomment e17. 2013-02-16 21:56:17 +04:00
Vladimír Čunát 08abf5a84a blender: minor update to work with libpng-1.6
also other fixes needed in order to build
2013-02-16 18:13:05 +01:00
Vladimír Čunát b3ce50d88a add python33 (needed by new blender) 2013-02-16 18:11:32 +01:00
Vladimír Čunát 2f8616cc2e libpng15: use it by some packages to fix build 2013-02-16 18:07:37 +01:00
Vladimír Čunát 64fd0379c8 libpng: reintroduce 1.5, some pkgs need older 2013-02-16 18:00:28 +01:00
Vladimír Čunát 60e52fd8db gnucash: fix for new intltool 2013-02-16 15:35:14 +01:00