nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 08:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
266,938 Commits 234 Branches 124 Tags 7.4 GiB
1554469f85
Commit Graph

993 Commits

Author SHA1 Message Date
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
 2012-01-19 21:31:51 +00:00
Peter Simons
5ebdf058cc intel X driver: upgraded to fix display glitches on newer chips 
at least 2 nixos users were affected by a graphics bug that got fixed
in 2.15.
Officially 2.15 was meant for a newer xorg server, libdrm, mesa and all, but
I've been running with this for over a month with no issues (used
compositing desktop, opengl and hd video).

I know 2.17 is in the repo, but it doesn't builde (missing deps I
think).

svn path=/nixpkgs/trunk/; revision=31661
 2012-01-18 20:38:30 +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
Peter Simons
fedda96bee xf86-video-ati: updated to version 6.14.3 
svn path=/nixpkgs/trunk/; revision=31471
 2012-01-10 20:12:25 +00:00
Florian Friesdorf
2e31e7293a moved parts of extra.list back to tarballs-7.6.list 
also added an short description about them to generate-expr-from-tarballs.pl

svn path=/nixpkgs/trunk/; revision=31189
 2011-12-31 15:37:51 +00:00
Florian Friesdorf
d2e8c37e41 default.nix now fully generated again 
with additional xf86-video-intel-2.17.0 and what looks like a fixed
xf86-video-intel-2.14.901.

svn path=/nixpkgs/trunk/; revision=31185
 2011-12-31 06:07:37 +00:00
Florian Friesdorf
1745900396 add xf86-video-intel-2.14.901 (and while at it 2.17.0) to extra.list 
svn path=/nixpkgs/trunk/; revision=31184
 2011-12-31 06:07:34 +00:00
Florian Friesdorf
2a2ceace7f generate-expr-from-tarballs.pl support multiple versions 
svn path=/nixpkgs/trunk/; revision=31183
 2011-12-31 06:07:32 +00:00
Florian Friesdorf
f6090f6bba reproduced my previous manual changes through generation of default.nix 
svn path=/nixpkgs/trunk/; revision=31182
 2011-12-31 06:07:28 +00:00
Florian Friesdorf
cebb40f533 adjusted oder of *.list in generate-expr-from-tarballs.pl example 
svn path=/nixpkgs/trunk/; revision=31181
 2011-12-31 06:07:26 +00:00
Florian Friesdorf
e45921800c adjusted example generate-expr-from-tarballs.pl call to 7.6 
svn path=/nixpkgs/trunk/; revision=31180
 2011-12-31 06:07:23 +00:00
Florian Friesdorf
0bb20084b5 xorg: alphabetical extra.list 
svn path=/nixpkgs/trunk/; revision=31179
 2011-12-31 06:07:21 +00:00
Florian Friesdorf
c9b2b8a182 xcb-util(-*)-0.3.8 and xlsclients-1.1.2 in extra.list 
svn path=/nixpkgs/trunk/; revision=31178
 2011-12-31 06:07:18 +00:00
Florian Friesdorf
e1556e64d7 xorg: moved individuals from tarballs-7.6 to extra.list and regen tarballs-7.6 
svn path=/nixpkgs/trunk/; revision=31177
 2011-12-31 06:07:15 +00:00
Florian Friesdorf
44ef26c896 xlsclients-1.1.2 
svn path=/nixpkgs/trunk/; revision=31176
 2011-12-31 04:30:46 +00:00
Florian Friesdorf
251d42d03f xcb-util-0.3.8 (+image|keysyms|renderutil|wm) 
this might break things but makes awesome-3.4.11 happy

svn path=/nixpkgs/trunk/; revision=31171
 2011-12-31 04:05:50 +00:00
Alexander Tsamutali
0ed57e3f64 servers/x11/xorg/overrides.nix: 
Added xproto to propagatedBuildInputs of libXext, because for ex.
  shape.h includes Xfuncproto.h.

svn path=/nixpkgs/trunk/; revision=29505
 2011-09-26 22:24:22 +00:00
Shea Levy
8a3f40a088 Get libpciaccess to compile on darwin 
The added patch uses the correct byte-conversion functions on Apple systems. The library compiles on darwin but is not yet tested.

svn path=/nixpkgs/trunk/; revision=28881
 2011-08-29 18:58:59 +00:00
Eelco Dolstra
626b7cd9f4 * Fix the xvinfo build. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27955
 2011-07-26 00:04:46 +00:00
Peter Simons
1b53d1f22d xorg: updated xf86-video-ati to version 6.14.2 
svn path=/nixpkgs/trunk/; revision=27776
 2011-07-14 12:22:49 +00:00
Michael Raskin
04d5aed6d0 Add intel driver prerelease 
svn path=/nixpkgs/trunk/; revision=26418
 2011-03-18 09:10:53 +00:00
Eelco Dolstra
5382f8e934 * xorg-server updated to 1.9.5. 
svn path=/nixpkgs/trunk/; revision=26417
 2011-03-18 09:07:46 +00:00
Michael Raskin
ee75c32a3b More needed propagations noted for future big update 
svn path=/nixpkgs/trunk/; revision=26409
 2011-03-18 05:32:14 +00:00
Michael Raskin
92a26c823c Comment about incomplete set of propagatedBuildInputs 
svn path=/nixpkgs/trunk/; revision=26406
 2011-03-17 22:00:22 +00:00
