philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

618 commits

Author SHA1 Message Date
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
Lluís Batlle i Rossell 9df13d6bba I remove a commented line for freeswitch parallel build. It failed once 
building, for me, with that option, so I take that off.

svn path=/nixpkgs/trunk/; revision=25665
 2011-01-21 22:12:39 +00:00
Lluís Batlle i Rossell 8cb0db3589 Adding freeswitch 
svn path=/nixpkgs/trunk/; revision=25664
 2011-01-21 22:12:34 +00:00
Lluís Batlle i Rossell 39506a095d Telling those GNU SIP Witch related packages to use gnutls. 
svn path=/nixpkgs/trunk/; revision=25635
 2011-01-19 21:48:05 +00:00
Lluís Batlle i Rossell 02f2fd1837 Adding GNU SIP Witch. 
svn path=/nixpkgs/trunk/; revision=25634
 2011-01-19 21:17:05 +00:00
Sander van der Burg 87c5470d94 Bumped Axis2 to 1.5.4. This subrelease finally seems to work properly again 
svn path=/nixpkgs/trunk/; revision=25523
 2011-01-12 15:56:05 +00:00
Lluís Batlle i Rossell 8dc9474e4d Making bind use /var/run/named instead of $out/var/run/named for the runtime temporary files. 
svn path=/nixpkgs/trunk/; revision=25509
 2011-01-11 22:08:43 +00:00
Lluís Batlle i Rossell a9345a51c5 Updating bind 
svn path=/nixpkgs/trunk/; revision=25457
 2011-01-07 11:33:04 +00:00
Peter Simons 12676e68d8 pkgs/servers/sql/mysql51/default.nix: updated to version 5.1.54 
The previous used version, 5.1.51, doesn't exist anymore on the server.

svn path=/nixpkgs/trunk/; revision=25378
 2011-01-04 12:35:06 +00:00
Alexander Tsamutali 5b6f88d1a9 servers/mpd: Updated to 0.16. 
svn path=/nixpkgs/trunk/; revision=25359
 2011-01-03 11:34:08 +00:00
Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
 2010-12-17 20:39:58 +00:00
Sander van der Burg 4e0c2cc3c6 Seems that this URL gives some trouble, fixed it to a better one... 
svn path=/nixpkgs/trunk/; revision=25161
 2010-12-16 21:04:13 +00:00
Sander van der Burg 5dd26bfdc6 Bumped MySQL JDBC connector to version 5.1.14 
svn path=/nixpkgs/trunk/; revision=25160
 2010-12-16 20:41:04 +00:00
Evgeny Egorochkin 77eb09e9cb Ghost One: packaged 
svn path=/nixpkgs/trunk/; revision=25137
 2010-12-15 02:19:59 +00:00
Eelco Dolstra 975ec6c177 * Added PostgreSQL 9.0.1. 
svn path=/nixpkgs/trunk/; revision=25106
 2010-12-13 21:55:34 +00:00
Eelco Dolstra b2fa805948 * PostgreSQL updates. 
svn path=/nixpkgs/trunk/; revision=25104
 2010-12-13 19:02:49 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
 2010-12-11 12:47:00 +00:00
Eelco Dolstra c4d731f52b * Samba updated to 3.5.6. Build with --localstatedir=/var to prevent 
smbd from writing in $out/var at runtime.  Also added --with-fhs.

svn path=/nixpkgs/trunk/; revision=25015
 2010-12-06 18:59:07 +00:00
Lluís Batlle i Rossell f7cfcbd1f9 Making gpm generate proper files in $out/lib, that allow good cross-linking. I 
had to do this to get the FB driver in links2 - it wants gpm to build, and
without these changes, the "-lgpm" did not work.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24932
 2010-11-29 23:51:24 +00:00
Evgeny Egorochkin 5e994b9153 ekiga: fix build failure. Patch by Karn Kallio. 
svn path=/nixpkgs/trunk/; revision=24897
 2010-11-28 09:21:36 +00:00
Lluís Batlle i Rossell 5103335a61 Making gpm crossbuild 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24879
 2010-11-26 17:55:22 +00:00
Michael Raskin fb58f74d82 Updating from trunk again 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
 2010-11-17 17:03:09 +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
