Lluís Batlle i Rossell
3b54414f31
I left a "set -x" without will.
...
svn path=/nixpkgs/trunk/; revision=20441
2010-03-05 22:13:58 +00:00
Lluís Batlle i Rossell
681929cd4d
I noticed that the patchPhase does not run postPatch, if there are no 'patches'.
...
So, I move what I had in postPatch to prePatch, which is run with or without 'patches'.
svn path=/nixpkgs/trunk/; revision=20440
2010-03-05 22:10:54 +00:00
Lluís Batlle i Rossell
ba28274db7
Updating mercurial
...
svn path=/nixpkgs/trunk/; revision=20439
2010-03-05 21:59:52 +00:00
Lluís Batlle i Rossell
48fa4b5257
Updating dwm, and allowing users set their own patches to configure it.
...
svn path=/nixpkgs/trunk/; revision=20437
2010-03-05 21:49:29 +00:00
Lluís Batlle i Rossell
ca86e6992b
Updating dmenu.
...
svn path=/nixpkgs/trunk/; revision=20436
2010-03-05 21:42:24 +00:00
Eelco Dolstra
2ae55812ef
svn path=/nixpkgs/trunk/; revision=20428
2010-03-05 18:29:56 +00:00
Lluís Batlle i Rossell
81d4c5d09b
Updating ts
...
svn path=/nixpkgs/trunk/; revision=20421
2010-03-05 17:22:37 +00:00
Lluís Batlle i Rossell
e1f0221bc3
As the main openoffice servers don't hold the 3.1.1 source anymore (This means I could
...
not find it), I update the URLs so it is taken from a mirror still having them.
I tried one at random from:
http://distribution.openoffice.org/mirrors/#mirrors
and it worked. They don't have older versions other than 3.1.1 though.
This also reverts the attempt from Sander updating the expression to 3.2.0, because
it failed. That deserves more effort.
svn path=/nixpkgs/trunk/; revision=20419
2010-03-05 17:09:34 +00:00
Sander van der Burg
0894348d60
Since OOo 3.1.1 is broken anyway, this is my first attempt in supporting 3.2.0
...
svn path=/nixpkgs/trunk/; revision=20414
2010-03-05 13:38:27 +00:00
Rob Vermaas
cb4a352b3e
wrong hash for nix-mysqlite 0.15
...
svn path=/nixpkgs/trunk/; revision=20411
2010-03-05 13:15:03 +00:00
Rob Vermaas
0723777cc7
update nixSqlite to 0.15pre20408
...
svn path=/nixpkgs/trunk/; revision=20410
2010-03-05 13:09:33 +00:00
Sander van der Burg
f788ae920d
Changed KDE 4.4.x to the default KDE version. Changed qt-4.6.x to the default qt4 version (except for the KDE 4.3.x attribute and older PyQt releases
...
svn path=/nixpkgs/trunk/; revision=20404
2010-03-05 12:00:37 +00:00
Rob Vermaas
e55f37246a
use hydrantlogger if in environment
...
svn path=/nixpkgs/trunk/; revision=20399
2010-03-05 10:35:11 +00:00
Rob Vermaas
0e809b5aca
hydra-ant-logger 2010.2
...
svn path=/nixpkgs/trunk/; revision=20397
2010-03-05 10:28:21 +00:00
Rob Vermaas
edb6a80ac3
ant builder
...
svn path=/nixpkgs/trunk/; revision=20395
2010-03-05 10:09:22 +00:00
Lluís Batlle i Rossell
4523a86c92
Adding the awesome man pages.
...
svn path=/nixpkgs/trunk/; revision=20394
2010-03-05 09:52:53 +00:00
Lluís Batlle i Rossell
40d3c2f29a
Adding graphicsmagick 1.3.7 for octave imread() and alike to work.
...
svn path=/nixpkgs/trunk/; revision=20390
2010-03-04 16:41:14 +00:00
Lluís Batlle i Rossell
ba274e578c
Made graphicsmagick-config not say anything about libraries that would be needed for static linking, because we are linking it dynamically.
...
Made octave link with graphicsmagick to get imread() working.
Nevertheless, imread does not work, because of some problems between octave and latest versions of graphicsmagick: http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html
Next to do: add an older version of graphics magick for octave.
svn path=/nixpkgs/trunk/; revision=20389
2010-03-04 16:41:10 +00:00
Lluís Batlle i Rossell
22065c11d9
Adding 'awesome' (and two packages it was depending on)
...
svn path=/nixpkgs/trunk/; revision=20385
2010-03-04 14:44:56 +00:00
Lluís Batlle i Rossell
9c75629a31
Made graphicsmagick build shared libraries (otherwise we have to care in x86_64 on PIC)
...
svn path=/nixpkgs/trunk/; revision=20384
2010-03-04 14:44:51 +00:00
Lluís Batlle i Rossell
aa38df2611
Adding GraphicsMagick
...
svn path=/nixpkgs/trunk/; revision=20383
2010-03-04 14:44:47 +00:00
Lluís Batlle i Rossell
c2cbd65668
Getting a better seg3d build. Now it runs from TMPDIR at least.
...
The installation still fails.
svn path=/nixpkgs/trunk/; revision=20382
2010-03-04 14:44:43 +00:00
Lluís Batlle i Rossell
8a080a699e
Fixing the cross build stdenv adapter so it tolerates buildInputs with 'null' elements.
...
svn path=/nixpkgs/trunk/; revision=20381
2010-03-04 14:44:38 +00:00
Lluís Batlle i Rossell
27b8b6cc66
Made mdadm cross build.
...
svn path=/nixpkgs/trunk/; revision=20380
2010-03-04 14:44:35 +00:00
Lluís Batlle i Rossell
f2830f5636
Making e2fsprogs crossbuild.
...
svn path=/nixpkgs/trunk/; revision=20379
2010-03-04 14:44:31 +00:00
Eelco Dolstra
2880af03c8
* Add a Nix expression for the Nix SQLite branch (temporarily).
...
svn path=/nixpkgs/trunk/; revision=20377
2010-03-04 14:39:47 +00:00
Ludovic Courtès
4aae5c458e
python-darcsver: Don't depend on Darcs.
...
svn path=/nixpkgs/trunk/; revision=20371
2010-03-04 13:28:46 +00:00
Ludovic Courtès
07356746ef
Add GNU cppi.
...
svn path=/nixpkgs/trunk/; revision=20363
2010-03-04 11:10:44 +00:00
Ludovic Courtès
888d6711da
GNU Sharutils 4.9.
...
svn path=/nixpkgs/trunk/; revision=20362
2010-03-04 11:10:40 +00:00
Ludovic Courtès
21e05c5ff3
GNU Zile 2.3.15.
...
svn path=/nixpkgs/trunk/; revision=20361
2010-03-04 11:10:35 +00:00
Ludovic Courtès
cbe0240818
pavucontrol 0.9.10.
...
svn path=/nixpkgs/trunk/; revision=20354
2010-03-03 14:27:22 +00:00
Ludovic Courtès
344f2efc5f
libcanberra 0.23.
...
svn path=/nixpkgs/trunk/; revision=20353
2010-03-03 14:27:17 +00:00
Eelco Dolstra
8ba2b6a933
* Latest NVIDIA driver.
...
svn path=/nixpkgs/trunk/; revision=20352
2010-03-03 14:06:14 +00:00
Sander van der Burg
e51cfc777a
Added libv4l which is now a required dependency for kdenetwork-4.4.1
...
svn path=/nixpkgs/trunk/; revision=20349
2010-03-03 10:37:38 +00:00
Sander van der Burg
5984fe2daa
Took viric's update script from the 4.3.x tree and updated KDE to 4.4.1
...
svn path=/nixpkgs/trunk/; revision=20348
2010-03-02 22:49:08 +00:00
Eelco Dolstra
10cb305f11
* Urgh.
...
svn path=/nixpkgs/trunk/; revision=20339
2010-03-02 16:33:35 +00:00
Eelco Dolstra
42d9c2e92a
svn path=/nixpkgs/trunk/; revision=20338
2010-03-02 16:33:17 +00:00
Rob Vermaas
e260b68122
added NIX_ANT_ARGS to ant wrapper
...
svn path=/nixpkgs/trunk/; revision=20334
2010-03-02 15:54:54 +00:00
Rob Vermaas
af2f53ab89
hydra-ant-logger
...
svn path=/nixpkgs/trunk/; revision=20332
2010-03-02 15:37:04 +00:00
Eelco Dolstra
979e808838
* NSPR updated to 4.8.3.
...
svn path=/nixpkgs/trunk/; revision=20327
2010-03-02 15:09:20 +00:00
Michael Raskin
58e5881b9b
More symbols for symbol-rich layout
...
svn path=/nixpkgs/trunk/; revision=20324
2010-03-02 13:19:58 +00:00
Ludovic Courtès
c2f72b3ba5
Tahoe-LAFS 1.6.1.
...
svn path=/nixpkgs/trunk/; revision=20323
2010-03-02 12:46:50 +00:00
Lluís Batlle i Rossell
8e0a5f75a7
I broke again the nixpkgs tarball. After this, I think I learnt how to test it before
...
committing.
svn path=/nixpkgs/trunk/; revision=20321
2010-03-02 07:45:22 +00:00
Lluís Batlle i Rossell
cc068f0be8
Adding the itk libraries.
...
Adding a skeleton of the seg3d package. It builds, but libraries and rpaths are wrong.
I hope to fix it soon.
svn path=/nixpkgs/trunk/; revision=20320
2010-03-01 23:31:35 +00:00
Lluís Batlle i Rossell
eb047010f8
Trying to get a better expression for uboot upstream, allowing normal and cross build
...
with proper assertions.
svn path=/nixpkgs/trunk/; revision=20319
2010-03-01 23:22:48 +00:00
Ludovic Courtès
0bae3266eb
Impressive: Fix references to Python's directories.
...
svn path=/nixpkgs/trunk/; revision=20318
2010-03-01 17:08:30 +00:00
Ludovic Courtès
a86e0ad8aa
pyopengl: Move to `python-packages.nix'.
...
svn path=/nixpkgs/trunk/; revision=20317
2010-03-01 17:08:25 +00:00
Ludovic Courtès
06944c9e13
Ikarus: Update URLs.
...
svn path=/nixpkgs/trunk/; revision=20316
2010-03-01 17:08:21 +00:00
Ludovic Courtès
ee2eb5b98a
Bigloo: Add meta.maintainers' and
meta.platforms'.
...
svn path=/nixpkgs/trunk/; revision=20315
2010-03-01 17:08:16 +00:00
Ludovic Courtès
b36dbdf2c4
ExifTool 8.12.
...
svn path=/nixpkgs/trunk/; revision=20314
2010-03-01 17:08:12 +00:00
Ludovic Courtès
f1fcbc0fc9
Fix JDEE.
...
The SVN history has apparently been modified in place.
svn path=/nixpkgs/trunk/; revision=20313
2010-03-01 17:08:08 +00:00
Rob Vermaas
63993b0c9b
ecj darwin~
...
svn path=/nixpkgs/trunk/; revision=20312
2010-03-01 16:40:02 +00:00
Rob Vermaas
f3f922f474
ecj for darwin
...
svn path=/nixpkgs/trunk/; revision=20311
2010-03-01 16:20:47 +00:00
Lluís Batlle i Rossell
95e22a39c7
Trying to make uboot not annoy the nixpkgs tarball. Tested.
...
svn path=/nixpkgs/trunk/; revision=20310
2010-03-01 15:21:24 +00:00
Rob Vermaas
7869d22938
i am an idiot, thnx ludo for pointing out my stupidity :-)
...
svn path=/nixpkgs/trunk/; revision=20309
2010-03-01 14:32:23 +00:00
Lluís Batlle i Rossell
152a0c97fa
Adding kernelArch to platforms.pc. Needed to make the release.nix tarball happy.
...
svn path=/nixpkgs/trunk/; revision=20308
2010-03-01 14:06:48 +00:00
Lluís Batlle i Rossell
38a19b7202
Adding the pc kernel headers base config, for the new linux kernel headers to build.
...
svn path=/nixpkgs/trunk/; revision=20307
2010-03-01 13:12:57 +00:00
Ludovic Courtès
72d59e3920
buildPythonPackage: Adapt to the cross-build-aware `stdenv'.
...
svn path=/nixpkgs/trunk/; revision=20306
2010-03-01 13:12:56 +00:00
Ludovic Courtès
67b7a89daf
Move zope.interface' to
python-packages.nix'.
...
svn path=/nixpkgs/trunk/; revision=20305
2010-03-01 13:12:52 +00:00
Ludovic Courtès
ff88e57803
GNU Parted 2.2.
...
svn path=/nixpkgs/trunk/; revision=20304
2010-03-01 13:12:48 +00:00
Rob Vermaas
4d94733de2
typo (lists in list)
...
svn path=/nixpkgs/trunk/; revision=20303
2010-03-01 12:49:15 +00:00
Rob Vermaas
6dbcd591ef
use mesaplatforms from lib
...
svn path=/nixpkgs/trunk/; revision=20302
2010-03-01 12:32:40 +00:00
Rob Vermaas
dfca3bc039
set meta.platforms to get rid of hydra evaluation errors (assertions)
...
svn path=/nixpkgs/trunk/; revision=20301
2010-03-01 12:23:49 +00:00
Rob Vermaas
9308f0465f
set meta.platforms to get rid of hydra evaluation errors (assertions)
...
svn path=/nixpkgs/trunk/; revision=20300
2010-03-01 12:21:12 +00:00
Rob Vermaas
0fd4468570
acct: updated hash
...
svn path=/nixpkgs/trunk/; revision=20299
2010-03-01 12:11:12 +00:00
Rob Vermaas
895ec201d3
yate2: updated hash
...
svn path=/nixpkgs/trunk/; revision=20298
2010-03-01 12:09:05 +00:00
Lluís Batlle i Rossell
b7abafeedc
Adding a new python package to allow calibre preview the books
...
svn path=/nixpkgs/trunk/; revision=20292
2010-02-28 22:55:08 +00:00
Lluís Batlle i Rossell
30a9cbf018
Updating calibre (I had to add a new python package for it: cssutils)
...
svn path=/nixpkgs/trunk/; revision=20291
2010-02-28 22:42:39 +00:00
Michael Raskin
01d5ec596b
Some more optional features for Vim
...
svn path=/nixpkgs/trunk/; revision=20288
2010-02-28 17:54:41 +00:00
Lluís Batlle i Rossell
ef1918f200
Allowing the kernel to build in the sheevaplug natively.
...
svn path=/nixpkgs/trunk/; revision=20284
2010-02-28 08:58:07 +00:00
Lluís Batlle i Rossell
18f667a954
I missed in release.nix the sheevaplug platform.
...
svn path=/nixpkgs/trunk/; revision=20282
2010-02-27 22:10:36 +00:00
Lluís Batlle i Rossell
89842675cb
Adding more cross build jobs for hydra. Kernels, gdb, mipsel, ultrasparc.
...
svn path=/nixpkgs/trunk/; revision=20281
2010-02-27 21:56:27 +00:00
Lluís Batlle i Rossell
289d728337
Fixing the kernel expressions to allow normal and cross-building, depending
...
on the native and cross platforms.
I thought I already did that today in a previous commit, but I did all wrong.
svn path=/nixpkgs/trunk/; revision=20280
2010-02-27 21:48:48 +00:00
Lluís Batlle i Rossell
305a7a2ddf
More testing allows fixing more errors from the recent commits.
...
svn path=/nixpkgs/trunk/; revision=20279
2010-02-27 21:21:20 +00:00
Lluís Batlle i Rossell
4677180b0d
Barf. I have to test the expressions before commiting.
...
svn path=/nixpkgs/trunk/; revision=20278
2010-02-27 20:37:58 +00:00
Lluís Batlle i Rossell
81b325b33f
Adding a cross compiler condition for sparc64 due to a gcc bug
...
svn path=/nixpkgs/trunk/; revision=20277
2010-02-27 20:29:39 +00:00
Lluís Batlle i Rossell
8cf1f739e2
Fixing the cross-glibc soft float case.
...
svn path=/nixpkgs/trunk/; revision=20276
2010-02-27 20:02:21 +00:00
Lluís Batlle i Rossell
3b747e92e5
Fixing the correct handling of uboot in the initrd and the kernel derivations.
...
(nixos on sheevaplug)
svn path=/nixpkgs/trunk/; revision=20275
2010-02-27 18:51:06 +00:00
Lluís Batlle i Rossell
11aa65c28a
Simplified much more the expressions for cross building and multiplatform.
...
I introduce the new nixpkgs parameter "platform", defaulting to "pc",
which was before defined as an attribute of nixpkgs.
I made the crossSystem nixpkgs attribute set parameter contain its own 'platform'.
This allows cross-building a kernel for a given crossSystem.platform in a non-PC
platform.
The actual native platform can be taken from stdenv.platform, and this way we also
avoid the constant passing of 'platform' to packages for platform-dependant builds
(kernel, initrd, ...).
I will update nixos accordingly to these changes, for non-PC platforms to work.
I think we are gaining on flexibility and clearness. I could cross build succesfully
an ultrasparc kernel and a mipsel kernel on PC. But since this change, I should be able
to do this also in non-PC.
Before this change, there was no possibility of distinguishing the "target platform" or
the "native build platform" when cross building, being the single "platform" attribute
always interpreted as target platform.
The platform is a quite relevant attribute set, as it determines the linuxHeaders used
(in the case, by now the only one supported, of linux targets).
The platform attributes are quite linux centric still. Let's hope for more generality to come.
svn path=/nixpkgs/trunk/; revision=20273
2010-02-27 17:35:47 +00:00
Lluís Batlle i Rossell
fca769846a
Adding a new special attribute for mkDerivation: crossAttrs. It sits next to
...
"meta" and "passthru", and these attributes will be appended to the usual
mkDerivation attributes only if the package is cross built.
This allows putting some of the cross-building logic in the mkDerivation
nix parameters, and not only in the final builder script, as it was until now.
svn path=/nixpkgs/trunk/; revision=20272
2010-02-27 17:35:42 +00:00
Lluís Batlle i Rossell
5ca75ac276
Updating gdb
...
svn path=/nixpkgs/trunk/; revision=20271
2010-02-27 13:00:55 +00:00
Lluís Batlle i Rossell
8f2427c91a
Updating the actual platforms in platforms.nix to fit the new requirement:
...
kernelHeadersBaseConfig.
svn path=/nixpkgs/trunk/; revision=20270
2010-02-27 00:55:03 +00:00
Lluís Batlle i Rossell
b1b7266aa3
After some testing with an ultrasparc cross-compiler:
...
Updating the cross-build expressions, adding some flexibility.
Updated the linux headers used cross building, as 2.6.28 had bugs on endianness in
sparc64.
There were, as usual some bugs in gcc. Maybe not many make a cross compiler to
ultrasparc.
For the record, I could build an ultrasparc kernel with this base nix:
import /etc/nixos/nixpkgs/default.nix # The root nixpkgs default.nix
{
crossSystem = {
config = "sparc64-unknown-linux";
bigEndian = true;
arch = "sparc64";
float = "soft";
withTLS = true;
cpu = "ultrasparc";
};
config = pkgs: {
packageOverrides = pkgs : {
platform = {
name = "sparc64";
kernelHeadersBaseConfig = "sparc64_defconfig";
kernelBaseConfig = "sparc64_defconfig";
kernelArch = "sparc";
kernelAutoModules = false;
kernelTarget = "zImage";
uboot = null;
};
};
};
}
Although it did not boot directly in qemu-system-sparc64:
[sparc64] Kernel already loaded
Unhandled Exception 0x0000000000000020
PC = 0x0000000000404000 NPC = 0x0000000000404004
svn path=/nixpkgs/trunk/; revision=20269
2010-02-27 00:52:48 +00:00
Lluís Batlle i Rossell
72edd54741
Making digikam build with kdeedu, to get the marble widget working to geolocate photos.
...
svn path=/nixpkgs/trunk/; revision=20266
2010-02-26 10:41:53 +00:00
Michael Raskin
df0922aab7
Fix argument retrieval
...
svn path=/nixpkgs/trunk/; revision=20263
2010-02-26 07:14:11 +00:00
Michael Raskin
98c282d12b
Make Unicode support optional
...
svn path=/nixpkgs/trunk/; revision=20261
2010-02-26 07:02:18 +00:00
Sander van der Burg
a777402b21
Added library general public license (LGPL 2.0). Although LGPL 2.1 is almost the same, I want to be precise
...
svn path=/nixpkgs/trunk/; revision=20259
2010-02-25 15:44:28 +00:00
Eelco Dolstra
61c9c2434f
* Updated fbcondecor for Linux 2.6.33.
...
svn path=/nixpkgs/trunk/; revision=20257
2010-02-25 14:15:42 +00:00
Eelco Dolstra
280ba422b8
* Linux 2.6.32.9.
...
svn path=/nixpkgs/trunk/; revision=20255
2010-02-25 13:55:57 +00:00
Rob Vermaas
3e9de0fd12
* nixpkgs: added webalizer
...
svn path=/nixpkgs/trunk/; revision=20253
2010-02-25 13:30:34 +00:00
Rob Vermaas
e9404a5d83
* remove sawmill
...
svn path=/nixpkgs/trunk/; revision=20252
2010-02-25 13:28:36 +00:00
Michael Raskin
a45255dee9
Fix Chromium
...
svn path=/nixpkgs/trunk/; revision=20251
2010-02-25 13:22:51 +00:00
Sander van der Burg
05245ea055
Added licenses to the lib attributeset
...
svn path=/nixpkgs/trunk/; revision=20249
2010-02-25 13:09:08 +00:00
Sander van der Burg
680c80e0b4
Added initial licenses attributeset to specify meta.license attributes more concisely
...
svn path=/nixpkgs/trunk/; revision=20248
2010-02-25 13:06:17 +00:00
Michael Raskin
5b4f9b1e56
Update ECL
...
svn path=/nixpkgs/trunk/; revision=20247
2010-02-25 12:54:46 +00:00
Eelco Dolstra
e04c9a452a
* Linux 2.6.33.
...
svn path=/nixpkgs/trunk/; revision=20246
2010-02-25 12:40:03 +00:00
Ludovic Courtès
f07aa3d96d
GNUnet 0.8.1b.
...
svn path=/nixpkgs/trunk/; revision=20245
2010-02-25 10:31:36 +00:00
Rob Vermaas
c4332bb7a1
nix 0.15pre20231 as nixUnstable
...
svn path=/nixpkgs/trunk/; revision=20243
2010-02-25 10:01:33 +00:00
Lluís Batlle i Rossell
7d898c52df
Adding some important modules to the qemu versatile board and the sheevaplug,
...
mainly for nfsroot and nixos.
svn path=/nixpkgs/trunk/; revision=20238
2010-02-24 22:13:48 +00:00
Lluís Batlle i Rossell
eaf2e0f1fa
Trying to get nfsroot boot in versatile (simply adding kernel options for that)
...
svn path=/nixpkgs/trunk/; revision=20237
2010-02-24 20:35:14 +00:00