Michael Raskin
1d99933141 Fix xbacklight 
svn path=/nixpkgs/trunk/; revision=26402
 2011-03-17 18:46:25 +00:00
Michael Raskin
3fa36ea4a1 Fix TWM build 
svn path=/nixpkgs/trunk/; revision=26399
 2011-03-17 15:51:13 +00:00
Eelco Dolstra
6ba53ec09a * Fix xf86-input-synaptics and xf86-input-keyboard. 
* Enable parallel building for all X.org packages.

svn path=/nixpkgs/branches/x-updates/; revision=25982
 2011-02-15 15:54:57 +00:00
Eelco Dolstra
a5aa96c3a3 * xorgserver: propagate dri2proto. 
svn path=/nixpkgs/branches/x-updates/; revision=25980
 2011-02-15 14:34:26 +00:00
Eelco Dolstra
1566609a1a * libXft: propagate libXrender. 
svn path=/nixpkgs/branches/x-updates/; revision=25950
 2011-02-14 10:14:34 +00:00
Eelco Dolstra
47aa6890d2 * libXaw: propagates libXmu. 
svn path=/nixpkgs/branches/x-updates/; revision=25948
 2011-02-14 10:04:37 +00:00
Eelco Dolstra
0f0d3f9543 * Fix xorg-server. 
svn path=/nixpkgs/branches/x-updates/; revision=25907
 2011-02-11 15:54:01 +00:00
Eelco Dolstra
337e26fea0 * xkbcomp 1.2.1. 
svn path=/nixpkgs/branches/x-updates/; revision=25906
 2011-02-11 15:32:08 +00:00
Eelco Dolstra
8ca86a8114 * Remove libX11 docs. 
svn path=/nixpkgs/branches/x-updates/; revision=25855
 2011-02-09 15:17:15 +00:00
Eelco Dolstra
6a59d1a98f * Latest Glib, ATK, Pango and GTK+. 
* Added gdk-pixbuf, which has been revived and is required by GTK+.
* Don't install the documentation of aforementioned packages.  This
  cuts 56 MiB off the closure of GTK+-based packages.  It wasn't
  really useful anyway because it's not installed in a way that allows
  users to find it easily on NixOS.  And if you want it, it's faster
  to Google it.

svn path=/nixpkgs/branches/x-updates/; revision=25853
 2011-02-09 15:09:29 +00:00
Eelco Dolstra
0b8efb0cbb * X.org 7.6. 
svn path=/nixpkgs/branches/x-updates/; revision=25818
 2011-02-08 17:39:28 +00:00
Michael Raskin
e59ddf7bcb Update Cairo, Pixman; update FF4beta - still broken, cannot pass fresh cairo correctly to it yet 
svn path=/nixpkgs/trunk/; revision=24714
 2010-11-16 21:05:54 +00:00
Michael Raskin
fada13658f Fix xf86inputsynaptics 
svn path=/nixpkgs/trunk/; revision=24274
 2010-10-14 10:51:52 +00:00
Michael Raskin
8a191cddd8 Fix include paths for xf86inputsynaptics 
svn path=/nixpkgs/trunk/; revision=24259
 2010-10-13 11:43:59 +00:00
Eelco Dolstra
4788fc9298 * Some X.org updates. 
svn path=/nixpkgs/trunk/; revision=24252
 2010-10-12 21:52:57 +00:00
Eelco Dolstra
f3677bef0d * Synaptics driver 1.2.2. 
svn path=/nixpkgs/trunk/; revision=23091
 2010-08-10 14:06:03 +00:00
Eelco Dolstra
ba498d4a43 * composedArgsAndFun -> makeOverridable for consistency. 
* Rename a few single-version packages to "default.nix".

svn path=/nixpkgs/trunk/; revision=22803
 2010-07-29 08:21:21 +00:00
Eelco Dolstra
e6ff6558d6 * xrandr 1.3.3. 
svn path=/nixpkgs/branches/x-updates/; revision=22727
 2010-07-25 09:14:12 +00:00
Eelco Dolstra
df7091a4a1 * libpciaccess 0.12.0. 
svn path=/nixpkgs/branches/x-updates/; revision=22684
 2010-07-21 11:29:26 +00:00
Eelco Dolstra
78a5abdf85 * Updated the X.org server to 1.8.2. Note that it no longer depends 
on HAL but instead uses udev to autoconfigure input devices.  We'll
  have to update the NixOS X server module accordingly, I guess.  See
  https://fedoraproject.org/wiki/Input_device_configuration.
* Updated Mesa to 7.8.2.

svn path=/nixpkgs/branches/x-updates/; revision=22681
 2010-07-20 19:24:21 +00:00
Eelco Dolstra
cb11b171d1 svn path=/nixpkgs/branches/x-updates/; revision=22671 2010-07-20 07:58:36 +00:00
Eelco Dolstra
5ebeb68c72 * Update the imake patch. 
svn path=/nixpkgs/branches/x-updates/; revision=22660
 2010-07-19 10:18:06 +00:00
Eelco Dolstra
0d225fb86a * Support *.pc.in files that are not in the top directory of the package. 
svn path=/nixpkgs/branches/x-updates/; revision=22659
 2010-07-19 08:59:05 +00:00
Eelco Dolstra
662600c241 * Updated various X.org packages, including libX11. 
svn path=/nixpkgs/branches/x-updates/; revision=22632
 2010-07-18 21:51:13 +00:00
