mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 15:15:36 +00:00
Code Issues Wiki Activity
46693 commits 191 branches 125 tags 8.1 GiB
Commit graph

90 commits

Author SHA1 Message Date
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
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vladimír Čunát e993219be7 gtk2: maintenance update 2014-06-26 18:22:49 +02:00
Peter Simons 07151095a7 Merge pull request #2532 from jwiegley/gtk 
Get glib, gtk+, harfbuzz and pango working on Darwin
 2014-05-23 16:37:00 +02:00
Vladimír Čunát f1ded0d7bd gtk3: bugfix update 3.12.1 -> .2 2014-05-15 21:02:28 +02:00
John Wiegley 61b94dff81 Get glib, gtk+, harfbuzz and pango working on Darwin 2014-05-12 16:53:11 -05:00
Vladimír Čunát 1ae918b0d2 gtk3: bugfix update 3.12.0 -> .1 2014-04-12 20:25:15 +02:00
Vladimír Čunát 151ac5ab9e gtk+3 core stack: update to 3.12 2014-03-27 20:53:50 +01:00
Vladimír Čunát aa48fc9b28 gtk2: bugfix update 2.24.22 -> .23 2014-03-21 10:34:19 +01:00
Vladimír Čunát fbff019f08 gtk3: bugfix update 3.10.6 -> .7, fix bad URI 
The bad URI was introduced by changing the name in 4881100.
 2014-02-02 10:42:11 +01:00
Vladimír Čunát 48811001c4 gtk3: change name to gtk+3-3.*, don't lower priority 
This is to allow alongside installation of gtk2 and gtk3 in user envs.
Therefore, decreasing the priority of gtk3 was superfluous now.
 2014-01-29 15:13:02 +01:00
Vladimír Čunát ac07b3d37f gtk3: bugfix update 3.10.5 -> .6 2014-01-25 21:01:40 +01:00
Vladimír Čunát 7a3ae83a97 gtk3: bugfix update 3.10.4 -> .5 2013-12-10 12:46:11 +01:00
Vladimír Čunát 6c193c7053 gtk3: bugfix updates 3.10.0 -> .4 2013-11-17 14:43:32 +01:00
Vladimír Čunát f448cc022b changes proposed for 'release-13.10' into x-updates 
Conflicts (simple, taking whole higher/later versions):
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/polkit/default.nix
 2013-11-05 08:38:15 +01:00
Vladimír Čunát cf568b6883 gtk2: minor update .20 -> .22 2013-11-01 10:32:23 +01:00
Vladimír Čunát e1e0a11f86 gtk3: update 3.8.4 -> 3.10.0 2013-10-05 21:27:45 +02:00
Vladimír Čunát 346ad74277 gtk2: minor update .20 -> .21 2013-10-05 21:27:08 +02:00
Vladimír Čunát 56c2ee8dcf gtk3: bugfix update 3.8.2 -> .4 2013-09-12 18:11:00 +02:00
Vladimír Čunát 7fbcc56260 add introspection into GTK libs (part of #517) 
This is all work of Marc Weber <marco-oweber@gmx.de>, except for a few nitpicks.

Tested space blowup: IMHO negligible to headers and similar stuff,
e.g. the firefox closure (reported by du) grows from 560 to 579 MB.
Saving space should be handled separately,
e.g. we have the multiple-outputs branch.
 2013-08-04 21:11:24 +02:00
Vladimír Čunát d374527509 GTK-related minor updates 2013-08-03 09:45:22 +02:00
Jason \"Don\" O'Conal 75dedeb8bd gtk2: fix build on darwin (close #749) 
* add xlibs.libXi to build inputs
 2013-07-27 20:01:08 +02:00
Shea Levy e193a4f898 Fix gtk2 build 
libintlOrEmpty is [], not null, when libintl isn't needed

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-07-13 16:01:06 -04:00
Jason \"Don\" O'Conal 7573056652 gtk++: fix build on darwin 
* add -lintl to CFLAGS
 2013-07-12 16:26:44 +02:00
Vladimír Čunát 4255b343e8 pango, gtk3: non-Linux attempts to fix 2013-06-19 09:00:06 +02:00
Vladimír Čunát 1f81984293 non-Linux: more adjustments 
Also reordered stuff in all-packages.nix.
 2013-06-18 23:59:23 +02:00
Vladimír Čunát 2058d95eb4 non-Linux platforms: extend to some important pkgs 2013-06-18 22:03:35 +02:00
Mathijs Kwik 4d19da7e99 gtk-2: remove unneeded argument 2013-06-14 13:49:35 +02:00
Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-13 17:12:43 +04:00
Jason "Don" O'Conal dc0c630e54 gtk2: fix compilation on darwin 
* add libintlOrEmpty to build inputs
* allow cups to be disabled by setting config.gtk2.cups to false
 2013-06-13 18:10:53 +10:00
Song Wenwu 92ba0a0913 gtk+: enable NLS support (merge #611) 
@vcunat: add minor refactorings like file-naming style unification.
ToDo: we get 2*20MB of locale, perhaps it's worth splitting one day.
 2013-06-12 10:18:38 +02:00
Vladimír Čunát 10b79927ba gtk2/3: bugfix updates 2013-05-16 17:07:06 +02:00
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Song Wenwu 3b01d244c3 gtk+: enable xcursor support, fixes #469 
@vcunat also reorganized the build input lists a bit
 2013-04-18 16:14:44 +02:00
Vladimír Čunát 23cde66a4a gtk3: propagate dependencies from the closure 2013-04-05 10:27:11 +02:00
Vladimír Čunát 8406a62973 gtk3: core platform update (versions from GNOME 3.8) 2013-03-29 02:22:29 +01:00
Vladimír Čunát 4e7741d694 gtk2 platform: minor updates 
Also make glib use libelf (a few hudred kBs).
 2013-03-29 02:01:03 +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 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
Vladimír Čunát 0cddd5787f gtk2: bugfix update 2013-02-19 17:08:31 +01:00
Vladimír Čunát 55bf1376af gtk2: minor bugfix update 2013-02-10 17:17:35 +01:00
Vladimír Čunát 6331d32267 rename the expressions of some gtk-related libraries 
now the default (and usually only) version is called default
 2013-01-29 16:48:23 +01:00
Vladimír Čunát 515f2af7d6 gtk2: minor update 2013-01-29 14:55:15 +01:00
Vladimír Čunát 56c7b96844 gtk2: a minor update 2013-01-10 22:53:46 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Eelco Dolstra 1c3ed1b8d4 gtk+: Update to 3.2.4 2012-10-08 14:20:30 -04:00
Eelco Dolstra f021420036 Revert "gtk+: Update to 3.6.0" 
This reverts commit 6cbb674895.
 2012-09-27 17:42:46 -04:00
Eelco Dolstra 6cbb674895 gtk+: Update to 3.6.0 2012-09-27 17:22:56 -04:00
Eelco Dolstra 2122279858 gtk+: Update to 2.24.13 2012-09-26 15:39:32 -04:00
Yury G. Kudryashov a14e9f7c0f gtk+-2.24.10 
svn path=/nixpkgs/trunk/; revision=32936
 2012-03-08 23:29:27 +00:00