Commit Graph
100 Commits
Author SHA1 Message Date
Tuomas Tynkkynen 69b4f427b6 nixos/zabbix-agent: Make the Zabbix package user-configurable 2018-08-28 17:43:12 +03:00
Tuomas Tynkkynen 7cca16e9f1 spidermonkey_52: Fix on ARMv6
Arch Linux applies the CFLAGS always, as does Debian, so do the same.
2018-08-21 13:29:17 +03:00
Tuomas Tynkkynen 58dc26180f nixos: Fix iso_graphical evaluation
I broke it:
in job ‘nixos.iso_graphical.x86_64-linux’:
The option `services.udisks2.enable' has conflicting definitions, in `/nix/store/bwcjw1ddj94q83vbbnq1nnrs5aisaw59-source/nixos/modules/profiles/installation-device.nix' and `/nix/store/bwcjw1ddj94q83vbbnq1nnrs5aisaw59-source/nixos/modules/services/x11/desktop-managers/plasma5.nix'.
2018-08-17 07:43:58 +03:00
Tuomas Tynkkynen cea4be23bc perlPackages.NetDBus: Reduce closure size
The module compiles a native module that links to the DBus C libraries,
so dbus (and pkgconfig) for that matter shouldn't be propagated.
2018-08-17 07:41:14 +03:00
Tuomas Tynkkynen 571fb74f44 installer: Disable udisks
Due to whoever-knows-what, udisks nowadays pulls in GTK+ et al. But it
shouldn't be needed anyway in the installer, so disable it.
2018-08-17 06:56:51 +03:00
Tuomas Tynkkynen 7e0561370b rust: Set dontUpdateAutotoolsGnuConfigScripts everywhere
It's needed on ARM nowadays as well, so just put it everywhere.
2018-08-14 10:40:47 +03:00
Tuomas Tynkkynen a2f499e21d linux_testing: 4.18-rc7 -> 4.18-rc8 2018-08-06 18:44:43 +03:00
Tuomas Tynkkynen 008fd5fcf5 Merge remote-tracking branch 'upstream/master' into staging 2018-08-04 15:17:42 +03:00
Tuomas Tynkkynen 6260fc8b8e Merge remote-tracking branch 'upstream/master' into staging 2018-08-01 19:06:09 +03:00
Tuomas Tynkkynen e94fcbcd01 pkgs/tests: Add test for LD_LIBRARY_PATH
The latest binutils upgrade silently broke this until it was fixed by
https://github.com/NixOS/nixpkgs/pull/43531.

So add a test.
2018-08-01 19:02:21 +03:00
Tuomas Tynkkynen cad1c18743 nixos/rename: Add temporary aliases for the system.nixos.* rename revert
See the previous commit for motivation.
2018-07-28 00:12:55 +03:00
Tuomas Tynkkynen 96190535e5 Revert "nixos: rename system.{stateVersion,defaultChannel} -> system.nixos.\1"
This reverts commit 095fe5b43d.

Pointless renames considered harmful. All they do is force people to
spend extra work updating their configs for no benefit, and hindering
the ability to switch between unstable and stable versions of NixOS.

Like, what was the value of having the "nixos." there? I mean, by
definition anything in a NixOS module has something to do with NixOS...
2018-07-28 00:12:55 +03:00
Tuomas Tynkkynen 3877501f9d Merge remote-tracking branch 'upstream/master' into staging 2018-07-26 23:09:22 +03:00
Tuomas Tynkkynen cd5095c0ee simg2img: Init at 1.1.3 2018-07-25 15:55:23 +03:00
Tuomas Tynkkynen b619e0b016 gnome2.GConf: Add python2 dependency for gsettings-schema-convert
https://hydra.nixos.org/build/78312507
2018-07-25 11:23:55 +03:00
Tuomas Tynkkynen 29b84841d2 kernel: Reduce peak disk usage during build
Since commit f620b1b693, the build directory is located inside the
source directory. Thus, the `cp -dpR` copies gigabytes worth of .o files
only to be deleted later on when we trim all non-essential files from
`$dev/lib/modules/${modDirVersion}/source/` thus causing a significant
amount of wasted I/O and peak disk usage.