Eelco Dolstra
26164c05c5 * lndir: work properly on directories with st_nlink set to 1 (such as 
on btrfs).  (From David Brown.)

svn path=/nixpkgs/trunk/; revision=22619
 2010-07-16 22:04:56 +00:00
Lluís Batlle i Rossell
93d2b4b7bf Updating the intel x11 video drivers. 
(I know I modified an automatically generated file, but I don't imagine
well the consequences of this)

svn path=/nixpkgs/trunk/; revision=21248
 2010-04-22 20:12:26 +00:00
Lluís Batlle i Rossell
8807722e17 Adding xdm 
svn path=/nixpkgs/trunk/; revision=20947
 2010-04-05 14:09:22 +00:00
Eelco Dolstra
04f73b29d6 * Force a rebuild of the X server, because the current build got 
corrupted in a crash.

svn path=/nixpkgs/trunk/; revision=20497
 2010-03-09 15:35:46 +00:00
Marc Weber
f57a5d2273 libXi: build man pages 
svn path=/nixpkgs/trunk/; revision=20089
 2010-02-18 01:49:53 +00:00
Eelco Dolstra
b1fb08569f * X.org server updated to 1.7.5. 
svn path=/nixpkgs/trunk/; revision=20050
 2010-02-16 13:34:30 +00:00
Lluís Batlle i Rossell
d47aead668 Setting the difference buildInputs/buildNativeInputs in some gtk related packages. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19620
 2010-01-22 18:49:16 +00:00
Lluís Batlle i Rossell
9183f21f7e Merging from trunk. 
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
 2010-01-14 14:49:31 +00:00
Eelco Dolstra
78718b5a3d * xorg-server updated to 1.7.4, along with some other X.org packages. 
svn path=/nixpkgs/trunk/; revision=19387
 2010-01-13 11:51:45 +00:00
Eelco Dolstra
3535899507 * Added xinit. 
svn path=/nixpkgs/trunk/; revision=19236
 2010-01-05 14:49:23 +00:00
Lluís Batlle i Rossell
89fe676bb3 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
 2009-12-10 14:48:45 +00:00
Peter Simons
d21a4d14fc pkgs/servers/x11/xorg/overrides.nix: dropped override for libXaw on Darwin 
With the latest version of libXaw, those patches aren't necessary
anymore; the build has been fixed upstream.

svn path=/nixpkgs/trunk/; revision=18856
 2009-12-09 15:56:20 +00:00
Eelco Dolstra
bf7a38f3ff * X.org server 1.7.3. 
svn path=/nixpkgs/trunk/; revision=18792
 2009-12-03 15:51:40 +00:00
Lluís Batlle i Rossell
a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory 
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
 2009-11-26 21:46:08 +00:00
Lluís Batlle i Rossell
b4e31ce1bf fixing the name in the openchrome expression. 
svn path=/nixpkgs/trunk/; revision=18573
 2009-11-23 21:40:26 +00:00
Lluís Batlle i Rossell
d8aa5b5db1 Fixing stdenv's chain of propagated-build-inputs (2nd level propagated build 
inputs did not get in)
Updating the xorg builder script to support cross building (in fact, support
for propagating the required build inputs).


svn path=/nixpkgs/branches/stdenv-updates/; revision=18569
 2009-11-23 19:45:18 +00:00
Lluís Batlle i Rossell
585ba8c27f Big fixes in the cross build: 
- Before this changes, cflags and ldflags for the native and the cross compiler
  got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are
  independant now, but enough, I think.
- Fixed the generic stdenv expression, which did a big mess on buildInputs and
  buildNativeInputs. Now it distinguishes when there is a stdenvCross or not.
  Maybe we should have a single stdenv and forget about the stdenvCross
  adapter - this could end in a stdenv a bit complex, but simpler than the
  generic stdenv + adapter.
- Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH
  now works for both the cross and the native compilers, but I think this
  should work well for most cases I can think of.
- I tried to fix the guile expression to cross-biuld; guile is built, but not
  its manual, so the derivation still fails. Guile requires patching to
  cross-build, as far as I understnad.
- Made the glibcCross build to be done through the usage of a
  gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it
  directly.
- Trying to make physfs (a neverball dependency) cross build.
- Updated the gcc expression to support building a cross compiler without getting
  derivation variables mixed with those of the stdenvCross.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
 2009-11-22 19:51:45 +00:00
Lluís Batlle i Rossell
d0d2c6e3fe Overriding some xorg expressions for them to cross-build. Now SDL cross-builds clean. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18501
 2009-11-21 14:49:25 +00:00
Lluís Batlle i Rossell
ca5d91aa60 Made more libraries cross compile. fontconfig, libxcb, bzip2, libdrm, zlib... 
I was trying to cross compile SDL. Many dependencies work, but I ended seeing
libX11 not ready for cross compilation. Other xorg libraries cross-compile
well. libX11 may need a small patch. The problem is the usual "configure test
cannot be run in cross compilation", so the configure script halts.

I made the pkgconfig expression always return buildDrv, as I think it rarely
will be needed as buildInput. So to avoid rewriting all its mentions to use
it as buildNativeInput, I prefered this small change.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18500
 2009-11-21 10:44:22 +00:00
Lluís Batlle i Rossell
3136303d63 Fixing the libxcb native build: missing dependency. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18499
 2009-11-21 10:11:44 +00:00
Lluís Batlle i Rossell
4acd0bdb8c Making xorgserver build also Xnest. 
svn path=/nixpkgs/trunk/; revision=18395
 2009-11-17 16:46:51 +00:00
