ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-05 09:58:50 +03:00
Code Issues Projects Releases Wiki Activity
12,151 Commits 96 Branches 102 Tags 4.5 GiB
93718907e4
Commit Graph

550 Commits

Author SHA1 Message Date
Lluís Batlle i Rossell
e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
 2009-11-19 19:09:10 +00:00
Eelco Dolstra
519e7870b6 * Move `modifyDerivation' from build-support/vm to lib and rename it 
to `overrideDerivation'.

svn path=/nixpkgs/trunk/; revision=18466
 2009-11-19 16:43:58 +00:00
Eelco Dolstra
aa392c3aa7 * Move functions like `runCommand' out of all-packages.nix and into 
build-support/.

svn path=/nixpkgs/trunk/; revision=18465
 2009-11-19 16:07:47 +00:00
Rob Vermaas
5fca80982a move autoconfPhase so it can be overriden 
svn path=/nixpkgs/trunk/; revision=18458
 2009-11-19 13:57:57 +00:00
Rob Vermaas
4dca2c8b12 echo to stderr in stead of stdout. else hydra cannot read hash/path 
svn path=/nixpkgs/trunk/; revision=18448
 2009-11-18 19:10:24 +00:00
Lluís Batlle i Rossell
4c09cfc8a3 Adding generic builder management of cross compilation: envHooksHost, pkgsHost, ... 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18446
 2009-11-18 18:16:35 +00:00
Ludovic Courtès
4f20056bca nix-prefetch-git: Default to SHA256. 
svn path=/nixpkgs/trunk/; revision=18443
 2009-11-18 16:39:09 +00:00
Ludovic Courtès
39476057a2 nix-prefetch-git: Support $NIX_PREFETCH_GIT_LEAVE_DOT_GIT. 
svn path=/nixpkgs/trunk/; revision=18442
 2009-11-18 16:39:06 +00:00
Ludovic Courtès
3124661215 nix-prefetch-git: Remove `--depth' argument since it's risky. 
The `--depth' argument asks Git to fetch the last revisions of the given
repo on *any* branch, which is often useless.

Thanks to Lluís Battle for clarifying this.

svn path=/nixpkgs/trunk/; revision=18438
 2009-11-18 16:24:31 +00:00
Ludovic Courtès
15da008651 Slightly generalize `sourceTarball'. 
svn path=/nixpkgs/trunk/; revision=18426
 2009-11-18 14:12:39 +00:00
Ludovic Courtès
2bbaf039da fetchurl: Improve GNU mirror list. 
svn path=/nixpkgs/trunk/; revision=18416
 2009-11-18 13:18:28 +00:00
Lluís Batlle i Rossell
0c631f6181 Trying to move all stdenv cross-compiling details out of the stdenv expression, 
into a stdenv adapater.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18397
 2009-11-17 21:14:57 +00:00
Rob Vermaas
66a537f774 redirect stdout of git calls to stderr to allow git to work in hydra as input 
svn path=/nixpkgs/trunk/; revision=18393
 2009-11-17 15:50:20 +00:00
Eelco Dolstra
a56509c0db * Remove some more unused functions. 
svn path=/nixpkgs/trunk/; revision=18390
 2009-11-17 15:31:48 +00:00
Eelco Dolstra
18a08aa008 * Add an openSUSE mirror that contains discontinued releases (such as 
10.3).

svn path=/nixpkgs/trunk/; revision=18385
 2009-11-17 14:26:42 +00:00
Lluís Batlle i Rossell
2c7fa189fb Making the definition of the cross compiling target an attribute set. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18378
 2009-11-16 23:21:13 +00:00
Lluís Batlle i Rossell
3c4edd6bfa Fixing the gcc cross wrapper (removing some /usr/) so it gives proper linking. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18361
 2009-11-15 21:36:13 +00:00
Nicolas Pierron
c8cb5210fb * Add a fetchhg builder to checkout mercurial repositories. 
svn path=/nixpkgs/trunk/; revision=18347
 2009-11-14 20:14:21 +00:00
Lluís Batlle i Rossell
2aba922d30 My first attempt at getting cross compilers in nixpkgs. 
My idea is to provide special stdenv expressions that will contain in the path
additional cross compilers. As most expressions for programs accept a stdenv parameter, 
we could substitute this parameter with the special stdenv, which will have a
generic builder that attempts the usual "--target=..." and can additionally
have an env variable like "cross" with the target architecture set.
So, finally we could have additional expressions like this:

bashRealArm = makeOverridable (import ../shells/bash) {
    inherit fetchurl bison;
    stdenv = stdenvCross "armv5tel-unknown-linux-gnueabi";
};

Meanwhile it does not work - I still cannot get the cross-gcc to build.

I think it does not fill the previous expressions with a lot of noise, so I
think it may be a good path to follow.

I only touched some files of the current stdenv: gcc-4.3, kernel headers
2.6.28, glibc 2.9, ...

I tried to use the gcc-cross-wrapper, that may be very outdated. Maybe I will
update it, or update the gcc-wrapper expression to make it fit the cross tools,
but meanwhile I even cannot build gcc, so I have not tested the wrapper.

This new idea on cross compiling is not similar to that of the
nixpkgs/branches/cross-compilation, which mostly added bare new expressions for
anything to be cross compiled, if I understood it correctly.

I cared not to break anything of the usual stdenv in all this work.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18343
 2009-11-14 08:11:30 +00:00
Lluís Batlle i Rossell
6864119104 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18341
 2009-11-13 19:19:34 +00:00
Michael Raskin
29b28dc3bb Reduce fetchmtn verbosity 
svn path=/nixpkgs/trunk/; revision=18300
 2009-11-08 22:30:38 +00:00
