Commit Graph
100 Commits
Author SHA1 Message Date
Tuomas Tynkkynen 2380f6a4fa nixos/tests/rsyslogd: Fix eval 2018-10-30 14:27:44 +02:00
Tuomas Tynkkynen 067d1cf330 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/science/math/sage/sage-src.nix
2018-10-27 19:58:03 +03:00
Tuomas Tynkkynen e310622999 spidermonkey_52: Split into multiple outputs (and nuke static lib)
Saves 28M.
2018-10-27 15:17:13 +03:00
Tuomas Tynkkynen ad7f2d120e nixos/installation-cd-minimal: Drop fontconfig
Shouldn't be needed for anything.
2018-10-27 15:17:13 +03:00
Tuomas Tynkkynen cc92fc0a83 nixos/installation-device: Move systemPackages additions to profiles/base
Other package additions are there as well.
2018-10-27 15:17:13 +03:00
Tuomas Tynkkynen 717206010f nixos/installer: Drop extra copy of w3m
The nixos-manual service already uses w3m-nographics for a variant that
drops unnecessary junk like various image libraries.

iso_minimal closure (i.e. uncompressed) goes from 1884M -> 1837M.
2018-10-27 13:16:30 +03:00
Tuomas Tynkkynen 74df71bc8b Revert "doc: Update section about imperative containers"
This reverts commit f309440ee3.

Breaks manual build:

https://nix-cache.s3.amazonaws.com/log/wnjcy6n5f871bpyy9nd06smiz1ggv99c-nixos-manual-combined.drv
2018-09-30 03:18:58 +03:00
Tuomas Tynkkynen 599c4df46a nixos/kexec: Replace meta.available checks
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
2018-09-28 15:01:00 +03:00
Tuomas Tynkkynen f4dd2fed7f ghc: Replace meta.available checks for enableIntegerSimple
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
2018-09-28 15:01:00 +03:00
Tuomas Tynkkynen 5e84926a66 treewide: Replace meta.available checks in shouldUsePackages copypasta
This reverts commit 79d8353b5e.

This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
2018-09-28 15:01:00 +03:00
Tuomas Tynkkynen 50d0360888 apparmor: Replace meta.available checks
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
2018-09-28 15:01:00 +03:00
Tuomas Tynkkynen cdeafe7cdf nix: Replace meta.available checks
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
2018-09-28 15:01:00 +03:00
Tuomas Tynkkynen fe7919f7a1 systemd: Replace meta.available checks
This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.
2018-09-28 15:01:00 +03:00
Tuomas Tynkkynen d6e3db44cf Add ssh backdoor to VM tests infrastructure.
Thanks to @dezgeg for prototype implementation, I've
cleaned it up and added documentation.
2018-09-28 10:53:08 +01:00
Tuomas Tynkkynen f9197b9f63 linux_rpi: Extend the logic for not installing unnecessary DTBs
Now ARMv6 and ARMv7 builds avoid installing DTBs for boards where the
resulting kernel won't run just like the aarch64 builds already do.
Also deduplicates the logic a bit.
2018-09-24 14:16:46 +03:00
Tuomas Tynkkynen 61b2e0cba8 U-Boot: 2018.07 -> 2018.09 2018-09-14 16:15:28 +03:00
Tuomas Tynkkynen 9f85167455 linux_rpi: 1.20180619 -> 1.20180817 2018-09-14 16:15:28 +03:00
Tuomas Tynkkynen 14fbea9111 raspberrypifw: 1.20180619 -> 1.20180817 2018-09-14 16:15:28 +03:00
Tuomas Tynkkynen 9236e9a28d zabbix34: Compile with OpenSSL
Fixes:

"TLSConnect" configuration parameter cannot be used: Zabbix agent was compiled without TLS support
2018-08-27 18:41:09 +03:00
Tuomas Tynkkynen 2760b24462 Merge remote-tracking branch 'upstream/master' into staging 2018-05-26 19:01:18 +03:00
Tuomas Tynkkynen 840e430744 Merge pull request #41088 from oxij/merge/master-to-staging-20180526
Merge master into staging
2018-05-26 18:50:40 +03:00
Tuomas Tynkkynen 6f1f11af4c nixos/programs/shell.nix: Enhance bad ownership error message
Steal this from scripts/nix-profile.sh.in in Nix to keep things more
consistent.
2018-05-24 04:58:57 +03:00
Tuomas Tynkkynen 3cfb492c63 nixos/programs/shell.nix: Use [ ] instead of test
Half of the script is using 'test' and other half '[ ]'. Let's stick to
'[ ]' everywhere as it seems more conventional in nixpkgs.
2018-05-24 04:58:57 +03:00
Tuomas Tynkkynen 7adae10a86 nixos/programs/shell.nix: Quote variables
In practice $HOME doesn't contain spaces, but let's stick to best
shell scripting practices anyway.
2018-05-24 04:58:57 +03:00
Tuomas Tynkkynen 430bfa5ae5 kmscube: Fix src
Someone sedded a bit too eagerly.
2018-05-20 14:30:24 +03:00
Tuomas Tynkkynen 003473613a Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/top-level/all-packages.nix
2018-05-18 03:54:38 +03:00
Tuomas Tynkkynen 6b6a575748 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/tools/networking/telnet/default.nix
	pkgs/top-level/aliases.nix
2018-05-16 03:09:33 +03:00
Tuomas Tynkkynen 16b45ec3da Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/unix-tools.nix
2018-04-16 21:13:30 +03:00
Tuomas Tynkkynen 333a24a628 nixos/release.nix: Add SD images for ARMv6 + ARMv7
These don't have affect the default Hydra setup (you need to pass
the relevant system in the supportedSystem list) but let's add it for
completeness and convenience.
2018-04-16 20:39:51 +03:00
Tuomas Tynkkynen bd77849b2f nixos/installer/channel: Add some files that the channel also has
Nothing probably uses this, but let's be pedantic and have the
pre-included channel on the install media be as close as possible to
what 'nix-channel --update' will give them.

The only remaining difference is that the channel adds programs.sqlite,
which is fundamentally unfixable.
2018-04-16 20:39:51 +03:00
Tuomas Tynkkynen 6326053490 diffoscope: Add script to list required tools 2018-03-03 22:36:03 +02:00
Tuomas Tynkkynen 71631a922b runInLinuxVM: Use QEMU command line that works on other architectures
... by moving the existing definition to qemu-flags.nix and reusing
that.
2018-01-30 16:57:27 +02:00
Tuomas Tynkkynen 8c4f8c51a6 runInLinuxVM: Don't hardcode x86-specific serial device 2018-01-30 16:57:27 +02:00
Tuomas Tynkkynen 95880aaf06 nixos/initrd: Don't include some x86-specific modules unconditionally 2018-01-22 12:53:33 +02:00
Tuomas Tynkkynen 44326993f4 build-support/vm: Autodetect kernel filename
It's 'Image' on AArch64.
2018-01-22 12:53:24 +02:00
Tuomas Tynkkynen 962e79ef32 nixos/make-disk-image.nix: Support EFI images
- Add a new parameter `imageType` that can specify either "efi" or
  "legacy" (the default which should see no change in behaviour by
  this patch).

- EFI images get a GPT partition table (instead of msdos) with a
  mandatory ESP partition (so we add an assert that `partitioned`
  is true).

- Use the partx tool from util-linux to determine exact start + size
  of the root partition. This is required because GPT stores a secondary
  partition table at the end of the disk, so we can't just have
  mkfs.ext4 create the filesystem until the end of the disk.

- (Unrelated to any EFI changes) Since we're depending on the
  `-E offset=X` option to mkfs which is only supported by e2fsprogs,
  disallow any attempts of creating partitioned disk images where
  the root filesystem is not ext4.
2018-01-22 11:18:23 +02:00
Tuomas Tynkkynen 4fd0a3a43d nixos/release.nix: More refactoring for multi-arch
Currently, even if you pass supportedSystems = [ "aarch64-linux" ] you
end up with e.g. `nixos.tests.docker` which actually silently runs on
x86_64-linux. Using the new callTestOnTheseSystems fixes that.

