Commit graph

134 commits

Author SHA1 Message Date
Arie Middelkoop
70d56e0638 Fixed autoconfPhase so that it additionally tests if ./bootstrap is a file (and not a directory with executable permission) before executing it.
svn path=/nixpkgs/trunk/; revision=32530
2012-02-23 23:50:56 +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
Eelco Dolstra
f3c3f11520 * Debian requires/provides should be comma-separated.
svn path=/nixpkgs/trunk/; revision=31259
2012-01-03 22:33:48 +00:00
Eelco Dolstra
032617b0ab * Check whether any packages were generated. Apparently checkinstall
doesn't return a non-zero exit code if something goes wrong.

svn path=/nixpkgs/trunk/; revision=31258
2012-01-03 22:25:46 +00:00
Eelco Dolstra
b583b816cc * Allow versionSuffix to be overriden.
svn path=/nixpkgs/trunk/; revision=30742
2011-12-05 14:16:30 +00:00
Rob Vermaas
0d62f0418c nix-build.nix: also recognize xz tarballs
svn path=/nixpkgs/trunk/; revision=29760
2011-10-11 14:47:56 +00:00
Eelco Dolstra
a1f9b6f7b6 * Enable "make check" for checkinstall-based Debian builds. I always
assumed this was enabled...

svn path=/nixpkgs/trunk/; revision=29750
2011-10-11 09:13:31 +00:00
Eelco Dolstra
167c520570 * Added Debian 6.0 and Ubuntu 10.10.
svn path=/nixpkgs/trunk/; revision=25968
2011-02-14 16:52:32 +00:00
Rob Vermaas
2bd4d50f0d nix-build.nix/source-tarball.nix: remove -v flag when copying build directory, to avoid polluting the log
svn path=/nixpkgs/trunk/; revision=25404
2011-01-05 09:06:53 +00:00
Rob Vermaas
f6426bad3b also add succeedOnFailure/keepBuildDirectory behaviour to source-tarball.nix
svn path=/nixpkgs/trunk/; revision=25400
2011-01-05 07:31:29 +00:00
Rob Vermaas
6016038097 nixBuild: add failurehook that saves build dir when succeedOnFailure = true and keepBuildDirectory = true
svn path=/nixpkgs/trunk/; revision=25243
2010-12-22 14:57:18 +00:00
Rob Vermaas
cf8da224c6 fixing wrappers in ant-build
svn path=/nixpkgs/trunk/; revision=24637
2010-11-10 12:55:25 +00:00
Rob Vermaas
0df15241ca fixes to ant-build
svn path=/nixpkgs/trunk/; revision=24383
2010-10-20 12:30:03 +00:00
Rob Vermaas
5a7fa1d061 antBuild: minor changes
svn path=/nixpkgs/trunk/; revision=24376
2010-10-20 08:23:52 +00:00
Rob Vermaas
b1332dca0f svn path=/nixpkgs/trunk/; revision=24366 2010-10-19 13:43:29 +00:00
Ludovic Courtès
193799ec3d nixBuild: Add `buildOutOfSourceTree' option.
svn path=/nixpkgs/trunk/; revision=23717
2010-09-10 12:39:57 +00:00
Rob Vermaas
03706558a9 maven-build: do full assembly without tests, add site to build products
svn path=/nixpkgs/trunk/; revision=23694
2010-09-09 10:47:54 +00:00
Rob Vermaas
62eb8741ce maven-build: only copy site dir if it exists
svn path=/nixpkgs/trunk/; revision=23692
2010-09-09 07:22:45 +00:00
Rob Vermaas
b601947bcb maven-build: copy whole site dir and adapted hydra-build-products
svn path=/nixpkgs/trunk/; revision=23691
2010-09-09 07:19:12 +00:00
Rob Vermaas
cf336d9c1d maven-build: use single target in stead of assembly to prevent test from being run twice
svn path=/nixpkgs/trunk/; revision=23249
2010-08-19 13:36:57 +00:00
Rob Vermaas
12bfda97b8 maven-build: if surefire was run, generate html and add to result
svn path=/nixpkgs/trunk/; revision=23246
2010-08-19 12:24:14 +00:00
Rob Vermaas
e7dd6dcc6a wrong location for surefire reports
svn path=/nixpkgs/trunk/; revision=23224
2010-08-18 11:48:35 +00:00
Rob Vermaas
9e2074f199 remove mvncobertura phase
svn path=/nixpkgs/trunk/; revision=23219
2010-08-18 09:55:34 +00:00
Rob Vermaas
7a4356b7e9 typo
svn path=/nixpkgs/trunk/; revision=22170
2010-06-07 14:24:57 +00:00
Rob Vermaas
94356324f5 antbuild: added 2 arguments, antbuildinputs (all jars are added to classpath) and buildfile (for different location of build.xml)
svn path=/nixpkgs/trunk/; revision=22169
2010-06-07 13:58:13 +00:00
Ludovic Courtès
9f50c154c3 Revert "releaseTools.sourceTarball: Make the bootstrap build inputs native."
This reverts commit 84b521c23b57108fc63731de7723885d68a92b08.
Reverting "releaseTools.sourceTarball: Fix regression introduced in r21955."
Reverting "releaseTools.sourceTarball: Make the bootstrap build inputs native."

svn path=/nixpkgs/trunk/; revision=21962
2010-05-25 08:24:50 +00:00
Ludovic Courtès
e436eb4915 releaseTools.sourceTarball: Fix regression introduced in r21955.
svn path=/nixpkgs/trunk/; revision=21959
2010-05-24 23:03:00 +00:00
Ludovic Courtès
0146e9b7ab releaseTools.sourceTarball: Make the bootstrap build inputs native.
svn path=/nixpkgs/trunk/; revision=21955
2010-05-24 21:28:36 +00:00
Ludovic Courtès
7a491b54fa releaseTools.coverageAnalysis: Add `lcovExtraTraceFiles' parameter.
svn path=/nixpkgs/trunk/; revision=21743
2010-05-12 12:22:44 +00:00
Rob Vermaas
fbc33c5485 maven-build.nix: added extraMvnFlags argurment
svn path=/nixpkgs/trunk/; revision=21181
2010-04-20 14:32:07 +00:00
Rob Vermaas
8929e647c6 generatewrapper fix
svn path=/nixpkgs/trunk/; revision=20796
2010-03-23 20:54:59 +00:00
Rob Vermaas
addc98c02f initial version for maven builder
svn path=/nixpkgs/trunk/; revision=20558
2010-03-11 14:44:17 +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
edb6a80ac3 ant builder
svn path=/nixpkgs/trunk/; revision=20395
2010-03-05 10:09:22 +00:00
Rob Vermaas
41698cf72c obviously just c/p'ing without testing should result in taking away commit rights...
svn path=/nixpkgs/trunk/; revision=19208
2010-01-04 13:37:49 +00:00
Rob Vermaas
db6f4ee89c * nix-build.nix: omit phases and define postPhases, suggested by eelco
svn path=/nixpkgs/trunk/; revision=19203
2010-01-04 12:44:34 +00:00
Rob Vermaas
67d7f430e2 * removed wrong order of phases from nixbuild, for now make check after install for strategoxt packages
svn path=/nixpkgs/trunk/; revision=19202
2010-01-04 12:07:05 +00:00
Ludovic Courtès
064aae6461 releaseTools.sourceTarball: Allow overriding of the bootstrap build inputs.
svn path=/nixpkgs/trunk/; revision=18804
2009-12-04 14:56:37 +00:00
Rob Vermaas
d55c6d8404 revert change from ludo rev. 18634. for now this order is needed for the stratego packages in the buildfarm, and the order should matter as normally nothing gets built in check phase that is needed for install phase
svn path=/nixpkgs/trunk/; revision=18637
2009-11-26 06:52:13 +00:00
Ludovic Courtès
f5236b1e0d releaseTools.nixBuild: Perform checkPhase' before installPhase'.
svn path=/nixpkgs/trunk/; revision=18634
2009-11-25 23:15:18 +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
Ludovic Courtès
15da008651 Slightly generalize `sourceTarball'.
svn path=/nixpkgs/trunk/; revision=18426
2009-11-18 14:12:39 +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
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
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
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
Rob Vermaas
4d5141bd2c extra deb/rpm changes
svn path=/nixpkgs/trunk/; revision=17560
2009-10-01 07:25:50 +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
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
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
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
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
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
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
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
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
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
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
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
6bb95494e7 * Use the version attribute if available.
svn path=/nixpkgs/trunk/; revision=14297
2009-03-02 14:33: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
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
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
79072e871f * Preserve meta attributes from the caller.
svn path=/nixpkgs/trunk/; revision=13433
2008-11-26 14:34:29 +00:00
Eelco Dolstra
dd61c77d4e * Use libtool.
svn path=/nixpkgs/trunk/; revision=13425
2008-11-26 01:00:23 +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