Michael Raskin
24162c6b4a Fix fetchmtn 
svn path=/nixpkgs/trunk/; revision=18298
 2009-11-08 22:12:14 +00:00
Lluís Batlle i Rossell
be2ff23280 Making the 'makeInitrd' expression use "platform" 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18292
 2009-11-08 18:47:55 +00:00
Marc Weber
edf78fcb6a some fetchgit documentation 
svn path=/nixpkgs/trunk/; revision=18283
 2009-11-08 03:02:10 +00:00
Lluís Batlle i Rossell
5eeac0d52a Merging from trunk. 
svn path=/nixpkgs/branches/stdenv-updates2/; revision=18280
 2009-11-08 02:03:13 +00:00
Lluís Batlle i Rossell
896dc42662 Forgot some 'depth' regarding fetchgit still. 
svn path=/nixpkgs/trunk/; revision=18279
 2009-11-08 01:59:50 +00:00
Lluís Batlle i Rossell
4326d07c11 Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates2/; revision=18278
 2009-11-08 01:57:40 +00:00
Lluís Batlle i Rossell
f1ee14bfaf Removing fetchgit --depth and its usage. It does not provide much advantages... 
I think it takes the recent N commits into the repository, which says very little,
even for wanting master/HEAD.

svn path=/nixpkgs/trunk/; revision=18277
 2009-11-08 01:51:20 +00:00
Lluís Batlle i Rossell
4b27d28701 Porting changes from stdenv-updates into this branch. 
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
 2009-11-08 00:32:12 +00:00
Michael Raskin
8334ad8b2a Roll back SBCL 
svn path=/nixpkgs/trunk/; revision=18189
 2009-11-06 10:13:00 +00:00
Eelco Dolstra
d843b24fbe * Added Ubuntu 9.10 ("Karmic Koala"). 
svn path=/nixpkgs/trunk/; revision=18142
 2009-11-05 14:49:17 +00:00
Eelco Dolstra
f7282b61c3 * Allow additional Deb provides/requires to be specified. 
svn path=/nixpkgs/trunk/; revision=18139
 2009-11-05 14:40:25 +00:00
Michael Raskin
cd04c58fe2 Allow not-that-shallow git fetches; enable it for uzbl 
svn path=/nixpkgs/trunk/; revision=17980
 2009-10-27 19:52:01 +00:00