Lluís Batlle i Rossell 8746de3ae8 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
 2010-11-11 22:18:14 +00:00
Michael Raskin 4f920af24a create logs symlink later so that builder doesn't stumble on it 
svn path=/nixpkgs/trunk/; revision=24665
 2010-11-11 19:57:46 +00:00
Lluís Batlle i Rossell f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in 
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
 2010-10-31 19:30:31 +00:00
Peter Simons 3f1392cb5a mod_wsgi: fixed build on Darwin 
The configure script had an hard-coded impure path to the lipo binary. If that
binary was found -- and it was --, then the script decided to pass an invalid
"-arch i386" flag to libtool, which subsequently failed. There is probably
another way to pass that -arch flag, but I didn't look hard because it's
redundant anyway.

svn path=/nixpkgs/trunk/; revision=24530
 2010-10-29 14:46:40 +00:00
Peter Simons 90490b0603 pkgs/servers/http/apache-httpd: updated to version 2.2.17 
svn path=/nixpkgs/trunk/; revision=24468
 2010-10-25 13:13:15 +00:00
Peter Simons 2bdf5c4fec pkgs/servers/http/apache-modules/mod_wsgi: added meta.platforms and meta.maintainer 
svn path=/nixpkgs/trunk/; revision=24467
 2010-10-25 13:13:09 +00:00
Peter Simons e75b4e4c91 pkgs/servers/http/apache-modules/mod_fastcgi: added meta.platforms and meta.maintainer 
svn path=/nixpkgs/trunk/; revision=24466
 2010-10-25 13:13:03 +00:00
Peter Simons 4fa49d4e8f pkgs/servers/http/apache-httpd: added meta.platforms and meta.maintainer 
svn path=/nixpkgs/trunk/; revision=24465
 2010-10-25 13:12:57 +00:00
Peter Simons 3527fd782a pkgs/servers/http/apache-httpd: dropped obsolete comment 
svn path=/nixpkgs/trunk/; revision=24464
 2010-10-25 13:12:33 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
 2010-10-23 14:52:21 +00:00
Peter Simons 7b630f442c Added an expression for mod_wsgi-3.3, to be used with Apache 2. 
svn path=/nixpkgs/trunk/; revision=24408
 2010-10-21 15:39:58 +00:00
Peter Simons b6693acfb2 pkgs/servers/http/apache-httpd: added meta.license information 
svn path=/nixpkgs/trunk/; revision=24407
 2010-10-21 15:39:53 +00:00
Peter Simons c7a87b1669 Added an expression for mod_fastcgi-2.4.6, to be used with Apache 2. 
svn path=/nixpkgs/trunk/; revision=24406
 2010-10-21 15:39:48 +00:00
Ludovic Courtès 346dbcdad3 GNU MyServer 0.10. 
svn path=/nixpkgs/trunk/; revision=24359
 2010-10-19 08:09:41 +00:00
Rob Vermaas 5a54c03c82 update mysql51 to mysql 5.1.51 
svn path=/nixpkgs/trunk/; revision=24355
 2010-10-19 07:06:16 +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
Lluís Batlle i Rossell fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
 2010-10-07 21:21:31 +00:00
Eelco Dolstra 0bd5f00696 * Updated Tomcat to 5.0.27. 
svn path=/nixpkgs/trunk/; revision=24066
 2010-10-05 10:39:12 +00:00
Lluís Batlle i Rossell cd4b54748a Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
 2010-10-03 09:25:34 +00:00
Lluís Batlle i Rossell 6923539d84 Fixing the apache build (comment on the fix in the source) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24032
 2010-10-03 09:18:03 +00:00
Yury G. Kudryashov 732997b02e Metadata 
svn path=/nixpkgs/trunk/; revision=23963
 2010-09-27 11:19:31 +00:00
Evgeny Egorochkin 8a68518454 Samba: option to compile winbind which is used by some apps under Wine 
svn path=/nixpkgs/trunk/; revision=23935
 2010-09-26 05:07:41 +00:00
Michael Raskin e8cca19dc7 Update CouchDB. Thanks to Cillian de Róiste for sending a patch.. 
svn path=/nixpkgs/trunk/; revision=23866
 2010-09-19 21:50:38 +00:00