As a side-effect, this also causes a rename of
`nixos.tests.docker` -> `nixos.tests.docker.x86_64-linux`, which is IMHO
a good thing since it's makes them consistent with the rest of the
tests.
2018-01-19 10:35:49 +02:00
Tuomas Tynkkynen eb57d6d089 nixos/release.nix: Add preferLocalBuild to makeNetboot result 2018-01-19 10:35:49 +02:00
Tuomas Tynkkynen 424fc54243 nixos/release.nix: Clean some syntax 2018-01-19 10:35:49 +02:00
Tuomas Tynkkynen 758b4c1ea4 make-disk-image.nix: Really fix write permissions in the store
I think the current one applies the -exec only to those that match
'-type d'. Let's switch it to something that humans can understand...
2017-12-20 17:28:46 +02:00
Tuomas Tynkkynen c9f71974f8 make-disk-image.nix: Remove write permissions from /nix/store
Fakeroot seems to always give the owner write bit to any files touched
inside it (presumably to easily simulate the fact that root can still
modify such files). So do an explicit chmod to remove them.

This should finally solve #32242 after the EC2 images are regenerated
with this change.

https://hydra.nixos.org/build/66143116
2017-12-17 01:19:05 +02:00
Tuomas Tynkkynen 0d27df280f build-support/vm: Use devtmpfs, not static device nodes
In 2017, there is no reason to create a static /dev.
2017-12-12 14:31:50 +02:00
Tuomas Tynkkynen bedc18c461 U-Boot: Add ubootQemuArm 2017-12-12 01:16:10 +02:00
Tuomas Tynkkynen 8b358b84a8 U-Boot: Add a patch to increase max kernel command line length 2017-12-12 01:16:10 +02:00
Tuomas Tynkkynen b2e315f97f nixos/qemu-vm: Pass gic-version=host for AArch64
This is required on the ThunderX CPUs on the Packet.net Type-2A
machines that have a GICv3. For some reason the default is to create a
GICv2 independent of the host hardware...
2017-12-06 17:29:09 +02:00
Tuomas Tynkkynen 65ace59fa8 tboot: Only works on x86
https://hydra.nixos.org/build/65116569

It's x86-related booting stuff.
2017-12-06 02:55:19 +02:00
Tuomas Tynkkynen 6254012053 nspluginwrapper: Only works on x86
https://hydra.nixos.org/build/65196296
2017-12-06 02:03:28 +02:00
Tuomas Tynkkynen 53bf3cc78c pipelight: Only works on x86
https://hydra.nixos.org/build/65195994
2017-12-05 23:27:30 +02:00
Tuomas Tynkkynen a86d746b93 thermald: Only works on x86
https://hydra.nixos.org/build/65220138

In general, the changelog at https://github.com/intel/thermal_daemon
sounds like it's only targeted at Intel processors.
2017-12-05 23:21:38 +02:00
Tuomas Tynkkynen 94dbb3a397 linuxPackages.phc-intel: Only works on x86
https://hydra.nixos.org/build/65227029
2017-12-05 22:33:27 +02:00
Tuomas Tynkkynen 5490e580f5 v8: Fix aarch64 build
https://hydra.nixos.org/build/65224506