Eelco Dolstra
b578e0d353 * Work around an apparent bug in the Nix expression lexer (it doesn't 
accept $' in ''-strings).

svn path=/nixpkgs/trunk/; revision=17942
 2009-10-23 13:41:11 +00:00
Eelco Dolstra
f8bd8467ae * Give SRPMs a different build product type. 
svn path=/nixpkgs/trunk/; revision=17912
 2009-10-21 13:34:17 +00:00
Michael Raskin
f237bad7b0 Add xz support to builderDefs 
svn path=/nixpkgs/trunk/; revision=17855
 2009-10-17 05:26:52 +00:00
Eelco Dolstra
c5b198300d * Postgres updated to 8.3.8 and 8.4.1. Dropped the "with args" and 
"version" argument.  Added a few Postgres mirrors.

svn path=/nixpkgs/trunk/; revision=17804
 2009-10-14 14:38:16 +00:00
Nicolas Pierron
d7897d0d1a Change fetchsvn as well as nix-prefect-svn to use the repository name and 
the revision number inside the derivation name.

svn path=/nixpkgs/trunk/; revision=17677
 2009-10-06 13:36:52 +00:00
Rob Vermaas
6b7b8ae98a give extraRPMs/-Debs file type rpm-extra or deb-extra in build products 
svn path=/nixpkgs/trunk/; revision=17592
 2009-10-02 09:49:53 +00:00
Rob Vermaas
3653e372b0 dash as default shell for debian/ubuntu systems 
svn path=/nixpkgs/trunk/; revision=17590
 2009-10-02 09:34:37 +00:00
Rob Vermaas
c2fe94783d svn path=/nixpkgs/trunk/; revision=17588 2009-10-02 09:11:42 +00:00
Rob Vermaas
3cfbaaba4b add extrarpms to build-products of rpm build 
svn path=/nixpkgs/trunk/; revision=17581
 2009-10-01 19:25:08 +00:00
Rob Vermaas
cbf13d8269 svn path=/nixpkgs/trunk/; revision=17571 2009-10-01 12:12:45 +00:00
Ludovic Courtès
a5945916f0 More Apache mirrors; use them for Ant. 
svn path=/nixpkgs/trunk/; revision=17563
 2009-10-01 09:07:09 +00:00
Rob Vermaas
a00a2ffdba add functions for adding extra virtual packges to images, leave old one for backw.compatibility for now 
svn path=/nixpkgs/trunk/; revision=17561
 2009-10-01 07:49:55 +00:00
Rob Vermaas
4d5141bd2c extra deb/rpm changes 
svn path=/nixpkgs/trunk/; revision=17560
 2009-10-01 07:25:50 +00:00
Michael Raskin
72919919a9 Add a Gentoo mirror 
svn path=/nixpkgs/trunk/; revision=17554
 2009-09-30 13:13:39 +00:00
Ludovic Courtès
fbd9fd14e6 Add more GNOME mirrors. 
svn path=/nixpkgs/trunk/; revision=17553
 2009-09-30 13:11:24 +00:00
Eelco Dolstra
23c0f1c25e * Added openSUSE 11.1. 
svn path=/nixpkgs/trunk/; revision=17397
 2009-09-24 07:40:30 +00:00
Eelco Dolstra
36df4d3bc2 svn path=/nixpkgs/trunk/; revision=17387 2009-09-23 20:46:22 +00:00
Eelco Dolstra
46c576ad25 * Enable FS translation to be enabled. 
svn path=/nixpkgs/trunk/; revision=17375
 2009-09-23 20:10:39 +00:00
Eelco Dolstra
f467c6d131 * Retry CIFS mounts a few times. Hopefully this fixes problems such 
as in http://hydra.nixos.org/build/79029 (i.e. "CIFS VFS: No
  response for cmd 114 mid 1", "CIFS VFS: cifs_mount failed w/return
  code = -112").

svn path=/nixpkgs/trunk/; revision=17365
 2009-09-23 15:17:47 +00:00
Eelco Dolstra
251c7207cf * Revert to KVM 76 in the VM build functions. The latest qemu-kvm has 
weird performance and data corruption regressions in the build farm.

svn path=/nixpkgs/trunk/; revision=17364
 2009-09-23 14:24:37 +00:00
Eelco Dolstra
15c8ec03a0 svn path=/nixpkgs/trunk/; revision=17248 2009-09-18 14:07:52 +00:00
Eelco Dolstra
04c225a4c7 * Debian 5.0.3. 
svn path=/nixpkgs/trunk/; revision=17247
 2009-09-18 14:05:45 +00:00
Eelco Dolstra
0b063ec39f * Use qemu-kvm. 
svn path=/nixpkgs/trunk/; revision=17243
 2009-09-18 10:42:50 +00:00
Michael Raskin
85ff50fe4a Make a safer version of default versionReferenceCreator in upstream data updater; use yet another version reference creator in xneur; check in correct URL for it 
svn path=/nixpkgs/trunk/; revision=17211
 2009-09-17 05:18:19 +00:00
Michael Raskin
125600079d Updating XMoto (and adding some functionality to upstream tracking system) 
svn path=/nixpkgs/trunk/; revision=17100
 2009-09-13 18:31:33 +00:00
Michael Raskin
491255bbb3 Trying to add Zen Linux Kernel 
svn path=/nixpkgs/trunk/; revision=17050
 2009-09-11 13:16:18 +00:00
Marc Weber
d3cb19bd41 added note that steps in builderDefs should be rewritten using '' syntax 
in order to strip spaces

svn path=/nixpkgs/trunk/; revision=17019
 2009-09-10 16:57:29 +00:00
Michael Raskin
edd56d707a Update source updater to support fetchgit; add aufs2 using that method. Unfortunately, AUFS2 seems to require some strict conditions on kernel options and version.. 
svn path=/nixpkgs/trunk/; revision=16983
 2009-09-08 09:35:21 +00:00
Eelco Dolstra
58e6161768 * addCoverageInstrumentation: factor out the code that keeps the build 
tree under $out into a separate stdenv adapter named keepBuildTree.
* makeModulesClosure: support building an initrd for a kernel that has
  been compiled with coverage instrumentation.

svn path=/nixpkgs/trunk/; revision=16916
 2009-09-01 21:56:46 +00:00
Michael Raskin
ef6a270501 Adding GVPE - a protected virtual multinode ethernet 
svn path=/nixpkgs/trunk/; revision=16913
 2009-09-01 20:12:01 +00:00
Eelco Dolstra
086dd25510 * Use --coverage, which is identical to -fprofile-arcs -ftest-coverage. 
svn path=/nixpkgs/trunk/; revision=16903
 2009-08-31 15:02:27 +00:00
Michael Raskin
a1ea759dd9 Adding libev - an even loop library remotely similar to libevent 
svn path=/nixpkgs/trunk/; revision=16877
 2009-08-27 07:17:57 +00:00
Michael Raskin
f16657b14f Adding monit monitoring tool; in the course of action creating a script to auto-prepare basic autoupdate layout 
svn path=/nixpkgs/trunk/; revision=16863
 2009-08-26 16:22:20 +00:00
Michael Raskin
fbea8a558a Adding WebDruid log analyzer. In the same time, reworking source autoupdate system a bit 
svn path=/nixpkgs/trunk/; revision=16859
 2009-08-26 11:13:36 +00:00
Michael Raskin
4ba8f74591 Adding Gphoto2FS - filesystem for attached cameras 
svn path=/nixpkgs/trunk/; revision=16841
 2009-08-24 21:35:45 +00:00
Michael Raskin
8e85ed36fb Update WebKit to latest and use Git checkout for libsoup 
svn path=/nixpkgs/trunk/; revision=16820
 2009-08-24 04:55:55 +00:00
Michael Raskin
5a6e313abf Add an automated updater script and definitions for its use for WebKit 
svn path=/nixpkgs/trunk/; revision=16816
 2009-08-23 22:10:08 +00:00
Ludovic Courtès
a58d165524 Revert r16645, which was intended for the `stdenv-updates' branch. 
svn path=/nixpkgs/trunk/; revision=16646
 2009-08-10 13:37:18 +00:00
Ludovic Courtès
09ab84a431 GCC wrapper: Don't create dangling symlinks; create a `gcj' symlink. 
svn path=/nixpkgs/trunk/; revision=16645
 2009-08-10 13:33:58 +00:00
Michael Raskin
890cf33ef7 Adding fbida, framebuffer image viewer 
svn path=/nixpkgs/trunk/; revision=16571
 2009-08-04 07:14:43 +00:00
Michael Raskin
cefe6deb04 Initialize DB in fetchmtn 
svn path=/nixpkgs/trunk/; revision=16545
 2009-08-03 06:04:28 +00:00
Lluís Batlle i Rossell
d4aedd92cc I revert my changes to get nixpkgs working on armv5tel-linux. 
I thought I didn't change stdenv, but I did. This will go soon into the stdenv
branch then.
Reverse-merging r16467 through r16465.


svn path=/nixpkgs/trunk/; revision=16468
 2009-07-26 22:47:33 +00:00
Lluís Batlle i Rossell
532fc4a05d Adding armv5tel to the 'if' checks in stdenv, gcc-wrapper and kernel headers 
svn path=/nixpkgs/trunk/; revision=16466
 2009-07-26 21:48:10 +00:00
Marc Weber
ec0e356b9a Revert "adding NIX_CONTINUE_DOWNLOADS feature, see mkdir comment" 
This reverts commit -r16401

svn path=/nixpkgs/trunk/; revision=16405
 2009-07-16 17:17:23 +00:00
Marc Weber
10f6c2592c adding NIX_CONTINUE_DOWNLOADS feature, see mkdir comment 
svn path=/nixpkgs/trunk/; revision=16401
 2009-07-16 15:18:26 +00:00
Eelco Dolstra
800489ac40 * Firefox wrapper: put gecko-mediaplayer and mplayer at the start of 
$PATH rather than the end.  This makes the behaviour more
  predictable.

svn path=/nixpkgs/trunk/; revision=16390
 2009-07-16 11:22:37 +00:00
Michael Raskin
b69be987c0 Added setuid-ready chroot utility. 
svn path=/nixpkgs/trunk/; revision=16331
 2009-07-12 08:10:51 +00:00
Ludovic Courtès
099dd7fa16 nix-prefetch-svn: Use SHA256/Base32 by default. 
svn path=/nixpkgs/trunk/; revision=16322
 2009-07-10 15:50:11 +00:00
Michael Raskin
d79e32c9b9 Add fetchmtn 
svn path=/nixpkgs/trunk/; revision=16204
 2009-07-07 10:02:09 +00:00
Eelco Dolstra
222ab9d494 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=16160
 2009-07-03 11:55:17 +00:00
Rob Vermaas
0806854b24 changed mem size for rpm/deb build vms, added version specific packages for fedora9++ 
svn path=/nixpkgs/trunk/; revision=16136
 2009-07-02 12:53:25 +00:00
Marc Weber
349de9bafe revrting my accident only keeping rubygem updates and ruby libs 
This partially reverts commit -r 16100

svn path=/nixpkgs/trunk/; revision=16107
 2009-06-30 15:58:02 +00:00
Marc Weber
d1e39e78f9 adding rubygems support to nix - implemented target libraries/apps: sup mail client 
svn path=/nixpkgs/trunk/; revision=16100
 2009-06-30 14:29:20 +00:00
Eelco Dolstra
cdf4cf5c23 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=16094
 2009-06-30 11:42:15 +00:00
Marc Weber
c59fb90f62 make fetchgit and nix-prefetch-git use --depth 1 to receive only a shallow clone cutting history 
svn path=/nixpkgs/trunk/; revision=16047
 2009-06-26 00:56:54 +00:00
Eelco Dolstra
674211ac9d * Revive klibc 1.5 for now since vmtools still uses its insmod. 
svn path=/nixpkgs/trunk/; revision=16040
 2009-06-25 08:22:51 +00:00
Peter Simons
7534cbe4b8 Define "brokenRedHatKernel = true" in $NIXPKGS_CONFIG to build a system that 
works on Red Hat Linux, i.e. that is based on glibc version 2.5.

Furthermore, this patch fixes a number of gcc 4.3.3 build errors in glibc 2.5
that occur on both x86 and x86_64. The older version of this library is still
useful for running Nix on a Red Hat host. Newer version of glibc fail to detect
the kernel's capabilities correctly (due to mad patches applied to the kernel
by Red Hat).

