jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,470 Commits 266 Branches 122 Tags 5.3 GiB
ab7d500f36
Commit Graph

40 Commits

Author SHA1 Message Date
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing
changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Vladimír Čunát
469d098083 gnome2.libgnome: fix for new glib (my own patch) 2013-04-17 19:01:28 +02:00
Vladimír Čunát
6bd036d5f9 non-linux attempts to fix: libbonobo and libjpeg 2013-04-14 14:06:10 +02:00
Vladimír Čunát
f4f8857284 gnome_vfs: fix build by disabling fatality of deprecations 2013-04-13 23:59:24 +02:00
Marc Weber
88a8330d44 make ORBit2 build again by disabling deprecation warnings for linc2, the commit introducing it didn't show any strong reason 2013-04-08 14:50:10 +02:00
Vladimír Čunát
86639d9bb9 Merge branch 'master' into x-updates 
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
 2013-03-09 17:55:37 +01:00
Peter Simons
5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Vladimír Čunát
787b150089 gnome2.libart_lgpl: update 2013-02-21 21:51:09 +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
f536aa7e7a Merge pull request #293 from vcunat/vlada/intltool 
unify intltool
 2013-02-14 12:29:29 -08:00
Vladimír Čunát
94cc7c5c83 gtkglext: fix by using pangox_compat 2013-02-02 14:39:21 +01:00
Vladimír Čunát
38ee738b8a unify intltool 
IMHO:
	- It's no longer GNOME package.
	- It seems best for everyone to use the newest version.
 2013-01-31 16:43:52 +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
44da496dcf Forgot to add some files 2012-10-09 17:07:59 -04:00
Eelco Dolstra
58082f0acb libgnomecups: Fix build 
http://hydra.nixos.org/build/3149255
 2012-10-09 11:23:56 -04:00
Peter Simons
f9d9a0c4ca gtkglextmm: add version 1.2.0 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 17:13:36 +02:00
Peter Simons
07e94a8892 gconfmm: add version 2.28.3 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 17:13:35 +02:00
Yury G. Kudryashov
3d0b778848 Move gnome-doc-utils and gtk-doc to top-level 
Add compatibility attrs.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33252
 2012-03-19 04:36:41 +00:00
Yury G. Kudryashov
736ecb4c53 Remove esound and libaudiofile 
svn path=/nixpkgs/trunk/; revision=32983
 2012-03-11 14:07:27 +00:00
Yury G. Kudryashov
dff711a9db GConf: depend on gtk 
It needs gtk only for 'gtk-sanity-check-2' program. We should split this program
to a dedicated package.

svn path=/nixpkgs/trunk/; revision=32920
 2012-03-08 22:45:25 +00:00
Yury G. Kudryashov
9a4c1acfb5 GConf-2.32.4 
svn path=/nixpkgs/trunk/; revision=32919
 2012-03-08 22:45:22 +00:00
Yury G. Kudryashov
e7e3a28ac6 gnome-vfs-monikers: cleanup CPPFLAGS 
svn path=/nixpkgs/trunk/; revision=32916
 2012-03-08 22:45:11 +00:00
Yury G. Kudryashov
5d42d15d15 at-spi-1.32.0 
svn path=/nixpkgs/trunk/; revision=32915
 2012-03-08 22:45:02 +00:00
Yury G. Kudryashov
b88e0e8807 libgnomeui depends on libgnome-keyring, not gnome-keyring 
svn path=/nixpkgs/trunk/; revision=32907
 2012-03-08 17:16:04 +00:00
Yury G. Kudryashov
1a62d14cdd Move glib-networking to top namespace 
svn path=/nixpkgs/trunk/; revision=32905
 2012-03-08 16:49:08 +00:00
Yury G. Kudryashov
9abf1b03a9 Move libgnome-keyring to development/libraries 
svn path=/nixpkgs/trunk/; revision=32887
 2012-03-08 13:06:44 +00:00
Peter Simons
f7896f322e libgnomeprint: fix gcc 4.6 compilation error 
svn path=/nixpkgs/trunk/; revision=32832
 2012-03-06 20:04:58 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
 2012-01-18 20:53:01 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Yury G. Kudryashov
a3f507892a Add gnome2.libgnome_keyring 
svn path=/nixpkgs/trunk/; revision=31404
 2012-01-07 15:31:36 +00:00
Yury G. Kudryashov
50dab98373 gnome2.gnome_vfs: disable HAL, enable ACL 
svn path=/nixpkgs/trunk/; revision=31403
 2012-01-07 15:31:31 +00:00
Yury G. Kudryashov
20973a9280 GConf-2.28.1, policykit->polkit 
svn path=/nixpkgs/trunk/; revision=31333
 2012-01-06 00:55:14 +00:00
Yury G. Kudryashov
6a27a67605 gnome-2/audiofile-0.3.2 
svn path=/nixpkgs/trunk/; revision=31331
 2012-01-06 00:54:39 +00:00
Yury G. Kudryashov
c3863358ef libgnomeui-2.24.5; add libtool to deps 
svn path=/nixpkgs/trunk/; revision=29746
 2011-10-10 21:48:21 +00:00
Yury G. Kudryashov
da80ec5203 libbonoboui-2.24.4, fix build 
svn path=/nixpkgs/trunk/; revision=29731
 2011-10-09 17:23:47 +00:00
Yury G. Kudryashov
f865f7c26d libIDL-0.8.14 
svn path=/nixpkgs/trunk/; revision=29725
 2011-10-09 07:11:38 +00:00
Yury G. Kudryashov
026325e75b Update a few gnome packages 
svn path=/nixpkgs/trunk/; revision=29724
 2011-10-09 07:11:28 +00:00
Yury G. Kudryashov
bbd24e9c87 Update gnome-common 
svn path=/nixpkgs/trunk/; revision=29723
 2011-10-08 19:12:24 +00:00
Yury G. Kudryashov
2fdeacfebb libunique-1.1.6 
svn path=/nixpkgs/trunk/; revision=29722
 2011-10-08 19:05:13 +00:00
Yury G. Kudryashov
e60fe8673b gnome: use callPackage, move to gnome-2 
gnome28 was a mix of packages from various releases, so do not mention 2.28 in
the attribute name.

svn path=/nixpkgs/trunk/; revision=29721
 2011-10-08 16:58:32 +00:00