Besides dontUpdateAutotoolsGnuConfigScripts, the 'arch' assignment was
wrong and resulted in "x64" (stdenv.isArm is not true on AArch64).
2017-12-05 03:43:07 +02:00
Tuomas Tynkkynen e220f31908 xdaliclock: Fix aarch64 build
https://hydra.nixos.org/build/65030707
2017-12-04 19:31:02 +02:00
Tuomas Tynkkynen b39ab30ba7 linux_4_13: Remove, no longer supported. 2017-12-03 23:20:08 +02:00
Tuomas Tynkkynen 8c3b96e58c virtualbox: Broken on non-x86
https://hydra.nixos.org/build/65212946
2017-12-03 19:51:59 +02:00
Tuomas Tynkkynen b3e4b224ed rowhammer-test: Broken on non-x86 (and Darwin)
https://hydra.nixos.org/build/65060720
https://hydra.nixos.org/build/65048404
2017-12-03 19:51:59 +02:00
Tuomas Tynkkynen 56ecf95468 open-vm-tools: Broken on non-x86
https://hydra.nixos.org/build/65049444
2017-12-03 19:51:58 +02:00
Tuomas Tynkkynen 9a13bc817e memtest86plus: Broken on non-x86
https://hydra.nixos.org/build/65048457
2017-12-03 19:51:58 +02:00
Tuomas Tynkkynen b51cc95a61 ioport: Broken on non-x86
https://hydra.nixos.org/build/65057213
2017-12-03 19:51:58 +02:00
Tuomas Tynkkynen f2766b4f42 intel-gpu-tools: Broken on non-x86
https://hydra.nixos.org/build/65032931
2017-12-03 19:51:58 +02:00
Tuomas Tynkkynen 17218f0bac Make callPackage_i686 fail on on-x86
...instead of silently producing an i686 derivation.
2017-12-03 17:17:34 +02:00
Tuomas Tynkkynen 574526d510 make-squashfs: Hack to avoid building images where nixos-install won't run
https://github.com/NixOS/nixpkgs/issues/32242
2017-12-03 03:37:45 +02:00
Tuomas Tynkkynen a506d0ac66 docbook_xsl_*: Remove builder.sh 2017-12-03 01:50:43 +02:00
Tuomas Tynkkynen f24d1b7c2c xhtml1: libxml2 is a nativeBuildInput 2017-12-03 01:50:43 +02:00
Tuomas Tynkkynen aeed0a9d17 docbook5: unzip is a nativeBuildInput 2017-12-03 01:50:42 +02:00
Tuomas Tynkkynen e36e23acd5 git: 2.15.0 -> 2.15.1 2017-12-03 01:50:42 +02:00
Tuomas Tynkkynen 2da5de5479 ncurses: 6.0-20170902 -> 6.0-20171125 2017-12-03 01:50:42 +02:00
Tuomas Tynkkynen 27a77af62f pam: 1.2.1 -> 1.3.0 2017-12-03 01:50:42 +02:00
Tuomas Tynkkynen 6ebb1354e6 help2man: 1.47.4 -> 1.47.5 2017-12-03 01:50:42 +02:00
Tuomas Tynkkynen 58307d15a7 Merge remote-tracking branch 'upstream/staging' into master 2017-12-03 01:49:14 +02:00
Tuomas Tynkkynen 491e5d8649 rustc: Support aarch64 2017-12-02 14:46:33 +02:00
Tuomas Tynkkynen dc5cd7800a tests/initrd-network-ssh: Don't build during evaluation
Issue #29774
2017-11-27 12:08:57 +02:00
Tuomas Tynkkynen cb008da167 owncloud: Don't build during evaluation
Issue #29774
2017-11-27 12:08:57 +02:00
Tuomas Tynkkynen 9fc1bf7d3c hubstaff: Fix quoting for older Nix versions
Issue #31179.
2017-11-27 12:08:57 +02:00
Tuomas Tynkkynen f3794bb8cb nixos/qemu-guest: Ensure virtio_mmio is available in initrd
ARM and AArch64 might use virtio_mmio in some cases.
2017-11-26 11:22:39 +02:00
Tuomas Tynkkynen 8762490337 nixos/qemu: Add virtio-rng-pci to test-driver
Otherwise AArch64 KVM guests don't have enough entropy at boot.
2017-11-26 11:13:21 +02:00
Tuomas Tynkkynen e56da6a464 nixos/qemu-vm: Use different serial port on ARM/AArch64 2017-11-26 11:13:21 +02:00
Tuomas Tynkkynen 0a2eda7a7e nixos/qemu-vm: Don't try enabling graphics/mouse on non-x86
Needs to be figured out some day, just disable them for now.
2017-11-26 11:13:21 +02:00
Tuomas Tynkkynen 43cb964e17 nixos/qemu-vm: Set QEMU command line depending on architecture 2017-11-26 11:13:21 +02:00
Tuomas Tynkkynen 3b2056536c qemu: Rename x86Only option to hostCpuOnly
And also make it work on ARM and Aarch64.
2017-11-26 11:13:20 +02:00
Tuomas Tynkkynen eb3925ff62 qemu: Disable numactl on ARM
32-bit ARM doesn't do numa.
2017-11-26 11:13:20 +02:00
Tuomas Tynkkynen bc98f13222 numactl: Not supported on 32-bit ARM 2017-11-26 11:13:20 +02:00
Tuomas Tynkkynen 3b21645529 usbredir: Fix ARM build
The error from -Wformat happens on all 32-bit plaforms, not just i686.
2017-11-26 11:13:20 +02:00
Tuomas Tynkkynen f689a6d1c6 snappy: 1.1.4 -> 1.1.7
Fixes build on ARM
2017-11-26 11:13:20 +02:00
Tuomas Tynkkynen 91d2cf9642 lkl: Supports aarch64
ARMv6 and ARMv7 didn't work when I tried.
2017-11-22 00:01:13 +02:00
Tuomas Tynkkynen 0347174a0f fio: 3.1 -> 3.2 2017-11-18 23:18:52 +02:00
Tuomas Tynkkynen 5ec0e09239 less: 520 -> 529 2017-11-18 17:52:33 +02:00
Tuomas Tynkkynen ce3924fd26 strace: 4.19 -> 4.20 2017-11-18 17:46:56 +02:00
Tuomas Tynkkynen 1830017289 reptyr: Fix GCC 7 build
https://hydra.nixos.org/build/63981928
2017-11-16 19:48:50 +02:00
Tuomas Tynkkynen 2b27a46f2e gnuapl: Fix build with GCC 7
https://hydra.nixos.org/build/63985912
2017-11-16 19:44:12 +02:00
Tuomas Tynkkynen 34f3ef2c4d tcp_wrappers: Use libnsl to fix build after new glibc
https://hydra.nixos.org/build/63759192