The individual changes are:

 * Re-activated glibc 2.5 in all-packages.nix.

 * Fix incomplete header search path in bootstrap tools.

   Gcc-wrapper sets "-B<prefix>" to tell the compiler about its installation
   root. Unfortunately, the setting doesn't add $gcc/lib/gcc/*/*/include-fixed
   to the search path. That directory is required, however, because it contains
   the system-specific "limits.h" file, and the glibc 2.5 builds tries to find
   that file via #include_next.

 * Support intrinsic functions like __signbit() or atof() correctly to avoid
   compile-time conflicts.

 * Switch to NPTL. Linuxthreads is no longer supported.

 * Added a meta attribute to glibc package.

 * Updated nixUnstable to version 0.13pre15614 from trunk. The previous version
   failed regression tests.

 * Fix more strict type checking in binutils since 2.18.50.0.3.

   Without this patch, the build failed on x86, saying:

     ../sysdeps/i386/fpu/ftestexcept.c: Assembler messages:
     ../sysdeps/i386/fpu/ftestexcept.c:33: Error: suffix or operands invalid for `fnstsw'

svn path=/nixpkgs/branches/stdenv-updates/; revision=16037
 2009-06-24 20:10:51 +00:00
Rob Vermaas
205fb0c87e * fetchgit and nix-prefetch-git 
svn path=/nixpkgs/trunk/; revision=16035
 2009-06-24 12:48:01 +00:00
Rob Vermaas
1c3f49e06f * Changed version of gcc to 4.0.1 - 5484 on darwin 
* Added dsymutil to gcc wrapper env on darwin
 * turned off make check for gnugrep on darwin
 * added --enable-bsd=libs configure flag for gnugrep on darwin 


svn path=/nixpkgs/trunk/; revision=16014
 2009-06-21 18:37:54 +00:00
Rob Vermaas
cd2c0b26ad moved finalPhase so it is possible to override through args 
svn path=/nixpkgs/trunk/; revision=15977
 2009-06-17 07:02:59 +00:00
Eelco Dolstra
cee3ca1228 svn path=/nixpkgs/trunk/; revision=15909 2009-06-09 14:32:31 +00:00
Eelco Dolstra
813909d153 * Fedora 11 uses SHA-256 hashes instead of SHA-1 in primary.xml. 
svn path=/nixpkgs/trunk/; revision=15908
 2009-06-09 14:25:45 +00:00
Eelco Dolstra
d8cc981d90 * Fedora 11. Completely untested. 
svn path=/nixpkgs/trunk/; revision=15907
 2009-06-09 14:10:16 +00:00
Rob Vermaas
8c3809729c * --fstrans=no for building debian packages 
svn path=/nixpkgs/trunk/; revision=15859
 2009-06-05 10:42:14 +00:00
Rob Vermaas
a46e339352 typo 
svn path=/nixpkgs/trunk/; revision=15846
 2009-06-03 19:20:13 +00:00
Rob Vermaas
59ae0e5bae svn path=/nixpkgs/trunk/; revision=15845 2009-06-03 19:19:24 +00:00
Rob Vermaas
1fe82f7ff9 * added pre-/postInstall hook to debbuild 
svn path=/nixpkgs/trunk/; revision=15843
 2009-06-03 18:33:04 +00:00
Rob Vermaas
b217e83691 * renamed installCommand -> installPhase for debian build 
svn path=/nixpkgs/trunk/; revision=15816
 2009-06-02 08:11:40 +00:00
Marc Weber
3157bb1098 removed all __primops from nixpkgs 
svn path=/nixpkgs/trunk/; revision=15693
 2009-05-24 10:57:46 +00:00
Marc Weber
f7f938a1d1 big breaking change: renaming lib.getAttr to lib.attrByPath 
getAttr was ambiguous. It's also a builtin function

fix

svn path=/nixpkgs/trunk/; revision=15692
 2009-05-24 10:57:41 +00:00
Marc Weber
52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry 
svn path=/nixpkgs/trunk/; revision=15662
 2009-05-19 23:25:58 +00:00
Michael Raskin
754eef0250 Update fetchsvn for proxy support 
svn path=/nixpkgs/trunk/; revision=15654
 2009-05-19 17:07:20 +00:00
Andres Löh
677f91a6d1 Added Idris and updated fetchdarcs. 
svn path=/nixpkgs/trunk/; revision=15595
 2009-05-13 19:02:23 +00:00
Eelco Dolstra
abf71d5352 * textClosure: don't use uniqList, and don't rely on buggy behaviour 
in the Nix expression evaluator (namely that comparison of attribute
  sets works properly).
* Removed some redundant parentheses in builder-defs.

svn path=/nixpkgs/trunk/; revision=15551
 2009-05-11 15:21:42 +00:00
Sander van der Burg
a8315aa241 Added desktop file generation function and desktop item for firefox 
svn path=/nixpkgs/trunk/; revision=15529
 2009-05-10 12:03:53 +00:00
Michael Raskin
1c43ab8b17 More archive types.. 
svn path=/nixpkgs/trunk/; revision=15525
 2009-05-10 09:13:25 +00:00
Michael Raskin
f067828cdc Allow question marks in URL... 
svn path=/nixpkgs/trunk/; revision=15507
 2009-05-08 17:00:33 +00:00
Eelco Dolstra
16da00e64d * Doh! Since r15200, modules-closure.sh generated an empty set of 
modules for the initial ramdisk if there were no additional kernel
  module packages (such as the NVIDIA driver or AUFS), leading to a
  kernel panic in the initrd.  This was because in that case modprobe
  would print paths referring to the kernel path rather than the
  module aggregation path, and then `sed "s^$kernel^$out^"' would
  silently fail.  Fixed.