Michael Raskin 29db2ca0c9 Adding Ekiga 
svn path=/nixpkgs/trunk/; revision=23653
 2010-09-05 23:37:54 +00:00
Eelco Dolstra b9f2f1dc46 * Zabbix 1.8.3. 
svn path=/nixpkgs/trunk/; revision=23401
 2010-08-24 15:18:06 +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 ab5669146d * apr 1.4.2, Apache httpd 2.2.16. 
svn path=/nixpkgs/trunk/; revision=23046
 2010-08-08 20:29:23 +00:00
Eelco Dolstra a1e834e85a * Get rid of the ugly `useFromStdenv' hack in all-packages.nix. 
Instead, use the generic package override mechanism to use packages
  from earlier bootstrap phases.
* Don't rely on the existence of attributes such as
  `stdenv.coreutils'.

svn path=/nixpkgs/trunk/; revision=22991
 2010-08-06 10:34:34 +00:00
Yury G. Kudryashov 288c414bb4 pulseaudio: udev and bluez support 
svn path=/nixpkgs/trunk/; revision=22834
 2010-07-31 13:05:58 +00:00
Eelco Dolstra 907bb1aac6 * ltrace: updated to 0.5.3. 
* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
  SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.

svn path=/nixpkgs/trunk/; revision=22814
 2010-07-29 18:55:16 +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 6609710409 * Get rid of many instances of "args: with args;", and other coding 
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
 2010-07-28 11:55:54 +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 0db478d40b * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=22707
 2010-07-22 13:18:07 +00:00
Sander van der Burg ed3640e9de Upgraded MySQL java connector to 5.1.13 
svn path=/nixpkgs/trunk/; revision=22703
 2010-07-22 10:54:34 +00:00
Ludovic Courtès 3c482c79d6 GNU Dico 2.1. 
svn path=/nixpkgs/trunk/; revision=22695
 2010-07-22 09:01:20 +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
Michael Raskin ccc497f80d Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense. 
svn path=/nixpkgs/trunk/; revision=22529
 2010-07-08 13:25:52 +00:00
Michael Raskin 1b0fe61154 Update ejabberd 
svn path=/nixpkgs/trunk/; revision=22475
 2010-07-05 12:39:00 +00:00
Michael Raskin e312c443fc Fixing interpreter paths in the end. Note that 4s-dump needs Perl Net::HTTP package that Nixpkgs apparently lack 
svn path=/nixpkgs/trunk/; revision=22435
 2010-07-01 05:05:47 +00:00
Michael Raskin 853212def0 Adding 4store RDF storage/SparQL server 
svn path=/nixpkgs/trunk/; revision=22434
 2010-06-30 21:51:48 +00:00
Michael Raskin 14eea491b8 Adding Redstore HTTP RDF/SPARQL server 
svn path=/nixpkgs/trunk/; revision=22428
 2010-06-29 22:18:49 +00:00
Eelco Dolstra 12ede4793f * Add ftp-archives.postgresql.org as a fallback for PostgreSQL 
downloads.
* PostgreSQL updated to 8.3.11, 8.4.4.  

svn path=/nixpkgs/trunk/; revision=22365
 2010-06-21 20:43:05 +00:00
Ludovic Courtès c62a73dc51 GNU Shishi 1.0.0. 
svn path=/nixpkgs/trunk/; revision=22313
 2010-06-17 17:06:47 +00:00
Michael Raskin 4f6613b267 Update CouchDB (patch and tested by Cillian Deroiste) 
svn path=/nixpkgs/trunk/; revision=22210
 2010-06-10 12:41:39 +00:00
Marc Weber d3be228d96 adding firebird (and embedded library ?) 
svn path=/nixpkgs/trunk/; revision=22130
 2010-06-03 15:19:56 +00:00
Eelco Dolstra 20fcfdef64 * Revert to Samba 3.3.3 because never versions (including 3.3.12) 
break our VM builds.  The child smbd process sends a TERM signal to
  its process group when it exists (e.g. on unmount), causing qemu-kvm
  to die.

  Reported upstream: https://sourceforge.net/tracker/?func=detail&aid=2996643&group_id=180599&atid=893831