https://sourceware.org/ml/libc-alpha/2017-02/msg00478.html
2017-11-07 20:38:41 +02:00
Tuomas Tynkkynen 3b9fbfc162 libnsl: init at 1.1.0
This code was formerly part of glibc, but is now standalone to
be able to link against TI-RPC for IPv6 support.
2017-11-07 20:38:11 +02:00
Tuomas Tynkkynen 5d5eb6aba4 lcdproc: Disable parallel build
https://hydra.nixos.org/build/63628044
2017-11-07 00:17:31 +02:00
Tuomas Tynkkynen b676aa045f eaglemode: Mark broken
The build just endlessly spams:

Say yes, no or always: Use of uninitialized value $ln in pattern match (m//) at make.pl line 626.
Use of uninitialized value $ln in pattern match (m//) at make.pl line 629.
Use of uninitialized value $ln in pattern match (m//) at make.pl line 632.
Use of uninitialized value $ln in pattern match (m//) at make.pl line 636.
2017-10-29 01:38:09 +03:00
Tuomas Tynkkynen 90e8e0b782 geoclue: Split into multiple outputs 2017-10-29 01:28:04 +03:00
Tuomas Tynkkynen e514447063 geoclue2: Split into multiple outputs 2017-10-29 01:28:04 +03:00
Tuomas Tynkkynen 8ac360ed95 libid3tag: Split into multiple outputs 2017-10-29 01:28:04 +03:00
Tuomas Tynkkynen 9812babaef xorg.xf86inputlibinput: Split dev output
Closure goes from 160M -> 42M
2017-10-28 14:54:35 +03:00
Tuomas Tynkkynen 43e020ac2f giblib: Split into multiple outputs
Or it propagates imlib2.dev.
2017-10-28 14:44:23 +03:00
Tuomas Tynkkynen 06c154386e claws-mail: Split dev output
Closure goes 484M -> 469M.
2017-10-28 12:25:24 +03:00
Tuomas Tynkkynen 0dd2ebc518 nix-info: Add separate tested variant for Hydra 2017-10-17 18:26:13 +03:00