* Also, use depmod here rather than doing sed hackery on modules.dep.

* Also, `allowMissing' was broken (missing "$" before the variable
  name).

svn path=/nixpkgs/trunk/; revision=15394
 2009-04-29 14:32:04 +00:00
Lluís Batlle i Rossell
3e0708e505 Fixing ttmkfdir, with help of a modification in deb-package. 
svn path=/nixpkgs/trunk/; revision=15335
 2009-04-27 12:04:11 +00:00
Eelco Dolstra
5175cce9a9 * Oops. We don't call genericBuild, so the fixupPhase (which creates 
the setup hook) is never run.  So revert.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15281
 2009-04-23 16:23:12 +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
f762b50991 * Another sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
 2009-04-23 11:59:43 +00:00
Eelco Dolstra
cf54a62384 svn path=/nixpkgs/trunk/; revision=15178 2009-04-20 12:52:24 +00:00
Eelco Dolstra
2cbc761779 * Move builder-defs to pkgs/build-support. (pkgs/top-level is for 
composition.)

svn path=/nixpkgs/trunk/; revision=15175
 2009-04-20 12:37:10 +00:00
Eelco Dolstra
ac24816344 * Move all the Perl packages out of all-packages.nix into a separate 
file, perl-packages.nix.

svn path=/nixpkgs/trunk/; revision=15171
 2009-04-20 12:08:09 +00:00
Eelco Dolstra
35e42d3e5c * Fix missing description errors. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15157
 2009-04-19 16:00:46 +00:00
Eelco Dolstra
fd473913f5 * Removed some obsolete nullglobs. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15140
 2009-04-19 08:55:27 +00:00
Eelco Dolstra
6b9ccbaf78 * setup.sh: turn on nullglob globally. 
* setup.sh: removed some obsolete features, specifically some that
  were only used by the old build farm.
* addToSearchPath: removed some parameters that weren't used
  anywhere.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15136
 2009-04-18 22:22:51 +00:00
Eelco Dolstra
a4c304ef84 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15065
 2009-04-15 13:25:01 +00:00
Eelco Dolstra
c5197de22d * Bump the names as well. 
svn path=/nixpkgs/trunk/; revision=15031
 2009-04-14 13:36:16 +00:00
Rob Vermaas
edca05ee30 build-support/vm/default.nix: updated debian hashes 
svn path=/nixpkgs/trunk/; revision=15020
 2009-04-14 08:05:10 +00:00
Eelco Dolstra
eeed10ba8e * g77 -> gfortran throughout. Got rid of the separate 
expressions/builders for Fortran.  Tested by building Octave with
  gfortran 4.3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14978
 2009-04-09 15:24:33 +00:00
Rob Vermaas
518eab2313 pkgs/build-support/vm/default.nix typo 
svn path=/nixpkgs/trunk/; revision=14975
 2009-04-09 14:38:08 +00:00
Rob Vermaas
39ba8d06ec pkgs/build-support/vm/default.nix: added ubuntu 904 
svn path=/nixpkgs/trunk/; revision=14974
 2009-04-09 14:29:19 +00:00
Eelco Dolstra
2eb05cf933 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
 2009-04-09 12:19:57 +00:00
Eelco Dolstra
4962864417 * Fixed the mount-cifs source URL (copied from the stdenv-branch). 
svn path=/nixpkgs/trunk/; revision=14958
 2009-04-09 08:12:16 +00:00
Eelco Dolstra
e01be47e53 * aclocal wrapper: skip directories in ACLOCAL_PATH that don't exist, 
otherwise aclocal barfs.  Updated the builder to use makeWrapper
* Made Automake 1.10 the default.
* Fixed `make check' in Automake by turning off indented logging in
  Make (there is a flag for that now).