svn path=/nixpkgs/trunk/; revision=21600
 2010-05-04 15:26:34 +00:00
Yury G. Kudryashov 0b11f22f49 Trying to fix virtuoso build on freebsd 
svn path=/nixpkgs/trunk/; revision=21475
 2010-05-01 07:41:40 +00:00
Yury G. Kudryashov bf92619681 Upgrade virtuoso to 6.1.1 
svn path=/nixpkgs/trunk/; revision=21473
 2010-05-01 07:07:31 +00:00
Yury G. Kudryashov 8137966874 Upgrade samba 
Also add symlink for CUPS

svn path=/nixpkgs/trunk/; revision=21464
 2010-04-30 20:39:54 +00:00
Yury G. Kudryashov 8a1dd10d81 samba: make kerberos optional 
svn path=/nixpkgs/trunk/; revision=21397
 2010-04-28 09:39:01 +00:00
Ludovic Courtès 106ba39180 Add GNU Shishi and GNU Radius. 
Contributed by Brian Gough <bjg@gnu.org>.

svn path=/nixpkgs/trunk/; revision=21313
 2010-04-26 08:45:23 +00:00
Eelco Dolstra 9fce3b7efc * Zabbix updated to 1.8.2. 
svn path=/nixpkgs/trunk/; revision=21267
 2010-04-23 11:58:59 +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
Sander van der Burg 1bf1500d39 Added Apache Felix gateway and remote shell packages 
svn path=/nixpkgs/trunk/; revision=21240
 2010-04-22 14:01:57 +00:00
Alexander Tsamutali 502f979532 mpd: New nixpkg. 
svn path=/nixpkgs/trunk/; revision=21148
 2010-04-18 19:26:30 +00:00
Eelco Dolstra 98bab41c33 * Clean up the "dict" package. For some reason "configureFlags" 
didn't get passed properly.

svn path=/nixpkgs/trunk/; revision=21069
 2010-04-14 10:55:50 +00:00
Michael Raskin ff8fbd8a1a Fix remaining perl mention in buildInputs 
svn path=/nixpkgs/trunk/; revision=20989
 2010-04-09 11:37:38 +00:00
Michael Raskin e80351a49d Update nginx 
svn path=/nixpkgs/trunk/; revision=20988
 2010-04-09 11:26:54 +00:00
Yury G. Kudryashov 99fda7a42f Do not pass pkgs to virtuoso 
svn path=/nixpkgs/trunk/; revision=20958
 2010-04-06 13:27:32 +00:00
Lluís Batlle i Rossell 8807722e17 Adding xdm 
svn path=/nixpkgs/trunk/; revision=20947
 2010-04-05 14:09:22 +00:00
Yury G. Kudryashov d22cb2fdb5 Add virtuoso database 
Very minimal installation needed by KDE

svn path=/nixpkgs/trunk/; revision=20932
 2010-04-03 17:34:14 +00:00
Sander van der Burg 2dce3019bf Upgraded Apache Tomcat to 6.0.26 
svn path=/nixpkgs/trunk/; revision=20606
 2010-03-13 16:27:27 +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
Eelco Dolstra 7ba365a41a * Apache httpd updated to 2.2.15. 
svn path=/nixpkgs/trunk/; revision=20477
 2010-03-08 14:28:47 +00:00
Eelco Dolstra 3f9cb1d9d2 * Build the Zabbix agent on other platforms. 
svn path=/nixpkgs/trunk/; revision=20188
 2010-02-23 12:17:23 +00:00
Michael Raskin 7db8225aed Update Data Matrix library and ifx its build 
svn path=/nixpkgs/trunk/; revision=20139
 2010-02-20 11:56:23 +00:00
Eelco Dolstra 06f07381c4 * Fix some evaluation errors. 
* Removed glibc 2.10.

svn path=/nixpkgs/trunk/; revision=20130
 2010-02-19 15:40:37 +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
Ludovic Courtès 859d2702b9 GNU MyServer 0.9.2. 
svn path=/nixpkgs/trunk/; revision=20042
 2010-02-16 10:48:06 +00:00
