Shea Levy
c514ee974a
Merge remote-tracking branch 'upstream/master' into x-updates
...
mountall conflict was trivial
Conflicts:
pkgs/os-specific/linux/mountall/default.nix
2012-07-14 14:24:27 -04:00
Michael Raskin
77b03dbc71
update-upstream-data: Fix a small bug
2012-07-07 20:11:06 +04:00
Peter Simons
94fe7bed1d
Extend compiler wrapper scripts to allow compilation of "/dev/null" input.
...
This feature sounds crazy, but it is used in some configure scripts (e.g. xbmc).
This patch causes an almost complete rebuild of Nixpkgs.
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
2012-07-02 17:15:21 +02:00
Kirill Elagin
1be62b87fe
Handle invalid references
2012-06-20 23:28:53 -04:00
Kirill Elagin
ba766ebcf4
Do not use old way of setting url
and rev
...
This was breaking `nix-prefetch-git --url smth --ref smth` (when
expected hash is not specified)
2012-06-20 23:28:52 -04:00
Michael Raskin
43bc3880f6
Process relative URLs
...
svn path=/nixpkgs/trunk/; revision=34367
2012-06-06 13:26:48 +00:00
Rob Vermaas
0cbfd8ff04
* update hashes for debian queeze
...
svn path=/nixpkgs/trunk/; revision=34316
2012-06-01 17:53:53 +00:00
Eelco Dolstra
c2fd3c184b
* Install/uninstall all RPMs in one operation. This is necessary if
...
the RPMs have dependencies between each other.
svn path=/nixpkgs/trunk/; revision=34303
2012-05-31 13:50:47 +00:00
Eelco Dolstra
ed2564f750
* Set the version number of generated Debian packages. Note that dpkg
...
apparently doesn't allows underscores in version strings, so we
replace them by dashes. This is the exact opposite of RPM, which
doesn't allow dashes.
svn path=/nixpkgs/trunk/; revision=34220
2012-05-24 15:07:38 +00:00
Eelco Dolstra
8336d55993
* Be less verbose generating initrds.
...
svn path=/nixpkgs/trunk/; revision=34199
2012-05-21 20:47:57 +00:00
Eelco Dolstra
41840af689
* Add a setup hook ‘autoreconfHook’ to simplify packages that need to
...
run autoreconf:
buildInputs = [ autoreconfHook ];
is essentially equivalent to
buildInputs = [ autoconf automake libtool ];
preConfigure = "autoreconf -i";
svn path=/nixpkgs/branches/x-updates/; revision=34181
2012-05-19 02:52:36 +00:00
Eelco Dolstra
b6917d3b73
* Added Ubuntu 12.04.
...
svn path=/nixpkgs/trunk/; revision=34055
2012-05-11 02:04:14 +00:00
Eelco Dolstra
40609ab6d5
* Add a hook for running a test after the RPMs have been installed.
...
svn path=/nixpkgs/trunk/; revision=33966
2012-05-01 20:31:01 +00:00
Peter Simons
5c1b0582d2
build-support/fetchurl/mirrors.nix: add funet.fi to more mirrors
...
Committed on behalf of Ilja Honkonen <ilja.honkonen@helsinki.fi>.
svn path=/nixpkgs/trunk/; revision=33946
2012-04-29 18:17:50 +00:00
Eelco Dolstra
fa276c45dd
* Set preferLocalBuild on a few more trivial builders.
...
svn path=/nixpkgs/trunk/; revision=33935
2012-04-26 15:17:43 +00:00
Eelco Dolstra
e5fc65ed40
* writeTextFile: don't use the build hook. NixOS uses this function a
...
lot, and it causes a lot of unnecessary overhead on machines with
remote building enabled.
svn path=/nixpkgs/trunk/; revision=33934
2012-04-26 15:01:41 +00:00
Ludovic Courtès
04600bbec1
Darwin: Add mig',
lipo', etc. to `stdenvNative'.
...
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.
svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Eelco Dolstra
9aa30ba705
* Pass -cpu kvm64 to keep GMP from barfing.
...
svn path=/nixpkgs/trunk/; revision=33848
2012-04-19 18:44:02 +00:00
Nicolas Pierron
82b308bf11
Add armv7l support.
...
svn path=/nixpkgs/trunk/; revision=33798
2012-04-15 23:41:25 +00:00
Eelco Dolstra
8b0bc7a745
* Add modules required by Linux 3.2.
...
svn path=/nixpkgs/trunk/; revision=33742
2012-04-11 07:45:12 +00:00
Eelco Dolstra
8fb94bace5
* Remove some obsolete kernel.org mirrors.
...
svn path=/nixpkgs/trunk/; revision=33609
2012-04-05 09:12:38 +00:00
Eelco Dolstra
8ecdd3a0aa
* Don't do a mkdir in the postHook.
...
svn path=/nixpkgs/trunk/; revision=33569
2012-04-04 16:05:08 +00:00
Lluís Batlle i Rossell
33e42bdd8e
Removing usernixos from nixpkgs trunk.
...
I placed a repository starting at this same svn content removed at:
http://viric.name/cgi-bin/usernixos
svn path=/nixpkgs/trunk/; revision=33459
2012-03-28 20:18:56 +00:00
Lluís Batlle i Rossell
68b5044cc0
Adding 'usernixos', where I start a modular kind-of-nixos that can go into
...
"nix-env -i" profiles, as a container for flexible configuration at the style
of nixos, to be defined in .nixpkgs/config.nix, with the main target of
generating an activation script.
svn path=/nixpkgs/trunk/; revision=33445
2012-03-27 20:33:49 +00:00
Eelco Dolstra
2938819d7e
* Remove an unnecessary function.
...
svn path=/nixpkgs/trunk/; revision=33271
2012-03-19 18:13:47 +00:00
Eelco Dolstra
c3072a8df8
* When doing coverage builds, set useTempPrefix (in case we're doing
...
an "installcheck").
svn path=/nixpkgs/trunk/; revision=33261
2012-03-19 16:05:29 +00:00
Eelco Dolstra
9f683a5aac
* After building an RPM, install and uninstall it.
...
svn path=/nixpkgs/trunk/; revision=33257
2012-03-19 13:40:57 +00:00
Eelco Dolstra
ebd19ec705
* For "nix-build --run-env" it's desirable that $stdenv/setup (and by
...
extension postHook) does nothing else than set up the environment.
It shouldn't touch $out because there may not be a $out. So move
the "imperative" bits of postHook into a separate phase.
svn path=/nixpkgs/trunk/; revision=33249
2012-03-19 03:45:36 +00:00
Eelco Dolstra
06d28ca8f1
* Support setting postPhases.
...
svn path=/nixpkgs/trunk/; revision=33247
2012-03-19 02:45:52 +00:00
Ludovic Courtès
adcc6d4102
gcc-cross-wrapper-libs: Gracefully deal with non-existent /TRIPLET/lib dir.
...
This fixes the cross-MinGW environment.
svn path=/nixpkgs/trunk/; revision=33010
2012-03-12 09:45:14 +00:00
Ludovic Courtès
9d125d64bf
VM: Upgrade to Debian 5.0.10.
...
svn path=/nixpkgs/trunk/; revision=33008
2012-03-12 08:13:10 +00:00
Ludovic Courtès
0a433261c5
VM: Make sure `smbd' is in QEMU's $PATH.
...
svn path=/nixpkgs/trunk/; revision=32987
2012-03-11 14:23:32 +00:00
Ludovic Courtès
5d159f8a06
runInGenericVM: Use whatever the current system is.
...
svn path=/nixpkgs/trunk/; revision=32970
2012-03-10 11:44:47 +00:00
Ludovic Courtès
2f01e58e61
vmTools: Use stdenv's glibc in `initrd-utils'.
...
svn path=/nixpkgs/trunk/; revision=32878
2012-03-08 09:40:45 +00:00
Eelco Dolstra
ed325cd1ae
* We accidentally lost xz support in rpm. This broke RPM builds
...
(http://hydra.nixos.org/build/2230623 ).
svn path=/nixpkgs/trunk/; revision=32847
2012-03-07 09:47:22 +00:00
Eelco Dolstra
5e4c7aa8f3
* This substitution causes bash to hang. Urgh. Bash's pattern
...
substitutions aren't very reliable.
svn path=/nixpkgs/trunk/; revision=32830
2012-03-06 18:49:44 +00:00
Yury G. Kudryashov
0210e20b5a
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Arie Middelkoop
d4960f72be
Added an optional parameter to "make-startupitem" to provide a prefix to the ".desktop" file.
...
svn path=/nixpkgs/trunk/; revision=32686
2012-02-29 12:50:17 +00:00
Ludovic Courtès
bd68cc6f5b
nix-build: Honor user-provided `failureHook'.
...
svn path=/nixpkgs/trunk/; revision=32680
2012-02-28 17:10:50 +00:00
Shea Levy
ea195b2507
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
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
Yury G. Kudryashov
d8454e538c
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32417
2012-02-20 05:30:06 +00:00
Peter Simons
cecff49b34
Moved the cabal build driver function from development/libraries/haskell/cabal to build-support/cabal.
...
This change also resolves the "cabal" vs. "Cabal" ambiguity on file systems
that don't distinguish case.
svn path=/nixpkgs/trunk/; revision=32401
2012-02-19 17:03:35 +00:00
Yury G. Kudryashov
5144a19987
svn merge ^/nixpkgs/trunk
...
There were a few merge conflicts due to ensureDir->mkdir -p migration
svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Eelco Dolstra
f680a3c175
* Put back the Ubuntu 10.10 images that I accidentally removed.
...
svn path=/nixpkgs/trunk/; revision=32141
2012-02-08 11:38:46 +00:00
Eelco Dolstra
c303784a89
* Debian 6.0.4.
...
svn path=/nixpkgs/trunk/; revision=32112
2012-02-07 13:19:03 +00:00
Eelco Dolstra
78ab1dd995
* Added Fedora 16 images.
...
svn path=/nixpkgs/trunk/; revision=32110
2012-02-07 13:14:25 +00:00
Eelco Dolstra
b22276deea
* Add disk images for Ubuntu 11.10.
...
svn path=/nixpkgs/trunk/; revision=32109
2012-02-07 12:38:32 +00:00
Yury G. Kudryashov
215a07c1a9
svn merge ^/nixpkgs/trunk
...
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)
The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Rob Vermaas
d52b0c377f
rpmclosure, remove exit
...
svn path=/nixpkgs/trunk/; revision=31965
2012-02-02 09:54:16 +00:00
Rob Vermaas
6a3feaa3dc
rpmclosure, also take into account rel attribute when versions are the same
...
svn path=/nixpkgs/trunk/; revision=31964
2012-02-02 09:53:45 +00:00
Arie Middelkoop
acda2c1967
Makes a .desktop startup item from a .desktop menu entry.
...
svn path=/nixpkgs/trunk/; revision=31958
2012-02-01 22:06:49 +00:00
Yury G. Kudryashov
5b132f6e96
svn merge ^/nixpkgs/trunk
...
Conflicts: cups, all-packages.nix (gcc45_debug)
svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Lluís Batlle i Rossell
4a1c721c01
Changing every reference from mips64-linux to mips64el-linux. That's
...
what the new nix thinks the fuloong is.
Anyone having the old nix should use a nixpkgs previous to this change to build
the new nix. And then, with the new nix, he can use any newer nixpkgs revision.
svn path=/nixpkgs/trunk/; revision=31751
2012-01-21 00:34:51 +00:00
Eelco Dolstra
1e7d074f1d
* builderDefs: don't use param1-5.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31737
2012-01-20 15:10: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
Yury G. Kudryashov
0c79434ccb
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
2012-01-14 21:34:37 +00:00
Rob Vermaas
080c0b2f38
prefer local builds for fetchhg
...
svn path=/nixpkgs/trunk/; revision=31462
2012-01-10 06:41:44 +00:00
Yury G. Kudryashov
3d61c49b42
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
2012-01-04 09:54:17 +00:00
Yury G. Kudryashov
b3709689db
Add modemmanager
...
svn path=/nixpkgs/trunk/; revision=31263
2012-01-04 09:05:22 +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
Yury G. Kudryashov
08761e83fc
Merge trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Rob Vermaas
a8785e7b72
use simple version compare in stead of timestamps to determine newer package
...
svn path=/nixpkgs/trunk/; revision=31108
2011-12-27 12:56:07 +00:00
Rob Vermaas
66b4a5a009
revert previous commit, i'm not awake...
...
svn path=/nixpkgs/trunk/; revision=30971
2011-12-19 21:15:17 +00:00
Rob Vermaas
1ef78f94eb
make sure fetchhg always produces same output for same revision
...
svn path=/nixpkgs/trunk/; revision=30970
2011-12-19 21:12:57 +00:00
Yury G. Kudryashov
b077940b3b
svn merge https://nixos.org/repos/nix/nixpkgs/trunk
...
No conflicts
svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
Michael Raskin
77e3784e9a
Dir-per-version SF layout seems to be more relevant now
...
svn path=/nixpkgs/trunk/; revision=30873
2011-12-13 21:00:26 +00:00
Eelco Dolstra
c044d7f56f
* Forgot a few utillinuxng references.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30866
2011-12-13 12:57:32 +00:00
Eelco Dolstra
eda3fd1730
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Eelco Dolstra
3ea1c30846
* Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing
...
in its interaction with the ‘dontStrip’ attribute.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30848
2011-12-12 14:02:12 +00:00
Peter Simons
9dab7db8a2
added git support to builder-defs
...
svn path=/nixpkgs/trunk/; revision=30840
2011-12-11 19:39:16 +00:00
Eelco Dolstra
b583b816cc
* Allow versionSuffix to be overriden.
...
svn path=/nixpkgs/trunk/; revision=30742
2011-12-05 14:16:30 +00:00
Shea Levy
68aaf3c843
Include Apple's libtool in darwin-cctools-wrapper
...
Packages which need GNU libtool should explicitly include it in buildInputs
svn path=/nixpkgs/trunk/; revision=30535
2011-11-23 02:39:09 +00:00
Peter Simons
368ac01473
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
2011-11-08 10:18:35 +00:00
Eelco Dolstra
4d0b546566
* Update Debian Squeeze to 6.0.3.
...
svn path=/nixpkgs/trunk/; revision=30310
2011-11-07 23:05:50 +00:00
Rob Vermaas
9d3e13f7f3
remove .hg-archival.txt from nix-prefetch-hg result
...
svn path=/nixpkgs/trunk/; revision=30217
2011-11-03 23:46:50 +00:00
Peter Simons
69488d688d
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
2011-11-02 10:28:32 +00:00
Shea Levy
0f80aa96a6
s|/nix/store|$NIX_STORE|
...
svn path=/nixpkgs/trunk/; revision=30094
2011-10-28 23:44:49 +00:00
Shea Levy
9afc1f6a24
nuke-refs: Don't assume /nix/store
...
svn path=/nixpkgs/trunk/; revision=30090
2011-10-28 21:23:40 +00:00
Shea Levy
d2006f51a0
Use -isystem instead of -I for system headers to avoid warnings when using -pedantic
...
svn path=/nixpkgs/trunk/; revision=30052
2011-10-27 06:39:45 +00:00
Peter Simons
dfd063cf12
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30027
2011-10-26 09:15:25 +00:00
Lluís Batlle i Rossell
faafa3513a
Adding a kernel mirror that at least has the module-init-tools of nixpkgs.
...
svn path=/nixpkgs/trunk/; revision=30020
2011-10-25 17:46:39 +00:00
Ludovic Courtès
d4a560845d
Make `ftp.gnu.org' the first site for GNU stuff.
...
svn path=/nixpkgs/trunk/; revision=29976
2011-10-22 21:55:04 +00:00
Peter Simons
db31cf8287
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29884
2011-10-19 08:50:00 +00:00
Shea Levy
db619f2d55
First try at a clang-wrapper. Hello world compiles\!
...
svn path=/nixpkgs/trunk/; revision=29879
2011-10-18 20:03:09 +00:00
Peter Simons
8dfef0f4a0
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29851
2011-10-14 22:06:50 +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
Rob Vermaas
40f1e4e289
* rpm-closure.pl: add possibility to use multiple repositories
...
* default.nix: do not assume fixed filesystem type when mounting, to allow using other filesystems
svn path=/nixpkgs/trunk/; revision=29757
2011-10-11 13:22:09 +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
Peter Simons
e3984c2caf
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29739
2011-10-10 17:01:17 +00:00
Ludovic Courtès
e1fb6adbe8
Update Debian Lenny (5.0.9).
...
svn path=/nixpkgs/trunk/; revision=29699
2011-10-06 13:27:58 +00:00
Peter Simons
1abdc56a12
Synchronized stdenv-updates branch with trunk.
...
There were conflicting patches of pkgs/os-specific/linux/module-init-tools.
Apparently, the expression was updated independently in both branches. I've
resolved the conflict by preferring the patches from stdenv-updates, because
those patches appeared to be more sophisticated, i.e. they build the manual,
etc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=29680
2011-10-06 09:37:22 +00:00
Shea Levy
21b2dd7ab4
D'oh
...
svn path=/nixpkgs/trunk/; revision=29562
2011-10-02 12:53:51 +00:00
Shea Levy
36910c10e5
modprobe --show-depends now spits out 'builtin' if a requested module is, well, built-in
...
svn path=/nixpkgs/trunk/; revision=29560
2011-10-02 11:50:19 +00:00
Shea Levy
3b260bfbf7
Merge from trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29553
2011-10-01 18:12:00 +00:00
Shea Levy
9f3fb4b1ae
Add a working kernel.org mirror
...
svn path=/nixpkgs/trunk/; revision=29541
2011-09-29 20:57:47 +00:00
Shea Levy
01df54f5cc
Merge from trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
2011-09-23 16:58:45 +00:00
Yury G. Kudryashov
c130be537b
Add fetchurl_gnome wrapper
...
It just creates correct mirror://gnome/sources/... URL.
svn path=/nixpkgs/trunk/; revision=29377
2011-09-20 06:21:46 +00:00
Peter Simons
a08329b7bb
pkgs/build-support/fetchurl/mirrors.nix: strip trailing whitespace
...
svn path=/nixpkgs/trunk/; revision=29360
2011-09-19 18:25:51 +00:00
Peter Simons
cc1ea39580
Added kernel.org mirror at tu-dresden.de to the list, which is currently reachable (unlike the kernel.org domain).
...
svn path=/nixpkgs/trunk/; revision=29359
2011-09-19 18:25:47 +00:00
Sander van der Burg
30872fb8cc
Transitive library dependencies are now propagated
...
svn path=/nixpkgs/trunk/; revision=29260
2011-09-13 21:07:08 +00:00
Sander van der Burg
cdde5132f8
Removed some obsolete restrictions, so that transitive dependencies are also loaded
...
svn path=/nixpkgs/trunk/; revision=29249
2011-09-13 20:07:14 +00:00
Sander van der Burg
29cb002977
The string array needs to be comma separated
...
svn path=/nixpkgs/trunk/; revision=29240
2011-09-13 15:53:26 +00:00
Sander van der Burg
06891d3997
Improved the wrapper: it is now a separate component invoking the executable's main method through the refelection API
...
svn path=/nixpkgs/trunk/; revision=29239
2011-09-13 15:47:54 +00:00
Sander van der Burg
89cf1d4b9b
Oops: forgot to include the wrapper class
...
svn path=/nixpkgs/trunk/; revision=29236
2011-09-13 12:17:28 +00:00
Sander van der Burg
610d109f75
Initial implementation of a main class wrapper which resolves runtime dependencies automatically
...
svn path=/nixpkgs/trunk/; revision=29235
2011-09-13 12:17:04 +00:00
Nicolas Pierron
9cd0f7ed09
nix-prefetch-git: remove .git in the cloned directory. (Fix issue 116)
...
svn path=/nixpkgs/trunk/; revision=29077
2011-09-07 10:02:17 +00:00
Nicolas Pierron
0608f1a9b5
nix-prefetch-git: Display usage message if missing builder arguments are
...
missing.
svn path=/nixpkgs/trunk/; revision=29076
2011-09-07 10:02:14 +00:00
Nicolas Pierron
5f5a47fc76
nix-prefetch-git: Remove missleading option name.
...
svn path=/nixpkgs/trunk/; revision=29075
2011-09-07 10:02:12 +00:00
Michael Raskin
f9728ee0db
Fix a typo
...
svn path=/nixpkgs/trunk/; revision=28871
2011-08-29 10:06:12 +00:00
Nicolas Pierron
d528cba5b8
fetchgit: Handle https.
...
svn path=/nixpkgs/trunk/; revision=28857
2011-08-28 16:03:14 +00:00
Shea Levy
4d70ba6cc9
Merge from trunk up through r28790
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
Yury G. Kudryashov
1e981a7deb
fetchmtn: move logic to default args
...
svn path=/nixpkgs/trunk/; revision=28786
2011-08-23 17:45:40 +00:00
Nicolas Pierron
9e53a20f50
Replace fetchgit default builder by a wrapper around nix-prefect-git.
...
svn path=/nixpkgs/trunk/; revision=28709
2011-08-20 14:29:57 +00:00
David Guibert
05a530fd10
module-init-tools: 3.4 -> 3.16
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=28621
2011-08-16 18:20:59 +00:00
Eelco Dolstra
eb9a0145ea
* Don't mount the entire host filesystem, but just /nix/store and a
...
temporary directory. This is necessary to isolate NixOS VMs from
the host filesystem for security.
svn path=/nixpkgs/trunk/; revision=28427
2011-08-09 14:05:40 +00:00
Ludovic Stordeur
cd3fda3def
Fixed error in build-support/fetchfile
...
Replaced undefined variable 'url' by the correct one 'pathname'
svn path=/nixpkgs/trunk/; revision=28424
2011-08-09 12:28:49 +00:00
Eelco Dolstra
b6d96e9782
* For building Fedora disk images, use the "Everything" repo rather
...
than the "Fedora" repo, since the latter doesn't contain some
packages (like perl-DBD-SQLite).
svn path=/nixpkgs/trunk/; revision=28389
2011-08-08 14:01:16 +00:00
Eelco Dolstra
8782b43c45
* Another mirror for old openSUSE releases.
...
svn path=/nixpkgs/trunk/; revision=28388
2011-08-08 13:58:52 +00:00
Eelco Dolstra
4e7e83a7ee
* Debian Squeeze updated to 6.0.2.1.
...
svn path=/nixpkgs/trunk/; revision=28385
2011-08-08 13:16:20 +00:00
Peter Simons
c78c1288c3
fetchgit: strip trailing whitespace
...
svn path=/nixpkgs/trunk/; revision=27862
2011-07-20 22:56:44 +00:00
Peter Simons
0b1bf668cd
fetchgit: added support for fetching sub-modules
...
svn path=/nixpkgs/trunk/; revision=27860
2011-07-20 22:56:35 +00:00
Michael Raskin
a0d97d5eb2
Adding OneTeam XMPP client
...
svn path=/nixpkgs/trunk/; revision=27553
2011-06-28 09:45:09 +00:00
Florian Friesdorf
8e606466b3
fetchgit builder - correctly quote "$rev"
...
svn path=/nixpkgs/trunk/; revision=27531
2011-06-22 23:33:41 +00:00
Florian Friesdorf
c8f12bd8be
fetchgit builder comment: can handle remotes without HEAD
...
thx civodul for bringing it up and testing
svn path=/nixpkgs/trunk/; revision=27523
2011-06-22 21:01:36 +00:00
Florian Friesdorf
e50e84daa1
fetchgit report fetch progress
...
svn path=/nixpkgs/trunk/; revision=27522
2011-06-22 19:34:32 +00:00
Florian Friesdorf
ee731974e9
fetchgit builder to handle broken remotes without a HEAD
...
svn path=/nixpkgs/trunk/; revision=27521
2011-06-22 19:34:27 +00:00
Ludovic Courtès
a208b2f85f
Fix typo.
...
svn path=/nixpkgs/trunk/; revision=27429
2011-06-12 22:35:20 +00:00
Ludovic Courtès
65f50c7aab
Specify the dynamic linker name for cross-compilation to GNU/Hurd.
...
svn path=/nixpkgs/trunk/; revision=27428
2011-06-12 22:32:44 +00:00
Michael Raskin
df54eb7a92
A phase that simply saves current exported vars for debugging use
...
svn path=/nixpkgs/trunk/; revision=27338
2011-05-31 19:30:10 +00:00
Michael Raskin
9f3e6006e8
Adding Xconq turn-based strategy
...
svn path=/nixpkgs/trunk/; revision=27306
2011-05-28 15:36:56 +00:00
Eelco Dolstra
aa5646ff3b
* For some reason Samba insists on setting the g+w bit on newly
...
created directories, which is a security risk. So create $out with
the proper permissions before starting the VM.
svn path=/nixpkgs/trunk/; revision=27095
2011-05-02 14:55:16 +00:00
Florian Friesdorf
a8c3649dd4
fetchgit builder rewrite to handle more cases
...
The old builder failed for:
- remote HEAD != master
- local repositories
svn path=/nixpkgs/trunk/; revision=26984
2011-04-27 03:00:47 +00:00
Lluís Batlle i Rossell
ee8b05eb70
Adding 'wakelan', to use UDP wake on lan on ethernet.
...
svn path=/nixpkgs/trunk/; revision=26912
2011-04-20 20:55:46 +00:00
Michael Raskin
451040c299
Adding globulation
...
svn path=/nixpkgs/trunk/; revision=26892
2011-04-19 16:02:29 +00:00
Michael Raskin
964d56e060
Workaround SCons paranoia
...
svn path=/nixpkgs/trunk/; revision=26873
2011-04-18 07:41:54 +00:00
Rob Vermaas
d7ac5cd014
nix-prefetch-hg: if url is local file, do not make clone, but run hg archive on it
...
svn path=/nixpkgs/trunk/; revision=26779
2011-04-11 12:24:57 +00:00
Rob Vermaas
3756e6021a
use same name as nix-prefetch-hg for derivation
...
svn path=/nixpkgs/trunk/; revision=26778
2011-04-11 12:20:59 +00:00
Michael Raskin
1886fad9f1
Fix cmake flags overriding
...
svn path=/nixpkgs/trunk/; revision=26765
2011-04-09 15:50:33 +00:00
Eelco Dolstra
f99c0dd302
* Sync with the trunk.
...
svn path=/nixpkgs/branches/modular-python/; revision=26678
2011-04-04 13:36:05 +00:00
Lluís Batlle i Rossell
9adeabc793
Making builder-defs doCMake build well the shared libraries and binaries (rpath related).
...
I simply made it do what the cmake setup-hook already said to do.
svn path=/nixpkgs/trunk/; revision=26617
2011-03-30 22:08:29 +00:00
Eelco Dolstra
353d450867
* wrapPythonPrograms: don't hard-code the Python library prefix.
...
svn path=/nixpkgs/branches/modular-python/; revision=26594
2011-03-29 15:19:59 +00:00
Eelco Dolstra
47adaa80e3
* Move the wrapPythonPrograms function into a separate setup hook
...
(wrapPython).
svn path=/nixpkgs/branches/modular-python/; revision=26580
2011-03-28 16:33:33 +00:00
Ludovic Courtès
3369508fa9
nix-prefetch-git: Add rudimentary TopGit support.
...
svn path=/nixpkgs/trunk/; revision=26305
2011-03-14 22:00:20 +00:00
Eelco Dolstra
4b50191fd4
* Remove a not very useful message that didn't get printed anyway
...
because the test condition was wrong.
svn path=/nixpkgs/trunk/; revision=26147
2011-03-03 14:59:58 +00:00
Eelco Dolstra
377b97a37b
* Drop the unnecessary boot=on flag.
...
svn path=/nixpkgs/trunk/; revision=26104
2011-02-24 21:48:32 +00:00
Eelco Dolstra
a74d449daf
* nixSqlite expects another integer (denoting the size of the NAR) in
...
`nix-store --load-db'.
svn path=/nixpkgs/trunk/; revision=25988
2011-02-16 11:49:08 +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
Yury G. Kudryashov
f736995e07
Prefer upstream mirror system to our hand-written mirror list.
...
svn path=/nixpkgs/trunk/; revision=25863
2011-02-09 21:09:48 +00:00
Rob Vermaas
224ff6c1ee
added nix-prefetch-bzr
...
svn path=/nixpkgs/trunk/; revision=25806
2011-02-08 13:09:17 +00:00
Rob Vermaas
81019cbdb9
vmTools: add some arguments with previous defaults
...
svn path=/nixpkgs/trunk/; revision=25742
2011-02-01 12:11:05 +00:00
Rob Vermaas
ebf9889a9e
extractmtdfs: bigger size mtdram, extractfs: support cramfs
...
svn path=/nixpkgs/trunk/; revision=25739
2011-01-31 18:02:46 +00:00
Rob Vermaas
06be15cb76
add hfs/hfsplus/squashfs support to extractfs
...
svn path=/nixpkgs/trunk/; revision=25737
2011-01-31 15:26:03 +00:00
Eelco Dolstra
7f4a312e35
* Handle FreeBSD filesystems.
...
svn path=/nixpkgs/trunk/; revision=25624
2011-01-19 10:59:26 +00:00
Rob Vermaas
ba23376718
added vm function to extract some filesystem
...
svn path=/nixpkgs/trunk/; revision=25622
2011-01-19 09:06:12 +00:00
Rob Vermaas
adeb63e4c2
remove aterm242fixes
...
svn path=/nixpkgs/trunk/; revision=25407
2011-01-05 09:42:56 +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
Karn Kallio
871b59c636
Remove semicolon causing evaluation error.
...
svn path=/nixpkgs/trunk/; revision=25354
2011-01-02 23:52:39 +00:00
Evgeny Egorochkin
bbedfb4a5e
Live builds support: initially for git and svn. taglib_live is packaged as an example.
...
svn path=/nixpkgs/trunk/; revision=25351
2011-01-02 23:23:59 +00:00
Michael Raskin
29cd3206f2
Adding ised
...
svn path=/nixpkgs/trunk/; revision=25331
2011-01-01 20:28:38 +00:00
Eelco Dolstra
aceef005c3
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=25244
2010-12-22 17:02:03 +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
Michael Raskin
22c42a26b6
Adding OGRE - object-oriented graphical engine
...
svn path=/nixpkgs/trunk/; revision=25240
2010-12-22 14:50:13 +00:00
Lluís Batlle i Rossell
e930a7385b
Fix about the order of -rpath and -L in the ld-wrapper
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=25128
2010-12-14 15:22:25 +00:00
Lluís Batlle i Rossell
195a90d7ce
Fixing a bug in the ld-wrapper, where the dynamic-linker path was taken as a
...
path worth a "-rpath" entry.
This put a problem in the bootstrap, where we built 'zlib' and wanted to link programs with it, and while they got linked well, at runtime the boostrap-tools zlib came first on rpath becaue
the ld call was done with "-dynamic-linker ..." before "-lz".
I saw this trouble on the fuloong, where the zlib in boostrap-tools is not
runtime compatible with that binutils are linked to.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25107
2010-12-13 22:46:21 +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
Lluís Batlle i Rossell
43930b36d9
I had changed the gcc-wrapper shell attribute, for it to be a specific kind of
...
derivation instead of a string, but this did not cover all use cases we had.
Instead of updating the use cases, I made the wrapper accept also a string.
We saw this problem trying to build gcc43_multi.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25029
2010-12-07 15:18:05 +00:00
Eelco Dolstra
04ec671c8a
* Run smbd in its own session / process group (setsid) because smbd
...
now kills its process group when it exits. Without setsid, this
ends up killing the parent (i.e., the builder).
* Use port 445 instead of 139 because the CIFS kernel module tries
port 445 first. If there is an actual Samba running on the host, it
would end up connecting to that one instead of our own and fail.
svn path=/nixpkgs/trunk/; revision=25017
2010-12-06 19:03:32 +00:00
Rob Vermaas
f26b267858
fix debian lenny hashes
...
svn path=/nixpkgs/trunk/; revision=24986
2010-12-06 08:03:11 +00:00
Lluís Batlle i Rossell
1b62c9c061
I made changes to achieve a working cross-built gcc wrapper. Now,
...
"gcc45.hostDrv" works in the host system, together with libc, binutils, dynamic
linker, ...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24971
2010-12-04 21:45:37 +00:00
Michael Raskin
64ed7e705d
Adding Satallax prover
...
svn path=/nixpkgs/trunk/; revision=24963
2010-12-03 11:26:34 +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
c5bb72d0da
Add autogen.sh phase
...
svn path=/nixpkgs/trunk/; revision=24706
2010-11-16 07:38:33 +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
07d9d421a7
Add progress reporting for generation of fonts
...
svn path=/nixpkgs/trunk/; revision=24660
2010-11-11 12:59:31 +00:00
Rob Vermaas
cf8da224c6
fixing wrappers in ant-build
...
svn path=/nixpkgs/trunk/; revision=24637
2010-11-10 12:55:25 +00:00
Eelco Dolstra
a2102af6df
* buildEnv: use $SHELL (i.e. bash) rather than /bin/sh. This allows
...
NixOS VM tests to be built on Ubuntu, where /bin/sh is dash rather
than bash.
svn path=/nixpkgs/trunk/; revision=24592
2010-11-03 22:37:00 +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
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
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
17670a5412
* Add some openSUSE mirrors that still have 10.3 and 11.0.
...
svn path=/nixpkgs/trunk/; revision=24053
2010-10-04 14:30:34 +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
Michael Raskin
5e32f98f5c
Recursive sourceInfo is more convenient
...
svn path=/nixpkgs/trunk/; revision=23868
2010-09-20 07:48:17 +00:00
Lluís Batlle i Rossell
2c5de61327
Updating from trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +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
a074da499c
vm/default.nix: updating debian lenny hashes
...
svn path=/nixpkgs/trunk/; revision=23674
2010-09-07 14:33:46 +00:00
Lluís Batlle i Rossell
641f956581
Setting any stdenv.system references for the loongson2f system to 'mips64-linux'.
...
(my git-svn info:)
Merge branch 'mips64' into stdenv-updates
Conflicts:
pkgs/applications/networking/browsers/firefox/3.6.nix
pkgs/top-level/all-packages.nix
svn path=/nixpkgs/branches/stdenv-updates/; revision=23588
2010-09-01 09:50:12 +00:00
Eelco Dolstra
3cdc3c4abe
* Mark the VM builds as requiring KVM support.
...
svn path=/nixpkgs/trunk/; revision=23526
2010-08-29 21:27:06 +00:00
Lluís Batlle i Rossell
cca1cae042
Updating from trunk. I had to do some changes to make it fit.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
2010-08-29 11:09:23 +00:00
Michael Raskin
3039709cd6
Update the currently used autocallable template to make it usable with probable future autoupdater..
...
svn path=/nixpkgs/trunk/; revision=23297
2010-08-20 21:55:36 +00:00
Lluís Batlle i Rossell
f16353b6f2
Updated from trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41: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