* Disabled the `make check' in Automake by default because it takes a
  REALLY long time (e.g. more than 2 hours on Cygwin, 50 minutes on
  Darwin, 25 minutes on Linux) which is a lot for a package that
  otherwise takes 10 seconds to build.  We can add a Hydra job with
  doCheck enabled to do regression testing.
* make-wrapper: allow --run commands to add additional flags to the
  invocation of the wrapped program.  An example is the aclocal
  wrapper: it adds additional -I ... flags.
* make-wrapper: call the wrapped program .foo-wrapped instead of
  .wrapped-foo to make it easier to tell programs apart in `ps'
  output.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14885
 2009-04-05 18:13:59 +00:00
Eelco Dolstra
21c3b6264b * Add the CPAN master site as a fallback. 
svn path=/nixpkgs/trunk/; revision=14863
 2009-04-03 15:51:39 +00:00
Eelco Dolstra
d27514cb28 * Sync with the trunk once more. 
* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
 2009-03-31 15:30:47 +00:00
Eelco Dolstra
37a216ee19 * Backported the GCC mirrors from the stdenv branch. 
svn path=/nixpkgs/trunk/; revision=14784
 2009-03-30 14:41:50 +00:00
Eelco Dolstra
7505920605 * Bump the default Hydra priority of tarball builds. 
svn path=/nixpkgs/trunk/; revision=14777
 2009-03-30 13:21:00 +00:00
Eelco Dolstra
ba86b027c5 * Revert r14418 - not including the directory in arvg[0] broke 
Firefox.

svn path=/nixpkgs/trunk/; revision=14774
 2009-03-30 10:59:45 +00:00
Eelco Dolstra
5d27947703 * Don't try to auto-include documentation in Debian packages. 
svn path=/nixpkgs/trunk/; revision=14737
 2009-03-27 14:13:49 +00:00
Eelco Dolstra
5a8a90cd56 * Test whether we can successfully install and uninstall the Debian 
package we just built.

svn path=/nixpkgs/trunk/; revision=14730
 2009-03-26 15:45:37 +00:00
Eelco Dolstra
f30fe65b3e * makeSourceTarball -> sourceTarball. 
* Added a function binaryTarball to do a DESTDIR build into
  /usr/local.  Useful for making statically linked binaries.  However,
  it may be better to do this in a VM (since if you do it in a Nix
  build environment, you can still end up with a lot of Nix
  dependencies in your binaries, even if you do static linking).

svn path=/nixpkgs/trunk/; revision=14726
 2009-03-26 14:11:59 +00:00
Eelco Dolstra
e032d40614 * Some meta.description attributes. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14712
 2009-03-25 18:34:27 +00:00
Eelco Dolstra
d9213df2c1 * gcc-wrapper: put "gcc-wrapper" in the name, e.g. "gcc-wrapper-4.3.3" 
instead of "gcc-4.3.3".  This fixed the long-standing annoyance that
  you can't distinguish the two in (say) nix-store -qR.
* On x86_64-linux, put $out/lib64 in the RPATH in addition to
  $out/lib, because some packages (in particular GCC) put libraries in
  $out/lib64 and ended up linking against the wrong library.
* Strip $out/lib64.
* Removed g77_42 because it's exactly the same as gfortran.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14708
 2009-03-25 17:34:38 +00:00
Eelco Dolstra
d8e436c742 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14634
 2009-03-20 16:49:02 +00:00
Eelco Dolstra
b460175a7e * Backwards compatibility hack for Stratego/XT packages. 
svn path=/nixpkgs/trunk/; revision=14608
 2009-03-19 13:59:31 +00:00
Eelco Dolstra
468ffe8466 * Turn on nullglob globally so that distPhase works when we copy 
"*.tar.bz2 *.tar.gz" and there are no *.tar.gz files.  Maybe we
  should turn this on in stdenv (nullglob just seems like the right
  thing to do in general).

svn path=/nixpkgs/trunk/; revision=14606
 2009-03-19 13:39:07 +00:00
Eelco Dolstra
3593b97d63 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
 2009-03-16 12:45:27 +00:00
Eelco Dolstra
199155087e * A Gentoo mirror disappeared. 
svn path=/nixpkgs/trunk/; revision=14499
 2009-03-10 21:00:07 +00:00
Eelco Dolstra
d0691bf1d7 * We don't need all that src.outPath / src.path hackery anymore. 
svn path=/nixpkgs/trunk/; revision=14419
 2009-03-06 16:53:44 +00:00