Lluís Batlle i Rossell
c28701c3d9 Fixing the xdriinfo build. 
svn path=/nixpkgs/trunk/; revision=18287
 2009-11-08 11:34:17 +00:00
Lluís Batlle i Rossell
b02ba2aff8 Updating the xorg dri path patch for dri2. 
svn path=/nixpkgs/trunk/; revision=18225
 2009-11-06 21:15:59 +00:00
Lluís Batlle i Rossell
bbcd6e2728 Fixing the url for the xorg video unichrome driver. 
prefetching and then realising the expression does not test the url,
I've to keep that in mind.

svn path=/nixpkgs/trunk/; revision=18222
 2009-11-06 19:26:00 +00:00
Lluís Batlle i Rossell
9240b56a61 Fixing fonts.alias in the new xorg, and adding a check for the next time 
they change the fonts.alias path.

svn path=/nixpkgs/trunk/; revision=18210
 2009-11-06 15:16:47 +00:00
Lluís Batlle i Rossell
91c8df91bf Adding the Unichrome xorg video driver, and updating the Openchrome. 
svn path=/nixpkgs/trunk/; revision=18161
 2009-11-05 21:34:31 +00:00
Eelco Dolstra
9a4cd33d10 * Fix the synaptics driver. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18115
 2009-11-04 19:53:23 +00:00
Eelco Dolstra
b98502f06a * Fix xf86inputsynaptics. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18085
 2009-11-03 23:54:08 +00:00
Eelco Dolstra
390548d708 * Fix the font packages. They need a --with-fontrootdir flag now. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18043
 2009-10-30 08:20:03 +00:00
Eelco Dolstra
1829882a24 svn path=/nixpkgs/branches/xorg-7.5/; revision=18042 2009-10-30 07:41:09 +00:00
Eelco Dolstra
05ff927d83 * Bring back libXxf86misc and xf86miscproto. These were removed from 
X.org, but some packages still need them.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18038
 2009-10-29 18:25:53 +00:00
Eelco Dolstra
28d718aceb * X.org 7.5. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18034
 2009-10-29 17:56:10 +00:00
Lluís Batlle i Rossell
9d71e990a1 Updating the openchrome xorg video driver 
svn path=/nixpkgs/trunk/; revision=17743
 2009-10-11 14:41:31 +00:00
Peter Simons
b9b57c6149 Move libXaw fix from default.nix to overrides.nix. 
svn path=/nixpkgs/trunk/; revision=17620
 2009-10-02 18:03:23 +00:00
Peter Simons
1570ccf3cf libXaw: fixed broken installation in MacOS X 
See comments in file for further details.

svn path=/nixpkgs/trunk/; revision=17609
 2009-10-02 13:57:21 +00:00