Eelco Dolstra 65aecdd00b * Zabbix updated to 1.8.1. 
svn path=/nixpkgs/trunk/; revision=20009
 2010-02-15 14:20:28 +00:00
Eelco Dolstra 91184831a9 * Using the en_US locale gives a lot of warnings (because we don't 
have it without glibc-locales).

svn path=/nixpkgs/trunk/; revision=19940
 2010-02-11 16:18:14 +00:00
Eelco Dolstra 554549de5b * Latest PostgreSQL. 
svn path=/nixpkgs/trunk/; revision=19931
 2010-02-11 13:40:20 +00:00
Eelco Dolstra a617a7c239 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
 2010-02-03 14:23:43 +00:00
Marco Maggesi f278489e98 Fix bugs and improve pkgs/servers/openafs-client 
svn path=/nixpkgs/trunk/; revision=19750
 2010-02-01 16:27:35 +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
Ludovic Courtès 4b31ecfb74 Rename kernel*' to linux*'. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19068
 2009-12-21 14:12:00 +00:00
Lluís Batlle i Rossell 5bae851b1e Merging from trunk. I had to give away some structure to build the native 
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
 2009-12-19 11:14:16 +00:00
Rob Vermaas 377b034541 enable max-nondb plugins for mysql 5.1.41 
svn path=/nixpkgs/trunk/; revision=19019
 2009-12-17 20:15:02 +00:00
Rob Vermaas d1e9045571 mysql 5.1.41 
svn path=/nixpkgs/trunk/; revision=19017
 2009-12-17 18:54:12 +00:00
Ludovic Courtès bc05fb3160 PulseAudio: Add maintainer and platform. 
svn path=/nixpkgs/trunk/; revision=18926
 2009-12-13 21:14:45 +00:00
Ludovic Courtès c7991b8a2b PulseAudio 0.9.21. 
svn path=/nixpkgs/trunk/; revision=18923
 2009-12-13 20:19:19 +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
Michael Raskin 13b91e2ca8 Update CouchDB; add Apache-related snippets to update-upstream-data. 
svn path=/nixpkgs/trunk/; revision=18851
 2009-12-09 12:59:23 +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
Eelco Dolstra b19ada9e05 * Fix the GPM URL. 
svn path=/nixpkgs/trunk/; revision=18413
 2009-11-18 12:47:58 +00:00
Eelco Dolstra 7f5b839524 * Removed selectVersion. There's no good reason to write 
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
 2009-11-18 09:39:59 +00:00
Sander van der Burg 52e9488541 Upgraded ejabberd to the latest stable 2.1.0 and also claimed maintainership since I really need this for one of my experiments 
svn path=/nixpkgs/trunk/; revision=18396
 2009-11-17 16:54:04 +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
Sander van der Burg 88a90ec1c5 Upgraded Axis2 to 1.5.1 
svn path=/nixpkgs/trunk/; revision=18373
 2009-11-16 12:50:04 +00:00
Sander van der Burg ac64ef2275 Upgraded JBoss to 5.1.0 
svn path=/nixpkgs/trunk/; revision=18329
 2009-11-11 15:52:26 +00:00
Marco Maggesi c0a6058122 Add package OpenAFS (added forgotten files) 
svn path=/nixpkgs/trunk/; revision=18323
 2009-11-10 16:00:52 +00:00
Wouter den Breejen 3259101fc0 Added par2, unzip/rar as dependencies so they are not picked up from PATH 
svn path=/nixpkgs/trunk/; revision=18303
 2009-11-08 23:37:49 +00:00
Wouter den Breejen d24e7434ec Added sabnzbd usenet download tool :) 
svn path=/nixpkgs/trunk/; revision=18295
 2009-11-08 19:59:56 +00:00
Wouter den Breejen a83def2812 Added sabnzbd usenet download tool :) 
svn path=/nixpkgs/trunk/; revision=18293
 2009-11-08 19:53:54 +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
Rob Vermaas ab8fd754c6 svn path=/nixpkgs/trunk/; revision=18209 2009-11-06 14:50:41 +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
Rob Vermaas 3bfd5b2d9c added couchdb 0.8.1-incubating 
svn path=/nixpkgs/trunk/; revision=18141
 2009-11-05 14:41:05 +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