Eelco Dolstra
bd5aed6fd6 * Set argv[0] to a nicer value. 
svn path=/nixpkgs/trunk/; revision=14418
 2009-03-06 16:53:02 +00:00
Eelco Dolstra
6bb95494e7 * Use the version attribute if available. 
svn path=/nixpkgs/trunk/; revision=14297
 2009-03-02 14:33:33 +00:00
Eelco Dolstra
84a0bd9c83 * Use qcow2. 
svn path=/nixpkgs/trunk/; revision=14296
 2009-03-02 14:31:33 +00:00
Eelco Dolstra
45081f330d * Append the version to the "name" attribute to make the store paths 
of Hydra builds more distinct (e.g. "patchelf-build-0.5pre1234"
  instead of just "patchelf-build").  If the version isn't known,
  append at least the revision.

* Propagate the release name of the source tarball to Nix builds.
  Useful to provide sensible package names in channels.

svn path=/nixpkgs/trunk/; revision=14294
 2009-03-02 13:45:48 +00:00
Eelco Dolstra
f19aea6d5a * Added openSUSE 11.0. 
* Create some device nodes in the RPM/Deb disk images, since modern
  distributions may not provide any device nodes (they're all
  generated by udev).

svn path=/nixpkgs/trunk/; revision=14293
 2009-03-02 13:22:31 +00:00
Eelco Dolstra
a8b75358b3 svn path=/nixpkgs/trunk/; revision=14219 2009-02-24 12:14:48 +00:00
Eelco Dolstra
7782a3189e * Added Debian 5.0 (Lenny). Added the "login" package to the base 
image, otherwise the post-installs script of the "passwd" package
  will fail because /etc/login.defs is missing.  This also fixes the
  Ubuntu 8.10 image generation, woohoo!

svn path=/nixpkgs/trunk/; revision=14217
 2009-02-24 10:56:42 +00:00
Eelco Dolstra
dab3b03a14 * Debian 4.0r7. 
svn path=/nixpkgs/trunk/; revision=14202
 2009-02-23 10:58:48 +00:00
Eelco Dolstra
2d89fb4fee * Support a post-install hook. 
svn path=/nixpkgs/trunk/; revision=14142
 2009-02-20 15:40:11 +00:00
Eelco Dolstra
eb28d380c3 * Removed broken mirror. 
svn path=/nixpkgs/trunk/; revision=14141
 2009-02-20 15:39:13 +00:00
Eelco Dolstra
37b9b420cb * Sync with trunk. Back to gtkLibs214. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13960
 2009-02-02 15:44:04 +00:00
Eelco Dolstra
472a0d2057 * Pass -rpath flags in the same order as -L flags. 
* Put the Glibc linker flags in front of the GCC linker flags.  Needed
  for the stdenv-linux bootstrap.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13940
 2009-02-01 21:26:28 +00:00
Eelco Dolstra
3cc0c9b44e svn path=/nixpkgs/trunk/; revision=13917 2009-01-30 14:00:18 +00:00
Eelco Dolstra
1c623126c7 * Use the sh from klibc in the bootstrap. It's a lot smaller than 
bash.  Also, use the cpio from klibc instead of tar.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13905
 2009-01-29 17:48:45 +00:00
Eelco Dolstra
76efe57d1b * GCC mirrors. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13878
 2009-01-27 12:48:32 +00:00
Eelco Dolstra
72822ebbc0 * Put Glibc at the very end of the GCC header search path. This 
should fix previous problems with GCC 4.3 in compiling C++ code
  where e.g. <cassert> has to appear before <assert.h> in the search
  path due to the former's use of #include_next.  The previous "fix"
  broke compilation of C code by placing the C++ include directory
  before the Glibc include directory (which would barf on
  e.g. <complex.h>, which appears in both).

svn path=/nixpkgs/branches/stdenv-updates/; revision=13806
 2009-01-19 16:22:27 +00:00
Eelco Dolstra
60ac36f9c5 * Ignore symlinks. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13790
 2009-01-16 17:13:14 +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
Eelco Dolstra
d25aa3c8a5 * checkinstall: build properly on x86_64. 
* checkinstall: get rid of the RUNPATH in the LD_PRELOAD library so
  that it works with native Glibc (e.g. in VM builds).
* debBuild: use our own checkinstall.  In particular this allows us to
  build Debs on x86_64.

svn path=/nixpkgs/trunk/; revision=13608
 2008-12-10 17:12:19 +00:00
Eelco Dolstra
e4a8b61eba svn path=/nixpkgs/branches/stdenv-updates/; revision=13604 2008-12-10 10:58: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
2b2bb11f32 * Always include "/nix/store/*" in lcovFilter. 
svn path=/nixpkgs/trunk/; revision=13583
 2008-12-04 15:32:30 +00:00
Eelco Dolstra
e056ebd34e * Don't repeat the standard definition of $phases. 
svn path=/nixpkgs/trunk/; revision=13493
 2008-11-28 16:12:50 +00:00
Eelco Dolstra
82ab4c6105 * buildRPM: Set the %_topdir variable to a known location, otherwise 
we run into trouble on Fedora 10 (RPM 4.6), where the default is no
  longer /usr/src/something but $HOME/something.

svn path=/nixpkgs/trunk/; revision=13466
 2008-11-27 18:58:37 +00:00
Eelco Dolstra
79072e871f * Preserve meta attributes from the caller. 
svn path=/nixpkgs/trunk/; revision=13433
 2008-11-26 14:34:29 +00:00
Eelco Dolstra
5dad580963 * Added Fedora 10. 
svn path=/nixpkgs/trunk/; revision=13428
 2008-11-26 11:14:39 +00:00