Eelco Dolstra
317fd0edd5 * Revert the manual changes to default.nix 
* Build libSM with the system libuuid on Darwin (in such a way that we
  don't get a rebuild on all other platforms).

svn path=/nixpkgs/trunk/; revision=17606
 2009-10-02 13:06:35 +00:00
Peter Simons
f2c6df33ba pkgs/servers/x11/xorg/default.nix: strip trailing white-space 
svn path=/nixpkgs/trunk/; revision=17601
 2009-10-02 12:45:04 +00:00
Peter Simons
abe32ecf99 libSM: use native libuuid when building on MacOS X 
On Linux, <uuid/uuid.h> and related functions are provided by the util-linux-ng
package, which doesn't build on other operating systems, such as MacOS X. That
platform provides libuuid as part of the system. Hence, to build libSM on
MacOS, we define (empty) variables LIBUUID_CFLAGS and LIBUUID_CFLAGS. Those
settings disable ./configure's attempt to detect libuuid with pkgconfig --
which would fail.

svn path=/nixpkgs/trunk/; revision=17600
 2009-10-02 12:44:59 +00:00
Eelco Dolstra
9d15693163 * Make sure that the X server can write the compiled xkb keymap. This 
requires $out/share/X11/xkb/compiled to be writable, so symlink it
  to /var/tmp.  Using --with-xkb-output doesn't work in a chroot build
  because `make install' tries to write a README.compiled file to
  /var/tmp, which doesn't exist in the chroot.

svn path=/nixpkgs/trunk/; revision=17000
 2009-09-09 22:16:09 +00:00
Eelco Dolstra
ced7a48e5d * glx: make the XORG_DRI_DRIVER_PATH environment variable work for the 
software renderer as well.

svn path=/nixpkgs/trunk/; revision=16943
 2009-09-02 22:32:56 +00:00
Lluís Batlle i Rossell
116c1e4bdd Adding the proper derivation name to the openchrome xorg driver override. 
svn path=/nixpkgs/trunk/; revision=16781
 2009-08-19 20:19:33 +00:00
Lluís Batlle i Rossell
dab4dc0de1 Using openchrome trunk instead of that distributed with xorg. That 
doesn't work in K8N800, and trunk even does a bit of 3D by hw.

svn path=/nixpkgs/trunk/; revision=16329
 2009-07-11 10:32:27 +00:00
Eelco Dolstra
645c91708f * Updated some drivers. 
svn path=/nixpkgs/trunk/; revision=16002
 2009-06-18 17:20:01 +00:00
Eelco Dolstra
85978b1efa * e2fsprogs updated to 1.41.6. Also keep the previous version around 
so that we don't have to rebuild everything that depends on libuuid
  (such as all X programs).

svn path=/nixpkgs/trunk/; revision=15964
 2009-06-15 16:45:48 +00:00
Michael Raskin
4fb36441e2 Override xf86videoati version and make xkbcomp work from inside X server 
svn path=/nixpkgs/trunk/; revision=15450
 2009-05-05 12:38:04 +00:00
Lluís Batlle i Rossell
7e53d1062f Adding mesa to compile the openchrome driver. 
svn path=/nixpkgs/trunk/; revision=15386
 2009-04-28 22:15:44 +00:00
Eelco Dolstra
c718ec217b * X.org generator: specify overrides in a Nix expression rather than 
in the generator script.  This makes it easier to change the X.org
  packages.
* Added xfs, twm.

svn path=/nixpkgs/trunk/; revision=15375
 2009-04-28 13:58:35 +00:00
Lluís Batlle i Rossell
44f19bc1b4 Making the latest xorg cope well with xkbcomp. 
svn path=/nixpkgs/trunk/; revision=15347
 2009-04-28 08:05:28 +00:00
Eelco Dolstra
5f9014cc7f * Updated evdev to the latest version. Otherwise, the arrow keys and 
others break under KDE and Gnome unless you set the keyboard type to
  evdev (e.g. in the KDE System Settings).  See
  
    http://wiki.archlinux.org/index.php/Xorg_input_hotplugging#Using_the_evdev_driver_kills_my_arrow_keys.2C_printscreen_is_triggered_instead

  TODO: update this in the X.org generator.

svn path=/nixpkgs/trunk/; revision=15343
 2009-04-27 23:06:02 +00:00
Marc Weber
3c05ea1a4b readding and updating xorg.xfs. It's required to run tightvnc 
1.0.8 is latest version

svn path=/nixpkgs/trunk/; revision=15329
 2009-04-27 01:44:30 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in 
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
 2009-04-23 13:31:10 +00:00
Eelco Dolstra
94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now. 
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
 2009-04-21 23:18:09 +00:00
Eelco Dolstra
0296fabb9e * Added dri2proto to the list of tarballs and reran 
the generator.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15201
 2009-04-20 21:59:42 +00:00
Lluís Batlle i Rossell
15f1feb702 Fixing mesa and xorgserver 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15199
 2009-04-20 18:46:32 +00:00
Eelco Dolstra
8f12b8abf9 * Fixed libXext; it needs newer headers. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15197
 2009-04-20 18:09:37 +00:00
Eelco Dolstra
077b0157a0 * Updated the generator to handle some missing dependencies. 
Also updated some X.org packages (notably xorg-server)
  as well as freetype.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15191
 2009-04-20 16:02:50 +00:00
Eelco Dolstra
406cacbb87 * printproto has a dependency on libXau which our generator 
doesn't see for some reason.  Will have to fix the 
  generator.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15187
 2009-04-20 14:37:05 +00:00
Eelco Dolstra
c584bb878a * Sync with trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13903
 2009-01-29 16:33:02 +00:00
Ludovic Courtès
05e01abc75 Xorg Pixman 0.13.2. 
svn path=/nixpkgs/trunk/; revision=13834
 2009-01-24 21:29:57 +00:00
Eelco Dolstra
c1579d2e78 * stdenv branch: synced with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
 2009-01-16 10:59:27 +00:00
Peter Simons
6fb297513a Committing Lluís Batlle's submissions from mailing list posting 
<45219fb00901110456i6f21db35tbd1894eaea2146ff@mail.gmail.com>:

 * nixpkgs-ccrypt-1.7-new.patch
 * nixpkgs-cmake-add-ccmake.patch
 * nixpkgs-cpufrequtils-005-new.patch
 * nixpkgs-dwm-5.1-fix.patch
 * nixpkgs-freeimage-3.11.0-new.patch
 * nixpkgs-proxychains-3.1-new.patch
 * nixpkgs-psi-to-0.12.patch
 * nixpkgs-skype-to-2.0.0.72.patch
 * nixpkgs-truecrypt-6.1a-fix.patch
 * nixpkgs-vxl-1.11.0-new.patch
 * nixpkgs-xkb-popular-esperanto-symbols.patch
 * nixpkgs-xorg-via-video-fix.patch

svn path=/nixpkgs/trunk/; revision=13751
 2009-01-12 21:12:07 +00:00
Eelco Dolstra
e31341510d * Merged from the trunk. Let's see how well this works with 
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
 2008-12-10 09:59:21 +00:00
Eelco Dolstra
964b969066 * Remove ... for now. 
svn path=/nixpkgs/trunk/; revision=13143
 2008-10-29 09:42:11 +00:00
Michael Raskin
8c3f202c09 Made it easy to build custom xf86videoati version 
svn path=/nixpkgs/trunk/; revision=13112
 2008-10-25 07:19:07 +00:00
Michael Raskin
b38742e0c2 Adding a more stable X.org ati driver version (more stable for dualview) 
svn path=/nixpkgs/trunk/; revision=13108
 2008-10-24 05:13:23 +00:00
Eelco Dolstra
c9c2045610 * Cairo: build with XCB support. 
* Fixed libXp.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13069
 2008-10-14 14:46:56 +00:00
Eelco Dolstra
dbc0d399bf * Add some more packages that have been apparently deprecated from X.org. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13043
 2008-10-10 08:55:45 +00:00
Eelco Dolstra
0e68610feb * libXp has been removed from X.org 7.4 but some packages still need it. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13032
 2008-10-09 16:24:51 +00:00
Eelco Dolstra
5eef7df51d * intltool: deleted redundant copy (it's already in the Gnome Nix 
expressions).
* Fixed xkbcomp: it no longer found the keyboard definitions since it
  disregards the -R option passed by the X server (it chdirs to the -R
  path, but "." has been removed from the xkbcomp search path in
  xkbcomp 1.0.5).  Build it with /etc/X11/xkb as its default
  location.  This is less pure but it does allow for updating
  xkeyboard-config in a running server.
* xkeyboard-config: updated to 1.4.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13018
 2008-10-09 12:12:58 +00:00
Eelco Dolstra
9fa8276ae5 * X.org 7.4. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13006
 2008-10-08 17:02:48 +00:00
Michael Raskin
e1f4d60dca Added fresh radeonhd to X.org expression. 
svn path=/nixpkgs/trunk/; revision=12205
 2008-06-28 07:10:51 +00:00
Michael Raskin
c750b3e602 Added dependencies to build ATi driver.. 
svn path=/nixpkgs/trunk/; revision=12113
 2008-06-16 06:27:21 +00:00
Michael Raskin
7c840c0f0f Fixing evdev X11 input driver build 
svn path=/nixpkgs/trunk/; revision=12103
 2008-06-15 16:55:27 +00:00
Michael Raskin
f7ccbf7c80 Update X.org server: security fix 
svn path=/nixpkgs/trunk/; revision=12082
 2008-06-13 17:24:14 +00:00
Eelco Dolstra
fc5eebdf8b * Merged the stdenv branch 
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
 2008-06-13 11:46:39 +00:00
Eelco Dolstra
319feed942 * Latest Cairo / GTK. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=11692
 2008-04-23 10:48:10 +00:00
Michael Raskin
6f35c8fdf8 Added option for newer ATi drivers in X.org 
svn path=/nixpkgs/trunk/; revision=11558
 2008-04-11 09:24:16 +00:00
Eelco Dolstra
e12b421add * Merged most of the stdenv-updates branch. Some stuff didn't 
merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
 2008-02-20 23:02:41 +00:00
Yury G. Kudryashov
c0496c0413 X.Org: added dbus, hal; removed unused gettext 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10467
 2008-02-02 20:42:55 +00:00
Yury G. Kudryashov
fb31183364 xorg: deault.nix and generate-expr-from-tarballs.pl synced 
svn path=/nixpkgs/trunk/; revision=10318
 2008-01-28 19:31:59 +00:00
Yury G. Kudryashov
a7703662a4 Merged with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
 2008-01-15 00:55:21 +00:00
Michael Raskin
4290be9a99 Various fixes to lessen reliance on nix.cs.uu.nl for tarballs; version bumps for unavailabel tarballs; ATI driver builds now 
svn path=/nixpkgs/trunk/; revision=9952
 2007-12-18 22:56:12 +00:00
Yury G. Kudryashov
95f5f51bae X.Org builder: always autoPropagate buildInputs 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9823
 2007-12-01 20:05:42 +00:00
Eelco Dolstra
f64beb4b58 * Fix a regression in setxkbmap: it couldn't find its rules anymore. 
svn path=/nixpkgs/trunk/; revision=9794
 2007-11-26 13:46:58 +00:00
Yury G. Kudryashov
e43ce8f723 xorg: deault.nix and generate-expr-from-tarballs.pl synced 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9761
 2007-11-19 22:29:08 +00:00
Michael Raskin
61f4326752 Added possibility to enable SVG in ImageMagick, updated pidgin-latex, added missed xorgserver xkb patch. 
svn path=/nixpkgs/trunk/; revision=9623
 2007-11-11 07:54:45 +00:00
Michael Raskin
f38d6d0f15 Fixed a LED bug; patch taken from bugs.freedesktop.org 
svn path=/nixpkgs/trunk/; revision=9622
 2007-11-10 17:32:55 +00:00
Michael Raskin
43b208bbb9 Fixed synaptics; Added GOCR (not that it is a good OCR); reverted MarcWeber's update to setup-new-2.sh (he has no time to use it in nearest future; later I hope it will be irrelevant) 
svn path=/nixpkgs/trunk/; revision=9613
 2007-11-09 13:54:02 +00:00
Eelco Dolstra
806ff74e5a * Add the i810 driver back in (don't know yet if it still works). 
svn path=/nixpkgs/trunk/; revision=9594
 2007-11-06 11:49:13 +00:00
Eelco Dolstra
b7f1b56b18 * X11R7.3. 
svn path=/nixpkgs/trunk/; revision=9592
 2007-11-05 23:59:55 +00:00
Michael Raskin
c12137d608 Added some symlinks to make xkbrules work in xorg.conf for switching keymaps. 
svn path=/nixpkgs/trunk/; revision=9031
 2007-08-02 21:30:33 +00:00
Yury G. Kudryashov
40657fbece * ncurses: added symlinks for bynary packages linked against libncurses. Tested 
with ghc. I will add 'unicode' option next check in (for cygwin).
* pidgin:  Got rid of builder.sh, added ncurses to the dependencies, so it builds
           finch.
* xorg:    Added glproto and mesaHeaders to xf86videosis dependencies. Now it
           compiles.
* pwgen:   Added.
* device-mapper: Version bump. Added 'static' option for use in initrd.
* lvm2:          Version bump. Added 'static' option for use in initrd.

svn path=/nixpkgs/trunk/; revision=8923
 2007-06-28 09:53:12 +00:00
Michael Raskin
42f841bcab Added some descriptions. 
svn path=/nixpkgs/trunk/; revision=8920
 2007-06-26 11:49:45 +00:00
Eelco Dolstra
91e0b058af * Don't touch symlinks to which we don't have write permission. 
svn path=/nixpkgs/trunk/; revision=8776
 2007-05-25 14:10:38 +00:00
Eelco Dolstra
50cc2acd23 * xorg-server 1.3.0, xf86-video-intel 2.0.0. 
svn path=/nixpkgs/trunk/; revision=8616
 2007-04-26 18:36:01 +00:00
Eelco Dolstra
1971bb6829 * X.org server 1.2.99.905. 
svn path=/nixpkgs/trunk/; revision=8595
 2007-04-18 15:46:58 +00:00
Eelco Dolstra
a29dbccc0f * Added the latest Intel video driver. 
svn path=/nixpkgs/trunk/; revision=8594
 2007-04-18 14:55:43 +00:00
Eelco Dolstra
c214c7525d * setxkbmap: add a symlink to xkeyboard-config so that it can find the 
rules files.  Maybe this should be done through an environment variable.

svn path=/nixpkgs/trunk/; revision=8496
 2007-03-29 23:02:07 +00:00
Eelco Dolstra
fc483e0d57 * Allow the path to xkbcomp to specified in an environment variable. 
The X server by default looks for it under its own prefix, which
  isn't right.  Not being able to run xkbcomp causes the Xkb keyboard
  extension to fail (which incidentally is also the reason why
  Ctrl-Alt-Fn didn't work).

svn path=/nixpkgs/trunk/; revision=8494
 2007-03-29 22:57:56 +00:00
Martin Bravenboer
fb6d590e50 xorg libxcb: patch to disable assert that stops Java GUI apps from 
working (the actual bug is in Java).


svn path=/nixpkgs/trunk/; revision=8189
 2007-03-05 18:28:49 +00:00
Eelco Dolstra
f6b15579b8 svn path=/nixpkgs/trunk/; revision=8065 2007-02-27 00:07:07 +00:00
Eelco Dolstra
8db3dbaf1a * Patched the X server to get the path of the DRI driver from the 
environment, rather than relative to the X server's prefix.

svn path=/nixpkgs/trunk/; revision=8064
 2007-02-26 23:50:03 +00:00
Eelco Dolstra
556cc5ed2f * Doh. 
svn path=/nixpkgs/trunk/; revision=8063
 2007-02-26 23:37:41 +00:00
Eelco Dolstra
ba443448e8 * Build the i810 driver. Only depend on the Mesa headers, not all of Mesa. 
svn path=/nixpkgs/trunk/; revision=8060
 2007-02-26 23:10:25 +00:00
Eelco Dolstra
9f173879e3 * Don't call fc-cache (it tries to write in fontconfig's prefix). 
svn path=/nixpkgs/trunk/; revision=8056
 2007-02-26 21:04:36 +00:00
Eelco Dolstra
24399a3f49 * Dependencies on fontconfig. 
svn path=/nixpkgs/trunk/; revision=8055
 2007-02-26 20:46:56 +00:00
Eelco Dolstra
26a710ad67 * Hack to address a GNU Make impurity (NIXPKGS-45). 
svn path=/nixpkgs/trunk/; revision=8054
 2007-02-26 19:11:19 +00:00
Eelco Dolstra
cd10e285d2 * Pass the Mesa source tree. 
svn path=/nixpkgs/trunk/; revision=8052
 2007-02-26 17:05:27 +00:00
Eelco Dolstra
3e19819c28 * X11R7.2 and associated updates. 
svn path=/nixpkgs/trunk/; revision=8049
 2007-02-26 16:32:27 +00:00
Eelco Dolstra
9a457db61d * Some font hackery. 
svn path=/nixpkgs/trunk/; revision=8042
 2007-02-25 15:54:15 +00:00
Eelco Dolstra
b3b1daf131 * Add Bitstream Vera. 
svn path=/nixpkgs/trunk/; revision=7751
 2007-01-22 17:11:08 +00:00
Eelco Dolstra
aa0918867b * Get some TTF fonts to work. Must merge with the generator. 
svn path=/nixpkgs/trunk/; revision=7708
 2007-01-17 17:18:14 +00:00
Eelco Dolstra
157b6cd18d * Missing dependencies. Will merge into the generator later. 
svn path=/nixpkgs/trunk/; revision=7166
 2006-11-28 22:28:27 +00:00
Eelco Dolstra
ad897a7c96 * Update more URLs. 
svn path=/nixpkgs/trunk/; revision=6713
 2006-10-12 14:53:45 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=6711
 2006-10-12 13:50:54 +00:00
Eelco Dolstra
4c7b042e32 * Doh! 
svn path=/nixpkgs/trunk/; revision=5521
 2006-06-24 20:44:19 +00:00
Eelco Dolstra
829d0d96ca * X11R7.1 (I hope - the release is incomplete...). 
svn path=/nixpkgs/trunk/; revision=5520
 2006-06-24 20:31:10 +00:00
Martin Bravenboer
179e41fe9d Fix 
svn path=/nixpkgs/trunk/; revision=5294
 2006-05-11 08:28:03 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=4623
 2006-01-30 16:04:03 +00:00
Eelco Dolstra
79b3528567 * OpenGL dependency in the i810 driver. 
svn path=/nixpkgs/trunk/; revision=4571
 2006-01-17 14:11:43 +00:00
Eelco Dolstra
57adf342b4 * Detect even more dependencies. 
svn path=/nixpkgs/trunk/; revision=4568
 2006-01-17 12:41:27 +00:00
Eelco Dolstra
43a679bab7 * More dependencies. 
svn path=/nixpkgs/trunk/; revision=4562
 2006-01-16 15:07:03 +00:00
Eelco Dolstra
c656e18b1d * Don't build static libraries. Whooooosh! 
svn path=/nixpkgs/trunk/; revision=4559
 2006-01-16 12:59:34 +00:00
Eelco Dolstra
b243aa0f12 * Even more zlib dependencies. 
svn path=/nixpkgs/trunk/; revision=4558
 2006-01-16 12:59:09 +00:00
Eelco Dolstra
830331445d * Some libraries need zlib. 
svn path=/nixpkgs/trunk/; revision=4557
 2006-01-16 12:46:20 +00:00
Eelco Dolstra
7dba8848ed * Fix a horrible in imake: its results depend on whether a C compiler 
exists in one of a fixed set of paths (e.g., /usr/bin/cc).  For
  instance, on a system without /usr/bin/cc the variable DependCmd
  would evaluate to "makedepend", and on a system with it, to
  "gccmakedep".

  Solution: just use "gcc" always.  Also disabled some shitty code to
  detect the current Linux distribution (by probing for files like
  /etc/SuSE-release). 

svn path=/nixpkgs/trunk/; revision=4534
 2006-01-11 00:21:52 +00:00
Eelco Dolstra
94517a614e * Export the input attributes. 
svn path=/nixpkgs/trunk/; revision=4533
 2006-01-09 21:39:47 +00:00
Eelco Dolstra
2346c0061b * Get imake to build again (xmkmf is gone). 
svn path=/nixpkgs/trunk/; revision=4530
 2006-01-09 19:34:26 +00:00
Eelco Dolstra
ceb9b654ed * Discover dependencies on libXaw. 
* Handle commas in *.pc files.

svn path=/nixpkgs/trunk/; revision=4525
 2006-01-09 12:49:21 +00:00
Eelco Dolstra
ebc93faa32 * Automatically propagate pkgconfig "Requires" fields so I don't have 
to figure out the propagatedBuildInputs.

svn path=/nixpkgs/trunk/; revision=4521
 2006-01-08 22:09:44 +00:00
Eelco Dolstra
c45d0521bd * Produce the right name attribute. 
svn path=/nixpkgs/trunk/; revision=4520
 2006-01-08 21:19:56 +00:00
Eelco Dolstra
20d0e31cd0 * Start update to X11R7.0. 
svn path=/nixpkgs/trunk/; revision=4519
 2006-01-08 20:32:34 +00:00
Eelco Dolstra
ea95a0509e * Start the switch to the new X libraries. It's still conditional: 
set `useOldXLibs' to `false' in all-packages-generic.nix to use
  them.
* Added Xaw3d.
* Added Xaw3d support to Emacs.

svn path=/nixpkgs/trunk/; revision=4263
 2005-11-12 17:05:51 +00:00
Eelco Dolstra
65a411cadc * Remove XFree86. 
svn path=/nixpkgs/trunk/; revision=4220
 2005-11-04 13:01:48 +00:00
Eelco Dolstra
e0a8574dc8 * Get the VESA driver to build. 
svn path=/nixpkgs/trunk/; revision=4200
 2005-11-03 14:10:57 +00:00
Eelco Dolstra
3f2c3a6066 * More fixes to get a basic X server running (keyboard, mouse, i810 
graphics).

svn path=/nixpkgs/trunk/; revision=4198
 2005-11-02 21:49:08 +00:00
Eelco Dolstra
a21e96548a * Add missing dependencies to the modular X components. This is a 
quick hack; the actual packages should be fixed instead.

svn path=/nixpkgs/trunk/; revision=4197
 2005-11-02 20:59:25 +00:00
Eelco Dolstra
4e50d07bdf * Added the generated Nix expression for the modular X.org tree. It 
contains derivations for the 279 packages in that tree.  (Biggest
  Nix expression ever!)

svn path=/nixpkgs/trunk/; revision=4193
 2005-11-02 15:47:56 +00:00
Eelco Dolstra
6d04a1fae0 * A script to generate Nix expressions for the modular X.org tree. 
svn path=/nixpkgs/trunk/; revision=4191
 2005-11-02 15:34:48 +00:00
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=3660
 2005-08-22 08:39:27 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a 
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
 2005-02-15 14:44:19 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders. 
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
 2004-03-29 17:23:01 +00:00
Eelco Dolstra
2fcc5fdb08 * "!isNull x" -> "x != null". Done automatically. Hope nothing 
broke.

svn path=/nixpkgs/trunk/; revision=870
 2004-03-29 10:25:25 +00:00
Eelco Dolstra
026ff9466a * Rename .fix -> .nix. 
svn path=/nixpkgs/trunk/; revision=511
 2003-11-18 12:12:56 +00:00
Eelco Dolstra
48c3faca51 * Renamed pkgs-ng to pkgs. 
svn path=/nixpkgs/trunk/; revision=502
 2003-11-14 09:59:13 +00:00