As `cp` doesn't come with a `--exclude` flag, use rsync. And throw out
the Documentation folder while at it.
2018-07-24 23:36:06 +03:00
Tuomas Tynkkynen 4cec65482a kernel: Respect makeFlagsArray in more places
It's used two lines above, so be consistent.
2018-07-24 23:36:06 +03:00
Tuomas Tynkkynen c6ed851fe2 kernel: Remove dead code
It's set in the same phase
2018-07-24 23:36:06 +03:00
Tuomas Tynkkynen e0ce4bee57 kernel: Remove empty preUnpack 2018-07-24 23:36:05 +03:00
Tuomas Tynkkynen cc700ad55b php: libtidy -> html-tidy
https://nix-cache.s3.amazonaws.com/log/i8221imxr8cimkycd7vglyi62an1qirv-nixpkgs-tarball-18.09pre146984.f99f42c4736.drv
2018-07-24 14:30:00 +03:00
Tuomas Tynkkynen 24596d7a4a binutils-wrapper: Try to avoid adding unnecessary -L flags
(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-21 21:30:13 +01:00
Tuomas Tynkkynen 20847b251e diffoscope: Add gnumeric dependency
For the `ssconvert` tool.
2018-07-19 02:33:45 +03:00
Tuomas Tynkkynen a595896c56 diffoscope: Document the script to locate missing optional dependencies
And give it it a bit more descriptive name of list-missing-tools.sh.
2018-07-19 02:31:23 +03:00
Tuomas Tynkkynen 8258f5bda4 ibniz: init at 1.18 2018-07-17 02:51:41 +03:00
Tuomas Tynkkynen 6b5c9fc197 linux_rpi: 1.20180417 -> 1.20180619 2018-07-12 17:04:07 +03:00
Tuomas Tynkkynen 7b25471fb1 raspberrypifw: 1.20180417 -> 1.20180619 2018-07-12 17:04:07 +03:00
Tuomas Tynkkynen d0195f0e1d U-Boot: 2018.05 -> 2018.07
- We get to drop a bunch of patches. Yay!
- bison and flex are now needed
2018-07-12 17:03:40 +03:00
Tuomas Tynkkynen d1b9bf9223 sidplayfp: Init at 1.4.3 2018-07-01 13:36:57 +03:00
Tuomas Tynkkynen ace7b252f2 libsidplayfp: 1.8.6 -> 1.8.7 2018-07-01 13:11:56 +03:00
Tuomas Tynkkynen ab340f7829 kernel config: Minor text fixes 2018-06-30 16:01:41 +03:00
Tuomas Tynkkynen fc816e5609 kernel config: Fix recent i686 builds 2018-06-30 16:01:41 +03:00
Tuomas Tynkkynen d92f73e8db rocket: Init at 2018-06-09 2018-06-25 19:22:25 +03:00
Tuomas Tynkkynen f9218b1346 nixos/stage-1: Make find-libs not choke on dynamic linker being in DT_NEEDED
find-libs is currently choking when it finds the dynamic linker
as a DT_NEEDED dependency (from glibc) and bails out like this
(as glibc doesn't have a RPATH):

Couldn't satisfy dependency ld-linux-x86-64.so.2

Actually the caller of find-libs ignores the exit status, so the issue
almost always goes unnoticed and happens to work by chance. But
additionally what happens is that indirect .so dependencies are
left out from the dependency closure calculation, which breaks
latest cryptsetup as libssl.so isn't found anymore.
2018-06-20 17:58:02 +03:00
Tuomas Tynkkynen e3875883cc libbass: Fix src hash 2018-06-11 17:36:24 +03:00
Tuomas Tynkkynen e864247f08 Merge branch 'plat-fix-for-merge-2' into master 2018-06-01 20:08:08 +03:00
Tuomas Tynkkynen a8c898be60 linux_rpi: More downstream device tree name fixups
Also remove the upstream device trees beforehand so we don't
accidentally end using them if we mess up in postFixup.

Also on the topic of mess ups, make the copy unconditional since they
always seem to be built on all architectures anyway so checking for
their existence just hides typos.
2018-06-01 13:48:55 +03:00
Tuomas Tynkkynen f49906d80c nixos/sd-image-raspberrypi: Support Raspberry Pi Zero 2018-06-01 13:48:55 +03:00
Tuomas Tynkkynen 912e87c45c U-Boot: Add ubootRaspberryPiZero variant 2018-06-01 13:48:54 +03:00
Tuomas Tynkkynen 964bd06bbc U-Boot: 2018.03 -> 2018.05 2018-06-01 13:48:54 +03:00
Tuomas Tynkkynen b71f5830fa linux_rpi: 1.20171029 -> 1.20180417 2018-06-01 13:48:54 +03:00
Tuomas Tynkkynen 85952d850e raspberrypifw: 1.20180328 -> 1.20180417 2018-06-01 13:48:54 +03:00
Tuomas Tynkkynen 27bb4da344 platforms.nix: More rpi2 cleanup 2018-05-31 18:06:09 +03:00
Tuomas Tynkkynen 3abdd4f1e3 platforms.nix: Clean up obsolete cruft from raspberrypi2 2018-05-31 18:06:09 +03:00
Tuomas Tynkkynen db2988f7bd platforms.nix: Clean up obsolete cruft from raspberrypi
Works fine without, and the 'DRM n' is actually preventing the mainline
VC4 driver from building.
2018-05-31 18:06:09 +03:00
Tuomas Tynkkynen 96edbe4a0e linux_rpi: Specify defconfig in kernel expression
In particular, now the mainline kernel can be built on the RPi 1 as well
(so kernelBaseConfig should always be a mainline defconfig from now on).
And RPi 2 users can now use linux_rpi without doing the
`nixpkgs.config.platform = lib.systems.platforms.raspberrypi2;` dance.
2018-05-31 18:06:09 +03:00
Tuomas Tynkkynen 87a68c455e kernel: Allow kernel packages to specify a custom default defconfig 2018-05-31 18:06:09 +03:00
Tuomas Tynkkynen 164601faa2 mesa: Enable virgl driver
This gets NixOS tests requiring X11 to work on aarch64:

https://nix-cache.s3.amazonaws.com/log/nj4dwi3wkxx0cxv230ii4a99yz71b4km-vm-test-run-keymap-neo.drv
2018-05-26 18:03:44 +03:00
Tuomas Tynkkynen 696c6bed4e w3m: Add a variant without graphics support and use for NixOS manual
This gets rid of various graphics libraries from the minimal installer.
2018-05-25 01:55:51 +03:00
Tuomas Tynkkynen f8dc087c71 parted: Split into multiple outputs 2018-05-25 01:55:51 +03:00
Tuomas Tynkkynen 26432f3e53 syslinux: Slim down closure size 2018-05-25 01:55:51 +03:00
Tuomas Tynkkynen 91117f0d1d nixos/installer: Drop dmraid
This seems some obsolete software RAID configuration program that hasn't
been updated since 2010.
2018-05-25 01:55:51 +03:00
Tuomas Tynkkynen 402ab2134f ntfs-3g: Split into multiple outputs 2018-05-25 01:55:51 +03:00
Tuomas Tynkkynen 0541762f06 efivar: Split into multiple outputs 2018-05-25 01:55:51 +03:00
Tuomas Tynkkynen aedc169d7f serf: Simplify 2018-05-23 01:14:51 +03:00
Tuomas Tynkkynen 20c2fd73ca apr-util: Fixup apu-1-config
apu-1-config --ldflags is giving broken output on the fixed-output
dependencies. This broke serf build since db was split to multiple
outputs.

https://nix-cache.s3.amazonaws.com/log/q35s5jba6p6dpdqlfn9qgy5w0hpa506v-serf-1.3.9.drv
2018-05-23 01:14:51 +03:00
Tuomas Tynkkynen 0fd461d5b5 db: Use more conventional outputs, also split bin 2018-05-22 17:49:04 +03:00
Tuomas Tynkkynen f9feacfc7c Merge remote-tracking branch 'upstream/master' into staging 2018-05-22 17:48:29 +03:00
Tuomas Tynkkynen ba172467cc U-Boot: Disable parallel build
https://hydra.nixos.org/build/71880710
(cherry picked from commit 50dc85ed62)
(cherry picked from commit 91b09422cf6f8e44d3d06274761053d9e21d6fa2)
2018-05-13 16:12:11 -04:00
Tuomas Tynkkynen d884ece1da U-Boot: Make ubootJetsonTK1 install even more files
(cherry picked from commit 4fe75d11b2)
(cherry picked from commit a68e60f450b5be76d40627066b2c34a0e2360fab)
2018-05-13 16:12:11 -04:00
Tuomas Tynkkynen f2ea9e0ebf U-Boot: Add Pine64 build
(cherry picked from commit 4b77663edf)
(cherry picked from commit 1896fcff609d7b99b4be1781a5c9523193c33e4f)
2018-05-13 16:12:11 -04:00
Tuomas Tynkkynen 7dffe0d38c U-Boot: Add AArch64 QEMU build
See

https://github.com/u-boot/u-boot/blob/master/doc/README.qemu-arm

on how to use it.

(cherry picked from commit 6b069c656a)
(cherry picked from commit eff6d9628c9e0bae2096251f8e97789c0b9afe6f)
2018-05-13 16:12:10 -04:00
Tuomas Tynkkynen 714aff4004 sunxi-tools: Use upstream install rule 2018-05-13 03:53:26 +03:00
Tuomas Tynkkynen 83b3e6d705 kernel: Drop bitrotted MIPS patches
Not a single one of these applies to even 4.4 anymore, so these have
clearly bitrotted a long, long time ago.
2018-05-11 12:27:31 +03:00
Tuomas Tynkkynen bc828721ed nixos/lib/make-ext4-fs: Add a sanity check
I ended up with a corrupted image with the debugfs contraption once, and
given I couldn't reproduce the problem I suppose that happens if the
filesystem of the builder runs out of space.

At least in this instance fsck could detect it, so let's add it as a
sanity check.
2018-05-05 19:30:54 +03:00
Tuomas Tynkkynen 4602e611fa Revert "Revert "hfsprogs: init at 332.25""
This reverts commit 6c182dd14d.

No reason to drop working code, for which there is no other alternative
(in this case, formatting/checking HFS+ filesystems).
2018-05-02 04:15:51 +03:00
Tuomas Tynkkynen dda74d9e50 nixos/qemu-vm: Always add a virtio RNG device to the quest
mke2fs has this annoying property that it uses getrandom() to get random
numbers (for whatever purposes) which blocks until the kernel's secure
RNG has sufficient entropy, which it usually doesn't in the early boot
(except if your CPU supports RDRAND) where we may need to create the
root disk.

So let's give the VM a virtio RNG to avoid the boot getting stuck at
mke2fs.
2018-04-28 12:48:06 +03:00
Tuomas Tynkkynen 3c6e077301 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	pkgs/development/tools/misc/binutils/default.nix
2018-04-22 22:31:30 +03:00
Tuomas Tynkkynen 6a819c8f8c nixos/iso-image.nix: Fix typo 2018-04-22 22:12:17 +03:00
Tuomas Tynkkynen 487be791d7 nixos/make-ext4-fs: Use closureInfo
exportReferencesGraph is deprecated and doesn't have the generated
initial Nix database contain the SHA256 of the contents of the store
paths, which breaks various things under Nix 2.0.
2018-04-10 00:31:36 +03:00
Tuomas Tynkkynen 1abd235963 rustc: Disable failing test on aarch64
https://hydra.nixos.org/build/72562211/nixlog/1
https://github.com/rust-lang/rust/issues/49807
2018-04-09 22:15:56 +03:00
Tuomas Tynkkynen 9c292a0568 llvm_34, llvm_35: Bring ARMv7 back to platforms
This is required for GHC.
2018-04-04 21:57:57 +03:00
Tuomas Tynkkynen bbc80227ab nixos/tests/openldap: Fix name 2018-04-04 18:26:41 +03:00
Tuomas Tynkkynen af16d71e88 gsl: Disable tests on aarch64
https://hydra.nixos.org/build/70700906

I opened an upstream bug, but their bug system is e-mail based and I
haven't got a single reply which contains an web link :(
2018-04-04 16:54:39 +03:00
Tuomas Tynkkynen 747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/top-level/all-packages.nix
2018-04-03 02:22:54 +03:00
Tuomas Tynkkynen 1e5cb384d5 nixos/sd-image-*: Raspberry Pi firmware no longer falls under unfree
It's just unfreeRedistributableFirmware now.
2018-04-02 23:46:18 +03:00
Tuomas Tynkkynen b59f9497aa raspberrypifw: Drop all non-firmware parts
They are now built from source in raspberrypi-tools.
2018-04-02 23:46:18 +03:00
Tuomas Tynkkynen 434722ba62 raspberrypi-tools: Init at 2018-02-05 2018-04-02 23:46:18 +03:00
Tuomas Tynkkynen 181e0675da nixos/release.nix: Add Hydra job for AArch64 SD image
Based on how ISO images are added to the release.
2018-04-02 15:18:25 +03:00
Tuomas Tynkkynen 4c21180a13 nixos/sd-image: Make it more similar to iso-image.nix
- Add `imageName` and `imageBaseName` options similar to the `isoName`
  and `isoBaseName` options
- Make the filename of the iso match what iso-image.nix does
- Generate a nix-support/hydra-build-products like iso-image.nix does
2018-04-02 15:18:25 +03:00
Tuomas Tynkkynen f2d6702e20 perlPackages.YAMLLibYAML: Remove obsolete build fix
Commit 4270c5c7be added this hunk which
apparently is making the build fail now.
2018-03-28 21:40:53 +03:00
Tuomas Tynkkynen d27f7942b7 nixos/tests/misc: Fix on aarch64
The psmouse module is for PS/2 mouse only, which doesn't exist outside
x86. But we can test for the mousedev module just as well which is used
for the '-device usb-tablet' emulated by QEMU.
2018-03-25 18:29:21 +03:00
Tuomas Tynkkynen bec461a35a llvm_34, llvm_35: Disable on aarch64
https://hydra.nixos.org/build/71176565
https://hydra.nixos.org/build/71167754
2018-03-25 16:39:10 +03:00
Tuomas Tynkkynen a6425fc66d ghc: Disable on AArch64
For some reason compiling the proper GHC from the binary one eventually
segfaults at some point.

Since it has never worked, just disable it and investigate later.
2018-03-24 16:11:31 +02:00
Tuomas Tynkkynen 3131daace1 nixos/tests/installer: Give eval failure on unsupported boot methods 2018-03-24 16:11:31 +02:00
Tuomas Tynkkynen 50dc85ed62 U-Boot: Disable parallel build
https://hydra.nixos.org/build/71880710
2018-03-24 16:07:50 +02:00
Tuomas Tynkkynen a8eb2c9ef9 glslviewer: 1.2 -> 2018-01-31, fixes build 2018-03-23 21:05:50 +02:00
Tuomas Tynkkynen a2c37c0700 riscv-pk: Set correct platforms 2018-03-23 20:05:23 +02:00
Tuomas Tynkkynen bab5a0664c armTrustedFirmware: Disable parallel build
I think https://hydra.nixos.org/build/71541345 is parallel build
related.
2018-03-23 19:03:26 +02:00
Tuomas Tynkkynen 107eaa8780 armTrustedFirmwareQemu: 1.4 -> 1.5, fixes build with GCC7 2018-03-23 19:03:04 +02:00
Tuomas Tynkkynen 809b0d26bd Merge remote-tracking branch 'upstream/master' into staging 2018-03-22 09:54:10 +02:00
Tuomas Tynkkynen c9d3fc7cad help2man: 1.47.5 -> 1.47.6 2018-03-22 09:48:22 +02:00
Tuomas Tynkkynen cd1cb10515 automake: 1.16 -> 1.16.1 2018-03-22 09:48:21 +02:00
Tuomas Tynkkynen 74720a36c7 Merge remote-tracking branch 'upstream/master' into staging 2018-03-21 23:51:55 +02:00
Tuomas Tynkkynen e58624a877 nixos/tests: Make simpleUefiGrub test work on AArch64
Needs more refactoring for the AArch64 '-enable-kvm' stuff some day...
2018-03-21 23:19:26 +02:00
Tuomas Tynkkynen f59eab75d2 edk2, OVMF: Build on aarch64
And also build in parallel.

I don't understand why we manually tediously link every single directory
from the source, but I don't want to investigate too much.
2018-03-21 23:19:26 +02:00
Tuomas Tynkkynen 1645011983 OVMF: Reformat a bit for readability
- Use 'somePkg == null' instead of 'somePkg == false' which is more
  conventional in rest of Nixpkgs
- Use lib.optionalString where applicable
2018-03-21 23:19:26 +02:00
Tuomas Tynkkynen 1d854b479c edk2: Reformat a bit for readability
- Have only one sed expression per line
- Put the important stuff closer to the command and not hidden in some
continuation line. That is, don't do:

sed \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <IMPORTANT STUFF>

but:

sed <IMPORTANT STUFF> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff>
2018-03-21 23:19:25 +02:00
Tuomas Tynkkynen 1874678d12 make-dbus-conf: Don't depend on unnecessary libxslt outputs
Might fix https://hydra.nixos.org/build/71580290.
2018-03-21 22:18:50 +02:00
Tuomas Tynkkynen 3918182cb5 nixos/manual: Don't depend on non-bin outputs of libxml2 and libxslt
Might fix https://hydra.nixos.org/build/71580290.
2018-03-21 22:18:49 +02:00
Tuomas Tynkkynen a2d8a9aad7 armTrustedFirmware: Remove targetPlatforms like was done in U-Boot
Should also fix Hydra attempting to build this stuff on x86, like
https://hydra.nixos.org/build/71533289
2018-03-20 02:33:40 +02:00