Eelco Dolstra
dd61c77d4e * Use libtool. 
svn path=/nixpkgs/trunk/; revision=13425
 2008-11-26 01:00:23 +00:00
Eelco Dolstra
31d12fc641 * Don't suppress error messages. 
svn path=/nixpkgs/trunk/; revision=13424
 2008-11-25 18:34:46 +00:00
Eelco Dolstra
a37251e2a5 * -pre' should be pre'. 
svn path=/nixpkgs/trunk/; revision=13420
 2008-11-25 18:08:49 +00:00
Eelco Dolstra
fd6e8a0f26 * Figure out the release name. 
svn path=/nixpkgs/trunk/; revision=13415
 2008-11-25 16:12:36 +00:00
Eelco Dolstra
8cc8ee244a svn path=/nixpkgs/trunk/; revision=13414 2008-11-25 15:54:05 +00:00
Eelco Dolstra
2efa4abeae * Set VERSION_SUFFIX to -pre<revision> unless building an "official" 
release.
* Use @-patterns and `...' instead of using a "with".

svn path=/nixpkgs/trunk/; revision=13413
 2008-11-25 15:53:45 +00:00
Eelco Dolstra
fc06d93252 svn path=/nixpkgs/trunk/; revision=13401 2008-11-25 02:26:54 +00:00
Eelco Dolstra
c90bd0756c * Automatically build Debian packages using checkinstall, as suggested 
by Pjotr Prins a while back.  This could also be used to generate
  RPMs for packages that don't have a spec-file.

* Added checkinstall to Nixpkgs.  However we don't use our own build
  yet because with it "make install" segfaults in a Debian VM, while
  the pre-built binary does work.

svn path=/nixpkgs/trunk/; revision=13400
 2008-11-25 02:20:41 +00:00
Eelco Dolstra
da8bcbd9a5 * Moved more stuff from the release tree. 
svn path=/nixpkgs/trunk/; revision=13395
 2008-11-25 00:20:51 +00:00
Eelco Dolstra
01acea6bbc * Start moving the Nix expressions that support the build farm 
(e.g. making source tarballs, doing coverage analysis) to the
  Nixpkgs tree.  This makes it easier to run build farm jobs locally
  since you don't need to check out the "release" tree separately.
  Also it means one less input to declare for build farm jobs.

* Removed succeedOnFailure and separate logging of phases.  Hydra
  doesn't need that.

svn path=/nixpkgs/trunk/; revision=13388
 2008-11-24 15:10:06 +00:00
Eelco Dolstra
aa84bce64d * Get rid of all references to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=13299
 2008-11-14 16:57:19 +00:00
Eelco Dolstra
957a8b876a svn path=/nixpkgs/trunk/; revision=13280 2008-11-13 12:45:08 +00:00
Eelco Dolstra
d22734c3e7 svn path=/nixpkgs/trunk/; revision=13273 2008-11-12 17:19:12 +00:00
Eelco Dolstra
8a3757b7f1 * Added Ubuntu 8.10. It doesn't work yet though (the passwd package 
fails to install).

svn path=/nixpkgs/trunk/; revision=13272
 2008-11-12 17:15:09 +00:00
Eelco Dolstra
4f61f1a7bc * Debian 4.0r5. 
svn path=/nixpkgs/trunk/; revision=13261
 2008-11-12 12:07:35 +00:00
Michael Raskin
c5363217ad meta.function -> passthru.function, not killing other contents of passthru 
svn path=/nixpkgs/trunk/; revision=13190
 2008-11-04 21:24:10 +00:00
Eelco Dolstra
b5e0436e5c * Drop prdownloads.sourceforge.net down the list, it tends to have 
connection problems.

svn path=/nixpkgs/trunk/; revision=13159
 2008-10-30 12:54:28 +00:00
Eelco Dolstra
000ba65363 * fail() is long gone. 
svn path=/nixpkgs/trunk/; revision=13155
 2008-10-29 17:19:49 +00:00
Eelco Dolstra
bcf24b6683 * KVM 76. 
svn path=/nixpkgs/trunk/; revision=13023
 2008-10-09 13:33:29 +00:00
Ludovic Courtès
d96a0e14d7 fetchurl: Add Debian mirrors. 
svn path=/nixpkgs/trunk/; revision=13010
 2008-10-08 18:42:44 +00:00
Eelco Dolstra
69b538fde3 * gcc-wrapper-new -> gcc-wrapper, setup-new -> setup. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=12991
 2008-10-07 17:33:20 +00:00
Eelco Dolstra
76e8254689 svn path=/nixpkgs/branches/stdenv-updates/; revision=12990 2008-10-07 17:03:52 +00:00
Eelco Dolstra
9fdecb1296 * mirror://apache/. 
svn path=/nixpkgs/trunk/; revision=12968
 2008-10-06 12:58:21 +00:00
Eelco Dolstra
4138945727 * X.org mirrors. 
svn path=/nixpkgs/trunk/; revision=12967
 2008-10-06 12:38:45 +00:00
Michael Raskin
ccf99b2ddf A helper to get the source some package is built from. 
svn path=/nixpkgs/trunk/; revision=12933
 2008-10-01 15:57:22 +00:00
Ludovic Courtès
9383cd0a48 Add `fetchbzr', to retrieve remote Bazaar repositories. 
svn path=/nixpkgs/trunk/; revision=12924
 2008-09-26 08:57:51 +00:00
Eelco Dolstra
617a289fa7 * Provide some more disk space by default. Qcow makes it cheap anyway. 
svn path=/nixpkgs/trunk/; revision=12880
 2008-09-18 10:45:22 +00:00
Eelco Dolstra
93456721f5 * Ubuntu 8.04 Hardy (i386 and amd64). 
svn path=/nixpkgs/trunk/; revision=12850
 2008-09-12 13:34:41 +00:00