Eelco Dolstra
63d7b6ee29
makeImageFromDebDist: Add extraDebs arguments
...
This allows adding packages that are not part of the distribution, e.g.g
extraDebs = [
(pkgs.fetchurl {
name = "openjdk.deb";
url = http://ppa.launchpad.net/openjdk-r/ppa/ubuntu/pool/main/o/openjdk-8/openjdk-8-jdk-headless_8u111-b14-3~14.04.1_amd64.deb ;
sha256 = "1n5ibpkx9pjmc4nr052rls1yqbq7ckav2rabixjhd4yxbyhjl0ap";
})
];
2017-07-27 20:34:24 +02:00
Eelco Dolstra
a7c8f5e419
debian: 8.8 -> 8.9
2017-07-26 20:02:17 +02:00
Eelco Dolstra
0996ea8a68
NixOS VM tests: Don't create a setgid group in vde_switch
...
Nix no longer allows this for security reasons.
http://hydra.nixos.org/build/53993125
2017-06-07 11:57:36 +02:00
Eelco Dolstra
31c2d20621
debian: 8.7 -> 8.8
2017-05-08 16:02:38 +02:00
rht
5628cebcf0
/bin/sh -> ${stdenv.shell}
2017-04-30 17:01:07 +02:00
Jörg Thalheim
f8cb022feb
build-support/vm: replace sha256 with sha1
2017-02-26 10:01:08 +01:00
Eelco Dolstra
d0d5ea0cdf
Grrr
2017-02-21 15:26:14 +01:00
Eelco Dolstra
fac3438a96
Fix Ubuntu 16.10 name
2017-02-21 15:22:30 +01:00
Eelco Dolstra
1fdb52ffcc
Add Ubuntu 16.10
2017-02-21 15:08:58 +01:00
Eelco Dolstra
acb2acf1f5
VM builds: Use -smp when enableParallelBuilding is set
2017-02-21 15:08:54 +01:00
Eelco Dolstra
012b5a5c45
Add Fedora 25
2017-02-21 15:08:46 +01:00
Eelco Dolstra
a4ec1841da
VM tests: veryloose -> cache=loose
2017-02-13 12:18:10 +01:00
Michael Raskin
5f3fa24a20
cygwin-iso: fix the most obvious parts of bit rot
...
Still doesn't build though. Is anyone still using it?
2017-02-09 15:07:38 +01:00
Eelco Dolstra
cc0981b176
debian: 8.6 -> 8.7
2017-01-17 10:55:05 +01:00
Eelco Dolstra
bbd03e236a
Use looser 9pfs caching in VM tests/builds
...
This can give significant speed ups, see
7e20254412
.
2016-12-29 21:26:16 +01:00
sternenseemann
e2372502d3
netcat: make netcat-openbsd the default netcat ( #19411 )
...
The motivation for this change is the following: As gnu-netcat,
e. g. does not support ipv6, it is not suitable as default netcat.
This commit also fixes all obvious build issues caused by this change.
2016-10-30 15:06:04 +01:00
Vladimír Čunát
027efec879
Merge staging without python splitting for now
...
The split needs more time to finish rebuilding,
but the rest seems OK and there are security fixes.
2016-10-14 09:24:21 +02:00
Profpatsch
bef6bef0d2
stdenv/stripHash: print to stdout, not to variable
...
`stripHash` documentation states that it prints out the stripped name to
the stdout, but the function stored the value in `strippedName`
instead.
Basically all usages did something like
`$(stripHash $foo | echo $strippedName)` which is just braindamaged.
Fixed the implementation and all invocations.
2016-10-11 18:34:36 +02:00
Allen Nelson
4abe579250
add docs to docker build functions
...
bring back ls_tar
replace goPackages with go
don't hardcode /nix/store in vmTools
more docs
2016-09-29 12:52:57 -05:00
Eelco Dolstra
f081a1aaf4
debian: 8.5 -> 8.6
2016-09-22 15:53:29 +02:00
Nikolay Amiantov
698cadd714
runVM: mount devpts
2016-09-04 17:11:01 +03:00
Nikolay Amiantov
8b38b6aae2
runVM: check exit code before postVM eval
2016-09-04 17:11:01 +03:00
Tuomas Tynkkynen
74a3a2cd7e
treewide: Use makeBinPath
2016-08-23 01:18:10 +03:00
Domen Kožar
b9e009b5b5
add Fedora 24
2016-08-12 16:44:23 +02:00
Maarten Hoogendoorn
e809667b17
vmTools.runInLinuxImage: add virtio_rng device
...
This allows the QEMU VM's to use the /dev/random device, by
getting entropy from the host.
2016-07-31 12:39:19 +02:00
Tuomas Tynkkynen
13160d9c10
buildInLinuxVM: Workaround bug #16742
...
This is blocking the channel update: #16949
2016-07-14 15:12:50 +03:00
zimbatm
4f5918cd2e
Revert "stdenv: introduce baseHash() to replace stripHash()"
...
Introduced by mistake
This reverts commit e71a5cb878
.
2016-06-25 14:25:58 +01:00
zimbatm
e71a5cb878
stdenv: introduce baseHash() to replace stripHash()
...
stripHash uses a global variable to communicate it's computation
results, but it's not necessary. You can just pipe to stdout in a
subshell. A function mostly behaves like just another command.
baseHash() also introduces a suffix-stripping capability since it's
something the users of the function tend to use.
2016-06-25 14:20:56 +01:00
Eelco Dolstra
5fc64c4baa
debian: 7.10 -> 7.11, 8.4 -> 8.5
2016-06-20 14:39:44 +02:00
zimbatm
b0f8416c5c
Merge pull request #16180 from zimbatm/shell-escaping
...
Escape all shell arguments uniformly
2016-06-19 23:27:52 +01:00
Rob Vermaas
91436641ec
Fix hash for Debian 8.4 Jessie
...
(cherry picked from commit fd60751ce0
)
2016-06-13 12:20:55 +00:00
zimbatm
28fa4a2f03
Escape all shell arguments uniformly
2016-06-12 18:11:37 +01:00
Domen Kožar
56714859f4
add CentOS 7.1
2016-05-24 11:35:39 +01:00
Domen Kožar
7fc845aeb1
add OpenSuse 13.2
...
(cherry picked from commit 2cf5dcd99a
)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-05-24 11:06:11 +01:00
Domen Kožar
ba0d4ecaf7
debian7: change hash due to 7.10 release
...
(cherry picked from commit 00df301ac2fd1818fa1f96debcee23dbb979834d)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-05-24 10:40:39 +01:00
Carles Pagès
e7ab828da1
makeImageFromDebDist: accept additional parameters for vm, as in rpm version.
2016-05-11 15:43:24 +02:00
Domen Kožar
8a3b70791c
vmTools.diskImages: add ubuntu 16.04
2016-04-29 11:50:27 +01:00
Tuomas Tynkkynen
01854a850a
treewide: Replace module_init_tools -> kmod
...
The former is deprecated and doesn't handle compressed kernel modules,
so all current usages of it are broken.
2016-04-22 10:40:57 +03:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Vladimír Čunát
aa670eb503
vmTools: update debian jessie 8.3 -> 8.4
...
Their in-place updates break download hashes...
2016-04-05 14:32:04 +02:00
Lluís Batlle i Rossell
635c99ce87
vm: allow overriding QEMU_OPTS / memSize for images.
...
It's nice to be able to create disk images with -smp 4
in qemu.
2016-04-01 10:32:59 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Lluís Batlle i Rossell
ab93f8c137
Making vm's qemu cache=unsafe. Faster.
...
I don't think it's unsafe, if it's meant for nix expressions.
2016-03-31 09:27:25 +02:00
Lluís Batlle i Rossell
e21dd19168
Making vm's interactive shell handle the terminal well.
2016-03-31 09:27:14 +02:00
Nicolas B. Pierron
6313a5698a
Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.
2016-03-13 18:25:52 +00:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Lluís Batlle i Rossell
202ebf794c
vm/rpm/rpm-closure.pl: make it deterministic
...
Some recent perl version introduced "keys" to return the keys
in random order. As some of the packages are solved by "provides" and
based on the order, this randomness affects what packages get into the
closure.
This problem may be in other nix perl scripts.
2016-03-01 11:02:42 +01:00
Cole Mickens
718848d5aa
azure: package qemu @ 2.2.0
...
This commit packages qemu-220. This package is qemu-2.2.0
and is only used with Azure.
2016-02-18 21:08:28 -08:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00