git.iko.soy/typeable/nixpkgs
on master help sign in
Merge remote-tracking branch 'upstream/master' into redmine
commitd13d35104ddecafd212ee7df01b5b5c48bce8d99 authorAaron Andersen <aaron@fosslib.net> dateTue 29 Jan 2019, 09:24 (8 years ago) parent4ed7d829310fc3
6662 files changed+225520−162720
.github/CODEOWNERS+41−7 .github/PULL_REQUEST_TEMPLATE.md+1 .gitignore+2−1 COPYING−9 README.md+7−1 doc/Makefile+4−2 doc/coding-conventions.xml+164−21 doc/configuration.xml+46−9 doc/cross-compilation.xml+95−102 doc/default.nix+3−2 doc/functions.xml+1 doc/functions/library.xml+9 doc/functions/library/attrsets.xml+761 doc/functions/overrides.xml+13−4 doc/functions/prefer-remote-fetch.xml+27 doc/languages-frameworks/android.section.md+240 doc/languages-frameworks/coq.xml+3−4 doc/languages-frameworks/haskell.section.md+1−1 doc/languages-frameworks/idris.section.md+104−28 doc/languages-frameworks/index.xml+4 doc/languages-frameworks/ios.section.md+219 doc/languages-frameworks/node.section.md+5−5 doc/languages-frameworks/ocaml.xml+99 doc/languages-frameworks/python.section.md+95−35 doc/languages-frameworks/ruby.xml+11 doc/languages-frameworks/rust.section.md+7−3 doc/languages-frameworks/texlive.xml+6−6 doc/languages-frameworks/titanium.section.md+115 doc/languages-frameworks/vim.section.md+25−1 doc/lib-function-docs.nix+26 doc/meta.xml+58−4 doc/multiple-output.xml+1−1 doc/overlays.xml+114−83 doc/package-notes.xml+14−17 doc/platform-notes.xml+5−5 doc/quick-start.xml+2−2 doc/reviewing-contributions.xml+32−34 doc/stdenv.xml+429−257 doc/style.css+22−2 lib/attrsets.nix+9 lib/composable-derivation.nix−113 lib/customisation.nix+1−1 lib/debug.nix+75−19 lib/default.nix+8−8 lib/deprecated.nix+5−121 lib/fixed-points.nix+22 lib/generators.nix+1 lib/licenses.nix+72−26 lib/lists.nix+136−48 lib/meta.nix+6−5 lib/modules.nix+29−5 lib/options.nix+88−67 lib/sources.nix+3−3 lib/strings.nix+178−73 lib/systems/default.nix+60 lib/systems/doubles.nix+4−1 lib/systems/examples.nix+58−8 lib/systems/inspect.nix+1 lib/systems/parse.nix+34−4 lib/systems/platforms.nix+1 lib/tests/misc.nix+3−39 lib/tests/modules.sh+6 lib/tests/modules/alias-with-priority-can-override.nix+52 lib/tests/modules/alias-with-priority.nix+52 lib/tests/systems.nix+15−14 lib/trivial.nix+94−30 lib/types.nix+7−1 maintainers/maintainer-list.nix+407−22 maintainers/scripts/copy-tarballs.pl+5−5 maintainers/scripts/test-eval-release.sh → maintainers/scripts/eval-release.sh+4 maintainers/scripts/find-tarballs.nix+1−1 maintainers/scripts/nix-generate-from-cpan.nix+1−1 maintainers/scripts/update-python-libraries+4−360 maintainers/scripts/update.nix+19−34 maintainers/scripts/update.py+79 nixos/doc/manual/administration/container-networking.xml+1 nixos/doc/manual/administration/declarative-containers.xml+1−1 nixos/doc/manual/configuration/adding-custom-packages.xml+1−1 nixos/doc/manual/configuration/config-file.xml+2−2 nixos/doc/manual/configuration/configuration.xml+1 nixos/doc/manual/configuration/firewall.xml−9 nixos/doc/manual/configuration/modularity.xml+22−5 nixos/doc/manual/configuration/profiles.xml+39 nixos/doc/manual/configuration/profiles/all-hardware.xml+20 nixos/doc/manual/configuration/profiles/base.xml+15 nixos/doc/manual/configuration/profiles/clone-config.xml+14 nixos/doc/manual/configuration/profiles/demo.xml+13 nixos/doc/manual/configuration/profiles/docker-container.xml+15 nixos/doc/manual/configuration/profiles/graphical.xml+21 nixos/doc/manual/configuration/profiles/hardened.xml+22 nixos/doc/manual/configuration/profiles/headless.xml+18 nixos/doc/manual/configuration/profiles/installation-device.xml+35 nixos/doc/manual/configuration/profiles/minimal.xml+17 nixos/doc/manual/configuration/profiles/qemu-guest.xml+16 nixos/doc/manual/configuration/x-windows.xml+2−2 nixos/doc/manual/development/debugging-nixos-tests.xml−37 nixos/doc/manual/development/nixos-tests.xml−1 nixos/doc/manual/development/option-types.xml+12−1 nixos/doc/manual/development/running-nixos-tests-interactively.xml+1−1 nixos/doc/manual/development/writing-nixos-tests.xml+1−1 nixos/doc/manual/installation/installing-usb.xml+1−1 nixos/doc/manual/installation/installing-virtualbox-guest.xml+6−2 nixos/doc/manual/man-nixos-generate-config.xml+4−4 nixos/doc/manual/man-nixos-rebuild.xml+39−14 nixos/doc/manual/release-notes/rl-1412.xml+1−1 nixos/doc/manual/release-notes/rl-1809.xml+47 nixos/doc/manual/release-notes/rl-1903.xml+305−9 nixos/lib/build-vms.nix+14−4 nixos/lib/eval-config.nix+2−1 nixos/lib/make-channel.nix+4 nixos/lib/make-disk-image.nix+6−3 nixos/lib/make-ext4-fs.nix+29−51 nixos/lib/make-iso9660-image.sh+3−2 nixos/lib/make-squashfs.nix+4−1 nixos/lib/make-system-tarball.nix+12−8 nixos/lib/make-system-tarball.sh+3−6 nixos/lib/test-driver/Logger.pm+3 nixos/lib/test-driver/Machine.pm+7−5 nixos/lib/testing.nix+31−10 nixos/lib/utils.nix+2−3 nixos/maintainers/scripts/gce/create-gce.sh+2−2 nixos/modules/config/appstream.nix+25 nixos/modules/config/fonts/fontconfig-penultimate.nix+1−1 nixos/modules/config/gtk/gtk-icon-cache.nix+86 nixos/modules/config/i18n.nix+13−1 nixos/modules/config/krb5/default.nix+1−1 nixos/modules/config/networking.nix+48−27 nixos/modules/config/no-x-libs.nix+1−1 nixos/modules/config/nsswitch.nix+5−3 nixos/modules/config/pulseaudio.nix+28−4 nixos/modules/config/shells-environment.nix+9−3 nixos/modules/config/system-path.nix+5−7 nixos/modules/config/users-groups.nix+3−3 nixos/modules/config/xdg/mime.nix+2−2 nixos/modules/config/xdg/sounds.nix+22 nixos/modules/config/zram.nix+67−14 nixos/modules/hardware/all-firmware.nix+1−1 nixos/modules/hardware/bladeRF.nix+28 nixos/modules/hardware/ckb-next.nix+49 nixos/modules/hardware/ckb.nix−40 nixos/modules/hardware/opengl.nix+10−6 nixos/modules/hardware/raid/hpsa.nix+2−2 nixos/modules/hardware/video/amdgpu-pro.nix+2−2 nixos/modules/hardware/video/ati.nix+2−2 nixos/modules/hardware/video/nvidia.nix+11−5 nixos/modules/installer/cd-dvd/channel.nix+1−1 nixos/modules/installer/cd-dvd/installation-cd-minimal.nix+2 nixos/modules/installer/cd-dvd/iso-image.nix+55−27 nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix+7 nixos/modules/installer/cd-dvd/sd-image-aarch64.nix+1−9 nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix+1−8 nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix+1−8 nixos/modules/installer/cd-dvd/sd-image.nix+3−1 nixos/modules/installer/tools/nix-fallback-paths.nix+4−4 nixos/modules/installer/tools/nixos-build-vms/build-vms.nix+5−1 nixos/modules/installer/tools/nixos-generate-config.pl+14−8 nixos/modules/installer/tools/nixos-install.sh+1 nixos/modules/installer/tools/nixos-option.sh+3−3 nixos/modules/installer/tools/nixos-rebuild.sh+2−2 nixos/modules/installer/tools/tools.nix+1−1 nixos/modules/installer/virtualbox-demo.nix+38 nixos/modules/misc/documentation.nix+1−1 nixos/modules/misc/ids.nix+23−7 nixos/modules/misc/nixpkgs.nix+44−13 nixos/modules/misc/version.nix+2−3 nixos/modules/module-list.nix+32−7 nixos/modules/profiles/base.nix+5−2 nixos/modules/profiles/clone-config.nix+9 nixos/modules/profiles/docker-container.nix+10−6 nixos/modules/profiles/hardened.nix+22−17 nixos/modules/profiles/headless.nix−1 nixos/modules/profiles/installation-device.nix+1−4 nixos/modules/profiles/minimal.nix+1−1 nixos/modules/programs/adb.nix+1−2 nixos/modules/programs/bash/bash.nix+15−7 nixos/modules/programs/command-not-found/command-not-found.nix+1−1 nixos/modules/programs/dmrconfig.nix+38 nixos/modules/programs/fish.nix+8−5 nixos/modules/programs/gnupg.nix+1−1 nixos/modules/programs/mininet.nix+39 nixos/modules/programs/nano.nix+3−2 nixos/modules/programs/nm-applet.nix+14 nixos/modules/programs/rootston.nix−103 nixos/modules/programs/shell.nix+2−8 nixos/modules/programs/ssh.nix+6−6 nixos/modules/programs/sway-beta.nix+90 nixos/modules/programs/sway.nix+10−3 nixos/modules/programs/thefuck.nix+1−1 nixos/modules/programs/wavemon.nix+28 nixos/modules/programs/way-cooler.nix+1−1 nixos/modules/programs/xss-lock.nix+2−1 nixos/modules/programs/zsh/oh-my-zsh.xml+4−4 nixos/modules/programs/zsh/zsh-autosuggestions.nix+4−4 nixos/modules/programs/zsh/zsh.nix+7−5 nixos/modules/rename.nix+8−1 nixos/modules/security/apparmor-suid.nix+1−1 nixos/modules/security/dhparams.nix+2 nixos/modules/security/google_oslogin.nix+68 nixos/modules/security/lock-kernel-modules.nix+4 nixos/modules/security/misc.nix+125 nixos/modules/security/pam.nix+31−1 nixos/modules/security/rngd.nix+1−3 nixos/modules/security/wrappers/default.nix−29 nixos/modules/services/admin/salt/master.nix+3 nixos/modules/services/admin/salt/minion.nix+16−5 nixos/modules/services/amqp/rabbitmq.nix+23−6 nixos/modules/services/backup/bacula.nix+18−6 nixos/modules/services/backup/borgbackup.nix+1−2 nixos/modules/services/backup/postgresql-backup.nix+42−11 nixos/modules/services/backup/restic.nix+6−1 nixos/modules/services/cluster/kubernetes/default.nix+4−4 nixos/modules/services/cluster/kubernetes/dns.nix+190−196 nixos/modules/services/computing/slurm/slurm.nix+115−12 nixos/modules/services/continuous-integration/buildbot/master.nix+49−18 nixos/modules/services/continuous-integration/buildbot/worker.nix+66−11 nixos/modules/services/continuous-integration/jenkins/job-builder.nix+34−2 nixos/modules/services/databases/aerospike.nix+1 nixos/modules/services/databases/cassandra.nix+22 nixos/modules/services/databases/clickhouse.nix+5 nixos/modules/services/databases/cockroachdb.nix+217 nixos/modules/services/databases/mysql.nix+33−21 nixos/modules/services/databases/openldap.nix+8−1 nixos/modules/services/databases/postgresql.nix+9−6 nixos/modules/services/databases/postgresql.xml+4−4 nixos/modules/services/desktops/accountsservice.nix+2−2 nixos/modules/services/desktops/geoclue2.nix+2 nixos/modules/services/desktops/gnome3/file-roller.nix+32 nixos/modules/services/desktops/gnome3/gnome-keyring.nix+1−1 nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix+18 nixos/modules/services/desktops/gnome3/seahorse.nix+1−1 nixos/modules/services/desktops/gsignond.nix+43 nixos/modules/services/desktops/profile-sync-daemon.nix+2−2 nixos/modules/services/development/jupyter/default.nix+1 nixos/modules/services/editors/emacs.xml+1−1 nixos/modules/services/games/minetest-server.nix+3 nixos/modules/services/hardware/bluetooth.nix+6−1 nixos/modules/services/hardware/lirc.nix+17−2 nixos/modules/services/hardware/tlp.nix+2 nixos/modules/services/hardware/trezord.nix+5−5 nixos/modules/services/hardware/upower.nix+26 nixos/modules/services/hardware/vdr.nix+81 nixos/modules/services/mail/clamsmtp.nix+2 nixos/modules/services/mail/dkimproxy-out.nix+2 nixos/modules/services/mail/dovecot.nix+5−1 nixos/modules/services/mail/postfix.nix+17−1 nixos/modules/services/mail/rmilter.nix+1−1 nixos/modules/services/mail/roundcube.nix+153 nixos/modules/services/mail/rspamd.nix+171−24 nixos/modules/services/mail/rss2email.nix+136 nixos/modules/services/misc/bees.nix+123 nixos/modules/services/misc/exhibitor.nix+3 nixos/modules/services/misc/gitea.nix+26−3 nixos/modules/services/misc/gitlab.nix+97−122 nixos/modules/services/misc/home-assistant.nix+1 nixos/modules/services/misc/nix-daemon.nix+13−9 nixos/modules/services/misc/nscd-sssd.conf−36 nixos/modules/services/misc/nzbget.nix+21−2 nixos/modules/services/misc/packagekit.nix−3 nixos/modules/services/misc/plex.nix+1−1 nixos/modules/services/misc/pykms.nix+27−40 nixos/modules/services/misc/sonarr.nix+47−13 nixos/modules/services/misc/sssd.nix−1 nixos/modules/services/misc/weechat.nix+3−1 nixos/modules/services/misc/weechat.xml+1−1 nixos/modules/services/misc/zoneminder.nix+362 nixos/modules/services/monitoring/alerta.nix+116 nixos/modules/services/monitoring/apcupsd.nix+1−1 nixos/modules/services/monitoring/datadog-agent.nix+22−2 nixos/modules/services/monitoring/grafana-reporter.nix+66 nixos/modules/services/monitoring/grafana.nix+113−7 nixos/modules/services/monitoring/kapacitor.nix+192 nixos/modules/services/monitoring/monit.nix+15−18 nixos/modules/services/monitoring/munin.nix+6−6 nixos/modules/services/monitoring/netdata.nix+41−10 nixos/modules/services/monitoring/osquery.nix+1−1 nixos/modules/services/monitoring/prometheus/alertmanager.nix+51−26 nixos/modules/services/monitoring/prometheus/default.nix+36−7 nixos/modules/services/monitoring/prometheus/exporters.nix+13−10 nixos/modules/services/monitoring/prometheus/exporters/bind.nix+55 nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix+23−1 nixos/modules/services/monitoring/prometheus/exporters/tor.nix+45 nixos/modules/services/monitoring/prometheus/exporters/varnish.nix+1 nixos/modules/services/monitoring/systemhealth.nix+1−1 nixos/modules/services/network-filesystems/glusterfs.nix+4−4 nixos/modules/services/network-filesystems/ipfs.nix+1−1 nixos/modules/services/network-filesystems/openafs/client.nix+2 nixos/modules/services/network-filesystems/openafs/server.nix+1 nixos/modules/services/networking/bitlbee.nix+1−1 nixos/modules/services/networking/chrony.nix+5−2 nixos/modules/services/networking/consul.nix+5−4 nixos/modules/services/networking/dhcpcd.nix+1−1 nixos/modules/services/networking/eternal-terminal.nix+89 nixos/modules/services/networking/firewall.nix+9−10 nixos/modules/services/networking/flashpolicyd.nix+5−5 nixos/modules/services/networking/hostapd.nix+3−3 nixos/modules/services/networking/mxisd.nix+125 nixos/modules/services/networking/networkmanager.nix+1−1 nixos/modules/services/networking/nsd.nix+5−7 nixos/modules/services/networking/ntpd.nix+38−2 nixos/modules/services/networking/oidentd.nix+1−2 nixos/modules/services/networking/pptpd.nix+1−1 nixos/modules/services/networking/prosody.nix+1 nixos/modules/services/networking/redsocks.nix+2 nixos/modules/services/networking/shairport-sync.nix+1−1 nixos/modules/services/networking/ssh/sshd.nix+6−1 nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix+83 nixos/modules/services/networking/syncthing-relay.nix+121 nixos/modules/services/networking/syncthing.nix+29−4 nixos/modules/services/networking/tinc.nix−8 nixos/modules/services/networking/wireguard.nix+1−1 nixos/modules/services/networking/xl2tpd.nix+1−1 nixos/modules/services/networking/xrdp.nix+7−1 nixos/modules/services/networking/zerotierone.nix+2−1 nixos/modules/services/networking/znc.nix−431 nixos/modules/services/networking/znc/default.nix+306 nixos/modules/services/networking/znc/options.nix+270 nixos/modules/services/printing/cupsd.nix+1−1 nixos/modules/services/search/elasticsearch-curator.nix+3−2 nixos/modules/services/search/kibana.nix+4−1 nixos/modules/services/search/solr.nix+72−109 nixos/modules/services/security/munge.nix−2 nixos/modules/services/security/tor.nix+12 nixos/modules/services/system/cloud-init.nix+30−7 nixos/modules/services/system/kerberos.nix−64 nixos/modules/services/system/kerberos/default.nix+80 nixos/modules/services/system/kerberos/heimdal.nix+68 nixos/modules/services/system/kerberos/mit.nix+68 nixos/modules/services/system/nscd.conf+29−5 nixos/modules/services/system/saslauthd.nix+1−1 nixos/modules/services/ttys/kmscon.nix+12−1 nixos/modules/services/web-apps/atlassian/confluence.nix+1−1 nixos/modules/services/web-apps/atlassian/crowd.nix+3−2 nixos/modules/services/web-apps/atlassian/jira.nix+1−1 nixos/modules/services/web-apps/matomo.nix+11−4 nixos/modules/services/web-apps/nextcloud.nix+34−8 nixos/modules/services/web-apps/nextcloud.xml+99 nixos/modules/services/web-apps/quassel-webserver.nix−101 nixos/modules/services/web-apps/selfoss.nix+2−2 nixos/modules/services/web-servers/apache-httpd/default.nix+15−2 nixos/modules/services/web-servers/apache-httpd/limesurvey.nix+1−1 nixos/modules/services/web-servers/apache-httpd/mediawiki.nix+5−5 nixos/modules/services/web-servers/apache-httpd/owncloud.nix−608 nixos/modules/services/web-servers/apache-httpd/wordpress.nix+4−4 nixos/modules/services/web-servers/lighttpd/collectd.nix+1−1 nixos/modules/services/web-servers/nginx/default.nix+31−4 nixos/modules/services/web-servers/nginx/vhost-options.nix+1−1 nixos/modules/services/web-servers/phpfpm/default.nix+21−10 nixos/modules/services/web-servers/phpfpm/pool-options.nix+14−1 nixos/modules/services/web-servers/tomcat.nix+53−5 nixos/modules/services/x11/compton.nix+6 nixos/modules/services/x11/desktop-managers/gnome3.nix+66−26 nixos/modules/services/x11/desktop-managers/lxqt.nix+1−10 nixos/modules/services/x11/desktop-managers/mate.nix+1−9 nixos/modules/services/x11/desktop-managers/plasma5.nix+2−4 nixos/modules/services/x11/desktop-managers/xfce.nix+2−1 nixos/modules/services/x11/display-managers/default.nix+16−4 nixos/modules/services/x11/display-managers/gdm.nix+1−1 nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix+1−1 nixos/modules/services/x11/display-managers/lightdm.nix+6−10 nixos/modules/services/x11/display-managers/sddm.nix+2−3 nixos/modules/services/x11/display-managers/xpra.nix+20−24 nixos/modules/services/x11/gdk-pixbuf.nix+45 nixos/modules/services/x11/urxvtd.nix+28−28 nixos/modules/services/x11/xserver.nix+4−3 nixos/modules/system/activation/activation-script.nix+2−1 nixos/modules/system/boot/initrd-network.nix+2−1 nixos/modules/system/boot/initrd-ssh.nix+1 nixos/modules/system/boot/loader/generations-dir/generations-dir.nix+2−2 nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix+1−1 nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix+2−2 nixos/modules/system/boot/loader/grub/grub.nix+1−1 nixos/modules/system/boot/loader/init-script/init-script.nix+2−2 nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh−29 nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix+10 nixos/modules/system/boot/loader/raspberrypi/builder.sh → nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh+40−34 nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix+11−17 nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix → nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix+11−11 nixos/modules/system/boot/loader/raspberrypi/uboot-builder.sh+38 nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix+1−1 nixos/modules/system/boot/luksroot.nix+35−35 nixos/modules/system/boot/stage-1-init.sh+5−4 nixos/modules/system/boot/stage-1.nix+5−5 nixos/modules/system/boot/systemd-nspawn.nix+10−7 nixos/modules/system/boot/systemd.nix+36−4 nixos/modules/system/etc/etc.nix+1−1 nixos/modules/installer/tools/auto-upgrade.nix → nixos/modules/tasks/auto-upgrade.nix nixos/modules/tasks/cpu-freq.nix+56−18 nixos/modules/tasks/filesystems.nix+5−3 nixos/modules/tasks/filesystems/bcachefs.nix+50−11 nixos/modules/tasks/filesystems/f2fs.nix+6 nixos/modules/tasks/filesystems/zfs.nix+2−1 nixos/modules/tasks/network-interfaces-scripted.nix+2−1 nixos/modules/testing/service-runner.nix+1−1 nixos/modules/testing/test-instrumentation.nix+1−2 nixos/modules/virtualisation/amazon-image.nix+6−2 nixos/modules/virtualisation/container-config.nix+2−7 nixos/modules/virtualisation/containers.nix+29−7 nixos/modules/virtualisation/docker-image.nix+38 nixos/modules/virtualisation/docker-preloader.nix+135 nixos/modules/virtualisation/ec2-amis.nix+18−1 nixos/modules/virtualisation/gce-images.nix+2−2 nixos/modules/virtualisation/google-compute-config.nix+233−3 nixos/modules/virtualisation/google-compute-image.nix+43−318 nixos/modules/virtualisation/kvmgt.nix+7−1 nixos/modules/virtualisation/libvirtd.nix+2 nixos/modules/virtualisation/parallels-guest.nix+2−2 nixos/modules/virtualisation/qemu-guest-agent.nix+1−1 nixos/modules/virtualisation/qemu-vm.nix+4−1 nixos/modules/virtualisation/virtualbox-image.nix+5−5 nixos/modules/virtualisation/xe-guest-utilities.nix+1−1 nixos/release-combined.nix+27−22 nixos/release.nix+32−217 nixos/tests/all-tests.nix+224 nixos/tests/bees.nix+55 nixos/tests/boot.nix+5−2 nixos/tests/borgbackup.nix+3 nixos/tests/buildbot.nix+114−105 nixos/tests/ceph.nix+3−4 nixos/tests/certmgr.nix+5−2 nixos/tests/chromium.nix+9−6 nixos/tests/cjdns.nix−3 nixos/tests/clickhouse.nix+25 nixos/tests/cloud-init.nix+5−2 nixos/tests/cockroachdb.nix+126 nixos/tests/common/webroot/news-rss.xml+15 nixos/tests/containers-bridge.nix−1 nixos/tests/containers-extra_veth.nix+1−1 nixos/tests/containers-ipv4.nix−1 nixos/tests/containers-ipv6.nix−1 nixos/tests/containers-portforward.nix−1 nixos/tests/containers-restart_networking.nix−1 nixos/tests/docker-preloader.nix+27 nixos/tests/docker-tools.nix+5 nixos/tests/ec2.nix+5−2 nixos/tests/elk.nix+8−2 nixos/tests/gitea.nix+79 nixos/tests/gitlab.nix+16−5 nixos/tests/gnome3-gdm.nix+24−8 nixos/tests/gnome3.nix+2−2 nixos/tests/google-oslogin/default.nix+52 nixos/tests/google-oslogin/server.nix+29 nixos/tests/google-oslogin/server.py+96 nixos/tests/handbrake.nix+25 nixos/tests/hardened.nix+21−1 nixos/tests/home-assistant.nix+11−3 nixos/tests/hydra/create-trivial-project.sh+2−1 nixos/tests/i3wm.nix+1−1 nixos/tests/incron.nix+52 nixos/tests/installer.nix+6−3 nixos/tests/jackett.nix+18 nixos/tests/kafka.nix+9−3 nixos/tests/kerberos/default.nix+7 nixos/tests/kerberos/heimdal.nix+53 nixos/tests/kerberos/mit.nix+45 nixos/tests/keymap.nix+6−3 nixos/tests/kubernetes/base.nix+5−2 nixos/tests/kubernetes/dns.nix+2−2 nixos/tests/kubernetes/kubernetes-common.nix−1 nixos/tests/lidarr.nix+18 nixos/tests/make-test.nix+6−2 nixos/tests/mxisd.nix+21 nixos/tests/nat.nix−2 nixos/tests/networking.nix+3−10 nixos/tests/nextcloud/default.nix+7−4 nixos/tests/nexus.nix+1−1 nixos/tests/opensmtpd.nix+6−2 nixos/tests/owncloud.nix−39 nixos/tests/plasma5.nix+5−16 nixos/tests/postgis.nix+1−1 nixos/tests/postgresql.nix+26−9 nixos/tests/predictable-interface-names.nix+5−2 nixos/tests/prometheus-exporters.nix+335 nixos/tests/prometheus.nix+22 nixos/tests/quagga.nix−1 nixos/tests/radarr.nix+18 nixos/tests/roundcube.nix+28 nixos/tests/rspamd.nix+166−5 nixos/tests/rss2email.nix+66 nixos/tests/rsyslogd.nix+42 nixos/tests/run-in-machine.nix+16−10 nixos/tests/sddm.nix+5−2 nixos/tests/slurm.nix+57−10 nixos/tests/solr.nix+47 nixos/tests/sonarr.nix+18 nixos/tests/statsd.nix−51 nixos/tests/syncthing-relay.nix+22 nixos/tests/systemd.nix+5 nixos/tests/telegraf.nix+30 nixos/tests/virtualbox.nix+8−3 nixos/tests/xmonad.nix+1−1 nixos/tests/xss-lock.nix+1−2 nixos/tests/zfs.nix+5−2 pkgs/applications/altcoins/aeon/default.nix+5−5 pkgs/applications/altcoins/bitcoin-abc.nix+4−4 pkgs/applications/altcoins/bitcoin.nix+2−2 pkgs/applications/altcoins/clightning.nix+17−11 pkgs/applications/altcoins/default.nix+10−5 pkgs/applications/altcoins/go-ethereum.nix+3−3 pkgs/applications/altcoins/litecoin.nix+2−2 pkgs/applications/altcoins/mist.nix+2−2 pkgs/applications/altcoins/monero-gui/default.nix+8−7 pkgs/applications/altcoins/monero/default.nix+4−3 pkgs/applications/altcoins/namecoin.nix+2−2 pkgs/applications/altcoins/nano-wallet/default.nix+2−2 pkgs/applications/altcoins/parity-ui/default.nix−2 pkgs/applications/altcoins/parity/beta.nix+4−5 pkgs/applications/altcoins/parity/default.nix+4−5 pkgs/applications/altcoins/parity/parity.nix+2−3 pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch−113 pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch−98 pkgs/applications/altcoins/particl/particl-core.nix+15−6 pkgs/applications/altcoins/polkadot/default.nix+30 pkgs/applications/altcoins/wownero.nix+51 pkgs/applications/audio/a2jmidid/default.nix+16−9 pkgs/applications/audio/abcde/default.nix+2−2 pkgs/applications/audio/aeolus/default.nix+2−2 pkgs/applications/audio/ams-lv2/default.nix+5−8 pkgs/applications/audio/ardour/default.nix+9−7 pkgs/applications/audio/ario/default.nix+7−10 pkgs/applications/audio/ario/glib-single-include.patch−40 pkgs/applications/audio/artyFX/default.nix+2 pkgs/applications/audio/audacity/default.nix+2−2 pkgs/applications/audio/avldrums-lv2/default.nix+30 pkgs/applications/audio/axoloti/default.nix+14−14 pkgs/applications/audio/bitmeter/default.nix+9−2 pkgs/applications/audio/bristol/default.nix+1−1 pkgs/applications/audio/bs1770gain/default.nix+2−2 pkgs/applications/audio/cadence/default.nix+50−34 pkgs/applications/audio/cantata/default.nix+2−2 pkgs/applications/audio/caps/default.nix+2−13 pkgs/applications/audio/clementine/default.nix+3−2 pkgs/applications/audio/cmusfm/default.nix+36 pkgs/applications/audio/cozy-audiobooks/default.nix+79 pkgs/applications/audio/crip/default.nix+2−3 pkgs/applications/audio/csound/csound-qt/default.nix+49 pkgs/applications/audio/csound/csound-qt/rtmidipath.patch+17 pkgs/applications/audio/csound/default.nix+5−2 pkgs/applications/audio/distrho/default.nix+21−16 pkgs/applications/audio/dragonfly-reverb/default.nix+7−5 pkgs/applications/audio/drumkv1/default.nix+2−2 pkgs/applications/audio/espeak-ng/default.nix+1−1 pkgs/applications/audio/faust/faust1.nix+1−1 pkgs/applications/audio/faust/faust2.nix+1−1 pkgs/applications/audio/faust/faustlive.nix+2−2 pkgs/applications/audio/flacon/default.nix+2−2 pkgs/applications/audio/fluidsynth/default.nix+20−4 pkgs/applications/audio/fomp/default.nix+2−8 pkgs/applications/audio/gnome-podcasts/default.nix+44 pkgs/applications/audio/gpodder/default.nix+4−4 pkgs/applications/audio/gradio/default.nix+2−2 pkgs/applications/audio/gtkpod/default.nix+4−4 pkgs/applications/audio/guitarix/default.nix+2−8 pkgs/applications/audio/gxplugins-lv2/default.nix+29 pkgs/applications/audio/hybridreverb2/default.nix+49 pkgs/applications/audio/ingen/default.nix+5−9 pkgs/applications/audio/jack-rack/default.nix+5 pkgs/applications/audio/jackmix/default.nix+1−5 pkgs/applications/audio/jalv/default.nix+2−8 pkgs/applications/audio/jamin/default.nix+4−6 pkgs/applications/audio/kid3/default.nix+2−2 pkgs/applications/audio/klick/default.nix+4−11 pkgs/applications/audio/lash/default.nix+6−1 pkgs/applications/audio/lingot/default.nix+1−1 pkgs/applications/audio/lmms/default.nix+4−4 pkgs/applications/audio/lollypop/default.nix+13−13 pkgs/applications/audio/ltc-tools/default.nix+25 pkgs/applications/audio/luppp/build-install.patch+16 pkgs/applications/audio/luppp/default.nix+40 pkgs/applications/audio/mda-lv2/default.nix+2−8 pkgs/applications/audio/mi2ly/default.nix+1−1 pkgs/applications/audio/mi2ly/default.upstream+1−1 pkgs/applications/audio/mid2key/default.nix+2−2 pkgs/applications/audio/mimms/default.nix+1−1 pkgs/applications/audio/mixxx/default.nix+6−19 pkgs/applications/audio/mopidy/default.nix+5−5 pkgs/applications/audio/mopidy/gmusic.nix+1−1 pkgs/applications/audio/mopidy/iris.nix+3−3 pkgs/applications/audio/mopidy/local-images.nix+2−2 pkgs/applications/audio/musescore/default.nix+8−4 pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch+25 pkgs/applications/audio/ncmpc/default.nix+4−4 pkgs/applications/audio/non/default.nix+2−5 pkgs/applications/audio/normalize/default.nix+1−1 pkgs/applications/audio/nova-filters/default.nix+3−11 pkgs/applications/audio/openmpt123/default.nix+16−10 pkgs/applications/audio/opus-tools/default.nix+4−4 pkgs/applications/audio/padthv1/default.nix+2−2 pkgs/applications/audio/patchage/default.nix+2−6 pkgs/applications/audio/pianobooster/default.nix+1 pkgs/applications/audio/picard/default.nix+11−5 pkgs/applications/audio/pithos/default.nix+2−2 pkgs/applications/audio/pulseaudio-modules-bt/default.nix+30−11 pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch+20 pkgs/applications/audio/pulseeffects/default.nix+5−5 pkgs/applications/audio/qjackctl/default.nix+2−2 pkgs/applications/audio/qmmp/default.nix+2−2 pkgs/applications/audio/qsampler/default.nix+2−2 pkgs/applications/audio/quodlibet/default.nix+8−14 pkgs/applications/audio/radiotray-ng/default.nix+2−3 pkgs/applications/audio/reaper/default.nix+15−36 pkgs/applications/audio/renoise/default.nix+10−4 pkgs/applications/audio/rhvoice/default.nix+2−10 pkgs/applications/audio/rhythmbox/default.nix+2−1 pkgs/applications/audio/rosegarden/default.nix+2−2 pkgs/applications/audio/samplv1/default.nix+2−2 pkgs/applications/audio/seq24/default.nix+1−1 pkgs/applications/audio/sfxr-qt/default.nix+36 pkgs/applications/audio/snapcast/default.nix+34−22 pkgs/applications/audio/snd/default.nix+2−2 pkgs/applications/audio/sonata/default.nix+3−3 pkgs/applications/audio/sonic-pi/default.nix+5−5 pkgs/applications/audio/sound-juicer/default.nix+2−2 pkgs/applications/audio/spectmorph/default.nix+22 pkgs/applications/audio/spotify/default.nix+10−4 pkgs/applications/audio/spotify/update.sh+61−14 pkgs/applications/audio/spotifywm/default.nix+31 pkgs/applications/audio/synthv1/default.nix+3−3 pkgs/applications/audio/tetraproc/default.nix+2−2 pkgs/applications/audio/timemachine/default.nix+4 pkgs/applications/audio/transcribe/default.nix+20−17 pkgs/applications/audio/traverso/default.nix+31 pkgs/applications/audio/vcv-rack/default.nix+3−2 pkgs/applications/audio/vocal/default.nix+7−6 pkgs/applications/audio/whipper/default.nix+10−7 pkgs/applications/audio/whipper/paths.patch−73 pkgs/applications/audio/wolf-shaper/default.nix+47 pkgs/applications/audio/x42-plugins/default.nix+3−3 pkgs/applications/audio/yoshimi/default.nix+2−2 pkgs/applications/backup/crashplan/crashplan-small-business.nix+1−1 pkgs/applications/backup/deja-dup/default.nix+13−10 pkgs/applications/backup/vdmfec/default.nix+19 pkgs/applications/display-managers/lightdm-mini-greeter/default.nix+3−3 pkgs/applications/display-managers/lightdm/default.nix+2−2 pkgs/applications/display-managers/ly/default.nix+29 pkgs/applications/display-managers/sddm/default.nix+2−3 pkgs/applications/display-managers/sddm/qt511.patch−28 pkgs/applications/editors/android-studio/common.nix+1−1 pkgs/applications/editors/android-studio/default.nix+21−10 pkgs/applications/editors/atom/default.nix+16−18 pkgs/applications/editors/eclipse/default.nix+21 pkgs/applications/editors/eclipse/plugins.nix+2−2 pkgs/applications/editors/ed/default.nix+3−3 pkgs/applications/editors/edbrowse/default.nix+10−2 pkgs/applications/editors/emacs-modes/bbdb/3.nix+2−2 pkgs/applications/editors/emacs-modes/cedille/default.nix+30 pkgs/applications/editors/emacs-modes/color-theme/default.nix+1−1 pkgs/applications/editors/emacs-modes/elpa-generated.nix+264−104 pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix+4−4 pkgs/applications/editors/emacs-modes/emms/default.nix+2−2 pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix+3−7 pkgs/applications/editors/emacs-modes/let-alist/default.nix+2−2 pkgs/applications/editors/emacs-modes/melpa-generated.nix+5771−2668 pkgs/applications/editors/emacs-modes/melpa-packages.nix+12 pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix+2608−1526 pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix+6−12 pkgs/applications/editors/emacs-modes/org-generated.nix+6−6 pkgs/applications/editors/emacs-modes/remember/default.nix−45 pkgs/applications/editors/emacs/25.nix+8−5 pkgs/applications/editors/emacs/builder.sh−40 pkgs/applications/editors/emacs/default.nix+8−5 pkgs/applications/editors/emacs/macport.nix+6−6 pkgs/applications/editors/emacs/site-start.el+1−1 pkgs/applications/editors/featherpad/default.nix+23 pkgs/applications/editors/focuswriter/default.nix+2−2 pkgs/applications/editors/geany/default.nix+3−3 pkgs/applications/editors/ghostwriter/default.nix+4−4 pkgs/applications/editors/gnome-builder/default.nix+10−27 pkgs/applications/editors/gnome-latex/default.nix+2−2 pkgs/applications/editors/jetbrains/default.nix+23−23 pkgs/applications/editors/kakoune/default.nix+6−2 pkgs/applications/editors/kile/default.nix+5−7 pkgs/applications/editors/leafpad/default.nix+1−1 pkgs/applications/editors/manuskript/default.nix+2−2 pkgs/applications/editors/mindforger/build.patch+91 pkgs/applications/editors/mindforger/default.nix+45 pkgs/applications/editors/moe/default.nix+3−3 pkgs/applications/editors/monodevelop/default.nix+1−1 pkgs/applications/editors/nano/default.nix+2−2 pkgs/applications/editors/ne/default.nix+2−2 pkgs/applications/editors/neovim/default.nix+19−2 pkgs/applications/editors/neovim/neovim-remote.nix+3−3 pkgs/applications/editors/neovim/qt.nix+73−57 pkgs/applications/editors/neovim/system_rplugin_manifest.patch+29 pkgs/applications/editors/neovim/wrapper.nix+42−20 pkgs/applications/editors/notepadqq/default.nix+10−7 pkgs/applications/editors/okteta/default.nix+2−2 pkgs/applications/editors/quilter/default.nix+11−32 pkgs/applications/editors/rednotebook/default.nix+5−5 pkgs/applications/editors/rstudio/clang-location.patch+25 pkgs/applications/editors/rstudio/default.nix+6−5 pkgs/applications/editors/rstudio/fix-cmake.patch+15 pkgs/applications/editors/rstudio/preview.nix+119 pkgs/applications/editors/standardnotes/default.nix+48 pkgs/applications/editors/sublime/2/default.nix+8−2 pkgs/applications/editors/sublime/3/common.nix+24−5 pkgs/applications/editors/sublime/3/packages.nix+3−3 pkgs/applications/editors/tecoc/default.nix+29−22 pkgs/applications/editors/texmacs/default.nix+1−6 pkgs/applications/editors/texmaker/default.nix+2−2 pkgs/applications/editors/texstudio/default.nix+2−2 pkgs/applications/editors/textadept/default.nix+1−1 pkgs/applications/editors/thonny/default.nix+12−4 pkgs/applications/editors/tiled/default.nix+2−2 pkgs/applications/editors/vim/common.nix+2−2 pkgs/applications/editors/vim/default.nix+6−2 pkgs/applications/editors/vscode/default.nix+22−16 pkgs/applications/editors/vscode/with-extensions.nix+7−20 pkgs/applications/editors/xmlcopyeditor/default.nix+28 pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch+36 pkgs/applications/editors/zile/default.nix+1−1 pkgs/applications/gis/openorienteering-mapper/default.nix+2−2 pkgs/applications/gis/qgis/default.nix+5−2 pkgs/applications/gis/saga/clang_patch.patch+19 pkgs/applications/gis/saga/default.nix+16−6 pkgs/applications/gis/saga/finite-6.3.0.patch+55 pkgs/applications/gis/saga/finite.patch+13 pkgs/applications/gis/saga/lts.nix+36 pkgs/applications/graphics/ImageMagick/7.0.nix+2−2 pkgs/applications/graphics/ahoviewer/default.nix+5−6 pkgs/applications/graphics/antimony/default.nix+1−1 pkgs/applications/graphics/ao/default.nix−41 pkgs/applications/graphics/autopanosiftc/default.nix+7 pkgs/applications/graphics/avocode/default.nix+13−8 pkgs/applications/graphics/batik/default.nix+6 pkgs/applications/graphics/cinepaint/default.nix+7−7 pkgs/applications/graphics/darktable/default.nix+4−4 pkgs/applications/graphics/deskew/default.nix+37 pkgs/applications/graphics/dia/default.nix+5−4 pkgs/applications/graphics/digikam/default.nix+3−2 pkgs/applications/graphics/feh/default.nix+4−4 pkgs/applications/graphics/gcolor2/default.nix+3−2 pkgs/applications/graphics/gimp/default.nix+21−7 pkgs/applications/graphics/gimp/remove-cc-reference.patch+13 pkgs/applications/graphics/giv/default.nix+2−6 pkgs/applications/graphics/glabels/default.nix+8−8 pkgs/applications/graphics/gocr/default.nix+2−2 pkgs/applications/graphics/goxel/default.nix+6−3 pkgs/applications/graphics/gqview/default.nix+4 pkgs/applications/graphics/graphicsmagick/default.nix+2−2 pkgs/applications/graphics/gthumb/default.nix+2−2 pkgs/applications/graphics/inkscape/default.nix+7−3 pkgs/applications/graphics/ipe/default.nix+2−4 pkgs/applications/graphics/ipe/xlocale.patch−10 pkgs/applications/graphics/jpeginfo/default.nix+21 pkgs/applications/graphics/k3d/default.nix+4 pkgs/applications/graphics/krita/default.nix+11−3 pkgs/applications/graphics/krop/default.nix+2−2 pkgs/applications/graphics/mypaint/default.nix+3−6 pkgs/applications/graphics/ocrad/default.nix+6−4 pkgs/applications/graphics/openimageio/default.nix+2−2 pkgs/applications/graphics/photoflow/default.nix+2−2 pkgs/applications/graphics/phototonic/default.nix+3−5 pkgs/applications/graphics/pqiv/default.nix+2−2 pkgs/applications/graphics/processing3/default.nix+1−1 pkgs/applications/graphics/rapid-photo-downloader/default.nix+4−4 pkgs/applications/graphics/rawtherapee/default.nix+2−2 pkgs/applications/graphics/renderdoc/default.nix+4−4 pkgs/applications/graphics/shotwell/default.nix+9−8 pkgs/applications/graphics/shutter/default.nix+10−9 pkgs/applications/graphics/tesseract/4.x.nix−61 pkgs/applications/graphics/tesseract/default.nix+13−62 pkgs/applications/graphics/tesseract/fetch-language-hashes+35 pkgs/applications/graphics/tesseract/languages.nix+289 pkgs/applications/graphics/tesseract/tesseract3.nix+29 pkgs/applications/graphics/tesseract/tesseract4.nix+27 pkgs/applications/graphics/tesseract/wrapper.nix+58 pkgs/applications/graphics/vimiv/default.nix+1−1 pkgs/applications/graphics/wings/default.nix+15−14 pkgs/applications/graphics/write_stylus/default.nix+4−3 pkgs/applications/graphics/xaos/default.nix+3−3 pkgs/applications/graphics/xournal/default.nix+2−2 pkgs/applications/graphics/yacreader/default.nix+25 pkgs/applications/graphics/yed/default.nix+6−7 pkgs/applications/inferno/default.nix−58 pkgs/applications/inferno/inferno−31 pkgs/applications/kde/akonadi/akonadi-paths.patch+10−9 pkgs/applications/kde/default.nix+2−1 pkgs/applications/kde/dolphin.nix+3−1 pkgs/applications/kde/fetch.sh+1−1 pkgs/applications/kde/kcharselect.nix+19 pkgs/applications/kde/kdepim-runtime.nix+2−2 pkgs/applications/kde/kmbox.nix+2−2 pkgs/applications/kde/konqueror.nix+20 pkgs/applications/kde/konsole.nix+7−1 pkgs/applications/kde/kpimtextedit.nix+3−2 pkgs/applications/kde/marble.nix+3 pkgs/applications/kde/srcs.nix+868−860 pkgs/applications/kde/syndication.nix−16 pkgs/applications/misc/1password/default.nix+5−5 pkgs/applications/misc/acbuild/default.nix−37 pkgs/applications/misc/airspy/default.nix+1−1 pkgs/applications/misc/airtame/default.nix+22−42 pkgs/applications/misc/alacritty/default.nix+17−23 pkgs/applications/misc/albert/default.nix+7−9 pkgs/applications/misc/aminal/default.nix+75 pkgs/applications/misc/apvlv/default.nix+3 pkgs/applications/misc/archiver/default.nix+28 pkgs/applications/misc/archiver/deps.nix+56 pkgs/applications/misc/artha/default.nix+6−2 pkgs/applications/misc/artha/gio-underlink.patch+13 pkgs/applications/misc/autospotting/default.nix+30 pkgs/applications/misc/autospotting/deps.nix+75 pkgs/applications/misc/avrdudess/default.nix+2−2 pkgs/applications/misc/bb/default.nix+8−4 pkgs/applications/misc/blender/default.nix+5−5 pkgs/applications/misc/calibre/default.nix+18−9 pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch+2−2 pkgs/applications/misc/cheat/default.nix+2−2 pkgs/applications/misc/cherrytree/default.nix+2−2 pkgs/applications/misc/chirp/default.nix+2−2 pkgs/applications/misc/clipmenu/default.nix+2−2 pkgs/applications/misc/cool-retro-term/default.nix+8−6 pkgs/applications/misc/copyq/default.nix+2−2 pkgs/applications/misc/coursera-dl/default.nix+5 pkgs/applications/misc/cura/default.nix+8−6 pkgs/applications/misc/curaengine/default.nix+2−10 pkgs/applications/misc/dbeaver/default.nix+2−2 pkgs/applications/misc/devilspie2/default.nix+1−1 pkgs/applications/misc/digitalbitbox/default.nix+2−2 pkgs/applications/misc/dmrconfig/default.nix+42 pkgs/applications/misc/dunst/default.nix+2−2 pkgs/applications/misc/eaglemode/default.nix+13−13 pkgs/applications/misc/electron-cash/default.nix+3−3 pkgs/applications/misc/electrum/dash.nix+1−1 pkgs/applications/misc/electrum/default.nix+16−11 pkgs/applications/misc/evilvte/default.nix+1−1 pkgs/applications/misc/extract_url/default.nix+8−9 pkgs/applications/misc/far2l/default.nix+2 pkgs/applications/misc/fbreader/default.nix+9−2 pkgs/applications/misc/fff/default.nix+31 pkgs/applications/misc/flrig/default.nix+2−2 pkgs/applications/misc/font-manager/default.nix+2−2 pkgs/applications/misc/fsv/default.nix+47 pkgs/applications/misc/gImageReader/default.nix+70 pkgs/applications/misc/get_iplayer/default.nix+4−4 pkgs/applications/misc/girara/default.nix+2−2 pkgs/applications/misc/gksu/default.nix+1−1 pkgs/applications/misc/glava/default.nix+8−22 pkgs/applications/misc/glom/default.nix+132 pkgs/applications/misc/gnome-recipes/default.nix+79 pkgs/applications/misc/gnome-usage/default.nix+2−2 pkgs/applications/misc/gnss-sdr/default.nix+1 pkgs/applications/misc/gnuradio/default.nix+4 pkgs/applications/misc/gnuradio/gsm.nix+1−1 pkgs/applications/misc/gnuradio/limesdr.nix+1−1 pkgs/applications/misc/gnuradio/osmosdr.nix+16−7 pkgs/applications/misc/gnuradio/rds.nix+3−3 pkgs/applications/misc/golden-cheetah/default.nix+3 pkgs/applications/misc/gollum/Gemfile.lock+2−2 pkgs/applications/misc/gollum/gemset.nix+2−2 pkgs/applications/misc/googleearth/default.nix+9 pkgs/applications/misc/googler/default.nix+2−2 pkgs/applications/misc/gpa/default.nix+2−2 pkgs/applications/misc/gpsprune/default.nix+2−2 pkgs/applications/misc/gpx-viewer/default.nix+2−2 pkgs/applications/misc/gpxsee/default.nix+5−5 pkgs/applications/misc/gramps/default.nix+4−4 pkgs/applications/misc/gremlin-console/default.nix+29 pkgs/applications/misc/gtk2fontsel/default.nix+1−1 pkgs/applications/misc/guake/default.nix+2−2 pkgs/applications/misc/gv/default.nix+1−1 pkgs/applications/misc/gxneur/default.nix+2 pkgs/applications/misc/hackrf/default.nix+7−6 pkgs/applications/misc/hamster-time-tracker/default.nix+2−12 pkgs/applications/misc/hello/default.nix+1−1 pkgs/applications/misc/hivemind/default.nix+21 pkgs/applications/misc/houdini/runtime.nix+4−4 pkgs/applications/misc/hovercraft/default.nix+35 pkgs/applications/misc/hugo/default.nix+2−2 pkgs/applications/misc/hugo/deps.nix+325−92 pkgs/applications/misc/hyper/default.nix+2−2 pkgs/applications/misc/ikiwiki/default.nix+11−14 pkgs/applications/misc/img2pdf/default.nix+2−2 pkgs/applications/misc/ipmicfg/default.nix+3−3 pkgs/applications/misc/jekyll/basic/Gemfile.lock+9−9 pkgs/applications/misc/jekyll/basic/gemset.nix+16−16 pkgs/applications/misc/jekyll/full/Gemfile.lock+10−10 pkgs/applications/misc/jekyll/full/gemset.nix+18−18 pkgs/applications/misc/josm/default.nix+5−5 pkgs/applications/misc/jrnl/default.nix+1−1 pkgs/applications/misc/k2pdfopt/default.nix+20−13 pkgs/applications/misc/kdeconnect/default.nix+2−2 pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix+3−3 pkgs/applications/misc/keepassx/default.nix+2−2 pkgs/applications/misc/khal/default.nix+7−20 pkgs/applications/misc/khard/default.nix+2−3 pkgs/applications/misc/kitty/default.nix+10−12 pkgs/applications/misc/kitty/fix-paths.patch+27 pkgs/applications/misc/kiwix/default.nix+3 pkgs/applications/misc/kupfer/default.nix+4−20 pkgs/applications/misc/latte-dock/default.nix+2−2 pkgs/applications/misc/libosmocore/default.nix+6−6 pkgs/applications/misc/llpp/default.nix+19−16 pkgs/applications/misc/llpp/fix-build-bash.patch+88 pkgs/applications/misc/lxterminal/default.nix+2−2 pkgs/applications/misc/mako/default.nix+25 pkgs/applications/misc/masterpdfeditor/default.nix+9−4 pkgs/applications/misc/mdp/default.nix+2−2 pkgs/applications/misc/mediainfo-gui/default.nix+2−2 pkgs/applications/misc/mediainfo/default.nix+2−2 pkgs/applications/misc/mlterm/default.nix+2−2 pkgs/applications/misc/moonlight-embedded/default.nix+8−7 pkgs/applications/misc/mrxvt/default.nix+2−2 pkgs/applications/misc/multimon-ng/default.nix+2−2 pkgs/applications/misc/mupdf/darwin.patch+27−44 pkgs/applications/misc/mupdf/default.nix+12−11 pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch−45 pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patch+39 pkgs/applications/misc/mwic/default.nix+2−2 pkgs/applications/misc/mysql-workbench/default.nix+2−2 pkgs/applications/misc/nixnote2/default.nix+2−1 pkgs/applications/misc/nnn/default.nix+12−5 pkgs/applications/misc/notejot/default.nix+10−9 pkgs/applications/misc/octoprint/default.nix+51−98 pkgs/applications/misc/octoprint/plugins.nix+34−12 pkgs/applications/misc/ola/default.nix+6−3 pkgs/applications/misc/omegat.nix+40 pkgs/applications/misc/onboard/default.nix+2−2 pkgs/applications/misc/oneko/default.nix+9−12 pkgs/applications/misc/opencpn/default.nix+3−3 pkgs/applications/misc/opentx/default.nix+9−5 pkgs/applications/misc/orca/default.nix+8−5 pkgs/applications/misc/orca/fix-paths.patch+49 pkgs/applications/misc/osmium-tool/default.nix+23 pkgs/applications/misc/pbpst/default.nix+49 pkgs/applications/misc/pcmanfm/default.nix+3−3 pkgs/applications/misc/pdf-quench/default.nix+1−1 pkgs/applications/misc/pdfpc/default.nix+4−4 pkgs/applications/misc/pdfshuffler/default.nix−41 pkgs/applications/misc/pgmanage/default.nix+2−2 pkgs/applications/misc/pinfo/default.nix+1−1 pkgs/applications/misc/plank/default.nix+7−4 pkgs/applications/misc/plank/hide-in-pantheon.patch+9 pkgs/applications/misc/playonlinux/default.nix+2−2 pkgs/applications/misc/pmenu/default.nix+2−2 pkgs/applications/misc/polar-bookshelf/default.nix+91 pkgs/applications/misc/polybar/default.nix+17−10 pkgs/applications/misc/pwsafe/default.nix+23−41 pkgs/applications/misc/qMasterPassword/default.nix+48 pkgs/applications/misc/qdirstat/default.nix+10−16 pkgs/applications/misc/qlcplus/default.nix+3−3 pkgs/applications/misc/qmapshack/default.nix+2−2 pkgs/applications/misc/qtbitcointrader/default.nix+11−11 pkgs/applications/misc/redshift/default.nix+7−4 pkgs/applications/misc/regextester/default.nix+20−16 pkgs/applications/misc/rescuetime/default.nix+5−5 pkgs/applications/misc/rofi/config.patch−54 pkgs/applications/misc/rofi/default.nix+3−11 pkgs/applications/misc/rtl-sdr/default.nix+1−7 pkgs/applications/misc/rtl_433/default.nix+3−3 pkgs/applications/misc/rxvt_unicode/default.nix+3−3 pkgs/applications/misc/safeeyes/default.nix+2−2 pkgs/applications/misc/sakura/default.nix+1−1 pkgs/applications/misc/sequeler/default.nix+8−8 pkgs/applications/misc/sigal/default.nix+7−8 pkgs/applications/misc/slic3r/default.nix+17−11 pkgs/applications/misc/slic3r/gcc6.patch−40 pkgs/applications/misc/slic3r/prusa3d.nix+7−4 pkgs/applications/misc/soapyairspy/default.nix+2−2 pkgs/applications/misc/soapybladerf/default.nix+2−2 pkgs/applications/misc/soapyremote/default.nix+5−5 pkgs/applications/misc/soapyrtlsdr/default.nix+30 pkgs/applications/misc/soapysdr/default.nix+10−9 pkgs/applications/misc/solaar/default.nix+2−2 pkgs/applications/misc/sweethome3d/default.nix+6−7 pkgs/applications/misc/synapse/default.nix+2−2 pkgs/applications/misc/synergy/default.nix+2−2 pkgs/applications/misc/tabula/default.nix+39 pkgs/applications/misc/tangogps/default.nix+1 pkgs/applications/misc/taskell/default.nix+59 pkgs/applications/misc/tdrop/default.nix+33 pkgs/applications/misc/termdown/default.nix+3−3 pkgs/applications/misc/terminator/default.nix+4−4 pkgs/applications/misc/termite/default.nix+4−4 pkgs/applications/misc/termonad/default.nix+19 pkgs/applications/misc/tilda/default.nix+6−6 pkgs/applications/misc/tilix/default.nix+9−12 pkgs/applications/misc/todolist/default.nix+2−2 pkgs/applications/misc/toggldesktop/default.nix+5−5 pkgs/applications/misc/toot/default.nix+2−2 pkgs/applications/misc/tootle/default.nix+14−6 pkgs/applications/misc/translate-shell/default.nix+2−2 pkgs/applications/misc/truecrypt/default.nix−98 pkgs/applications/misc/truecrypt/gcc6.patch−61 pkgs/applications/misc/tzupdate/default.nix+2−2 pkgs/applications/misc/udiskie/default.nix+2−2 pkgs/applications/misc/urh/default.nix+5−4 pkgs/applications/misc/urlscan/default.nix+2−2 pkgs/applications/misc/valauncher/default.nix−28 pkgs/applications/misc/valentina/default.nix+3−4 pkgs/applications/misc/veracrypt/default.nix+23−28 pkgs/applications/misc/vifm/default.nix+2−2 pkgs/applications/misc/visidata/default.nix+29 pkgs/applications/misc/wego/default.nix+3−3 pkgs/applications/misc/wego/deps.nix+15−6 pkgs/applications/misc/welle-io/default.nix+2−2 pkgs/applications/misc/workrave/default.nix+4−4 pkgs/applications/misc/wsjtx/default.nix+8−5 pkgs/applications/misc/wsjtx/super.patch+12 pkgs/applications/misc/wsjtx/wsjtx.patch+6−6 pkgs/applications/misc/wtf/default.nix+28 pkgs/applications/misc/xautoclick/default.nix+1 pkgs/applications/misc/xca/default.nix+2−2 pkgs/applications/misc/xcruiser/default.nix+7−7 pkgs/applications/misc/xdgmenumaker/default.nix+2−2 pkgs/applications/misc/xiphos/default.nix+4−13 pkgs/applications/misc/xkbd/default.nix+3−3 pkgs/applications/misc/xkbmon/default.nix+3−3 pkgs/applications/misc/xlog/default.nix+2−2 pkgs/applications/misc/xmove/default.nix−19 pkgs/applications/misc/xmr-stak/default.nix+3−3 pkgs/applications/misc/xmrig/default.nix+4−4 pkgs/applications/misc/xpad/default.nix+4−8 pkgs/applications/misc/xterm/default.nix+3−3 pkgs/applications/misc/xtermcontrol/default.nix+2−2 pkgs/applications/misc/xxkb/default.nix+10−9 pkgs/applications/misc/yarssr/default.nix+4−8 pkgs/applications/misc/yubioath-desktop/default.nix+43−28 pkgs/applications/misc/zathura/core/default.nix+4−7 pkgs/applications/misc/zathura/pdf-mupdf/default.nix+13−6 pkgs/applications/misc/zathura/wrapper.nix+5−3 pkgs/applications/misc/gutenberg/default.nix → pkgs/applications/misc/zola/default.nix+11−11 pkgs/applications/networking/browsers/brave/default.nix+150 pkgs/applications/networking/browsers/chromium/common.nix+41−27 pkgs/applications/networking/browsers/chromium/default.nix+4−1 pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch−15 pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch−9 pkgs/applications/networking/browsers/chromium/plugins.nix+9−5 pkgs/applications/networking/browsers/chromium/update.sh+1−1 pkgs/applications/networking/browsers/chromium/upstream-info.nix+9−9 pkgs/applications/networking/browsers/eolie/default.nix+14−9 pkgs/applications/networking/browsers/falkon/default.nix+8−4 pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix+397−397 pkgs/applications/networking/browsers/firefox-bin/default.nix+1−1 pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix+397−397 pkgs/applications/networking/browsers/firefox-bin/release_sources.nix+397−397 pkgs/applications/networking/browsers/firefox-bin/update.nix+3−1 pkgs/applications/networking/browsers/firefox/common.nix+53−54 pkgs/applications/networking/browsers/firefox/packages.nix+48−52 pkgs/applications/networking/browsers/firefox/update.nix+4−1 pkgs/applications/networking/browsers/google-chrome/default.nix+2−2 pkgs/applications/networking/browsers/luakit/default.nix+3−2 pkgs/applications/networking/browsers/lynx/default.nix+2−2 pkgs/applications/networking/browsers/midori/default.nix+17−40 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix+9−8 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix+11−7 pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix+2−2 pkgs/applications/networking/browsers/opera/default.nix+4−2 pkgs/applications/networking/browsers/otter/default.nix+3−2 pkgs/applications/networking/browsers/palemoon/default.nix+1−1 pkgs/applications/networking/browsers/qutebrowser/default.nix+10−21 pkgs/applications/networking/browsers/surf/default.nix+1−1 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix+5−23 pkgs/applications/networking/browsers/tor-browser-bundle/default.nix+4−26 pkgs/applications/networking/browsers/vimb/default.nix+11−15 pkgs/applications/networking/browsers/vivaldi/default.nix+4−4 pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix+4−4 pkgs/applications/networking/browsers/w3m/default.nix+25−7 pkgs/applications/networking/cloudflared/default.nix+25 pkgs/applications/networking/cloudflared/deps.nix+444 pkgs/applications/networking/cluster/cni/default.nix+6−6 pkgs/applications/networking/cluster/cni/plugins.nix+10−4 pkgs/applications/networking/cluster/docker-machine/default.nix+7−7 pkgs/applications/networking/cluster/docker-machine/kvm.nix+2−2 pkgs/applications/networking/cluster/docker-machine/kvm2.nix+3−8 pkgs/applications/networking/cluster/flink/default.nix+4−4 pkgs/applications/networking/cluster/helm/default.nix+1−1 pkgs/applications/networking/cluster/helmfile/default.nix+7−2 pkgs/applications/networking/cluster/kops/default.nix+2−2 pkgs/applications/networking/cluster/kube-router/default.nix+32 pkgs/applications/networking/cluster/kubectl/default.nix+33 pkgs/applications/networking/cluster/kubernetes/default.nix+5−5 pkgs/applications/networking/cluster/kubetail/default.nix+6−3 pkgs/applications/networking/cluster/luigi/default.nix+35 pkgs/applications/networking/cluster/minikube/default.nix+2−2 pkgs/applications/networking/cluster/minishift/default.nix+70 pkgs/applications/networking/cluster/nomad/default.nix+2−2 pkgs/applications/networking/cluster/openshift/default.nix+17−20 pkgs/applications/networking/cluster/pig/default.nix+4−4 pkgs/applications/networking/cluster/stern/default.nix+21−10 pkgs/applications/networking/cluster/stern/deps.nix+8−17 pkgs/applications/networking/cluster/terraform-docs/default.nix+26 pkgs/applications/networking/cluster/terraform-providers/data.nix+158−81 pkgs/applications/networking/cluster/terraform-providers/default.nix+3 pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix+26 pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix+21 pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix+5−1 pkgs/applications/networking/cluster/terraform-providers/providers.txt+4−1 pkgs/applications/networking/cluster/terraform/default.nix+8−26 pkgs/applications/networking/cluster/terragrunt/0.11.1.nix−35 pkgs/applications/networking/cluster/terragrunt/0.9.8.nix−35 pkgs/applications/networking/cluster/terragrunt/default.nix+4−4 pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix−111 pkgs/applications/networking/corebird/default.nix+2−2 pkgs/applications/networking/davmail/default.nix+1−1 pkgs/applications/networking/dropbox/cli.nix+3−3 pkgs/applications/networking/dropbox/default.nix+2−2 pkgs/applications/networking/enhanced-ctorrent/default.nix+2−2 pkgs/applications/networking/esniper/default.nix+1−1 pkgs/applications/networking/feedreaders/canto-curses/default.nix+3−3 pkgs/applications/networking/feedreaders/canto-daemon/default.nix+4−5 pkgs/applications/networking/feedreaders/feedreader/default.nix+4−4 pkgs/applications/networking/feedreaders/newsboat/default.nix+19−10 pkgs/applications/networking/feedreaders/rawdog/default.nix+2−2 pkgs/applications/networking/feedreaders/rss2email/default.nix+7−2 pkgs/applications/networking/flent/http-getter.nix+2−2 pkgs/applications/networking/flexget/default.nix+18−31 pkgs/applications/networking/ftp/taxi/default.nix+2−2 pkgs/applications/networking/gmailieer/default.nix+2−2 pkgs/applications/networking/gns3/default.nix+3−3 pkgs/applications/networking/gns3/server.nix+31−40 pkgs/applications/networking/google-drive-ocamlfuse/default.nix+2−2 pkgs/applications/networking/instant-messengers/baresip/default.nix+2−2 pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix+2−2 pkgs/applications/networking/instant-messengers/blink/default.nix+1−1 pkgs/applications/networking/instant-messengers/dino/default.nix+9−5 pkgs/applications/networking/instant-messengers/discord/default.nix+15−11 pkgs/applications/networking/instant-messengers/ekiga/default.nix+10−9 pkgs/applications/networking/instant-messengers/fractal/default.nix+43 pkgs/applications/networking/instant-messengers/franz/default.nix+16−33 pkgs/applications/networking/instant-messengers/freetalk/default.nix+1−1 pkgs/applications/networking/instant-messengers/gajim/default.nix+2−2 pkgs/applications/networking/instant-messengers/nheko/default.nix+1 pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix+4−3 pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix+7−4 pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix+9−11 pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix+5−10 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix+2−6 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix+2−2 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix+5−9 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix+2−3 pkgs/applications/networking/instant-messengers/pidgin/default.nix+3−4 pkgs/applications/networking/instant-messengers/poezio/default.nix+28 pkgs/applications/networking/instant-messengers/profanity/default.nix+1−1 pkgs/applications/networking/instant-messengers/psi-plus/default.nix+4−4 pkgs/applications/networking/instant-messengers/psi/default.nix+4−4 pkgs/applications/networking/instant-messengers/quaternion/default.nix+5−19 pkgs/applications/networking/instant-messengers/rambox/bare.nix+5−5 pkgs/applications/networking/instant-messengers/rambox/default.nix+16−5 pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix+3−3 pkgs/applications/networking/instant-messengers/riot/riot-web.nix+2−2 pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix+2−3 pkgs/applications/networking/instant-messengers/scudcloud/default.nix+1−1 pkgs/applications/networking/instant-messengers/signal-desktop/default.nix+5−4 pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix+1 pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix+2−2 pkgs/applications/networking/instant-messengers/slack-term/default.nix+23 pkgs/applications/networking/instant-messengers/slack/default.nix+20−4 pkgs/applications/networking/instant-messengers/swift-im/default.nix+5−9 pkgs/applications/networking/instant-messengers/teamspeak/server.nix+3−3 pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix+4−4 pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patch−68 pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix+7−7 pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix+2−2 pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix+2−2 pkgs/applications/networking/instant-messengers/toxic/default.nix+4−4 pkgs/applications/networking/instant-messengers/utox/default.nix−5 pkgs/applications/networking/instant-messengers/vacuum/default.nix+2−2 pkgs/applications/networking/instant-messengers/vk-messenger/default.nix+3−3 pkgs/applications/networking/instant-messengers/wavebox/default.nix+9−8 pkgs/applications/networking/instant-messengers/wire-desktop/default.nix+16−11 pkgs/applications/networking/instant-messengers/zoom-us/default.nix+2−2 pkgs/applications/networking/insync/default.nix+2−2 pkgs/applications/networking/ipfs-cluster/default.nix+3−3 pkgs/applications/networking/ipfs/default.nix+3−3 pkgs/applications/networking/irc/irssi/default.nix+2−2 pkgs/applications/networking/irc/quassel/default.nix+10−7 pkgs/applications/networking/irc/quassel/qt5_11.patch−72 pkgs/applications/networking/irc/quassel/source.nix−9 pkgs/applications/networking/irc/weechat/aggregate-commands.patch−110 pkgs/applications/networking/irc/weechat/default.nix+6−78 pkgs/applications/networking/irc/weechat/scripts/default.nix+5−1 pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix+13−3 pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patch+13 pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix+25 pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix+3−3 pkgs/applications/networking/irc/weechat/wrapper.nix+80 pkgs/applications/networking/jnetmap/default.nix+33 pkgs/applications/networking/mailreaders/astroid/default.nix+2−2 pkgs/applications/networking/mailreaders/balsa/default.nix+5−4 pkgs/applications/networking/mailreaders/claws-mail/default.nix+2−2 pkgs/applications/networking/mailreaders/claws-mail/mime.patch+21−8 pkgs/applications/networking/mailreaders/imapfilter.nix+2−2 pkgs/applications/networking/mailreaders/inboxer/default.nix+2−2 pkgs/applications/networking/mailreaders/mutt/default.nix+4−4 pkgs/applications/networking/mailreaders/neomutt/default.nix+5−3 pkgs/applications/networking/mailreaders/notmuch-bower/default.nix+2−2 pkgs/applications/networking/mailreaders/notmuch/default.nix+19−46 pkgs/applications/networking/mailreaders/realpine/default.nix+2−2 pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix+1−1 pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix+233−233 pkgs/applications/networking/mailreaders/thunderbird/default.nix+6−23 pkgs/applications/networking/mailreaders/trojita/default.nix+6−5 pkgs/applications/networking/modem-manager-gui/default.nix+50 pkgs/applications/networking/mpop/default.nix+6−7 pkgs/applications/networking/msmtp/default.nix+7−15 pkgs/applications/networking/mumble/default.nix+15−6 pkgs/applications/networking/newsreaders/liferea/default.nix+2−2 pkgs/applications/networking/newsreaders/pan/default.nix+2−2 pkgs/applications/networking/nextcloud-client/default.nix+24−20 pkgs/applications/networking/nextcloud-client/find-sql.patch−12 pkgs/applications/networking/nload/default.nix+14−1 pkgs/applications/networking/offrss/default.nix+4−1 pkgs/applications/networking/omping/default.nix+35 pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix+2−2 pkgs/applications/networking/p2p/qbittorrent/default.nix+2−2 pkgs/applications/networking/p2p/soulseekqt/default.nix+2−2 pkgs/applications/networking/p2p/synapse-bt/default.nix+4−4 pkgs/applications/networking/p2p/tixati/default.nix+2−2 pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix+2−2 pkgs/applications/networking/p2p/tribler/default.nix+7−5 pkgs/applications/networking/p2p/zeronet/default.nix+2−2 pkgs/applications/networking/pjsip/default.nix+2−2 pkgs/applications/networking/protonmail-bridge/default.nix+4−4 pkgs/applications/networking/remote/anydesk/default.nix+7−6 pkgs/applications/networking/remote/freerdp/default.nix+2−2 pkgs/applications/networking/remote/remmina/default.nix+21−34 pkgs/applications/networking/remote/ssvnc/default.nix+3−1 pkgs/applications/networking/remote/teamviewer/default.nix+3−3 pkgs/applications/networking/remote/x2goclient/default.nix+9−10 pkgs/applications/networking/remote/x2goclient/qt511.patch−15 pkgs/applications/networking/remote/xrdp/default.nix+5−5 pkgs/applications/networking/resilio-sync/default.nix+3−3 pkgs/applications/networking/seafile-client/default.nix+3−3 pkgs/applications/networking/sieve-connect/default.nix+8−6 pkgs/applications/networking/sniffers/wireshark/default.nix+13−2 pkgs/applications/networking/sniproxy/default.nix+2−2 pkgs/applications/networking/sync/desync/default.nix+3−3 pkgs/applications/networking/sync/desync/deps.nix+208−25 pkgs/applications/networking/sync/rclone/browser.nix+25 pkgs/applications/networking/sync/rclone/default.nix+3−2 pkgs/applications/networking/syncplay/default.nix+6−6 pkgs/applications/networking/syncthing-gtk/default.nix+2−2 pkgs/applications/networking/syncthing/default.nix+20−18 pkgs/applications/networking/transporter/default.nix+2−2 pkgs/applications/networking/tsung/default.nix+3−3 pkgs/applications/networking/vnstat/default.nix+4−4 pkgs/applications/networking/weather/meteo/default.nix+2−2 pkgs/applications/networking/websocketd/default.nix+24 pkgs/applications/networking/websocketd/deps.nix+12 pkgs/applications/networking/znc/default.nix+9−2 pkgs/applications/networking/znc/modules.nix+2 pkgs/applications/office/aesop/default.nix+9−16 pkgs/applications/office/autokey/default.nix+2−2 pkgs/applications/office/bookworm/default.nix+25−11 pkgs/applications/office/fava/default.nix+14−4 pkgs/applications/office/gnucash/2.4.nix−90 pkgs/applications/office/gnucash/2.6.nix−116 pkgs/applications/office/gnucash/default.nix+6−2 pkgs/applications/office/gnumeric/default.nix+15−19 pkgs/applications/office/homebank/default.nix+2−2 pkgs/applications/office/jameica/default.nix+7−17 pkgs/applications/office/kmymoney/default.nix+3−2 pkgs/applications/office/ledger-web/Gemfile.lock+3−3 pkgs/applications/office/ledger-web/gemset.nix+10−2 pkgs/applications/office/ledger/default.nix+9−1 pkgs/applications/office/libreoffice/default-primary-src.nix+3−3 pkgs/applications/office/libreoffice/default.nix+6−3 pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix+8−8 pkgs/applications/office/libreoffice/poppler.patch+289 pkgs/applications/office/libreoffice/still-primary-src.nix+3−3 pkgs/applications/office/libreoffice/still.nix+2−2 pkgs/applications/office/libreoffice/wrapper.nix+4−1 pkgs/applications/office/marp/default.nix+13−8 pkgs/applications/office/mendeley/default.nix+1−2 pkgs/applications/office/mendeley/update.nix+2−1 pkgs/applications/office/mytetra/default.nix+11−6 pkgs/applications/office/planner/default.nix+15−10 pkgs/applications/office/scribus/default.nix+14−1 pkgs/applications/office/scribus/unstable.nix+39 pkgs/applications/office/skrooge/default.nix+4−4 pkgs/applications/office/spice-up/default.nix+13−9 pkgs/applications/office/todoman/default.nix+4−3 pkgs/applications/office/trilium/default.nix+58 pkgs/applications/office/tryton/default.nix+2−2 pkgs/applications/office/zim/default.nix+3−2 pkgs/applications/office/zotero/default.nix+3−3 pkgs/applications/science/astronomy/gildas/default.nix+3−3 pkgs/applications/science/astronomy/stellarium/default.nix+2−2 pkgs/applications/science/astronomy/xearth/default.nix+6−7 pkgs/applications/science/biology/EZminc/default.nix−2 pkgs/applications/science/biology/N3/default.nix+2−5 pkgs/applications/science/biology/ants/default.nix−2 pkgs/applications/science/biology/bftools/default.nix+41 pkgs/applications/science/biology/bowtie2/default.nix+2−2 pkgs/applications/science/biology/conglomerate/default.nix+3−3 pkgs/applications/science/biology/hmmer/default.nix+8−11 pkgs/applications/science/biology/igv/default.nix+2−2 pkgs/applications/science/biology/inormalize/default.nix+2−4 pkgs/applications/science/biology/minc-tools/default.nix+2−4 pkgs/applications/science/biology/minc-widgets/default.nix+2−2 pkgs/applications/science/biology/minimap2/default.nix+2−2 pkgs/applications/science/biology/mni_autoreg/default.nix+2−2 pkgs/applications/science/biology/mosdepth/default.nix+6−3 pkgs/applications/science/biology/niftyreg/default.nix+24 pkgs/applications/science/biology/niftyseg/default.nix+24 pkgs/applications/science/biology/picard-tools/default.nix+5−4 pkgs/applications/science/biology/star/default.nix+2−2 pkgs/applications/science/chemistry/avogadro/default.nix+7 pkgs/applications/science/chemistry/gwyddion/default.nix+1−1 pkgs/applications/science/chemistry/jmol/default.nix+2−2 pkgs/applications/science/chemistry/marvin/LicenseManager.desktop+9 pkgs/applications/science/chemistry/marvin/MarvinSketch.desktop+10 pkgs/applications/science/chemistry/marvin/MarvinView.desktop+10 pkgs/applications/science/chemistry/marvin/default.nix+49 pkgs/applications/science/chemistry/octopus/default.nix+2−2 pkgs/applications/science/electronics/alliance/default.nix+2−2 pkgs/applications/science/electronics/archimedes/default.nix+1−1 pkgs/applications/science/electronics/dsview/default.nix+47 pkgs/applications/science/electronics/dsview/install.patch+15 pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix+28 pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix+27 pkgs/applications/science/electronics/gtkwave/default.nix+2−2 pkgs/applications/science/electronics/kicad/default.nix+2−2 pkgs/applications/science/electronics/librepcb/default.nix+3−3 pkgs/applications/science/electronics/ngspice/default.nix+5−4 pkgs/applications/science/electronics/tkgate/1.x.nix+4−2 pkgs/applications/science/electronics/verilator/default.nix+2−2 pkgs/applications/science/electronics/verilog/default.nix+3−3 pkgs/applications/science/logic/abella/default.nix+2−2 pkgs/applications/science/logic/acgtk/default.nix+10−40 pkgs/applications/science/logic/acgtk/install-emacs-to-site-lisp.patch−23 pkgs/applications/science/logic/acgtk/use-nix-ocaml-byteflags.patch−11 pkgs/applications/science/logic/alt-ergo/default.nix+4−4 pkgs/applications/science/logic/aspino/default.nix+2 pkgs/applications/science/logic/avy/default.nix+3 pkgs/applications/science/logic/cedille/default.nix+50 pkgs/applications/science/logic/coq/8.4.nix−97 pkgs/applications/science/logic/coq/configure.patch−11 pkgs/applications/science/logic/coq/default.nix+3 pkgs/applications/science/logic/coq2html/default.nix+2−2 pkgs/applications/science/logic/cryptominisat/default.nix+5−11 pkgs/applications/science/logic/cubicle/default.nix+2−2 pkgs/applications/science/logic/elan/default.nix+2−2 pkgs/applications/science/logic/eprover/default.nix+2−2 pkgs/applications/science/logic/glucose/default.nix+2 pkgs/applications/science/logic/iprover/default.nix+3−3 pkgs/applications/science/logic/lean/default.nix+3−3 pkgs/applications/science/logic/ltl2ba/default.nix+2−2 pkgs/applications/science/logic/prooftree/default.nix+5−4 pkgs/applications/science/logic/sapic/default.nix−28 pkgs/applications/science/logic/sapic/native.patch−38 pkgs/applications/science/logic/symbiyosys/default.nix+3−3 pkgs/applications/science/logic/tamarin-prover/default.nix+14−9 pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patch−109 pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patch−130 pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patch−140 pkgs/applications/science/logic/tamarin-prover/sapic-native.patch+77 pkgs/applications/science/logic/tptp/default.nix+3−3 pkgs/applications/science/logic/vampire/default.nix+1−1 pkgs/applications/science/logic/why3/default.nix+5−5 pkgs/applications/science/logic/yices/default.nix+8−7 pkgs/applications/science/logic/z3/default.nix+4−4 pkgs/applications/science/logic/z3/tptp.nix+31 pkgs/applications/science/machine-learning/shogun/default.nix+4−4 pkgs/applications/science/math/R/default.nix+9−5 pkgs/applications/science/math/calc/default.nix+2−2 pkgs/applications/science/math/colpack/default.nix+1 pkgs/applications/science/math/fricas/default.nix+1−1 pkgs/applications/science/math/gap/default.nix+127−36 pkgs/applications/science/math/giac/default.nix+27−12 pkgs/applications/science/math/gmsh/CMakeLists.txt.patch−37 pkgs/applications/science/math/gmsh/default.nix+5−9 pkgs/applications/science/math/gurobi/default.nix+8−2 pkgs/applications/science/math/mathematica/l10ns.nix+2−2 pkgs/applications/science/math/maxima/default.nix+1−1 pkgs/applications/science/math/nasc/default.nix+16−23 pkgs/applications/science/math/nauty/default.nix+9−2 pkgs/applications/science/math/pari/default.nix+2−2 pkgs/applications/science/math/pari/gp2c.nix+2−2 pkgs/applications/science/math/polymake/default.nix+48 pkgs/applications/science/math/pspp/default.nix+1−1 pkgs/applications/science/math/pynac/default.nix+2−2 pkgs/applications/science/math/qalculate-gtk/default.nix+2−2 pkgs/applications/science/math/sage/README.md+1−40 pkgs/applications/science/math/sage/default.nix+87−64 pkgs/applications/science/math/sage/env-locations.nix+6−3 pkgs/applications/science/math/sage/openblas-pc.nix−17 pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch+35 pkgs/applications/science/math/sage/patches/dochtml-optional.patch−127 pkgs/applications/science/math/sage/patches/eclib-20180710.patch−40 pkgs/applications/science/math/sage/patches/eclib-regulator-precision.patch−98 pkgs/applications/science/math/sage/patches/fix-ecl-race.patch+19 pkgs/applications/science/math/sage/patches/giac-1.5.0.patch+14 pkgs/applications/science/math/sage/patches/known-padics-bug.patch−15 pkgs/applications/science/math/sage/patches/matplotlib-normed-deprecated.patch−12 pkgs/applications/science/math/sage/patches/numpy-1.15.1.patch−911 pkgs/applications/science/math/sage/patches/pari-no-threads.patch−18 pkgs/applications/science/math/sage/patches/revert-sphinx-always-fork.patch+71 pkgs/applications/science/math/sage/patches/singular-4.1.1p2.patch−274 pkgs/applications/science/math/sage/patches/spkg-scripts.patch−46 pkgs/applications/science/math/sage/patches/test-in-tmpdir.patch−31 pkgs/applications/science/math/sage/sage-env.nix+25−18 pkgs/applications/science/math/sage/sage-src.nix+52−117 pkgs/applications/science/math/sage/sage-tests.nix+57 pkgs/applications/science/math/sage/sage-with-env.nix+15−15 pkgs/applications/science/math/sage/sage-wrapper.nix−41 pkgs/applications/science/math/sage/sage.nix+44−8 pkgs/applications/science/math/sage/sagedoc.nix+14−28 pkgs/applications/science/math/sage/sagelib.nix+13−11 pkgs/applications/science/math/sage/sagenb.nix+6−2 pkgs/applications/science/math/scilab-bin/default.nix+33−2 pkgs/applications/science/misc/boinc/default.nix+5−5 pkgs/applications/science/misc/golly/beta.nix+3−3 pkgs/applications/science/misc/golly/default.nix+3−4 pkgs/applications/science/misc/golly/default.upstream+1−1 pkgs/applications/science/misc/motu-client/default.nix+2−2 pkgs/applications/science/misc/netlogo/default.nix+58 pkgs/applications/science/misc/root/5.nix+5−2 pkgs/applications/science/misc/root/default.nix+2−2 pkgs/applications/science/misc/sasview/default.nix+3−3 pkgs/applications/science/misc/sasview/xhtml2pdf.nix+1 pkgs/applications/science/misc/simgrid/default.nix+4−4 pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix+37 pkgs/applications/science/molecular-dynamics/gromacs/default.nix+3−3 pkgs/applications/science/molecular-dynamics/lammps/default.nix+32−39 pkgs/applications/science/physics/quantomatic/default.nix+31 pkgs/applications/science/physics/xfitter/default.nix+5−3 pkgs/applications/science/physics/xfitter/calling_convention.patch → pkgs/applications/science/physics/xfitter/undefined_behavior.patch+106−7 pkgs/applications/science/robotics/qgroundcontrol/default.nix+1 pkgs/applications/search/catfish/default.nix+2−2 pkgs/applications/search/recoll/default.nix+2−2 pkgs/applications/version-management/arch/default.nix+1−1 pkgs/applications/version-management/bazaar/tools.nix+1−1 pkgs/applications/version-management/git-and-tools/default.nix+12 pkgs/applications/version-management/git-and-tools/fast-export/default.nix+1−1 pkgs/applications/version-management/git-and-tools/git-absorb/default.nix+24 pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix+3−3 pkgs/applications/version-management/git-and-tools/git-bug/default.nix+32 pkgs/applications/version-management/git-and-tools/git-bug/deps.nix+417 pkgs/applications/version-management/git-and-tools/git-cola/default.nix+1 pkgs/applications/version-management/git-and-tools/git-crypt/default.nix+4−5 pkgs/applications/version-management/git-and-tools/git-recent/default.nix+2−2 pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix+2−2 pkgs/applications/version-management/git-and-tools/git-reparent/default.nix+33 pkgs/applications/version-management/git-and-tools/git-secret/default.nix+4−4 pkgs/applications/version-management/git-and-tools/git-secrets/default.nix+14−22 pkgs/applications/version-management/git-and-tools/git-test/default.nix+33 pkgs/applications/version-management/git-and-tools/git/default.nix+29−40 pkgs/applications/version-management/git-and-tools/gitweb/default.nix+1−1 pkgs/applications/version-management/git-and-tools/grv/default.nix+6−2 pkgs/applications/version-management/git-and-tools/hub/default.nix+6−5 pkgs/applications/version-management/git-and-tools/lab/default.nix+25 pkgs/applications/version-management/git-and-tools/lab/deps.nix+327 pkgs/applications/version-management/git-and-tools/stgit/default.nix+2−2 pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix+4 pkgs/applications/version-management/git-repo/default.nix+5−5 pkgs/applications/version-management/git-review/default.nix+2−2 pkgs/applications/version-management/gitea/default.nix+17−4 pkgs/applications/version-management/gitkraken/default.nix+6−5 pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch−27 pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patch−11 pkgs/applications/version-management/gitlab/data.json+32 pkgs/applications/version-management/gitlab/default.nix+15−31 pkgs/applications/version-management/gitaly/Gemfile → pkgs/applications/version-management/gitlab/gitaly/Gemfile+12−7 pkgs/applications/version-management/gitaly/Gemfile.lock → pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock+76−70 pkgs/applications/version-management/gitaly/default.nix → pkgs/applications/version-management/gitlab/gitaly/default.nix+2−2 pkgs/applications/version-management/gitaly/gemset.nix → pkgs/applications/version-management/gitlab/gitaly/gemset.nix+153−144 pkgs/applications/version-management/gitlab-shell/default.nix → pkgs/applications/version-management/gitlab/gitlab-shell/default.nix+2−2 pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch+58 pkgs/applications/version-management/gitlab-workhorse/default.nix → pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix+5−4 pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch → pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patch pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile+51−45 pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock+177−207 pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix+254−290 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile+51−45 pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock+177−207 pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix+257−293 pkgs/applications/version-management/gitlab/update.py+235 pkgs/applications/version-management/gitolite/default.nix+4−4 pkgs/applications/version-management/meld/default.nix+35−30 pkgs/applications/version-management/mercurial/default.nix+5−4 pkgs/applications/version-management/monotone-viz/default.nix+3−3 pkgs/applications/version-management/monotone/default.nix+2−2 pkgs/applications/version-management/mr/default.nix+5−3 pkgs/applications/version-management/peru/default.nix+5−3 pkgs/applications/version-management/pijul/default.nix+13−6 pkgs/applications/version-management/rcs/default.nix+1−1 pkgs/applications/version-management/redmine/Gemfile.lock+2−2 pkgs/applications/version-management/redmine/gemset.nix+2−2 pkgs/applications/version-management/smartgithg/default.nix+2−2 pkgs/applications/version-management/src/default.nix+2−2 pkgs/applications/version-management/subversion/default.nix+10−4 pkgs/applications/version-management/tortoisehg/default.nix+2−2 pkgs/applications/version-management/vcsh/default.nix+3−7 pkgs/applications/version-management/yadm/default.nix+4 pkgs/applications/video/aegisub/default.nix+6 pkgs/applications/video/bombono/default.nix+1−7 pkgs/applications/video/cinelerra/default.nix+2−2 pkgs/applications/video/clipgrab/default.nix+2−2 pkgs/applications/video/gnomecast/default.nix+2−2 pkgs/applications/video/handbrake/default.nix+39−33 pkgs/applications/video/kazam/default.nix+2−2 pkgs/applications/video/kino/default.nix+8−2 pkgs/applications/video/kodi/default.nix+6−6 pkgs/applications/video/kodi/plugins.nix+48−21 pkgs/applications/video/kodi/yatp/dont-monkey.patch+29 pkgs/applications/video/makemkv/default.nix+13−5 pkgs/applications/video/mapmap/default.nix+2 pkgs/applications/video/mediathekview/default.nix+22−22 pkgs/applications/video/miro/default.nix−90 pkgs/applications/video/miro/gconf.patch−374 pkgs/applications/video/miro/youtube-feeds.patch−15 pkgs/applications/video/mkvtoolnix/default.nix+2−2 pkgs/applications/video/motion/default.nix+11−9 pkgs/applications/video/mpv/default.nix+9−3 pkgs/applications/video/mpv/scripts/mpris.nix+2−2 pkgs/applications/video/obs-studio/default.nix+17−3 pkgs/applications/video/openshot-qt/default.nix+3−3 pkgs/applications/video/openshot-qt/libopenshot.nix+2−2 pkgs/applications/video/pitivi/default.nix+15−14 pkgs/applications/video/plex-media-player/default.nix+11−11 pkgs/applications/video/pyca/default.nix+30 pkgs/applications/video/qgifer/default.nix−25 pkgs/applications/video/qmediathekview/default.nix+3−4 pkgs/applications/video/shotcut/default.nix+2−2 pkgs/applications/video/smplayer/default.nix+2−2 pkgs/applications/video/smtube/default.nix+2−2 pkgs/applications/video/vdr/default.nix+78 pkgs/applications/video/vdr/plugins.nix+318 pkgs/applications/video/vdr/wrapper.nix+21 pkgs/applications/video/vlc/default.nix+18−7 pkgs/applications/video/wxcam/default.nix+5−5 pkgs/applications/video/xawtv/default.nix+4−4 pkgs/applications/video/xine-ui/default.nix+1−1 pkgs/applications/video/xvidcap/default.nix+5−5 pkgs/applications/video/zdfmediathk/default.nix−38 pkgs/applications/virtualization/cntr/default.nix+24 pkgs/applications/virtualization/containerd/default.nix+24−22 pkgs/development/python-modules/docker_compose/default.nix → pkgs/applications/virtualization/docker-compose/default.nix+2−2 pkgs/applications/virtualization/docker/default.nix+14−13 pkgs/applications/virtualization/driver/win-spice/default.nix+8−7 pkgs/applications/virtualization/dynamips/default.nix+2−2 pkgs/applications/virtualization/firecracker/default.nix+35 pkgs/applications/virtualization/lkl/default.nix+5−5 pkgs/applications/virtualization/looking-glass-client/default.nix+6−6 pkgs/applications/virtualization/open-vm-tools/default.nix+2−2 pkgs/applications/virtualization/podman/conmon.nix+33 pkgs/applications/virtualization/podman/default.nix+43 pkgs/applications/virtualization/qemu/default.nix+19−19 pkgs/applications/virtualization/railcar/cargo-lock.patch+435 pkgs/applications/virtualization/railcar/default.nix+28 pkgs/applications/virtualization/remotebox/default.nix+2−2 pkgs/applications/virtualization/runc/default.nix+12−22 pkgs/applications/virtualization/spice-vdagent/default.nix+1−1 pkgs/applications/virtualization/virt-manager/default.nix+9−9 pkgs/applications/virtualization/virt-manager/qt.nix+4−2 pkgs/applications/virtualization/virt-what/default.nix+2−2 pkgs/applications/virtualization/virtualbox/default.nix+9−9 pkgs/applications/virtualization/virtualbox/extpack.nix+8−5 pkgs/applications/virtualization/virtualbox/guest-additions/default.nix+2−2 pkgs/applications/virtualization/xen/acpica-utils-20180427.patch+63 pkgs/applications/virtualization/xen/generic.nix+2−1 pkgs/applications/window-managers/awesome/default.nix+2−2 pkgs/applications/window-managers/dwm/dwm-status.nix+12−7 pkgs/applications/window-managers/evilwm/default.nix+2−2 pkgs/applications/window-managers/fluxbox/default.nix+2−2 pkgs/applications/window-managers/i3/default.nix+2−2 pkgs/applications/window-managers/i3/easyfocus.nix+2−2 pkgs/applications/window-managers/i3/gaps.nix+2−2 pkgs/applications/window-managers/i3/i3ipc-glib.nix+3−3 pkgs/applications/window-managers/i3/status.nix+2−2 pkgs/applications/window-managers/jwm/default.nix+3−3 pkgs/applications/window-managers/jwm/jwm-settings-manager.nix+44 pkgs/applications/window-managers/kbdd/default.nix+8−6 pkgs/applications/window-managers/larswm/default.nix+5−7 pkgs/applications/window-managers/oroborus/default.nix+2−2 pkgs/applications/window-managers/qtile/default.nix+7−7 pkgs/applications/window-managers/ratpoison/default.nix+3−3 pkgs/applications/window-managers/stalonetray/default.nix+3−3 pkgs/applications/window-managers/sway/beta.nix+43 pkgs/applications/window-managers/sway/default.nix+1−1 pkgs/applications/window-managers/sway/idle.nix+31 pkgs/applications/window-managers/sway/lock.nix+34 pkgs/applications/window-managers/sxhkd/unstable.nix−23 pkgs/applications/window-managers/tabbed/default.nix+5−5 pkgs/applications/window-managers/way-cooler/crates-io.nix+2916 pkgs/applications/window-managers/way-cooler/default.nix+18−6 pkgs/applications/window-managers/way-cooler/way-cooler.nix+310−1851 pkgs/applications/window-managers/yabar/unstable.nix+8−1 pkgs/build-support/agda/default.nix+3−3 pkgs/build-support/bintools-wrapper/default.nix+15−5 pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c+1−1 pkgs/build-support/build-fhs-userenv/chrootenv/default.nix+4−7 pkgs/build-support/build-fhs-userenv/chrootenv/meson.build+5 pkgs/build-support/build-fhs-userenv/default.nix+2−2 pkgs/build-support/build-maven.nix+11−7 pkgs/build-support/cc-wrapper/default.nix+17−4 pkgs/build-support/closure-info.nix+2−2 pkgs/build-support/docker/default.nix+55−50 pkgs/build-support/docker/examples.nix+29 pkgs/build-support/emacs/melpa.nix+14−15 pkgs/build-support/emacs/trivial.nix+4−9 pkgs/build-support/fetchgit/default.nix+2−1 pkgs/build-support/fetchgit/nix-prefetch-git+1−1 pkgs/build-support/fetchhg/default.nix+9−2 pkgs/build-support/fetchipfs/default.nix+4−4 pkgs/build-support/fetchmavenartifact/default.nix+1−1 pkgs/build-support/fetchsvn/default.nix+4−3 pkgs/build-support/fetchurl/default.nix+4−3 pkgs/build-support/fetchurl/mirrors.nix+21−24 pkgs/build-support/libredirect/default.nix+42−8 pkgs/build-support/libredirect/libredirect.c+7 pkgs/build-support/libredirect/test.c+59 pkgs/build-support/ocaml/dune.nix+36 pkgs/build-support/prefer-remote-fetch/default.nix+19 pkgs/build-support/rust/build-rust-crate/build-crate.nix+22−7 pkgs/build-support/rust/build-rust-crate/configure-crate.nix+3 pkgs/build-support/rust/build-rust-crate/default.nix+11−8 pkgs/build-support/rust/build-rust-crate/helpers.nix+27 pkgs/build-support/rust/build-rust-crate/install-crate.nix+5−3 pkgs/build-support/rust/carnix.nix+225−1439 pkgs/build-support/rust/crates-io.nix+2049 pkgs/build-support/rust/default-crate-overrides.nix+62−27 pkgs/build-support/rust/default.nix+7−9 pkgs/build-support/rust/fetchcargo.nix+6−5 pkgs/build-support/rust/make-rust-platform.nix+18 pkgs/build-support/setup-hooks/audit-tmpdir.sh+6−6 pkgs/build-support/setup-hooks/auto-patchelf.sh+68−10 pkgs/build-support/setup-hooks/breakpoint-hook.sh+9 pkgs/build-support/setup-hooks/make-wrapper.sh+1−1 pkgs/build-support/setup-hooks/patch-shebangs.sh+6−6 pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh+1−1 pkgs/build-support/singularity-tools/default.nix+4−1 pkgs/build-support/templaterpm/nix-template-rpm.py+23−23 pkgs/build-support/writers/default.nix+262 pkgs/build-support/writers/test.nix+168 pkgs/common-updater/scripts/update-source-version+8−3 pkgs/data/documentation/std-man-pages/default.nix+1−1 pkgs/data/fonts/agave/default.nix+28 pkgs/data/fonts/andika/default.nix+31 pkgs/data/fonts/ankacoder/condensed.nix+24 pkgs/data/fonts/ankacoder/default.nix+24 pkgs/data/fonts/b612/default.nix+38 pkgs/data/fonts/cantarell-fonts/default.nix+9−3 pkgs/data/fonts/charis-sil/default.nix+31 pkgs/data/fonts/cherry/default.nix+35 pkgs/data/fonts/comfortaa/default.nix+3−3 pkgs/data/fonts/cooper-hewitt/default.nix+22 pkgs/data/fonts/culmus/default.nix+13−8 pkgs/data/fonts/doulos-sil/default.nix+31 pkgs/data/fonts/droid/default.nix−64 pkgs/data/fonts/font-awesome-5/default.nix+3−5 pkgs/data/fonts/freefont-ttf/default.nix+1−1 pkgs/data/fonts/google-fonts/default.nix+1−3 pkgs/data/fonts/hermit/default.nix+28 pkgs/data/fonts/ibm-plex/default.nix+2−2 pkgs/data/fonts/inter-ui/default.nix+2−2 pkgs/data/fonts/iosevka/bin.nix+2−2 pkgs/data/fonts/liberationsansnarrow/default.nix → pkgs/data/fonts/liberation-sans-narrow/default.nix+12−12 pkgs/data/fonts/liberationsansnarrow/binary.nix−22 pkgs/data/fonts/lmodern/default.nix+5−5 pkgs/data/fonts/luculent/default.nix+23 pkgs/data/fonts/material-design-icons/default.nix+38 pkgs/data/fonts/noto-fonts/default.nix+10−7 pkgs/data/fonts/open-dyslexic/default.nix+3−3 pkgs/data/fonts/open-sans/default.nix+33 pkgs/data/fonts/opensans-ttf/default.nix−27 pkgs/data/fonts/overpass/default.nix+2−2 pkgs/data/fonts/powerline-fonts/default.nix+3−3 pkgs/data/fonts/redhat-liberation-fonts/default.nix+23−33 pkgs/data/fonts/rictydiminished-with-firacode/default.nix+1−1 pkgs/data/fonts/sarasa-gothic/default.nix+12−15 pkgs/data/fonts/source-sans-pro/default.nix+7−5 pkgs/data/fonts/terminus-font-ttf/default.nix+2−2 pkgs/data/fonts/terminus-font/default.nix+9−11 pkgs/data/fonts/twemoji-color-font/default.nix+2−2 pkgs/data/fonts/unifont/default.nix+4−4 pkgs/data/fonts/weather-icons/default.nix+29 pkgs/data/icons/bibata-cursors/default.nix+41 pkgs/data/icons/elementary-icon-theme/default.nix+23−10 pkgs/data/icons/maia-icon-theme/default.nix+21−9 pkgs/data/icons/paper-icon-theme/default.nix+5 pkgs/data/icons/papirus-icon-theme/default.nix+2−2 pkgs/data/icons/zafiro-icons/default.nix+29 pkgs/data/machine-learning/mnist/default.nix+45 pkgs/data/misc/hackage/default.nix+2−2 pkgs/data/misc/iana-etc/default.nix+2−2 pkgs/data/misc/mailcap/default.nix+28 pkgs/data/misc/miscfiles/default.nix+1−1 pkgs/data/misc/nixos-artwork/wallpapers.nix+9 pkgs/data/misc/osinfo-db/default.nix+2−2 pkgs/data/misc/shared-mime-info/default.nix+3−4 pkgs/data/misc/tzdata/default.nix+5−5 pkgs/data/misc/wireless-regdb/default.nix+2−2 pkgs/data/misc/xorg-rgb/default.nix+2−2 pkgs/data/themes/ant-theme/default.nix+39 pkgs/misc/themes/matcha/default.nix → pkgs/data/themes/matcha/default.nix+5−5 pkgs/misc/themes/materia-theme/default.nix → pkgs/data/themes/materia-theme/default.nix+2−3 pkgs/data/themes/mojave/default.nix+31 pkgs/data/themes/nordic-polar/default.nix+35 pkgs/data/themes/nordic/default.nix+43 pkgs/misc/themes/plano/default.nix → pkgs/data/themes/plano/default.nix+2−2 pkgs/data/themes/plata/default.nix+80 pkgs/data/themes/qogir/default.nix+31 pkgs/misc/themes/shades-of-gray/default.nix → pkgs/data/themes/shades-of-gray/default.nix+3−3 pkgs/desktops/deepin/dbus-factory/default.nix+8−2 pkgs/desktops/deepin/dde-api/default.nix+66 pkgs/desktops/deepin/dde-api/deps.nix+102 pkgs/desktops/deepin/dde-calendar/default.nix+5−3 pkgs/desktops/deepin/dde-daemon/default.nix+92 pkgs/desktops/deepin/dde-daemon/deps.nix+111 pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix+5−3 pkgs/desktops/deepin/dde-session-ui/default.nix+62 pkgs/desktops/deepin/deepin-desktop-base/default.nix+47 pkgs/desktops/deepin/deepin-desktop-schemas/default.nix+46 pkgs/desktops/deepin/deepin-gettext-tools/default.nix+3−1 pkgs/desktops/deepin/deepin-gtk-theme/default.nix+11−8 pkgs/desktops/deepin/deepin-icon-theme/default.nix+5−3 pkgs/desktops/deepin/deepin-image-viewer/default.nix+6−3 pkgs/desktops/deepin/deepin-menu/default.nix+5−3 pkgs/desktops/deepin/deepin-metacity/default.nix+64 pkgs/desktops/deepin/deepin-movie-reborn/default.nix+55 pkgs/desktops/deepin/deepin-mutter/default.nix+5−4 pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix+3−2 pkgs/desktops/deepin/deepin-sound-theme/default.nix+5−2 pkgs/desktops/deepin/deepin-terminal/default.nix+33−27 pkgs/desktops/deepin/deepin-wallpapers/default.nix+44 pkgs/desktops/deepin/deepin-wm/default.nix+60 pkgs/desktops/deepin/default.nix+11−1 pkgs/desktops/deepin/dtkcore/default.nix+5−3 pkgs/desktops/deepin/dtkwidget/default.nix+5−4 pkgs/desktops/deepin/dtkwm/default.nix+4−1 pkgs/desktops/deepin/go-dbus-factory/default.nix+8−4 pkgs/desktops/deepin/go-dbus-generator/default.nix+4−3 pkgs/desktops/deepin/go-gir-generator/default.nix+20−5 pkgs/desktops/deepin/go-lib/default.nix+9−5 pkgs/desktops/deepin/qt5dxcb-plugin/default.nix+6−3 pkgs/desktops/deepin/qt5integration/default.nix+7−6 pkgs/desktops/deepin/update.nix+38 pkgs/desktops/enlightenment/efl.nix+6−3 pkgs/desktops/enlightenment/terminology.nix+2−2 pkgs/desktops/gnome-2/desktop/mail-notification/default.nix+1−1 pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix+3−2 pkgs/desktops/gnome-2/platform/GConf/default.nix+1−1 pkgs/desktops/gnome-2/platform/libglade/default.nix+2 pkgs/desktops/gnome-3/apps/accerciser/default.nix+2−2 pkgs/desktops/gnome-3/apps/cheese/default.nix+2−2 pkgs/desktops/gnome-3/apps/evolution/default.nix+4−4 pkgs/desktops/gnome-3/apps/file-roller/default.nix+3−2 pkgs/desktops/gnome-3/apps/gedit/default.nix+2−2 pkgs/desktops/gnome-3/apps/glade/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix+6−6 pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix+4−4 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix+10−5 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix+4−4 pkgs/desktops/gnome-3/apps/gnome-documents/default.nix+13−5 pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-logs/default.nix+3−3 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix+16−13 pkgs/desktops/gnome-3/apps/gnome-music/default.nix+7−7 pkgs/desktops/gnome-3/apps/bijiben/default.nix → pkgs/desktops/gnome-3/apps/gnome-notes/default.nix+6−6 pkgs/desktops/gnome-3/apps/gnome-photos/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix+2−2 pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix+14−8 pkgs/desktops/gnome-3/apps/gnome-weather/default.nix+2−2 pkgs/desktops/gnome-3/apps/polari/default.nix+4−4 pkgs/desktops/gnome-3/apps/seahorse/default.nix+17−14 pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix+9−6 pkgs/desktops/gnome-3/core/baobab/default.nix+2−2 pkgs/desktops/gnome-3/core/dconf-editor/default.nix+6−6 pkgs/desktops/gnome-3/core/dconf/default.nix+13−8 pkgs/desktops/gnome-3/core/empathy/default.nix+12−7 pkgs/desktops/gnome-3/core/eog/default.nix+13−4 pkgs/desktops/gnome-3/core/epiphany/default.nix+4−4 pkgs/desktops/gnome-3/core/evince/default.nix+6−6 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix+7−6 pkgs/desktops/gnome-3/core/gdm/default.nix+12−12 pkgs/desktops/gnome-3/core/gdm/fix-paths.patch+14−14 pkgs/desktops/gnome-3/core/gdm/reset-environment.patch+20 pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch−52 pkgs/desktops/gnome-3/core/gjs/default.nix+6−6 pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix+4−4 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix+4−4 pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix+6−6 pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch+24−28 pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch+1−1 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix+6−9 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-keyring/default.nix+1−1 pkgs/desktops/gnome-3/core/gnome-menus/default.nix−23 pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix+9−8 pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix+41 pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-session/default.nix+11−11 pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch+18−2 pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix+4−7 pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix+7−5 pkgs/desktops/gnome-3/core/gnome-shell/default.nix+6−10 pkgs/desktops/gnome-3/core/gnome-software/default.nix+8−10 pkgs/desktops/gnome-3/core/gnome-system-log/default.nix−34 pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix+9−8 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix+4 pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix+2−2 pkgs/desktops/gnome-3/core/grilo-plugins/default.nix+8−11 pkgs/desktops/gnome-3/core/grilo/default.nix+16−17 pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix+4−4 pkgs/desktops/gnome-3/core/gucharmap/default.nix+4−13 pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix+2−2 pkgs/desktops/gnome-3/core/libpeas/default.nix−34 pkgs/desktops/gnome-3/core/mutter/3.28.nix+55 pkgs/desktops/gnome-3/core/mutter/default.nix+5−5 pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch+19 pkgs/desktops/gnome-3/core/nautilus/default.nix+24−9 pkgs/desktops/gnome-3/core/rygel/default.nix+2−2 pkgs/desktops/gnome-3/core/simple-scan/default.nix+15−31 pkgs/desktops/gnome-3/core/sushi/default.nix+20−30 pkgs/desktops/gnome-3/core/totem/default.nix+5−5 pkgs/desktops/gnome-3/core/tracker-miners/default.nix+5−11 pkgs/desktops/gnome-3/core/tracker/default.nix+21−4 pkgs/desktops/gnome-3/core/yelp-xsl/default.nix+2−2 pkgs/desktops/gnome-3/core/yelp/default.nix+2−2 pkgs/desktops/gnome-3/core/zenity/default.nix+2−2 pkgs/desktops/gnome-3/default.nix+39−69 pkgs/desktops/gnome-3/devtools/anjuta/default.nix+3−2 pkgs/desktops/gnome-3/devtools/devhelp/default.nix+4−4 pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix+2−2 pkgs/desktops/gnome-3/devtools/nemiver/default.nix+1 pkgs/desktops/gnome-3/extensions/caffeine/default.nix+3−3 pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix+3−3 pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix+2−2 pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+91 pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch+44 pkgs/desktops/gnome-3/extensions/icon-hider/default.nix+2−2 pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix+2−2 pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix+2−2 pkgs/desktops/gnome-3/extensions/system-monitor/default.nix+2−2 pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix+2−2 pkgs/desktops/gnome-3/find-latest-version.py+1−1 pkgs/desktops/gnome-3/games/aisleriot/default.nix+2−2 pkgs/desktops/gnome-3/games/atomix/default.nix+2−2 pkgs/desktops/gnome-3/games/five-or-more/default.nix+18−11 pkgs/desktops/gnome-3/games/gnome-chess/default.nix+4−4 pkgs/desktops/gnome-3/games/gnome-mines/default.nix+5−5 pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix+16−9 pkgs/desktops/gnome-3/games/gnome-taquin/default.nix+2−2 pkgs/desktops/gnome-3/games/iagno/default.nix+11−9 pkgs/desktops/gnome-3/games/lightsoff/default.nix+14−6 pkgs/desktops/gnome-3/games/swell-foop/default.nix+2−2 pkgs/desktops/gnome-3/misc/california/default.nix−47 pkgs/desktops/gnome-3/misc/geary/default.nix+26−4 pkgs/desktops/gnome-3/misc/gitg/default.nix+21−10 pkgs/desktops/gnome-3/misc/gnome-applets/default.nix+2−24 pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix+2−2 pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix+140−62 pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch−30 pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix+15−13 pkgs/desktops/gnome-3/misc/gnome-panel/default.nix+23−5 pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix+96 pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch+11 pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix+4−4 pkgs/desktops/gnome-3/misc/gpaste/default.nix+18−14 pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix+2−2 pkgs/desktops/gnome-3/misc/metacity/default.nix+2−2 pkgs/desktops/gnome-3/misc/nautilus-python/default.nix+62 pkgs/desktops/gnome-3/misc/pomodoro/default.nix+11−3 pkgs/desktops/gnome-3/update.nix+12−7 pkgs/desktops/gnustep/back/default.nix+2−2 pkgs/desktops/gnustep/base/default.nix+2−2 pkgs/desktops/gnustep/gui/default.nix+2−2 pkgs/desktops/gnustep/libobjc2/default.nix+1 pkgs/desktops/lxde/core/lxrandr/default.nix+23 pkgs/desktops/mate/atril/default.nix+7−4 pkgs/desktops/mate/caja-extensions/default.nix+2−2 pkgs/desktops/mate/caja/default.nix+2−2 pkgs/desktops/mate/engrampa/default.nix+2−2 pkgs/desktops/mate/eom/default.nix+2−2 pkgs/desktops/mate/libmatekbd/default.nix+2−2 pkgs/desktops/mate/libmatemixer/default.nix+2−2 pkgs/desktops/mate/libmateweather/default.nix+2−2 pkgs/desktops/mate/marco/default.nix+2−2 pkgs/desktops/mate/mate-applets/default.nix+2−2 pkgs/desktops/mate/mate-calc/default.nix+2−2 pkgs/desktops/mate/mate-control-center/default.nix+2−2 pkgs/desktops/mate/mate-desktop/default.nix+2−2 pkgs/desktops/mate/mate-icon-theme-faenza/default.nix+9−3 pkgs/desktops/mate/mate-icon-theme/default.nix+2−2 pkgs/desktops/mate/mate-media/default.nix+2−2 pkgs/desktops/mate/mate-menus/default.nix+5−5 pkgs/desktops/mate/mate-notification-daemon/default.nix+2−2 pkgs/desktops/mate/mate-panel/default.nix+5−4 pkgs/desktops/mate/mate-polkit/default.nix+5−5 pkgs/desktops/mate/mate-power-manager/default.nix+2−2 pkgs/desktops/mate/mate-screensaver/default.nix+2−2 pkgs/desktops/mate/mate-sensors-applet/default.nix+2−2 pkgs/desktops/mate/mate-session-manager/default.nix+2−2 pkgs/desktops/mate/mate-settings-daemon/default.nix+2−2 pkgs/desktops/mate/mate-system-monitor/default.nix+2−2 pkgs/desktops/mate/mate-terminal/default.nix+5−5 pkgs/desktops/mate/mate-themes/default.nix+7−3 pkgs/desktops/mate/mate-user-guide/default.nix+2−2 pkgs/desktops/mate/mate-utils/default.nix+2−2 pkgs/desktops/mate/mozo/default.nix+12−11 pkgs/desktops/mate/pluma/default.nix+2−2 pkgs/desktops/mate/python-caja/default.nix+2−2 pkgs/desktops/maxx/default.nix+2−2 pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix+2−2 pkgs/desktops/plasma-5/breeze-qt5.nix+2−2 pkgs/desktops/plasma-5/fetch.sh+1−1 pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch+8−8 pkgs/desktops/plasma-5/plasma-integration/D9070.patch−24 pkgs/desktops/plasma-5/plasma-integration/default.nix−7 pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch+5−9 pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch+9−11 pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch+3−3 pkgs/desktops/plasma-5/plasma-workspace/default.nix−4 pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch+17−17 pkgs/desktops/plasma-5/srcs.nix+180−180 pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix+3−1 pkgs/desktops/rox/rox-filer/default.nix+1 pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix+2−2 pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix+2−2 pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix+3−8 pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix+4−9 pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix+1−1 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix+2−2 pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix+2−9 pkgs/desktops/xfce4-13/default.nix+1−3 pkgs/desktops/xfce4-13/libxfce4ui/default.nix+2−2 pkgs/desktops/xfce4-13/libxfce4util/default.nix+2−2 pkgs/desktops/xfce4-13/xfce4-panel/default.nix+2−2 pkgs/desktops/xfce4-13/xfce4-terminal/default.nix+2−1 pkgs/development/mobile/androidenv/androidndk-pkgs.nix → pkgs/development/androidndk-pkgs/androidndk-pkgs.nix+16−10 pkgs/development/androidndk-pkgs/default.nix+34 pkgs/development/arduino/platformio/core.nix+61−8 pkgs/development/beam-modules/default.nix+7−4 pkgs/development/beam-modules/hex-registry-snapshot.nix+2−2 pkgs/development/beam-modules/hex/default.nix+3−3 pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py+63 pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix+59 pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix+112 pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix+10 pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix+9 pkgs/development/compilers/adoptopenjdk-bin/sources.json+98 pkgs/development/compilers/ats2/default.nix+3−3 pkgs/development/compilers/chez/default.nix+1 pkgs/development/compilers/chicken/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch → pkgs/development/compilers/chicken/4/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch pkgs/development/compilers/chicken/default.nix → pkgs/development/compilers/chicken/4/chicken.nix pkgs/development/compilers/chicken/4/default.nix+21 pkgs/development/tools/egg2nix/default.nix → pkgs/development/compilers/chicken/4/egg2nix.nix pkgs/development/compilers/chicken/eggDerivation.nix → pkgs/development/compilers/chicken/4/eggDerivation.nix+2−3 pkgs/development/tools/egg2nix/chicken-eggs.nix → pkgs/development/compilers/chicken/4/eggs.nix pkgs/development/tools/egg2nix/chicken-eggs.scm → pkgs/development/compilers/chicken/4/eggs.scm pkgs/build-support/fetchegg/builder.sh → pkgs/development/compilers/chicken/4/fetchegg/builder.sh pkgs/build-support/fetchegg/default.nix → pkgs/development/compilers/chicken/4/fetchegg/default.nix+1−1 pkgs/development/compilers/chicken/overrides.nix → pkgs/development/compilers/chicken/4/overrides.nix pkgs/development/compilers/chicken/setup-hook.sh → pkgs/development/compilers/chicken/4/setup-hook.sh pkgs/development/compilers/chicken/5/chicken.nix+62 pkgs/development/compilers/chicken/5/default.nix+21 pkgs/development/compilers/chicken/5/egg2nix.nix+29 pkgs/development/compilers/chicken/5/eggDerivation.nix+41 pkgs/development/compilers/chicken/5/eggs.nix+91 pkgs/development/compilers/chicken/5/eggs.scm+3 pkgs/development/compilers/chicken/5/fetchegg/builder.sh+10 pkgs/development/compilers/chicken/5/fetchegg/default.nix+25 pkgs/development/compilers/chicken/5/overrides.nix+2 pkgs/development/compilers/chicken/5/setup-hook.sh+6 pkgs/development/compilers/clasp/default.nix+95−39 pkgs/development/compilers/clean/default.nix+5−5 pkgs/development/compilers/closure/default.nix+2−2 pkgs/development/compilers/compcert/default.nix+37−13 pkgs/development/compilers/crystal/default.nix+2−2 pkgs/development/compilers/cudatoolkit/default.nix+40−6 pkgs/development/compilers/dmd/default.nix+22−47 pkgs/development/compilers/dotnet/sdk/default.nix+3−3 pkgs/development/compilers/dtc/default.nix+3−8 pkgs/development/compilers/elm/README.md+24 pkgs/development/compilers/elm/default.nix+11−94 pkgs/development/compilers/elm/elm2nix.rb−26 pkgs/development/compilers/elm/fetchElmDeps.nix+11 pkgs/development/compilers/elm/makeDotElm.nix+30 pkgs/development/compilers/elm/packages/elm-elm.nix−50 pkgs/development/compilers/elm/packages/elm-srcs.nix+62 pkgs/development/compilers/elm/packages/elm.nix+1 pkgs/development/compilers/elm/packages/tasty-quickcheck.nix−14 pkgs/development/compilers/elm/update.sh+8−1 pkgs/development/compilers/elm/versions.dat pkgs/development/compilers/factor-lang/default.nix+51−39 pkgs/development/compilers/factor-lang/fuel-dir.patch+20 pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patch+13 pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch+24 pkgs/development/compilers/fasm/bin.nix+24 pkgs/development/compilers/fasm/default.nix+28 pkgs/development/compilers/fpc/default.upstream+1−1 pkgs/development/compilers/fpc/lazarus.nix+3−3 pkgs/development/compilers/gambit/bootstrap.nix+6−6 pkgs/development/compilers/gambit/build.nix+2−2 pkgs/development/compilers/gambit/default.nix+4−5 pkgs/development/compilers/gambit/unstable.nix+8−7 pkgs/development/compilers/gcc-arm-embedded/6/default.nix+1 pkgs/development/compilers/gcc-arm-embedded/7/default.nix+1 pkgs/development/compilers/gcc-arm-embedded/8/default.nix+40 pkgs/development/compilers/gcc-arm-embedded/default.nix+1 pkgs/development/compilers/gcc/4.8/default.nix+40−30 pkgs/development/compilers/gcc/4.9/default.nix+38−33 pkgs/development/compilers/gcc/5/default.nix+31−27 pkgs/development/compilers/gcc/6/default.nix+35−33 pkgs/development/compilers/gcc/7/default.nix+38−28 pkgs/development/compilers/gcc/8/default.nix+25−28 pkgs/development/compilers/gcc/builder.sh−5 pkgs/development/compilers/gcc/snapshot/default.nix+25−21 pkgs/development/compilers/gcl/2.6.13-pre.nix+5−5 pkgs/development/compilers/gcl/default.nix+4−4 pkgs/development/compilers/gerbil/build.nix+5−5 pkgs/development/compilers/gerbil/default.nix+10−8 pkgs/development/compilers/gerbil/unstable.nix+9−8 pkgs/development/compilers/ghc/7.10.3-binary.nix−163 pkgs/development/compilers/ghc/8.2.1-binary.nix → pkgs/development/compilers/ghc/8.2.2-binary.nix+7−8 pkgs/development/compilers/ghc/8.2.2.nix+6−9 pkgs/development/compilers/ghc/8.4.3.nix → pkgs/development/compilers/ghc/8.4.4.nix+16−15 pkgs/development/compilers/ghc/8.6.1.nix+9−12 pkgs/development/compilers/ghc/7.10.3.nix → pkgs/development/compilers/ghc/8.6.2.nix+67−31 pkgs/development/compilers/ghc/8.0.2.nix → pkgs/development/compilers/ghc/8.6.3.nix+61−35 pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch−23 pkgs/development/compilers/ghc/ghc-gold-linker.patch−54 pkgs/development/compilers/ghc/ghc-no-madv-free.patch−18 pkgs/development/compilers/ghc/head.nix+6−8 pkgs/development/compilers/ghc/relocation.patch−27 pkgs/development/compilers/ghcjs-ng/8.4/git.json+2−2 pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix+1 pkgs/development/compilers/ghcjs/7.10/boot.patch−104 pkgs/development/compilers/ghcjs/7.10/default.nix−50 pkgs/development/compilers/ghcjs/7.10/shims.nix−7 pkgs/development/compilers/ghcjs/7.10/stage2.nix−344 pkgs/development/compilers/ghcjs/8.0/boot.patch−86 pkgs/development/compilers/ghcjs/8.0/default.nix−50 pkgs/development/compilers/ghcjs/8.0/shims.nix−7 pkgs/development/compilers/ghcjs/8.0/stage2.nix−545 pkgs/development/compilers/glslang/default.nix+3−11 pkgs/development/compilers/go/1.10.nix+5−11 pkgs/development/compilers/go/1.11.nix+93−48 pkgs/development/compilers/go/1.9.nix+2−8 pkgs/development/compilers/gprolog/default.nix+3−3 pkgs/development/compilers/graalvm/default.nix+36−13 pkgs/development/compilers/halide/default.nix+2−2 pkgs/development/compilers/iasl/default.nix+2−2 pkgs/development/compilers/ispc/default.nix+3−10 pkgs/development/compilers/jetbrains-jdk/default.nix−5 pkgs/development/compilers/jsonnet/default.nix+2−2 pkgs/development/compilers/julia/0004-hardened.patch−25 pkgs/development/compilers/julia/1.0.nix+2−2 pkgs/development/compilers/julia/default.nix+3−4 pkgs/development/compilers/julia/shared.nix+4−4 pkgs/development/compilers/kotlin/default.nix+2−2 pkgs/development/compilers/ldc/default.nix+46−93 pkgs/development/compilers/llvm/3.5/llvm.nix−6 pkgs/development/compilers/llvm/3.7/llvm.nix−2 pkgs/development/compilers/llvm/3.8/llvm.nix−2 pkgs/development/compilers/llvm/3.9/llvm.nix−2 pkgs/development/compilers/llvm/4/libc++/default.nix+5 pkgs/development/compilers/llvm/4/libc++/libc++.a+1 pkgs/development/compilers/llvm/4/libc++abi.nix+1 pkgs/development/compilers/llvm/4/lldb.nix+1−1 pkgs/development/compilers/llvm/4/llvm.nix+1−7 pkgs/development/compilers/llvm/5/libc++/default.nix+5 pkgs/development/compilers/llvm/5/libc++/libc++.a+1 pkgs/development/compilers/llvm/5/libc++abi.nix+1 pkgs/development/compilers/llvm/5/lldb.nix+1−1 pkgs/development/compilers/llvm/5/llvm.nix+2−10 pkgs/development/compilers/llvm/6/libc++/default.nix+5 pkgs/development/compilers/llvm/6/libc++/libc++.a+1 pkgs/development/compilers/llvm/6/libc++abi.nix+1 pkgs/development/compilers/llvm/6/lldb.nix+1−1 pkgs/development/compilers/llvm/6/llvm.nix+38−29 pkgs/development/compilers/llvm/7/clang/default.nix+1−1 pkgs/development/compilers/llvm/7/compiler-rt.nix+1−1 pkgs/development/compilers/llvm/7/default.nix+2−2 pkgs/development/compilers/llvm/7/libc++/default.nix+6−1 pkgs/development/compilers/llvm/7/libc++/libc++.a+1 pkgs/development/compilers/llvm/7/libc++abi.nix+2−1 pkgs/development/compilers/llvm/7/lld.nix+1−1 pkgs/development/compilers/llvm/7/lldb.nix+2−2 pkgs/development/compilers/llvm/7/llvm.nix+30−31 pkgs/development/compilers/llvm/7/openmp.nix+1−1 pkgs/development/compilers/llvm/common.nix+22 pkgs/development/compilers/manticore/default.nix+3−3 pkgs/development/compilers/mentor/default.nix−80 pkgs/development/compilers/microscheme/default.nix+1−6 pkgs/development/compilers/mit-scheme/default.nix+1−1 pkgs/development/compilers/mlton/20130715.nix+118 pkgs/development/compilers/mlton/20180207-binary.nix+57 pkgs/development/compilers/mlton/default.nix+21−129 pkgs/development/compilers/mlton/from-git-source.nix+35 pkgs/development/compilers/mlton/meta.nix+15 pkgs/development/compilers/mono/4.0.nix−9 pkgs/development/compilers/mono/4.4.nix−8 pkgs/development/compilers/mono/4.6.nix−8 pkgs/development/compilers/mono/4.8.nix → pkgs/development/compilers/mono/4.nix+1−1 pkgs/development/compilers/mono/5.0.nix−8 pkgs/development/compilers/mono/5.14.nix−8 pkgs/development/compilers/mono/5.4.nix−8 pkgs/development/compilers/mono/5.8.nix−8 pkgs/development/compilers/mono/5.nix+8 pkgs/development/compilers/mono/build-fix-llvm.patch−12 pkgs/development/compilers/mono/generic-cmake.nix−92 pkgs/development/compilers/mono/generic.nix+17−25 pkgs/development/compilers/mono/llvm.nix+12−18 pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch−65 pkgs/development/compilers/mruby/default.nix+2−2 pkgs/development/compilers/nasm/default.nix+2−2 pkgs/development/compilers/nextpnr/default.nix+48−9 pkgs/development/compilers/nim/default.nix+20−21 pkgs/development/compilers/ocaml/4.07.nix+2−2 pkgs/development/compilers/ocaml/ber-metaocaml-104.nix−83 pkgs/development/compilers/ocaml/ber-metaocaml.nix+96 pkgs/development/compilers/ocaml/generic.nix+7−5 pkgs/development/compilers/openjdk/10.nix → pkgs/development/compilers/openjdk/11.nix+21−59 pkgs/development/compilers/openjdk/8.nix+11−20 pkgs/development/compilers/openjdk/bootstrap.nix+2−10 pkgs/development/compilers/openjdk/darwin/10.nix → pkgs/development/compilers/openjdk/darwin/11.nix+7−8 pkgs/development/compilers/openspin/default.nix+26 pkgs/development/compilers/oraclejdk/jdk-linux-base.nix+27−23 pkgs/development/compilers/oraclejdk/jdk10-linux.nix−155 pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix+9−7 pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix+9−7 pkgs/development/compilers/osl/default.nix+3−3 pkgs/development/compilers/pakcs/default.nix+3−1 pkgs/development/compilers/ponyc/default.nix+2−2 pkgs/development/compilers/purescript/psc-package/default.nix+2−2 pkgs/development/compilers/reason/default.nix+8−9 pkgs/development/compilers/rust/binaryBuild.nix+1−3 pkgs/development/compilers/rust/bootstrap.nix+8−9 pkgs/development/compilers/rust/cargo.nix+3−6 pkgs/development/compilers/rust/default.nix+6−6 pkgs/development/compilers/rust/rustc.nix+32−35 pkgs/development/compilers/sbcl/default.nix+30−11 pkgs/development/compilers/scala/default.nix+2−2 pkgs/development/compilers/scala/dotty-bare.nix+5−5 pkgs/development/compilers/shaderc/default.nix+21−11 pkgs/development/compilers/smlnj/bootstrap.nix+3−3 pkgs/development/compilers/smlnj/default.nix+24−23 pkgs/development/compilers/solc/default.nix+5−12 pkgs/development/compilers/solc/patches/shared-libs-install.patch+21−14 pkgs/development/compilers/swift/default.nix+23−29 pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch+1−1 pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch+1−1 pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch+1−1 pkgs/development/compilers/swift/patches/build-script-pax.patch−33 pkgs/development/compilers/swift/patches/glibc-arch-headers.patch+13 pkgs/development/compilers/swift/patches/llvm-include-dirs.patch+13 pkgs/development/compilers/swift/purity.patch+1−1 pkgs/development/compilers/terra/default.nix−4 pkgs/development/compilers/tinycc/default.nix−4 pkgs/development/compilers/urn/default.nix+2−2 pkgs/development/compilers/urweb/default.nix+3−3 pkgs/development/compilers/vala/default.nix+13−11 pkgs/development/compilers/x11basic/default.nix+48 pkgs/development/compilers/yosys/default.nix+5−5 pkgs/development/coq-modules/Cheerios/default.nix+32 pkgs/development/coq-modules/InfSeqExt/default.nix+31 pkgs/development/coq-modules/QuickChick/default.nix+16−3 pkgs/development/coq-modules/StructTact/default.nix+31 pkgs/development/coq-modules/Velisarios/default.nix+50 pkgs/development/coq-modules/Verdi/default.nix+32 pkgs/development/coq-modules/autosubst/default.nix+1 pkgs/development/coq-modules/bignums/default.nix+8−5 pkgs/development/coq-modules/category-theory/default.nix+20−16 pkgs/development/coq-modules/contribs/default.nix+2−2 pkgs/development/coq-modules/coq-ext-lib/default.nix+2−1 pkgs/development/coq-modules/coq-haskell/default.nix+1−1 pkgs/development/coq-modules/coqprime/default.nix+7−4 pkgs/development/coq-modules/corn/default.nix+38 pkgs/development/coq-modules/dpdgraph/default.nix+3−3 pkgs/development/coq-modules/equations/default.nix+1−1 pkgs/development/coq-modules/fiat/HEAD.nix+3−2 pkgs/development/coq-modules/flocq/default.nix+23−6 pkgs/development/coq-modules/heq/default.nix+1−1 pkgs/development/coq-modules/math-classes/default.nix+3−3 pkgs/development/coq-modules/mathcomp/default.nix+58−22 pkgs/development/coq-modules/mathcomp/generic.nix−42 pkgs/development/coq-modules/metalib/default.nix+1−1 pkgs/development/coq-modules/paco/default.nix+1−1 pkgs/development/coq-modules/simple-io/default.nix+32 pkgs/development/coq-modules/ssreflect/default.nix+31−28 pkgs/development/coq-modules/ssreflect/generic.nix−49 pkgs/development/dhall-modules/default.nix+9 pkgs/development/dhall-modules/prelude/v3.nix+25 pkgs/development/go-modules/generic/default.nix+169−155 pkgs/development/guile-modules/guile-cairo/default.nix+6−5 pkgs/development/guile-modules/guile-gnome/default.nix+1−1 pkgs/development/guile-modules/guile-lib/default.nix+1−1 pkgs/development/guile-modules/guile-opengl/default.nix+1−1 pkgs/development/guile-modules/guile-sdl/default.nix+1−1 pkgs/development/guile-modules/guile-sdl2/default.nix+4−4 pkgs/development/haskell-modules/configuration-common.nix+123−90 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix−239 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix−88 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix+15 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+22−40 pkgs/development/haskell-modules/configuration-ghc-head.nix+1−1 pkgs/development/haskell-modules/configuration-hackage2nix.yaml+1626−1441 pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix−59 pkgs/development/haskell-modules/configuration-nix.nix+26−1 pkgs/development/haskell-modules/default.nix+4−1 pkgs/development/haskell-modules/generic-builder.nix+14−6 pkgs/development/haskell-modules/hackage-packages.nix+13343−8355 pkgs/development/haskell-modules/lib.nix+68−6 pkgs/development/haskell-modules/make-package-set.nix+10−7 pkgs/development/haskell-modules/non-hackage-packages.nix+15 pkgs/development/haskell-modules/patches/fgl-monad-fail.patch−61 pkgs/development/haskell-modules/patches/opencv-fix-116.patch+11 pkgs/development/idris-modules/categories.nix+2−3 pkgs/development/idris-modules/curses.nix−33 pkgs/development/idris-modules/default.nix−2 pkgs/development/idris-modules/derive.nix+3−4 pkgs/development/idris-modules/tparsec.nix+3−3 pkgs/development/interpreters/angelscript/2.22.nix+1 pkgs/development/interpreters/angelscript/default.nix+2−2 pkgs/development/interpreters/bats/default.nix+5−2 pkgs/development/interpreters/clisp/default.nix+5−4 pkgs/development/interpreters/clisp/hg.nix+3−3 pkgs/development/interpreters/clojure/default.nix+4−4 pkgs/development/interpreters/clojurescript/lumo/default.nix+257 pkgs/development/interpreters/clojurescript/lumo/deps.edn+12 pkgs/development/interpreters/clojurescript/lumo/deps.nix+393 pkgs/development/interpreters/clojurescript/lumo/package.json+42 pkgs/development/interpreters/duktape/default.nix+2−2 pkgs/development/interpreters/elixir/1.3.nix−7 pkgs/development/interpreters/elixir/1.7.nix+2−2 pkgs/development/interpreters/elixir/1.8.nix+7 pkgs/development/interpreters/erlang/R21.nix+2−2 pkgs/development/interpreters/erlang/generic-builder.nix+5−3 pkgs/development/interpreters/gauche/default.nix+2−2 pkgs/development/interpreters/gnu-apl/default.nix+1−1 pkgs/development/interpreters/groovy/default.nix+2−2 pkgs/development/interpreters/gtk-server/default.nix+4 pkgs/development/interpreters/guile/1.8.nix+2−2 pkgs/development/interpreters/guile/2.0.nix+3−3 pkgs/development/interpreters/guile/default.nix+1−1 pkgs/development/interpreters/hy/default.nix+9−9 pkgs/development/interpreters/joker/default.nix+2−2 pkgs/development/interpreters/joker/deps.nix+9 pkgs/development/interpreters/jruby/default.nix+2−2 pkgs/development/interpreters/love/11.1.nix+2−2 pkgs/development/interpreters/lush/default.nix+2−2 pkgs/development/interpreters/lush/default.upstream+1−1 pkgs/development/interpreters/maude/default.nix+5 pkgs/development/interpreters/metamath/default.nix+34 pkgs/development/interpreters/mujs/default.nix+8−8 pkgs/development/interpreters/perl/default.nix+14−20 pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch+9−8 pkgs/development/interpreters/php/default.nix+67−54 pkgs/development/interpreters/php/fix-paths-php7.patch+18−15 pkgs/development/interpreters/php/php71-darwin-isfinite.patch+60 pkgs/development/interpreters/php/php72-darwin-isfinite.patch+62 pkgs/development/interpreters/php/php73-darwin-isfinite.patch+60 pkgs/development/interpreters/picolisp/default.nix+23−17 pkgs/development/interpreters/proglodyte-wasm/default.nix pkgs/development/interpreters/pure/default.nix+1 pkgs/development/interpreters/python/build-python-package-common.nix+2−3 pkgs/development/interpreters/python/build-python-package-setuptools.nix+5−6 pkgs/development/interpreters/python/build-python-package.nix+6−4 pkgs/development/interpreters/python/cpython/2.7/boot.nix−2 pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch+32 pkgs/development/interpreters/python/cpython/2.7/default.nix+48−40 pkgs/development/interpreters/python/cpython/3.4/default.nix−214 pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch−51 pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch−147 pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch−48 pkgs/development/interpreters/python/cpython/3.5/default.nix−213 pkgs/development/interpreters/python/cpython/3.7/default.nix−196 pkgs/development/interpreters/python/cpython/default.nix+107−82 pkgs/development/interpreters/python/default.nix+156 pkgs/development/interpreters/python/mk-python-derivation.nix+14−4 pkgs/development/interpreters/python/pypy/2.7/default.nix−144 pkgs/development/interpreters/python/pypy/default.nix+148 pkgs/development/interpreters/python/pypy/prebuilt.nix+123 pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch pkgs/development/interpreters/python/update-python-libraries/default.nix+12 pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py+362 pkgs/development/interpreters/python/wrap-python.nix+3−2 pkgs/development/interpreters/python/wrap.sh+13−7 pkgs/development/interpreters/python/wrapper.nix+3−1 pkgs/development/interpreters/racket/default.nix+15−13 pkgs/development/interpreters/racket/minimal.nix+1−1 pkgs/development/interpreters/regina/default.upstream+1−1 pkgs/development/interpreters/renpy/default.nix+2−2 pkgs/development/interpreters/ruby/default.nix+27−22 pkgs/development/interpreters/ruby/patchsets.nix+5−3 pkgs/development/interpreters/spidermonkey/1.8.5.nix+1−4 pkgs/development/interpreters/spidermonkey/17.nix−88 pkgs/development/interpreters/spidermonkey/31.nix−64 pkgs/development/interpreters/spidermonkey/38.nix+3−7 pkgs/development/interpreters/spidermonkey/52.nix+10 pkgs/development/interpreters/spidermonkey/60.nix+64 pkgs/development/interpreters/supercollider/default.nix+3−2 pkgs/development/interpreters/tcl/generic.nix+10−6 pkgs/development/interpreters/tinyscheme/default.nix+33 pkgs/development/java-modules/postgresql_jdbc/default.nix+4−4 pkgs/development/libraries/SDL/default.nix+14−9 pkgs/development/libraries/SDL2/default.nix+18−16 pkgs/development/libraries/SDL2_image/default.nix+2−2 pkgs/development/libraries/SDL2_mixer/default.nix+2−2 pkgs/development/libraries/SDL_sound/default.nix+5−3 pkgs/development/libraries/Xaw3d/default.nix+1 pkgs/development/libraries/a52dec/default.nix+4 pkgs/development/libraries/accountsservice/default.nix+2−2 pkgs/development/libraries/ace/default.nix+2−2 pkgs/development/libraries/acl/default.nix+4−8 pkgs/development/libraries/adns/default.nix+1−1 pkgs/development/libraries/aften/default.nix+1−1 pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix+7−8 pkgs/development/libraries/agda/agda-stdlib/default.nix+2−2 pkgs/development/libraries/alembic/default.nix+2−2 pkgs/development/libraries/allegro/5.nix+17−9 pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch+26 pkgs/development/libraries/allegro/default.nix+7−6 pkgs/development/libraries/appstream-glib/default.nix+4−4 pkgs/development/libraries/appstream/default.nix+4−4 pkgs/development/libraries/aravis/default.nix+89 pkgs/development/libraries/arb/default.nix+2−2 pkgs/development/libraries/arb/git.nix−21 pkgs/development/libraries/argp-standalone/default.nix+41 pkgs/development/libraries/arguments/default.nix−1 pkgs/development/libraries/armadillo/default.nix+2−2 pkgs/development/libraries/arrow-cpp/default.nix+40−9 pkgs/development/libraries/aspell/dictionaries.nix+2−2 pkgs/development/libraries/at-spi2-atk/default.nix+2−2 pkgs/development/libraries/at-spi2-core/default.nix+4−4 pkgs/development/libraries/atk/default.nix+4−12 pkgs/development/libraries/atkmm/default.nix+12−8 pkgs/development/libraries/attr/default.nix+4−10 pkgs/development/libraries/attr/fix-headers-musl.patch−54 pkgs/development/libraries/aubio/default.nix+4−10 pkgs/development/libraries/audio/lilv/default.nix+2−8 pkgs/development/libraries/audio/lv2/default.nix+2−8 pkgs/development/libraries/audio/lv2/unstable.nix+2−8 pkgs/development/libraries/audio/lvtk/default.nix+6−11 pkgs/development/libraries/audio/ntk/default.nix+2−11 pkgs/development/libraries/audio/raul/default.nix+2−8 pkgs/development/libraries/audio/sratom/default.nix+2−8 pkgs/development/libraries/audio/suil/default.nix+2−7 pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix+8−8 pkgs/development/libraries/audio/zita-convolver/default.nix+3−3 pkgs/development/libraries/audio/zita-resampler/default.nix+3−3 pkgs/development/libraries/avahi/default.nix+7−3 pkgs/development/libraries/aws-sdk-cpp/default.nix+2−2 pkgs/development/libraries/babl/default.nix+2−2 pkgs/development/libraries/bamf/default.nix+30−17 pkgs/development/libraries/beignet/default.nix+2 pkgs/development/libraries/boehm-gc/default.nix+5−4 pkgs/development/libraries/boost/1.69.nix+11 pkgs/development/libraries/boost/generic.nix+8−10 pkgs/development/libraries/bootil/default.nix+15−13 pkgs/development/libraries/box2d/default.nix+9−5 pkgs/development/libraries/brigand/default.nix+26 pkgs/development/libraries/buddy/default.nix+3 pkgs/development/libraries/bwidget/default.nix+2−2 pkgs/development/libraries/c-ares/default.nix+2−11 pkgs/development/libraries/caf/default.nix+2−2 pkgs/development/libraries/cairo/default.nix+2−2 pkgs/development/libraries/capnproto/default.nix+2−2 pkgs/development/libraries/capstone/default.nix+2−2 pkgs/development/libraries/catch/default.nix+2−2 pkgs/development/libraries/catch2/default.nix+27 pkgs/development/libraries/ccrtp/1.8.nix+1−1 pkgs/development/libraries/ccrtp/default.nix+1−1 pkgs/development/libraries/chipmunk/default.nix+3−3 pkgs/development/libraries/clucene-core/2.x.nix+16−8 pkgs/development/libraries/clutter-gtk/default.nix+2−2 pkgs/development/libraries/clutter/default.nix+2−2 pkgs/development/libraries/cmark/default.nix+1−2 pkgs/development/libraries/cogl/default.nix+2−2 pkgs/development/libraries/commoncpp2/default.nix+1−1 pkgs/development/libraries/confuse/default.nix−17 pkgs/development/libraries/cpp-hocon/default.nix+2−2 pkgs/development/libraries/cutelyst/default.nix+5−4 pkgs/development/libraries/cwiid/default.nix+4 pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch+12 pkgs/development/libraries/cyrus-sasl/default.nix+14−29 pkgs/development/libraries/dbus-cplusplus/default.nix+1−1 pkgs/development/libraries/dbus-sharp/default.nix+2−2 pkgs/development/libraries/dbus/default.nix+2−2 pkgs/development/libraries/dee/default.nix+2−2 pkgs/development/libraries/directfb/default.nix+2−2 pkgs/development/libraries/dlib/default.nix+2−2 pkgs/development/libraries/dqlite/default.nix+27 pkgs/development/libraries/drumstick/default.nix+2−2 pkgs/development/libraries/dssi/default.nix+3−3 pkgs/development/libraries/easyloggingpp/default.nix+2−2 pkgs/development/libraries/eccodes/default.nix+9−5 pkgs/development/libraries/editline/default.nix+11−2 pkgs/development/libraries/eigen/3.3.nix−38 pkgs/development/libraries/eigen/default.nix+7−9 pkgs/development/libraries/eigen/include-dir.patch+49 pkgs/development/libraries/elf-header/default.nix+1−1 pkgs/development/libraries/enchant/default.nix+4−4 pkgs/development/libraries/esdl/default.nix−32 pkgs/development/libraries/exiv2/default.nix+3−25 pkgs/development/libraries/farstream/default.nix+2−2 pkgs/development/libraries/fcppt/default.nix+4−4 pkgs/development/libraries/fdk-aac/default.nix+2−2 pkgs/development/libraries/fflas-ffpack/default.nix+10 pkgs/development/libraries/ffmpeg-full/default.nix+8−9 pkgs/development/libraries/ffmpeg/3.4.nix+2−2 pkgs/development/libraries/ffmpeg/4.nix+2−2 pkgs/development/libraries/ffmpeg/generic.nix+3−1 pkgs/development/libraries/flatbuffers/default.nix+10−7 pkgs/development/libraries/flatpak/default.nix+17−20 pkgs/development/libraries/flatpak/fix-test-paths.patch+28−10 pkgs/development/libraries/fltk/1.4.nix+52 pkgs/development/libraries/fltk/default.nix+4−4 pkgs/development/libraries/fmt/default.nix+43 pkgs/development/libraries/folks/default.nix+13−16 pkgs/development/libraries/folly/default.nix+15−12 pkgs/development/libraries/fontconfig/default.nix+2−3 pkgs/development/libraries/fontconfig/make-fonts-cache.nix+2−1 pkgs/development/libraries/freetds/default.nix+3−3 pkgs/development/libraries/freetype/default.nix+7 pkgs/development/libraries/fribidi/default.nix+8 pkgs/development/libraries/fstrcmp/default.nix+31 pkgs/development/libraries/ganv/default.nix+2−8 pkgs/development/libraries/gcab/default.nix+4−4 pkgs/development/libraries/gcc/libstdc++/5.nix+1−1 pkgs/development/libraries/gcr/default.nix+7−7 pkgs/development/libraries/gdal/default.nix+16−2 pkgs/development/libraries/gdbm/default.nix+4−4 pkgs/development/libraries/gdcm/default.nix+2−2 pkgs/development/libraries/gdk-pixbuf/default.nix+17−30 pkgs/development/libraries/gdl/default.nix+8−6 pkgs/development/libraries/gecode/default.nix+11−7 pkgs/development/libraries/gegl/4.0.nix+2−2 pkgs/development/libraries/geis/default.nix+2−2 pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch+55 pkgs/development/libraries/geoclue/default.nix+28−25 pkgs/development/libraries/geocode-glib/default.nix+6−7 pkgs/development/libraries/geocode-glib/installed-tests-path.patch pkgs/development/libraries/geoip/default.nix+5 pkgs/development/libraries/geos/default.nix+2−2 pkgs/development/libraries/getdns/default.nix+3−3 pkgs/development/libraries/gettext/default.nix+1−1 pkgs/development/libraries/gettext/gettext-setup-hook.sh+1−1 pkgs/development/libraries/gexiv2/default.nix+14−14 pkgs/development/libraries/gfbgraph/default.nix+7−9 pkgs/development/libraries/git2/0.27.nix+2−2 pkgs/development/libraries/git2/default.nix+1−1 pkgs/development/libraries/glbinding/default.nix+2−2 pkgs/development/libraries/glfw/3.x.nix+10−2 pkgs/development/libraries/glib-networking/default.nix+7−12 pkgs/development/libraries/glib/default.nix+61−29 pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch+11 pkgs/development/libraries/glib/setup-hook.sh+1−1 pkgs/development/libraries/glibc/common.nix+2−2 pkgs/development/libraries/glibc/default.nix+10−1 pkgs/development/libraries/glibmm/default.nix+14−16 pkgs/development/libraries/glpk/default.nix+1−1 pkgs/development/libraries/gmime/2.nix+2−2 pkgs/development/libraries/gmime/3.nix+6−4 pkgs/development/libraries/gnome-menus/default.nix+22 pkgs/development/libraries/gnome-sharp/Makefile.in.patch−11 pkgs/development/libraries/gnome-sharp/default.nix+27−9 pkgs/development/libraries/gnu-config/default.nix+3−3 pkgs/development/libraries/gnu-efi/default.nix+2−2 pkgs/development/libraries/gnutls-kdh/generic.nix+1−1 pkgs/development/libraries/gnutls/generic.nix+1−1 pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch+3−3 pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch+41−26 pkgs/development/libraries/gobject-introspection/default.nix+19−14 pkgs/development/libraries/gobject-introspection/macos-shared-library.patch+36 pkgs/development/libraries/gobject-introspection/test_shlibs.patch+50 pkgs/development/libraries/goffice/0.8.nix−38 pkgs/development/libraries/goffice/default.nix+16−7 pkgs/development/libraries/goffice/pcre_info.patch−13 pkgs/development/libraries/goocanvas/2.x.nix+2−2 pkgs/development/libraries/goocanvasmm/default.nix+31 pkgs/development/libraries/google-gflags/default.nix+2−2 pkgs/development/libraries/gpgme/default.nix+16−8 pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch+129 pkgs/development/libraries/granite/default.nix+36−15 pkgs/development/libraries/grantlee/5/default.nix+1 pkgs/development/libraries/grantlee/default.nix+1−1 pkgs/development/libraries/grib-api/default.nix+2−2 pkgs/development/libraries/grpc/default.nix+5−3 pkgs/development/libraries/gsasl/default.nix+2−2 pkgs/development/libraries/gsettings-qt/default.nix+2−2 pkgs/development/libraries/gsignond/conf.patch+12 pkgs/development/libraries/gsignond/default.nix+67 pkgs/development/libraries/gsignond/plugin-load-env.patch+35 pkgs/development/libraries/gsignond/plugins/lastfm.nix+38 pkgs/development/libraries/gsignond/plugins/mail.nix+36 pkgs/development/libraries/gsignond/plugins/oauth.nix+48 pkgs/development/libraries/gsignond/plugins/sasl.nix+45 pkgs/development/libraries/gsignond/wrapper.nix+25 pkgs/development/libraries/gsl/default.nix+2−2 pkgs/development/libraries/gsl/gsl-1_16.nix+5−3 pkgs/development/libraries/gsound/default.nix+4−7 pkgs/development/libraries/gspell/default.nix+2−2 pkgs/development/libraries/gss/default.nix+1−1 pkgs/development/libraries/gssdp/default.nix+2−2 pkgs/development/libraries/gstreamer/bad/default.nix+4−4 pkgs/development/libraries/gstreamer/base/default.nix+5−5 pkgs/development/libraries/gstreamer/core/default.nix+4−4 pkgs/development/libraries/gstreamer/ges/default.nix+8−4 pkgs/development/libraries/gstreamer/good/default.nix+2−2 pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix−2 pkgs/development/libraries/gstreamer/libav/default.nix+2−2 pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix+3−2 pkgs/development/libraries/gstreamer/rtsp-server/default.nix+4−4 pkgs/development/libraries/gstreamer/ugly/default.nix+4−2 pkgs/development/libraries/gstreamer/vaapi/default.nix+2−2 pkgs/development/libraries/gstreamer/validate/default.nix+4−4 pkgs/development/libraries/gtest/default.nix+10−17 pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch+30 pkgs/development/libraries/gtk+/2.x.nix+2−2 pkgs/development/libraries/gtk+/3.x.nix+16−6 pkgs/development/libraries/gtk-mac-integration/default.nix+2−2 pkgs/development/libraries/gtk-sharp-beans/default.nix+2−1 pkgs/development/libraries/gtk-sharp/2.0.nix+34−15 pkgs/development/libraries/gtkd/default.nix+4−4 pkgs/development/libraries/gtkdatabox/default.nix+2−2 pkgs/development/libraries/gtkmm/3.x.nix+12−8 pkgs/development/libraries/gtksourceview/3.x.nix+4−4 pkgs/development/libraries/gtksourceview/4.x.nix+5−5 pkgs/development/libraries/gtksourceviewmm/4.x.nix+30 pkgs/development/libraries/gtksourceviewmm/default.nix+7−3 pkgs/development/libraries/gtkspell/3.nix+6−6 pkgs/development/libraries/gtkspell/default.nix+7−4 pkgs/development/libraries/gupnp-av/default.nix+4−4 pkgs/development/libraries/gupnp-dlna/default.nix+2−2 pkgs/development/libraries/gupnp-igd/default.nix+2−2 pkgs/development/libraries/gupnp/default.nix+2−2 pkgs/development/libraries/gusb/default.nix+24−16 pkgs/development/libraries/gvfs/default.nix+32−63 pkgs/development/libraries/harfbuzz/default.nix+2−2 pkgs/development/libraries/hivex/default.nix+3−4 pkgs/development/libraries/hpx/default.nix+2−2 pkgs/development/libraries/hspell/default.nix+4−4 pkgs/development/libraries/http-parser/default.nix+12−32 pkgs/development/libraries/hunspell/default.nix+3−2 pkgs/development/libraries/hwloc/default.nix+9−4 pkgs/development/libraries/hyena/default.nix+1 pkgs/development/libraries/hyperscan/default.nix+69 pkgs/development/libraries/icu/63.nix+14 pkgs/development/libraries/icu/base.nix+2−2 pkgs/development/libraries/id3lib/default.nix+5−2 pkgs/development/libraries/igraph/default.nix+2−2 pkgs/development/libraries/ilmbase/cross.patch+35 pkgs/development/libraries/ilmbase/default.nix+4−3 pkgs/development/libraries/imlib/default.nix+6−4 pkgs/development/libraries/imlib2/default.nix+2−2 pkgs/development/libraries/incrtcl/default.nix+4−3 pkgs/development/libraries/intel-gmmlib/default.nix+25 pkgs/development/libraries/intel-media-driver/default.nix+34 pkgs/development/libraries/isl/0.12.2.nix−21 pkgs/development/libraries/isl/0.20.0.nix+3−3 pkgs/development/libraries/jama/default.nix+4−3 pkgs/development/libraries/jansson/default.nix+2−2 pkgs/development/libraries/jasper/default.nix+1 pkgs/development/libraries/java/commons/compress/default.nix+2−2 pkgs/development/libraries/java/commons/lang/default.nix+2−2 pkgs/development/libraries/java/commons/math/default.nix+2−2 pkgs/development/libraries/java/dbus-java/default.nix+4−3 pkgs/development/libraries/java/gwt-dragdrop/default.nix+5−4 pkgs/development/libraries/java/gwt-widgets/default.nix+5−4 pkgs/development/libraries/java/hsqldb/default.nix+4−3 pkgs/development/libraries/java/httpunit/default.nix+4−2 pkgs/development/libraries/java/jdom/default.nix+5−2 pkgs/development/libraries/java/jflex/default.nix+16−6 pkgs/development/libraries/java/libmatthew-java/default.nix+4−3 pkgs/development/libraries/java/lombok/default.nix+2−2 pkgs/development/libraries/java/lucene/default.nix+4−2 pkgs/development/libraries/java/mockobjects/default.nix+4−2 pkgs/development/libraries/java/saxon/default.nix+3−3 pkgs/development/libraries/jemalloc/common.nix+20−11 pkgs/development/libraries/jemalloc/default.nix+2−8 pkgs/development/libraries/jemalloc/jemalloc450.nix+1−3 pkgs/development/libraries/jitterentropy/default.nix+30 pkgs/development/libraries/json-glib/default.nix+5−13 pkgs/development/libraries/jsonrpc-glib/default.nix+5−8 pkgs/development/libraries/judy/default.nix+1−1 pkgs/development/libraries/jxrlib/default.nix+28 pkgs/development/libraries/kde-frameworks/fetch.sh+1−1 pkgs/development/libraries/kde-frameworks/kio/default.nix+2−1 pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch+1−1 pkgs/development/libraries/kde-frameworks/srcs.nix+316−316 pkgs/development/libraries/kerberos/krb5.nix+3−3 pkgs/development/libraries/keybinder/default.nix+2−2 pkgs/development/libraries/keybinder3/default.nix+8−8 pkgs/development/libraries/kmsxx/default.nix+3−3 pkgs/development/libraries/kyotocabinet/default.nix+1−1 pkgs/development/libraries/lasem/default.nix+38 pkgs/development/libraries/lasso/default.nix+2−2 pkgs/development/libraries/ldns/default.nix+1−1 pkgs/development/libraries/leatherman/default.nix+2−2 pkgs/development/libraries/lensfun/default.nix+3−3 pkgs/development/libraries/lesstif/default.nix+7−4 pkgs/development/libraries/leveldb/default.nix+7−6 pkgs/development/libraries/libHX/default.nix+4−3 pkgs/development/libraries/libaccounts-glib/default.nix+38−17 pkgs/development/libraries/libaccounts-glib/py-override.patch+38 pkgs/development/libraries/libaom/default.nix+17−5 pkgs/development/libraries/libaosd/default.nix+36 pkgs/development/libraries/libappindicator/default.nix+2−2 pkgs/development/libraries/libarchive/CVE-2017-14166.patch−36 pkgs/development/libraries/libarchive/CVE-2017-14502.patch−28 pkgs/development/libraries/libarchive/default.nix+2−13 pkgs/development/libraries/libassuan/default.nix+2−2 pkgs/development/libraries/libatomic_ops/default.nix+2−2 pkgs/development/libraries/libbap/default.nix+4−3 pkgs/development/libraries/libbfd/default.nix+1−1 pkgs/development/libraries/libbladeRF/default.nix+21−5 pkgs/development/libraries/libblockdev/default.nix+4−4 pkgs/development/libraries/libbsd/cdefs.patch−222 pkgs/development/libraries/libbsd/darwin.patch+205−547 pkgs/development/libraries/libbsd/default.nix+4−11 pkgs/development/libraries/libbsd/features.patch−26 pkgs/development/libraries/libbsd/musl.patch+14 pkgs/development/libraries/libbsd/non-glibc.patch−74 pkgs/development/libraries/libcacard/default.nix+22 pkgs/development/libraries/libcdio/default.nix+1−1 pkgs/development/libraries/libcdr/default.nix+2−10 pkgs/development/libraries/libcec/default.nix+2−2 pkgs/development/libraries/libchamplain/default.nix+2−2 pkgs/development/libraries/libchop/default.nix+2−2 pkgs/development/libraries/libcloudproviders/default.nix+8−14 pkgs/development/libraries/libcloudproviders/fix-include.patch−11 pkgs/development/libraries/libclthreads/default.nix+8−10 pkgs/development/libraries/libclxclient/default.nix+14−6 pkgs/development/libraries/libcollectdclient/default.nix+1−5 pkgs/development/libraries/libcouchbase/default.nix+5−3 pkgs/development/libraries/libcroco/default.nix+3−4 pkgs/development/libraries/libdap/default.nix+2−2 pkgs/development/libraries/libdazzle/default.nix+9−6 pkgs/development/libraries/libdbusmenu-qt/default.nix+1−1 pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix+9−7 pkgs/development/libraries/libdbusmenu/default.nix+2−2 pkgs/development/libraries/libdeflate/default.nix+31 pkgs/development/libraries/libdigidocpp/default.nix+2−2 pkgs/development/libraries/libdrm/default.nix+2−2 pkgs/development/libraries/libdwarf/default.nix+1−1 pkgs/development/libraries/libe-book/default.upstream+1−1 pkgs/development/libraries/libepc/default.nix+47 pkgs/development/libraries/libestr/default.nix+2−2 pkgs/development/libraries/libevdev/default.nix+2−2 pkgs/development/libraries/libextractor/default.nix+2−2 pkgs/development/libraries/libexttextcat/default.nix+3−2 pkgs/development/libraries/libfakekey/default.nix+5−2 pkgs/development/libraries/libffi/default.nix+1−1 pkgs/development/libraries/libfive/default.nix+3−3 pkgs/development/libraries/libfm/default.nix+10−4 pkgs/development/libraries/libfprint/default.nix+16−9 pkgs/development/libraries/libftdi/1.x.nix+3−3 pkgs/development/libraries/libgcrypt/default.nix+3−11 pkgs/development/libraries/libgcrypt/fix-jent-locking.patch−29 pkgs/development/libraries/libgda/default.nix+13−20 pkgs/development/libraries/libgdamm/default.nix+39 pkgs/development/libraries/libgdata/default.nix+8−12 pkgs/development/libraries/libgdiplus/default.nix+34−18 pkgs/development/libraries/libgdiplus/giflib.patch−143 pkgs/development/libraries/libgee/default.nix+5−8 pkgs/development/libraries/libgepub/default.nix+4−7 pkgs/development/libraries/libgit2-glib/default.nix+10−7 pkgs/development/libraries/libgksu/default.nix+12−12 pkgs/development/libraries/libglvnd/default.nix+2−2 pkgs/development/libraries/libgnome-keyring/default.nix+1 pkgs/development/libraries/libgnomekbd/default.nix+3−3 pkgs/development/libraries/libgnurl/default.nix+12−18 pkgs/development/libraries/libgpg-error/default.nix+6−3 pkgs/development/libraries/libgpiod/default.nix+38 pkgs/development/libraries/libgpod/default.nix+4−3 pkgs/development/libraries/libgrss/default.nix+3−2 pkgs/development/libraries/libgsf/default.nix+11−4 pkgs/development/libraries/libgtop/default.nix+2−2 pkgs/development/libraries/libgudev/default.nix+2−2 pkgs/development/libraries/libguestfs/default.nix+8−7 pkgs/development/libraries/libgweather/default.nix+6−9 pkgs/development/libraries/libgxps/default.nix+18−8 pkgs/development/libraries/libhandy/default.nix+57 pkgs/development/libraries/libharu/default.nix+1−1 pkgs/development/libraries/libhttpseverywhere/default.nix+4−3 pkgs/development/libraries/libiberty/default.nix+1−1 pkgs/development/libraries/libibverbs/default.nix−79 pkgs/development/libraries/libical/default.nix+3−2 pkgs/development/libraries/libicns/default.nix+5−2 pkgs/development/libraries/libiconv/default.nix+1−1 pkgs/development/libraries/libiconv/setup-hook.sh+4−2 pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch+13 pkgs/development/libraries/libid3tag/default.nix+4−1 pkgs/development/libraries/libidn/default.nix+1−1 pkgs/development/libraries/libiio/default.nix+2−2 pkgs/development/libraries/libimagequant/default.nix+2−2 pkgs/development/libraries/libindicate/default.nix+2−2 pkgs/development/libraries/libinfinity/default.nix+2−2 pkgs/development/libraries/libinput/default.nix+29−14 pkgs/development/libraries/libiodbc/default.nix+6−4 pkgs/development/libraries/libipfix/default.nix+1−1 pkgs/development/libraries/libite/default.nix+1 pkgs/development/libraries/libjpeg-turbo/default.nix+22−8 pkgs/development/libraries/libjson/default.nix+10−3 pkgs/development/libraries/libkate/default.nix+3−3 pkgs/development/libraries/libksba/default.nix+4−1 pkgs/development/libraries/liblangtag/default.nix+2−2 pkgs/development/libraries/liblastfm/default.nix+3−2 pkgs/development/libraries/liblastfmSF/default.nix+1 pkgs/development/libraries/liblcf/default.nix+4−3 pkgs/development/libraries/liblinear/default.nix+2−2 pkgs/development/libraries/liblognorm/default.nix+2−2 pkgs/development/libraries/liblqr-1/default.nix+1−1 pkgs/development/libraries/libmanette/default.nix+2−2 pkgs/development/libraries/libmatchbox/default.nix+3 pkgs/development/libraries/libmatheval/default.nix+8−8 pkgs/development/libraries/libmd/default.nix+2−2 pkgs/development/libraries/libmediaart/default.nix+10−8 pkgs/development/libraries/libmesode/default.nix+2−2 pkgs/development/libraries/libmicrohttpd/default.nix+3−3 pkgs/development/libraries/libmikmod/default.nix+1−1 pkgs/development/libraries/libmilter/default.nix+5−2 pkgs/development/libraries/libmkv/default.nix+5 pkgs/development/libraries/libmms/default.nix+4−3 pkgs/development/libraries/libmp3splt/default.nix+1 pkgs/development/libraries/libmtp/default.nix+5−5 pkgs/development/libraries/libmusicbrainz/5.x.nix+3−3 pkgs/development/libraries/libmusicbrainz/default.nix+3−3 pkgs/development/libraries/libmwaw/default.upstream+1−1 pkgs/development/libraries/libmx/default.nix+2−2 pkgs/development/libraries/libnatspec/default.nix+3−3 pkgs/development/libraries/libndctl/default.nix+28−31 pkgs/development/libraries/libnetfilter_queue/default.nix+3−3 pkgs/development/libraries/libnftnl/default.nix+2−2 pkgs/development/libraries/libngspice/default.nix+6−5 pkgs/development/libraries/libnice/default.nix+44−7 pkgs/development/libraries/libnih/default.nix+1−1 pkgs/development/libraries/libnotify/default.nix+5−4 pkgs/development/libraries/libnova/default.nix+5−4 pkgs/development/libraries/liboauth/default.nix+1 pkgs/development/libraries/libodfgen/default.upstream+1−1 pkgs/development/libraries/libofa/default.nix+3−2 pkgs/development/libraries/libogg/default.nix+6 pkgs/development/libraries/liboggz/default.nix+3−3 pkgs/development/libraries/libopcodes/default.nix+1−1 pkgs/development/libraries/libopenaptx/default.nix+25 pkgs/development/libraries/libopus/default.nix+2−2 pkgs/development/libraries/libopusenc/default.nix+28 pkgs/development/libraries/libosinfo/default.nix+4−4 pkgs/development/libraries/libosmium/default.nix+24 pkgs/development/libraries/libowfat/default.nix+15−3 pkgs/development/libraries/libp11/default.nix+2−2 pkgs/development/libraries/libpcap/default.nix+8−16 pkgs/development/libraries/libpeas/default.nix+36 pkgs/development/libraries/libpfm/default.nix+6−1 pkgs/development/libraries/libpng/default.nix+4−4 pkgs/development/libraries/libpqxx/default.nix+3−3 pkgs/development/libraries/libpsl/default.nix+5−6 pkgs/development/libraries/libqalculate/default.nix+3−2 pkgs/development/libraries/libqmatrixclient/default.nix+2−2 pkgs/development/libraries/libqrencode/default.nix−35 pkgs/development/libraries/libraw/default.nix+2−2 pkgs/development/libraries/librdf/redland.nix+4−2 pkgs/development/libraries/librdmacm/default.nix−36 pkgs/development/libraries/libre/default.nix+2−2 pkgs/development/libraries/librealsense/default.nix+2−2 pkgs/development/libraries/librelp/default.nix+2−2 pkgs/development/libraries/librem/default.nix+2−2 pkgs/development/libraries/libressl/default.nix+9−9 pkgs/development/libraries/librest/default.nix+7−8 pkgs/development/libraries/librevenge/default.upstream+1−1 pkgs/development/libraries/librime/default.nix+2−2 pkgs/development/libraries/librsvg/default.nix+4−4 pkgs/development/libraries/libs3/default.nix+5−8 pkgs/development/libraries/libsass/default.nix+2−10 pkgs/development/libraries/libsearpc/default.nix+1−1 pkgs/development/libraries/libsecret/default.nix+19−11 pkgs/development/libraries/libsigcxx/1.2.nix+3−2 pkgs/development/libraries/libsigcxx/default.nix+13−8 pkgs/development/libraries/libsignal-protocol-c/default.nix+1−1 pkgs/development/libraries/libsignon-glib/default.nix+53 pkgs/development/libraries/libsigsegv/default.nix+1−1 pkgs/development/libraries/libskk/default.nix+6−6 pkgs/development/libraries/libsolv/default.nix+4−4 pkgs/development/libraries/libsoup/default.nix+13−17 pkgs/development/libraries/libssh/default.nix+3−13 pkgs/development/libraries/libssh2/default.nix+3−2 pkgs/development/libraries/libtar/default.nix+2−2 pkgs/development/libraries/libtasn1/default.nix+1−1 pkgs/development/libraries/libtensorflow/default.nix+11 pkgs/development/libraries/libtiff/default.nix+11−17 pkgs/development/libraries/libtiger/default.nix+1 pkgs/development/libraries/libtorrent-rasterbar/default.nix+3−3 pkgs/development/libraries/libtoxcore/default.nix+2−3 pkgs/development/libraries/libtxc_dxtn/default.nix+3−2 pkgs/development/libraries/libuchardet/default.nix+17−11 pkgs/development/libraries/libui/default.nix+42−46 pkgs/development/libraries/libunarr/default.nix+21 pkgs/development/libraries/libunique/3.x.nix+2−2 pkgs/development/libraries/libunique/default.nix+2 pkgs/development/libraries/libunistring/default.nix+1−1 pkgs/development/libraries/libunity/default.nix+2−2 pkgs/development/libraries/libunwind/default.nix+4−7 pkgs/development/libraries/libunwind/version-1.2.1.patch−13 pkgs/development/libraries/liburcu/default.nix+2−2 pkgs/development/libraries/libusb/default.nix+10−2 pkgs/development/libraries/libusb1/default.nix+9−4 pkgs/development/libraries/libuv/default.nix+3−2 pkgs/development/libraries/libva-utils/default.nix+1−1 pkgs/development/libraries/libva/default.nix+2−2 pkgs/development/libraries/libvdpau/default.nix+1−1 pkgs/development/libraries/libversion/default.nix+2−2 pkgs/development/libraries/libvirt-glib/default.nix+4−4 pkgs/development/libraries/libvirt/default.nix+3−3 pkgs/development/libraries/libvncserver/default.nix+8−1 pkgs/development/libraries/libvpx/git.nix−182 pkgs/development/libraries/libwacom/default.nix+10−7 pkgs/development/libraries/libwebp/default.nix+2−2 pkgs/development/libraries/libwebsockets/default.nix+2−2 pkgs/development/libraries/libwmf/default.nix+4−2 pkgs/development/libraries/libwnck/3.x.nix+4−4 pkgs/development/libraries/libwpd/0.8.nix+7−4 pkgs/development/libraries/libwpg/default.nix+3−3 pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix+32 pkgs/development/libraries/libxklavier/default.nix+2−2 pkgs/development/libraries/libxl/default.nix+2−2 pkgs/development/libraries/libxmi/default.nix+1−1 pkgs/development/libraries/libxml2/default.nix+6−18 pkgs/development/libraries/libxmlb/default.nix+34 pkgs/development/libraries/libxslt/default.nix+6−12 pkgs/development/libraries/libxslt/patch-ah.patch−69 pkgs/development/libraries/libzapojit/default.nix+7−9 pkgs/development/libraries/lightning/default.nix+1−1 pkgs/development/libraries/lightstep-tracer-cpp/default.nix+9−13 pkgs/development/libraries/lirc/default.nix+13−7 pkgs/development/libraries/live555/default.nix+18−6 pkgs/development/libraries/lmdb/default.nix+2−3 pkgs/development/libraries/log4cplus/default.nix+2−2 pkgs/development/libraries/log4shib/default.nix+2 pkgs/development/libraries/loudmouth/default.nix+3−2 pkgs/development/libraries/mailcore2/default.nix+2−2 pkgs/development/libraries/mapnik/default.nix+31−36 pkgs/development/libraries/martyr/default.nix+1 pkgs/development/libraries/matio/default.nix+2−2 pkgs/development/libraries/mbedtls/1.3.nix+2−2 pkgs/development/libraries/mbedtls/default.nix+4−3 pkgs/development/libraries/mdds/0.12.1.nix−17 pkgs/development/libraries/mdds/0.7.1.nix−17 pkgs/development/libraries/mdds/default.nix+3−2 pkgs/development/libraries/menu-cache/default.nix+2−2 pkgs/development/libraries/mesa/default.nix+21−17 pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch+10−10 pkgs/development/libraries/minixml/default.nix+10−6 pkgs/development/libraries/mm-common/default.nix+33 pkgs/development/libraries/mono-addins/default.nix+3−2 pkgs/development/libraries/mono-zeroconf/default.nix+1 pkgs/development/libraries/movit/default.nix+7−5 pkgs/development/libraries/mp4v2/default.nix+7−1 pkgs/development/libraries/mpich/default.nix+10−9 pkgs/development/libraries/mps/default.nix+3−2 pkgs/development/libraries/msgpack/generic.nix−2 pkgs/development/libraries/msilbc/default.nix+4−2 pkgs/development/libraries/mythes/default.nix+3−2 pkgs/development/libraries/nanoflann/default.nix+2−2 pkgs/development/libraries/nanomsg/default.nix+2−2 pkgs/development/libraries/ncurses/default.nix+12−8 pkgs/development/libraries/ncurses/st-0.7.patch−13 pkgs/development/libraries/ndn-cxx/default.nix+16−25 pkgs/development/libraries/neon/0.29.nix+3−2 pkgs/development/libraries/neon/default.nix+3−2 pkgs/development/libraries/netcdf-fortran/default.nix+2−2 pkgs/development/libraries/netcdf/default.nix+3 pkgs/development/libraries/nettle/default.nix+2−2 pkgs/development/libraries/nghttp2/default.nix+9−4 pkgs/development/libraries/nix-plugins/default.nix+2−2 pkgs/development/libraries/nlohmann_json/default.nix+2−4 pkgs/development/libraries/nlopt/default.nix+7−5 pkgs/development/libraries/notify-sharp/default.nix+1 pkgs/development/libraries/nspr/default.nix+7−3 pkgs/development/libraries/nss/default.nix+6−4 pkgs/development/libraries/nss_wrapper/default.nix+2−2 pkgs/development/libraries/ntl/default.nix+2−2 pkgs/development/libraries/ntrack/default.nix+4−4 pkgs/development/libraries/nv-codec-headers/default.nix+4−4 pkgs/development/libraries/ode/default.nix+4−2 pkgs/development/libraries/ogre/1.9.x.nix+8−8 pkgs/development/libraries/ogre/default.nix+8−8 pkgs/development/libraries/ois/default.nix+3−3 pkgs/development/libraries/olm/default.nix+2−2 pkgs/development/libraries/oniguruma/default.nix+2−2 pkgs/development/libraries/opal/default.nix+3−2 pkgs/development/libraries/openal-soft/default.nix+7−5 pkgs/development/libraries/openbabel/default.nix+9−1 pkgs/development/libraries/opencascade/default.nix+7−6 pkgs/development/libraries/opencollada/default.nix+2−2 pkgs/development/libraries/opencsg/default.nix+4−5 pkgs/development/libraries/opencv/3.x.nix+16−10 pkgs/development/libraries/opencv/4.x.nix+292 pkgs/development/libraries/opencv/default.nix+2−2 pkgs/development/libraries/opendbx/default.nix+6 pkgs/development/libraries/opendht/default.nix+2−2 pkgs/development/libraries/opendkim/default.nix+5−1 pkgs/development/libraries/openfst/default.nix+1−1 pkgs/development/libraries/openh264/default.nix+2−2 pkgs/development/libraries/openjpeg/2.1.nix−8 pkgs/development/libraries/openjpeg/2.x.nix+31 pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch+55 pkgs/development/libraries/openjpeg/generic.nix+2−2 pkgs/development/libraries/openldap/default.nix+21−12 pkgs/development/libraries/openmpi/default.nix+5−6 pkgs/development/libraries/openpam/default.nix+4−3 pkgs/development/libraries/openscenegraph/3.4.0.nix+39 pkgs/development/libraries/openscenegraph/default.nix+3−3 pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch+16 pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch pkgs/development/libraries/openssl/1.1/nix-ssl-cert-file.patch+15 pkgs/development/libraries/openssl/chacha.nix+3−2 pkgs/development/libraries/openssl/darwin-arch.patch−12 pkgs/development/libraries/openssl/default.nix+21−15 pkgs/development/libraries/openssl/nix-ssl-cert-file.patch−14 pkgs/development/libraries/opentracing-cpp/default.nix+21 pkgs/development/libraries/openwsman/default.nix+4−2 pkgs/development/libraries/openzwave/default.nix+6−4 pkgs/development/libraries/osip/3.nix−17 pkgs/development/libraries/osip/default.nix+1−1 pkgs/development/libraries/osm-gps-map/default.nix+2−2 pkgs/development/libraries/p11-kit/default.nix+2−2 pkgs/development/libraries/pagmo2/default.nix+16−18 pkgs/development/libraries/pango/default.nix+2−2 pkgs/development/libraries/pangomm/default.nix+11−8 pkgs/development/libraries/pangoxsl/default.nix+5−2 pkgs/development/libraries/parquet-cpp/default.nix−39 pkgs/development/libraries/pcl/default.nix−1 pkgs/development/libraries/pcre2/default.nix+2−2 pkgs/development/libraries/phonon/backends/gstreamer.nix+1 pkgs/development/libraries/phonon/backends/vlc.nix+1 pkgs/development/libraries/physics/apfelgrid/default.nix+2−2 pkgs/development/libraries/physics/cernlib/default.nix+3−1 pkgs/development/libraries/physics/fastjet/default.nix+2−8 pkgs/development/libraries/physics/geant4/g4py/default.nix+1−1 pkgs/development/libraries/physics/herwig/default.nix+3−2 pkgs/development/libraries/physics/hoppet/default.nix+6−1 pkgs/development/libraries/physics/qcdnum/default.nix+2−2 pkgs/development/libraries/physics/rivet/default.nix+2−4 pkgs/development/libraries/physics/thepeg/default.nix+2−2 pkgs/development/libraries/physics/yoda/default.nix+3−3 pkgs/development/libraries/pipewire/default.nix+3−3 pkgs/development/libraries/pixman/default.nix+4−13 pkgs/development/libraries/png++/default.nix+1−1 pkgs/development/libraries/podofo/default.nix+15−14 pkgs/development/libraries/poker-eval/default.nix−24 pkgs/development/libraries/polkit-qt-1/qt-4.nix+4−3 pkgs/development/libraries/polkit/default.nix+11−10 pkgs/development/libraries/poppler/0.61.nix+2−2 pkgs/development/libraries/poppler/default.nix+6−6 pkgs/development/libraries/popt/default.nix+3−2 pkgs/development/libraries/postgis/default.nix+3−3 pkgs/development/libraries/prison/default.nix+1−1 pkgs/development/libraries/protobuf/generic-v3.nix+10−4 pkgs/development/libraries/protozero/default.nix+22 pkgs/development/libraries/psqlodbc/default.nix pkgs/development/libraries/pth/default.nix+1−1 pkgs/development/libraries/ptlib/default.nix+1 pkgs/development/libraries/pupnp/default.nix+3−2 pkgs/development/libraries/pyotherside/default.nix+29 pkgs/development/libraries/pyotherside/qml-path.patch+12 pkgs/development/libraries/python-qt/default.nix+42 pkgs/development/libraries/qgnomeplatform/default.nix+2−2 pkgs/development/libraries/qjson/default.nix+4−2 pkgs/development/libraries/qmlbox2d/default.nix+3−3 pkgs/development/libraries/qmltermwidget/default.nix+8−7 pkgs/development/libraries/qoauth/default.nix+2−2 pkgs/development/libraries/qpdf/default.nix+2−2 pkgs/development/libraries/qrencode/default.nix+47 pkgs/development/libraries/qrupdate/default.nix+5−2 pkgs/development/libraries/qt-3/default.nix+7−7 pkgs/development/libraries/qt-5/5.11/default.nix+7−3 pkgs/development/libraries/qt-5/5.11/qtbase-fixguicmake.patch+30 pkgs/development/libraries/qt-5/5.11/qtwebengine-paxmark-mksnapshot.patch−48 pkgs/development/libraries/qt-5/5.12/default.nix+146 pkgs/development/libraries/qt-5/5.12/fetch.sh+2 pkgs/development/libraries/qt-5/5.12/qtbase-darwin-nseventtype.patch+13 pkgs/development/libraries/qt-5/5.12/qtbase-darwin.patch+70 pkgs/development/libraries/qt-5/5.12/qtbase-fixguicmake.patch+30 pkgs/development/libraries/qt-5/5.12/qtbase-revert-no-macos10.10.patch+102 pkgs/development/libraries/qt-5/5.12/qtbase.patch+1096 pkgs/development/libraries/qt-5/5.12/qtdeclarative.patch+33 pkgs/development/libraries/qt-5/5.12/qtscript.patch+13 pkgs/development/libraries/qt-5/5.12/qtserialport.patch+22 pkgs/development/libraries/qt-5/5.12/qtwebkit.patch+12 pkgs/development/libraries/qt-5/5.12/srcs.nix+325 pkgs/development/libraries/qt-5/5.6/default.nix+2−3 pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch+30 pkgs/development/libraries/qt-5/5.6/qtwebengine-paxmark-mksnapshot.patch−46 pkgs/development/libraries/qt-5/5.9/default.nix+5−3 pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch+30 pkgs/development/libraries/qt-5/5.9/qtwebengine-paxmark-mksnapshot.patch−48 pkgs/development/libraries/qt-5/README.md+2−2 pkgs/development/libraries/qt-5/modules/qtbase.nix+5−1 pkgs/development/libraries/qt-5/modules/qtdeclarative.nix+2−2 pkgs/development/libraries/qt-5/modules/qtmacextras.nix+5−3 pkgs/development/libraries/qt-5/modules/qtwebengine.nix+3−5 pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix+6 pkgs/development/libraries/qt-5/modules/qtwebkit.nix+5−3 pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix+2−2 pkgs/development/libraries/qt-mobility/default.nix+4−3 pkgs/development/libraries/qtscriptgenerator/default.nix+1−1 pkgs/development/libraries/qtstyleplugin-kvantum/default.nix+5−5 pkgs/development/libraries/range-v3/default.nix+2−2

3662 more files changed are not listed.

.github/CODEOWNERS+41−7
@@ -12,7 +12,7 @@
1212
1313# Libraries
1414/lib @edolstra @nbp
15−/lib/systems @nbp @ericson2314
15+/lib/systems @nbp @ericson2314 @matthewbauer
1616/lib/generators.nix @edolstra @nbp @Profpatsch
1717/lib/debug.nix @edolstra @nbp @Profpatsch
1818
@@ -20,9 +20,11 @@
2020/default.nix @nbp
2121/pkgs/top-level/default.nix @nbp @Ericson2314
2222/pkgs/top-level/impure.nix @nbp @Ericson2314
23−/pkgs/top-level/stage.nix @nbp @Ericson2314
24−/pkgs/stdenv/generic @Ericson2314
25−/pkgs/stdenv/cross @Ericson2314
23+/pkgs/top-level/stage.nix @nbp @Ericson2314 @matthewbauer
24+/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer
25+/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer
26+/pkgs/stdenv/generic @Ericson2314 @matthewbauer
27+/pkgs/stdenv/cross @Ericson2314 @matthewbauer
2628/pkgs/build-support/cc-wrapper @Ericson2314 @orivej
2729/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej
2830/pkgs/build-support/setup-hooks @Ericson2314
@@ -45,12 +47,15 @@
4547/nixos/doc/manual/man-nixos-option.xml @nbp
4648/nixos/modules/installer/tools/nixos-option.sh @nbp
4749
50+# NixOS modules
51+/nixos/modules @Infinisil
52+
4853# Python-related code and docs
4954/maintainers/scripts/update-python-libraries @FRidh
5055/pkgs/top-level/python-packages.nix @FRidh
5156/pkgs/development/interpreters/python @FRidh
5257/pkgs/development/python-modules @FRidh
53−/doc/languages-frameworks/python.md @FRidh
58+/doc/languages-frameworks/python.section.md @FRidh
5459
5560# Haskell
5661/pkgs/development/compilers/ghc @peti @ryantm @basvandijk
@@ -59,13 +64,18 @@
5964/pkgs/development/haskell-modules/generic-builder.nix @peti @ryantm @basvandijk
6065/pkgs/development/haskell-modules/hoogle.nix @peti @ryantm @basvandijk
6166
67+# Perl
68+/pkgs/development/interpreters/perl @volth
69+/pkgs/top-level/perl-packages.nix @volth
70+/pkgs/development/perl-modules @volth
71+
6272# R
6373/pkgs/applications/science/math/R @peti
6474/pkgs/development/r-modules @peti
6575
6676# Ruby
67−/pkgs/development/interpreters/ruby @zimbatm
68−/pkgs/development/ruby-modules @zimbatm
77+/pkgs/development/interpreters/ruby @alyssais @zimbatm
78+/pkgs/development/ruby-modules @alyssais @zimbatm
6979
7080# Rust
7181/pkgs/development/compilers/rust @Mic92 @LnL7
@@ -74,6 +84,14 @@
7484/pkgs/stdenv/darwin @NixOS/darwin-maintainers
7585/pkgs/os-specific/darwin @NixOS/darwin-maintainers
7686
87+# C compilers
88+/pkgs/development/compilers/gcc @matthewbauer
89+/pkgs/development/compilers/llvm @matthewbauer
90+
91+# Compatibility stuff
92+/pkgs/top-level/unix-tools.nix @matthewbauer
93+/pkgs/development/tools/xcbuild @matthewbauer
94+
7795# Beam-related (Erlang, Elixir, LFE, etc)
7896/pkgs/development/beam-modules @gleber
7997/pkgs/development/interpreters/erlang @gleber
@@ -97,3 +115,19 @@
97115/pkgs/desktops/plasma-5 @ttuegel
98116/pkgs/development/libraries/kde-frameworks @ttuegel
99117/pkgs/development/libraries/qt-5 @ttuegel
118+
119+# PostgreSQL and related stuff
120+/pkgs/servers/sql/postgresql @thoughtpolice
121+/nixos/modules/services/databases/postgresql.xml @thoughtpolice
122+/nixos/modules/services/databases/postgresql.nix @thoughtpolice
123+/nixos/tests/postgresql.nix @thoughtpolice
124+
125+# Dhall
126+/pkgs/development/dhall-modules @Gabriel439 @Profpatsch
127+/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch
128+
129+# Idris
130+/pkgs/development/idris-modules @Infinisil
131+
132+# Bazel
133+/pkgs/development/tools/build-managers/bazel @mboes @Profpatsch
.github/PULL_REQUEST_TEMPLATE.md+1
@@ -14,6 +14,7 @@
1414- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
1515- [ ] Tested execution of all binary files (usually in `./result/bin/`)
1616- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
17+- [ ] Assured whether relevant documentation is up to date
1718- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
1819
1920---
.gitignore+2−1
@@ -13,4 +13,5 @@ result-*
1313.DS_Store
1414
1515/pkgs/development/libraries/qt-5/*/tmp/
16−/pkgs/desktops/kde-5/*/tmp/
16+/pkgs/desktops/kde-5/*/tmp/
17+/pkgs/development/mobile/androidenv/xml/*
COPYING−9
@@ -18,12 +18,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
1818LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
1919OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2020WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21−
22−======================================================================
23−
24−Note: the license above does not apply to the packages built by the
25−Nix Packages collection, merely to the package descriptions (i.e., Nix
26−expressions, build scripts, etc.). It also might not apply to patches
27−included in Nixpkgs, which may be derivative works of the packages to
28−which they apply. The aforementioned artifacts are all covered by the
29−licenses of the respective packages.
README.md+7−1
@@ -20,7 +20,7 @@ release and `nixos-unstable` for the latest successful build of master:
2020% git rebase channels/nixos-18.09
2121```
2222
23−For pull-requests, please rebase onto nixpkgs `master`.
23+For pull requests, please rebase onto nixpkgs `master`.
2424
2525[NixOS](https://nixos.org/nixos/) Linux distribution source code is located inside
2626`nixos/` folder.
@@ -39,3 +39,9 @@ Communication:
3939
4040* [Discourse Forum](https://discourse.nixos.org/)
4141* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)
42+
43+Note: MIT license does not apply to the packages built by Nixpkgs, merely to
44+the package descriptions (Nix expressions, build scripts, and so on). It also
45+might not apply to patches included in Nixpkgs, which may be derivative works
46+of the packages to which they apply. The aforementioned artifacts are all
47+covered by the licenses of the respective packages.
doc/Makefile+4−2
@@ -9,8 +9,10 @@ debug:
99
1010.PHONY: format
1111format:
12− find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
13− xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {}
12+ find . -iname '*.xml' -type f | while read f; do \
13+ echo $$f ;\
14+ xmlformat --config-file "$$XMLFORMAT_CONFIG" -i $$f ;\
15+ done
1416
1517.PHONY: fix-misc-xml
1618fix-misc-xml:
doc/coding-conventions.xml+164−21
@@ -56,25 +56,30 @@ foo { arg = ...; }
5656 or list elements should be aligned:
5757<programlisting>
5858# A long list.
59−list =
60− [ elem1
61− elem2
62− elem3
63− ];
59+list = [
60+ elem1
61+ elem2
62+ elem3
63+];
6464
6565# A long attribute set.
66−attrs =
67− { attr1 = short_expr;
68− attr2 =
69− if true then big_expr else big_expr;
70− };
71−
72−# Alternatively:
7366attrs = {
7467 attr1 = short_expr;
7568 attr2 =
7669 if true then big_expr else big_expr;
7770};
71+
72+# Combined
73+listOfAttrs = [
74+ {
75+ attr1 = 3;
76+ attr2 = "fff";
77+ }
78+ {
79+ attr1 = 5;
80+ attr2 = "ggg";
81+ }
82+];
7883</programlisting>
7984 </para>
8085 </listitem>
@@ -191,6 +196,23 @@ args.stdenv.mkDerivation (args // {
191196 <section xml:id="sec-package-naming">
192197 <title>Package naming</title>
193198
199+ <para>
200+ The key words
201+ <emphasis>must</emphasis>,
202+ <emphasis>must not</emphasis>,
203+ <emphasis>required</emphasis>,
204+ <emphasis>shall</emphasis>,
205+ <emphasis>shall not</emphasis>,
206+ <emphasis>should</emphasis>,
207+ <emphasis>should not</emphasis>,
208+ <emphasis>recommended</emphasis>,
209+ <emphasis>may</emphasis>,
210+ and <emphasis>optional</emphasis> in this section
211+ are to be interpreted as described in
212+ <link xlink:href="https://tools.ietf.org/html/rfc2119">RFC 2119</link>.
213+ Only <emphasis>emphasized</emphasis> words are to be interpreted in this way.
214+ </para>
215+
194216 <para>
195217 In Nixpkgs, there are generally three different names associated with a
196218 package:
@@ -231,14 +253,15 @@ args.stdenv.mkDerivation (args // {
231253 <itemizedlist>
232254 <listitem>
233255 <para>
234− Generally, try to stick to the upstream package name.
256+ The <literal>name</literal> attribute <emphasis>should</emphasis>
257+ be identical to the upstream package name.
235258 </para>
236259 </listitem>
237260 <listitem>
238261 <para>
239− Don’t use uppercase letters in the <literal>name</literal> attribute
240− — e.g., <literal>"mplayer-1.0rc2"</literal> instead of
241− <literal>"MPlayer-1.0rc2"</literal>.
262+ The <literal>name</literal> attribute <emphasis>must not</emphasis>
263+ contain uppercase letters — e.g., <literal>"mplayer-1.0rc2"</literal>
264+ instead of <literal>"MPlayer-1.0rc2"</literal>.
242265 </para>
243266 </listitem>
244267 <listitem>
@@ -252,14 +275,14 @@ args.stdenv.mkDerivation (args // {
252275 <para>
253276 If a package is not a release but a commit from a repository, then the
254277 version part of the name <emphasis>must</emphasis> be the date of that
255− (fetched) commit. The date must be in <literal>"YYYY-MM-DD"</literal>
278+ (fetched) commit. The date <emphasis>must</emphasis> be in <literal>"YYYY-MM-DD"</literal>
256279 format. Also append <literal>"unstable"</literal> to the name - e.g.,
257280 <literal>"pkgname-unstable-2014-09-23"</literal>.
258281 </para>
259282 </listitem>
260283 <listitem>
261284 <para>
262− Dashes in the package name should be preserved in new variable names,
285+ Dashes in the package name <emphasis>should</emphasis> be preserved in new variable names,
263286 rather than converted to underscores or camel cased — e.g.,
264287 <varname>http-parser</varname> instead of <varname>http_parser</varname>
265288 or <varname>httpParser</varname>. The hyphenated style is preferred in
@@ -268,7 +291,7 @@ args.stdenv.mkDerivation (args // {
268291 </listitem>
269292 <listitem>
270293 <para>
271− If there are multiple versions of a package, this should be reflected in
294+ If there are multiple versions of a package, this <emphasis>should</emphasis> be reflected in
272295 the variable names in <filename>all-packages.nix</filename>, e.g.
273296 <varname>json-c-0-9</varname> and <varname>json-c-0-11</varname>. If
274297 there is an obvious “default” version, make an attribute like
@@ -791,7 +814,7 @@ args.stdenv.mkDerivation (args // {
791814
792815 <para>
793816 There are multiple ways to fetch a package source in nixpkgs. The general
794− guideline is that you should package sources with a high degree of
817+ guideline is that you should package reproducible sources with a high degree of
795818 availability. Right now there is only one fetcher which has mirroring
796819 support and that is <literal>fetchurl</literal>. Note that you should also
797820 prefer protocols which have a corresponding proxy environment variable.
@@ -842,14 +865,134 @@ src = fetchFromGitHub {
842865 owner = "NixOS";
843866 repo = "nix";
844867 rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
845− sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9";
868+ sha256 = "1i2yxndxb6yc9l6c99pypbd92lfq5aac4klq7y2v93c9qvx2cgpc";
846869}
847870</programlisting>
871+ Find the value to put as <literal>sha256</literal> by running
872+ <literal>nix run -f '&lt;nixpkgs&gt;' nix-prefetch-github -c nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix</literal>
873+ or <literal>nix-prefetch-url --unpack https://github.com/NixOS/nix/archive/1f795f9f44607cc5bec70d1300150bfefcef2aae.tar.gz</literal>.
848874 </para>
849875 </listitem>
850876 </itemizedlist>
851877 </para>
852878 </section>
879+ <section xml:id="sec-source-hashes">
880+ <title>Obtaining source hash</title>
881+
882+ <para>
883+ Preferred source hash type is sha256. There are several ways to get it.
884+ </para>
885+
886+ <orderedlist>
887+ <listitem>
888+ <para>
889+ Prefetch URL (with <literal>nix-prefetch-<replaceable>XXX</replaceable>
890+ <replaceable>URL</replaceable></literal>, where
891+ <replaceable>XXX</replaceable> is one of <literal>url</literal>,
892+ <literal>git</literal>, <literal>hg</literal>, <literal>cvs</literal>,
893+ <literal>bzr</literal>, <literal>svn</literal>). Hash is printed to
894+ stdout.
895+ </para>
896+ </listitem>
897+ <listitem>
898+ <para>
899+ Prefetch by package source (with <literal>nix-prefetch-url
900+ '&lt;nixpkgs&gt;' -A <replaceable>PACKAGE</replaceable>.src</literal>,
901+ where <replaceable>PACKAGE</replaceable> is package attribute name). Hash
902+ is printed to stdout.
903+ </para>
904+ <para>
905+ This works well when you've upgraded existing package version and want to
906+ find out new hash, but is useless if package can't be accessed by
907+ attribute or package has multiple sources (<literal>.srcs</literal>,
908+ architecture-dependent sources, etc).
909+ </para>
910+ </listitem>
911+ <listitem>
912+ <para>
913+ Upstream provided hash: use it when upstream provides
914+ <literal>sha256</literal> or <literal>sha512</literal> (when upstream
915+ provides <literal>md5</literal>, don't use it, compute
916+ <literal>sha256</literal> instead).
917+ </para>
918+ <para>
919+ A little nuance is that <literal>nix-prefetch-*</literal> tools produce
920+ hash encoded with <literal>base32</literal>, but upstream usually provides
921+ hexadecimal (<literal>base16</literal>) encoding. Fetchers understand both
922+ formats. Nixpkgs does not standardize on any one format.
923+ </para>
924+ <para>
925+ You can convert between formats with nix-hash, for example:
926+<screen>
927+$ nix-hash --type sha256 --to-base32 <replaceable>HASH</replaceable>
928+</screen>
929+ </para>
930+ </listitem>
931+ <listitem>
932+ <para>
933+ Extracting hash from local source tarball can be done with
934+ <literal>sha256sum</literal>. Use <literal>nix-prefetch-url
935+ file:///path/to/tarball </literal> if you want base32 hash.
936+ </para>
937+ </listitem>
938+ <listitem>
939+ <para>
940+ Fake hash: set fake hash in package expression, perform build and extract
941+ correct hash from error Nix prints.
942+ </para>
943+ <para>
944+ For package updates it is enough to change one symbol to make hash fake.
945+ For new packages, you can use <literal>lib.fakeSha256</literal>,
946+ <literal>lib.fakeSha512</literal> or any other fake hash.
947+ </para>
948+ <para>
949+ This is last resort method when reconstructing source URL is non-trivial
950+ and <literal>nix-prefetch-url -A</literal> isn't applicable (for example,
951+ <link xlink:href="https://github.com/NixOS/nixpkgs/blob/d2ab091dd308b99e4912b805a5eb088dd536adb9/pkgs/applications/video/kodi/default.nix#L73">
952+ one of <literal>kodi</literal> dependencies</link>). The easiest way then
953+ would be replace hash with a fake one and rebuild. Nix build will fail and
954+ error message will contain desired hash.
955+ </para>
956+ <warning><para>This method has security problems. Check below for details.</para></warning>
957+ </listitem>
958+ </orderedlist>
959+
960+ <section xml:id="sec-source-hashes-security">
961+ <title>Obtaining hashes securely</title>
962+ <para>
963+ Let's say Man-in-the-Middle (MITM) sits close to your network. Then instead of fetching
964+ source you can fetch malware, and instead of source hash you get hash of malware. Here are
965+ security considerations for this scenario:
966+ </para>
967+ <itemizedlist>
968+ <listitem>
969+ <para>
970+ <literal>http://</literal> URLs are not secure to prefetch hash from;
971+ </para>
972+ </listitem>
973+ <listitem>
974+ <para>
975+ hashes from upstream (in method 3) should be obtained via secure protocol;
976+ </para>
977+ </listitem>
978+ <listitem>
979+ <para>
980+ <literal>https://</literal> URLs are secure in methods 1, 2, 3;
981+ </para>
982+ </listitem>
983+ <listitem>
984+ <para>
985+ <literal>https://</literal> URLs are not secure in method 5. When obtaining hashes
986+ with fake hash method, TLS checks are disabled. So
987+ refetch source hash from several different networks to exclude MITM scenario.
988+ Alternatively, use fake hash method to make Nix error, but instead of extracting
989+ hash from error, extract <literal>https://</literal> URL and prefetch it
990+ with method 1.
991+ </para>
992+ </listitem>
993+ </itemizedlist>
994+ </section>
995+ </section>
853996 <section xml:id="sec-patches">
854997 <title>Patches</title>
855998
doc/configuration.xml+46−9
@@ -132,7 +132,7 @@
132132 </itemizedlist>
133133
134134 <para>
135− The difference between an a package being unsupported on some system and
135+ The difference between a package being unsupported on some system and
136136 being broken is admittedly a bit fuzzy. If a program
137137 <emphasis>ought</emphasis> to work on a certain platform, but doesn't, the
138138 platform should be included in <literal>meta.platforms</literal>, but marked
@@ -175,11 +175,16 @@
175175</programlisting>
176176 </para>
177177 <para>
178− A more useful example, the following configuration allows only allows
179− flash player and visual studio code:
178+ For a more useful example, try the following. This configuration
179+ only allows unfree packages named flash player and visual studio
180+ code:
180181<programlisting>
181182{
182− allowUnfreePredicate = (pkg: elem (builtins.parseDrvName pkg.name).name [ "flashplayer" "vscode" ]);
183+ allowUnfreePredicate = (pkg: builtins.elem
184+ (builtins.parseDrvName pkg.name).name [
185+ "flashplayer"
186+ "vscode"
187+ ]);
183188}
184189</programlisting>
185190 </para>
@@ -286,8 +291,8 @@
286291
287292 <para>
288293 You can define a function called <varname>packageOverrides</varname> in your
289− local <filename>~/.config/nixpkgs/config.nix</filename> to override nix
290− packages. It must be a function that takes pkgs as an argument and return
294+ local <filename>~/.config/nixpkgs/config.nix</filename> to override Nix
295+ packages. It must be a function that takes pkgs as an argument and returns a
291296 modified set of packages.
292297<programlisting>
293298{
@@ -321,7 +326,18 @@
321326 packageOverrides = pkgs: with pkgs; {
322327 myPackages = pkgs.buildEnv {
323328 name = "my-packages";
324− paths = [ aspell bc coreutils gdb ffmpeg nixUnstable emscripten jq nox silver-searcher ];
329+ paths = [
330+ aspell
331+ bc
332+ coreutils
333+ gdb
334+ ffmpeg
335+ nixUnstable
336+ emscripten
337+ jq
338+ nox
339+ silver-searcher
340+ ];
325341 };
326342 };
327343}
@@ -342,7 +358,18 @@
342358 packageOverrides = pkgs: with pkgs; {
343359 myPackages = pkgs.buildEnv {
344360 name = "my-packages";
345− paths = [ aspell bc coreutils gdb ffmpeg nixUnstable emscripten jq nox silver-searcher ];
361+ paths = [
362+ aspell
363+ bc
364+ coreutils
365+ gdb
366+ ffmpeg
367+ nixUnstable
368+ emscripten
369+ jq
370+ nox
371+ silver-searcher
372+ ];
346373 pathsToLink = [ "/share" "/bin" ];
347374 };
348375 };
@@ -377,7 +404,17 @@
377404 packageOverrides = pkgs: with pkgs; {
378405 myPackages = pkgs.buildEnv {
379406 name = "my-packages";
380− paths = [ aspell bc coreutils ffmpeg nixUnstable emscripten jq nox silver-searcher ];
407+ paths = [
408+ aspell
409+ bc
410+ coreutils
411+ ffmpeg
412+ nixUnstable
413+ emscripten
414+ jq
415+ nox
416+ silver-searcher
417+ ];
381418 pathsToLink = [ "/share/man" "/share/doc" "/bin" ];
382419 extraOutputsToInstall = [ "man" "doc" ];
383420 };
doc/cross-compilation.xml+95−102
@@ -6,17 +6,17 @@
66 <title>Introduction</title>
77
88 <para>
9− "Cross-compilation" means compiling a program on one machine for another
10− type of machine. For example, a typical use of cross compilation is to
11− compile programs for embedded devices. These devices often don't have the
12− computing power and memory to compile their own programs. One might think
13− that cross-compilation is a fairly niche concern, but there are advantages
14− to being rigorous about distinguishing build-time vs run-time environments
15− even when one is developing and deploying on the same machine. Nixpkgs is
16− increasingly adopting the opinion that packages should be written with
17− cross-compilation in mind, and nixpkgs should evaluate in a similar way (by
18− minimizing cross-compilation-specific special cases) whether or not one is
19− cross-compiling.
9+ "Cross-compilation" means compiling a program on one machine for another type
10+ of machine. For example, a typical use of cross-compilation is to compile
11+ programs for embedded devices. These devices often don't have the computing
12+ power and memory to compile their own programs. One might think that
13+ cross-compilation is a fairly niche concern. However, there are significant
14+ advantages to rigorously distinguishing between build-time and run-time
15+ environments! This applies even when one is developing and deploying on the
16+ same machine. Nixpkgs is increasingly adopting the opinion that packages
17+ should be written with cross-compilation in mind, and nixpkgs should evaluate
18+ in a similar way (by minimizing cross-compilation-specific special cases)
19+ whether or not one is cross-compiling.
2020 </para>
2121
2222 <para>
@@ -34,15 +34,15 @@
3434 <title>Platform parameters</title>
3535
3636 <para>
37− Nixpkgs follows the
38− <link xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html">common
39− historical convention of GNU autoconf</link> of distinguishing between 3
40− types of platform: <wordasword>build</wordasword>,
41− <wordasword>host</wordasword>, and <wordasword>target</wordasword>. In
42− summary, <wordasword>build</wordasword> is the platform on which a package
43− is being built, <wordasword>host</wordasword> is the platform on which it
44− is to run. The third attribute, <wordasword>target</wordasword>, is
45− relevant only for certain specific compilers and build tools.
37+ Nixpkgs follows the <link
38+ xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html">conventions
39+ of GNU autoconf</link>. We distinguish between 3 types of platforms when
40+ building a derivation: <wordasword>build</wordasword>,
41+ <wordasword>host</wordasword>, and <wordasword>target</wordasword>. In
42+ summary, <wordasword>build</wordasword> is the platform on which a package
43+ is being built, <wordasword>host</wordasword> is the platform on which it
44+ will run. The third attribute, <wordasword>target</wordasword>, is relevant
45+ only for certain specific compilers and build tools.
4646 </para>
4747
4848 <para>
@@ -64,7 +64,7 @@
6464 <para>
6565 The "build platform" is the platform on which a package is built. Once
6666 someone has a built package, or pre-built binary package, the build
67− platform should not matter and be safe to ignore.
67+ platform should not matter and can be ignored.
6868 </para>
6969 </listitem>
7070 </varlistentry>
@@ -94,11 +94,11 @@
9494 <para>
9595 The build process of certain compilers is written in such a way that the
9696 compiler resulting from a single build can itself only produce binaries
97− for a single platform. The task specifying this single "target platform"
98− is thus pushed to build time of the compiler. The root cause of this
99− mistake is often that the compiler (which will be run on the host) and
100− the the standard library/runtime (which will be run on the target) are
101− built by a single build process.
97+ for a single platform. The task of specifying this single "target
98+ platform" is thus pushed to build time of the compiler. The root cause of
99+ this that the compiler (which will be run on the host) and the standard
100+ library/runtime (which will be run on the target) are built by a single
101+ build process.
102102 </para>
103103 <para>
104104 There is no fundamental need to think about a single target ahead of
@@ -135,8 +135,10 @@
135135 <para>
136136 This is a two-component shorthand for the platform. Examples of this
137137 would be "x86_64-darwin" and "i686-linux"; see
138− <literal>lib.systems.doubles</literal> for more. This format isn't very
139− standard, but has built-in support in Nix, such as the
138+ <literal>lib.systems.doubles</literal> for more. The first component
139+ corresponds to the CPU architecture of the platform and the second to the
140+ operating system of the platform (<literal>[cpu]-[os]</literal>). This
141+ format has built-in support in Nix, such as the
140142 <varname>builtins.currentSystem</varname> impure string.
141143 </para>
142144 </listitem>
@@ -147,12 +149,13 @@
147149 </term>
148150 <listitem>
149151 <para>
150− This is a 3- or 4- component shorthand for the platform. Examples of
151− this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14".
152− This is a standard format called the "LLVM target triple", as they are
153− pioneered by LLVM and traditionally just used for the
154− <varname>targetPlatform</varname>. This format is strictly more
155− informative than the "Nix host double", as the previous format could
152+ This is a 3- or 4- component shorthand for the platform. Examples of this
153+ would be <literal>x86_64-unknown-linux-gnu</literal> and
154+ <literal>aarch64-apple-darwin14</literal>. This is a standard format
155+ called the "LLVM target triple", as they are pioneered by LLVM. In the
156+ 4-part form, this corresponds to
157+ <literal>[cpu]-[vendor]-[os]-[abi]</literal>. This format is strictly
158+ more informative than the "Nix host double", as the previous format could
156159 analogously be termed. This needs a better name than
157160 <varname>config</varname>!
158161 </para>
@@ -164,12 +167,11 @@
164167 </term>
165168 <listitem>
166169 <para>
167− This is a nix representation of a parsed LLVM target triple with
168− white-listed components. This can be specified directly, or actually
169− parsed from the <varname>config</varname>. [Technically, only one need
170− be specified and the others can be inferred, though the precision of
171− inference may not be very good.] See
172− <literal>lib.systems.parse</literal> for the exact representation.
170+ This is a Nix representation of a parsed LLVM target triple
171+ with white-listed components. This can be specified directly,
172+ or actually parsed from the <varname>config</varname>. See
173+ <literal>lib.systems.parse</literal> for the exact
174+ representation.
173175 </para>
174176 </listitem>
175177 </varlistentry>
@@ -193,7 +195,7 @@
193195 <listitem>
194196 <para>
195197 These predicates are defined in <literal>lib.systems.inspect</literal>,
196− and slapped on every platform. They are superior to the ones in
198+ and slapped onto every platform. They are superior to the ones in
197199 <varname>stdenv</varname> as they force the user to be explicit about
198200 which platform they are inspecting. Please use these instead of those.
199201 </para>
@@ -221,7 +223,7 @@
221223
222224 <para>
223225 In this section we explore the relationship between both runtime and
224− buildtime dependencies and the 3 Autoconf platforms.
226+ build-time dependencies and the 3 Autoconf platforms.
225227 </para>
226228
227229 <para>
@@ -249,17 +251,17 @@
249251 </para>
250252
251253 <para>
252− Some examples will probably make this clearer. If a package is being built
253− with a <literal>(build, host, target)</literal> platform triple of
254− <literal>(foo, bar, bar)</literal>, then its build-time dependencies would
255− have a triple of <literal>(foo, foo, bar)</literal>, and <emphasis>those
256− packages'</emphasis> build-time dependencies would have triple of
257− <literal>(foo, foo, foo)</literal>. In other words, it should take two
258− "rounds" of following build-time dependency edges before one reaches a
259− fixed point where, by the sliding window principle, the platform triple no
260− longer changes. Indeed, this happens with cross compilation, where only
261− rounds of native dependencies starting with the second necessarily coincide
262− with native packages.
254+ Some examples will make this clearer. If a package is being built with a
255+ <literal>(build, host, target)</literal> platform triple of <literal>(foo,
256+ bar, bar)</literal>, then its build-time dependencies would have a triple of
257+ <literal>(foo, foo, bar)</literal>, and <emphasis>those packages'</emphasis>
258+ build-time dependencies would have a triple of <literal>(foo, foo,
259+ foo)</literal>. In other words, it should take two "rounds" of following
260+ build-time dependency edges before one reaches a fixed point where, by the
261+ sliding window principle, the platform triple no longer changes. Indeed,
262+ this happens with cross-compilation, where only rounds of native
263+ dependencies starting with the second necessarily coincide with native
264+ packages.
263265 </para>
264266
265267 <note>
@@ -271,23 +273,23 @@
271273 </note>
272274
273275 <para>
274− How does this work in practice? Nixpkgs is now structured so that
275− build-time dependencies are taken from <varname>buildPackages</varname>,
276− whereas run-time dependencies are taken from the top level attribute set.
277− For example, <varname>buildPackages.gcc</varname> should be used at build
278− time, while <varname>gcc</varname> should be used at run time. Now, for
279− most of Nixpkgs's history, there was no <varname>buildPackages</varname>,
280− and most packages have not been refactored to use it explicitly. Instead,
281− one can use the six (<emphasis>gasp</emphasis>) attributes used for
282− specifying dependencies as documented in
283− <xref linkend="ssec-stdenv-dependencies"/>. We "splice" together the
284− run-time and build-time package sets with <varname>callPackage</varname>,
285− and then <varname>mkDerivation</varname> for each of four attributes pulls
286− the right derivation out. This splicing can be skipped when not cross
287− compiling as the package sets are the same, but is a bit slow for cross
288− compiling. Because of this, a best-of-both-worlds solution is in the works
289− with no splicing or explicit access of <varname>buildPackages</varname>
290− needed. For now, feel free to use either method.
276+ How does this work in practice? Nixpkgs is now structured so that build-time
277+ dependencies are taken from <varname>buildPackages</varname>, whereas
278+ run-time dependencies are taken from the top level attribute set. For
279+ example, <varname>buildPackages.gcc</varname> should be used at build-time,
280+ while <varname>gcc</varname> should be used at run-time. Now, for most of
281+ Nixpkgs's history, there was no <varname>buildPackages</varname>, and most
282+ packages have not been refactored to use it explicitly. Instead, one can use
283+ the six (<emphasis>gasp</emphasis>) attributes used for specifying
284+ dependencies as documented in <xref linkend="ssec-stdenv-dependencies"/>. We
285+ "splice" together the run-time and build-time package sets with
286+ <varname>callPackage</varname>, and then <varname>mkDerivation</varname> for
287+ each of four attributes pulls the right derivation out. This splicing can be
288+ skipped when not cross-compiling as the package sets are the same, but is a
289+ bit slow for cross-compiling. Because of this, a best-of-both-worlds
290+ solution is in the works with no splicing or explicit access of
291+ <varname>buildPackages</varname> needed. For now, feel free to use either
292+ method.
291293 </para>
292294
293295 <note>
@@ -305,11 +307,11 @@
305307 <title>Cross packaging cookbook</title>
306308
307309 <para>
308− Some frequently problems when packaging for cross compilation are good to
309− just spell and answer. Ideally the information above is exhaustive, so this
310− section cannot provide any new information, but its ludicrous and cruel to
311− expect everyone to spend effort working through the interaction of many
312− features just to figure out the same answer to the same common problem.
310+ Some frequently encountered problems when packaging for cross-compilation
311+ should be answered here. Ideally, the information above is exhaustive, so
312+ this section cannot provide any new information, but it is ludicrous and
313+ cruel to expect everyone to spend effort working through the interaction of
314+ many features just to figure out the same answer to the same common problem.
313315 Feel free to add to this list!
314316 </para>
315317
@@ -364,17 +366,9 @@
364366 <section xml:id="sec-cross-usage">
365367 <title>Cross-building packages</title>
366368
367− <note>
368− <para>
369− More information needs to moved from the old wiki, especially
370− <link xlink:href="https://nixos.org/wiki/CrossCompiling" />, for this
371− section.
372− </para>
373− </note>
374−
375369 <para>
376370 Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in
377− which case there is no cross compiling and everything is built by and for
371+ which case there is no cross-compiling and everything is built by and for
378372 that system, or also with <varname>crossSystem</varname>, in which case
379373 packages run on the latter, but all building happens on the former. Both
380374 parameters take the same schema as the 3 (build, host, and target) platforms
@@ -391,7 +385,7 @@ nix-build &lt;nixpkgs&gt; --arg crossSystem '(import &lt;nixpkgs/lib&gt;).system
391385 Eventually we would like to make these platform examples an unnecessary
392386 convenience so that
393387<programlisting>
394−nix-build &lt;nixpkgs&gt; --arg crossSystem.config '&lt;arch&gt;-&lt;os&gt;-&lt;vendor&gt;-&lt;abi&gt;' -A whatever</programlisting>
388+nix-build &lt;nixpkgs&gt; --arg crossSystem '{ config = "&lt;arch&gt;-&lt;os&gt;-&lt;vendor&gt;-&lt;abi&gt;"; }' -A whatever</programlisting>
395389 works in the vast majority of cases. The problem today is dependencies on
396390 other sorts of configuration which aren't given proper defaults. We rely on
397391 the examples to crudely to set those configuration parameters in some
@@ -440,15 +434,14 @@ nix-build &lt;nixpkgs&gt; --arg crossSystem.config '&lt;arch&gt;-&lt;os&gt;-&lt;
440434 build plan or package set. A simple "build vs deploy" dichotomy is adequate:
441435 the sliding window principle described in the previous section shows how to
442436 interpolate between the these two "end points" to get the 3 platform triple
443− for each bootstrapping stage. That means for any package a given package
444− set, even those not bound on the top level but only reachable via
445− dependencies or <varname>buildPackages</varname>, the three platforms will
446− be defined as one of <varname>localSystem</varname> or
447− <varname>crossSystem</varname>, with the former replacing the latter as one
448− traverses build-time dependencies. A last simple difference then is
449− <varname>crossSystem</varname> should be null when one doesn't want to
450− cross-compile, while the <varname>*Platform</varname>s are always non-null.
451− <varname>localSystem</varname> is always non-null.
437+ for each bootstrapping stage. That means for any package a given package set,
438+ even those not bound on the top level but only reachable via dependencies or
439+ <varname>buildPackages</varname>, the three platforms will be defined as one
440+ of <varname>localSystem</varname> or <varname>crossSystem</varname>, with the
441+ former replacing the latter as one traverses build-time dependencies. A last
442+ simple difference is that <varname>crossSystem</varname> should be null when
443+ one doesn't want to cross-compile, while the <varname>*Platform</varname>s
444+ are always non-null. <varname>localSystem</varname> is always non-null.
452445 </para>
453446 </section>
454447<!--============================================================-->
@@ -461,14 +454,14 @@ nix-build &lt;nixpkgs&gt; --arg crossSystem.config '&lt;arch&gt;-&lt;os&gt;-&lt;
461454
462455 <note>
463456 <para>
464− If one explores nixpkgs, they will see derivations with names like
465− <literal>gccCross</literal>. Such <literal>*Cross</literal> derivations is
466− a holdover from before we properly distinguished between the host and
467− target platforms —the derivation with "Cross" in the name covered the
468− <literal>build = host != target</literal> case, while the other covered the
469− <literal>host = target</literal>, with build platform the same or not based
470− on whether one was using its <literal>.nativeDrv</literal> or
471− <literal>.crossDrv</literal>. This ugliness will disappear soon.
457+ If one explores Nixpkgs, they will see derivations with names like
458+ <literal>gccCross</literal>. Such <literal>*Cross</literal> derivations is a
459+ holdover from before we properly distinguished between the host and target
460+ platforms—the derivation with "Cross" in the name covered the <literal>build
461+ = host != target</literal> case, while the other covered the <literal>host =
462+ target</literal>, with build platform the same or not based on whether one
463+ was using its <literal>.nativeDrv</literal> or <literal>.crossDrv</literal>.
464+ This ugliness will disappear soon.
472465 </para>
473466 </note>
474467 </section>
doc/default.nix+3−2
@@ -2,8 +2,8 @@
22let
33 lib = pkgs.lib;
44 locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs; };
5−in
6−pkgs.stdenv.mkDerivation {
5+ functionDocs = import ./lib-function-docs.nix { inherit locationsXml pkgs; };
6+in pkgs.stdenv.mkDerivation {
77 name = "nixpkgs-manual";
88
99 buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing xmlformat ];
@@ -32,6 +32,7 @@ pkgs.stdenv.mkDerivation {
3232 postPatch = ''
3333 rm -rf ./functions/library/locations.xml
3434 ln -s ${locationsXml} ./functions/library/locations.xml
35+ ln -s ${functionDocs} ./functions/library/generated
3536 echo ${lib.version} > .version
3637 '';
3738
doc/functions.xml+1
@@ -14,4 +14,5 @@
1414 <xi:include href="functions/fhs-environments.xml" />
1515 <xi:include href="functions/shell.xml" />
1616 <xi:include href="functions/dockertools.xml" />
17+ <xi:include href="functions/prefer-remote-fetch.xml" />
1718</chapter>
doc/functions/library.xml+9
@@ -12,4 +12,13 @@
1212 <xi:include href="./library/asserts.xml" />
1313
1414 <xi:include href="./library/attrsets.xml" />
15+
16+ <!-- These docs are generated via nixdoc. To add another generated
17+ library function file to this list, the file
18+ `lib-function-docs.nix` must also be updated. -->
19+ <xi:include href="./library/generated/strings.xml" />
20+ <xi:include href="./library/generated/trivial.xml" />
21+ <xi:include href="./library/generated/lists.xml" />
22+ <xi:include href="./library/generated/debug.xml" />
23+ <xi:include href="./library/generated/options.xml" />
1524</section>
doc/functions/library/attrsets.xml+761
@@ -966,5 +966,766 @@ lib.attrsets.mapAttrsToList (name: value: "${name}=${value}")
966966 itself to attribute sets. Also, the first argument of the argument function
967967 is a <emphasis>list</emphasis> of the names of the containing attributes.
968968 </para>
969+
970+ <variablelist>
971+ <varlistentry>
972+ <term>
973+ <varname>f</varname>
974+ </term>
975+ <listitem>
976+ <para>
977+ <literal>[ String ] -> Any -> Any</literal>
978+ </para>
979+ <para>
980+ Given a list of attribute names and value, return a new value.
981+ </para>
982+ <variablelist>
983+ <varlistentry>
984+ <term>
985+ <varname>name_path</varname>
986+ </term>
987+ <listitem>
988+ <para>
989+ The list of attribute names to this value.
990+ </para>
991+ <para>
992+ For example, the <varname>name_path</varname> for the
993+ <literal>example</literal> string in the attribute set <literal>{ foo
994+ = { bar = "example"; }; }</literal> is <literal>[ "foo" "bar"
995+ ]</literal>.
996+ </para>
997+ </listitem>
998+ </varlistentry>
999+ <varlistentry>
1000+ <term>
1001+ <varname>value</varname>
1002+ </term>
1003+ <listitem>
1004+ <para>
1005+ The attribute's value.
1006+ </para>
1007+ </listitem>
1008+ </varlistentry>
1009+ </variablelist>
1010+ </listitem>
1011+ </varlistentry>
1012+ <varlistentry>
1013+ <term>
1014+ <varname>set</varname>
1015+ </term>
1016+ <listitem>
1017+ <para>
1018+ The attribute set to recursively map over.
1019+ </para>
1020+ </listitem>
1021+ </varlistentry>
1022+ </variablelist>
1023+
1024+ <example xml:id="function-library-lib.attrsets.mapAttrsRecursive-example">
1025+ <title>A contrived example of using <function>lib.attrsets.mapAttrsRecursive</function></title>
1026+<programlisting><![CDATA[
1027+mapAttrsRecursive
1028+ (path: value: concatStringsSep "-" (path ++ [value]))
1029+ {
1030+ n = {
1031+ a = "A";
1032+ m = {
1033+ b = "B";
1034+ c = "C";
1035+ };
1036+ };
1037+ d = "D";
1038+ }
1039+=> {
1040+ n = {
1041+ a = "n-a-A";
1042+ m = {
1043+ b = "n-m-b-B";
1044+ c = "n-m-c-C";
1045+ };
1046+ };
1047+ d = "d-D";
1048+ }
1049+ ]]></programlisting>
1050+ </example>
1051+ </section>
1052+
1053+ <section xml:id="function-library-lib.attrsets.mapAttrsRecursiveCond">
1054+ <title><function>lib.attrsets.mapAttrsRecursiveCond</function></title>
1055+
1056+ <subtitle><literal>mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([ String ] -> Any -> Any) -> AttrSet -> AttrSet</literal>
1057+ </subtitle>
1058+
1059+ <xi:include href="./locations.xml" xpointer="lib.attrsets.mapAttrsRecursiveCond" />
1060+
1061+ <para>
1062+ Like <function>mapAttrsRecursive</function>, but it takes an additional
1063+ predicate function that tells it whether to recursive into an attribute set.
1064+ If it returns false, <function>mapAttrsRecursiveCond</function> does not
1065+ recurse, but does apply the map function. It is returns true, it does
1066+ recurse, and does not apply the map function.
1067+ </para>
1068+
1069+ <variablelist>
1070+ <varlistentry>
1071+ <term>
1072+ <varname>cond</varname>
1073+ </term>
1074+ <listitem>
1075+ <para>
1076+ <literal>(AttrSet -> Bool)</literal>
1077+ </para>
1078+ <para>
1079+ Determine if <function>mapAttrsRecursive</function> should recurse deeper
1080+ in to the attribute set.
1081+ </para>
1082+ <variablelist>
1083+ <varlistentry>
1084+ <term>
1085+ <varname>attributeset</varname>
1086+ </term>
1087+ <listitem>
1088+ <para>
1089+ An attribute set.
1090+ </para>
1091+ </listitem>
1092+ </varlistentry>
1093+ </variablelist>
1094+ </listitem>
1095+ </varlistentry>
1096+ <varlistentry>
1097+ <term>
1098+ <varname>f</varname>
1099+ </term>
1100+ <listitem>
1101+ <para>
1102+ <literal>[ String ] -> Any -> Any</literal>
1103+ </para>
1104+ <para>
1105+ Given a list of attribute names and value, return a new value.
1106+ </para>
1107+ <variablelist>
1108+ <varlistentry>
1109+ <term>
1110+ <varname>name_path</varname>
1111+ </term>
1112+ <listitem>
1113+ <para>
1114+ The list of attribute names to this value.
1115+ </para>
1116+ <para>
1117+ For example, the <varname>name_path</varname> for the
1118+ <literal>example</literal> string in the attribute set <literal>{ foo
1119+ = { bar = "example"; }; }</literal> is <literal>[ "foo" "bar"
1120+ ]</literal>.
1121+ </para>
1122+ </listitem>
1123+ </varlistentry>
1124+ <varlistentry>
1125+ <term>
1126+ <varname>value</varname>
1127+ </term>
1128+ <listitem>
1129+ <para>
1130+ The attribute's value.
1131+ </para>
1132+ </listitem>
1133+ </varlistentry>
1134+ </variablelist>
1135+ </listitem>
1136+ </varlistentry>
1137+ <varlistentry>
1138+ <term>
1139+ <varname>set</varname>
1140+ </term>
1141+ <listitem>
1142+ <para>
1143+ The attribute set to recursively map over.
1144+ </para>
1145+ </listitem>
1146+ </varlistentry>
1147+ </variablelist>
1148+
1149+ <example xml:id="function-library-lib.attrsets.mapAttrsRecursiveCond-example">
1150+ <title>Only convert attribute values to JSON if the containing attribute set is marked for recursion</title>
1151+<programlisting><![CDATA[
1152+lib.attrsets.mapAttrsRecursiveCond
1153+ ({ recurse ? false, ... }: recurse)
1154+ (name: value: builtins.toJSON value)
1155+ {
1156+ dorecur = {
1157+ recurse = true;
1158+ hello = "there";
1159+ };
1160+ dontrecur = {
1161+ converted-to- = "json";
1162+ };
1163+ }
1164+=> {
1165+ dorecur = {
1166+ hello = "\"there\"";
1167+ recurse = "true";
1168+ };
1169+ dontrecur = "{\"converted-to\":\"json\"}";
1170+ }
1171+ ]]></programlisting>
1172+ </example>
1173+ </section>
1174+
1175+ <section xml:id="function-library-lib.attrsets.genAttrs">
1176+ <title><function>lib.attrsets.genAttrs</function></title>
1177+
1178+ <subtitle><literal>genAttrs :: [ String ] -> (String -> Any) -> AttrSet</literal>
1179+ </subtitle>
1180+
1181+ <xi:include href="./locations.xml" xpointer="lib.attrsets.genAttrs" />
1182+
1183+ <para>
1184+ Generate an attribute set by mapping a function over a list of attribute
1185+ names.
1186+ </para>
1187+
1188+ <variablelist>
1189+ <varlistentry>
1190+ <term>
1191+ <varname>names</varname>
1192+ </term>
1193+ <listitem>
1194+ <para>
1195+ Names of values in the resulting attribute set.
1196+ </para>
1197+ </listitem>
1198+ </varlistentry>
1199+ <varlistentry>
1200+ <term>
1201+ <varname>f</varname>
1202+ </term>
1203+ <listitem>
1204+ <para>
1205+ <literal>String -> Any</literal>
1206+ </para>
1207+ <para>
1208+ Takes the name of the attribute and return the attribute's value.
1209+ </para>
1210+ <variablelist>
1211+ <varlistentry>
1212+ <term>
1213+ <varname>name</varname>
1214+ </term>
1215+ <listitem>
1216+ <para>
1217+ The name of the attribute to generate a value for.
1218+ </para>
1219+ </listitem>
1220+ </varlistentry>
1221+ </variablelist>
1222+ </listitem>
1223+ </varlistentry>
1224+ </variablelist>
1225+
1226+ <example xml:id="function-library-lib.attrsets.genAttrs-example">
1227+ <title>Generate an attrset based on names only</title>
1228+<programlisting><![CDATA[
1229+lib.attrsets.genAttrs [ "foo" "bar" ] (name: "x_${name}")
1230+=> { foo = "x_foo"; bar = "x_bar"; }
1231+ ]]></programlisting>
1232+ </example>
1233+ </section>
1234+
1235+ <section xml:id="function-library-lib.attrsets.isDerivation">
1236+ <title><function>lib.attrsets.isDerivation</function></title>
1237+
1238+ <subtitle><literal>isDerivation :: Any -> Bool</literal>
1239+ </subtitle>
1240+
1241+ <xi:include href="./locations.xml" xpointer="lib.attrsets.isDerivation" />
1242+
1243+ <para>
1244+ Check whether the argument is a derivation. Any set with <code>{ type =
1245+ "derivation"; }</code> counts as a derivation.
1246+ </para>
1247+
1248+ <variablelist>
1249+ <varlistentry>
1250+ <term>
1251+ <varname>value</varname>
1252+ </term>
1253+ <listitem>
1254+ <para>
1255+ The value which is possibly a derivation.
1256+ </para>
1257+ </listitem>
1258+ </varlistentry>
1259+ </variablelist>
1260+
1261+ <example xml:id="function-library-lib.attrsets.isDerivation-example-true">
1262+ <title>A package is a derivation</title>
1263+<programlisting><![CDATA[
1264+lib.attrsets.isDerivation (import <nixpkgs> {}).ruby
1265+=> true
1266+ ]]></programlisting>
1267+ </example>
1268+
1269+ <example xml:id="function-library-lib.attrsets.isDerivation-example-false">
1270+ <title>Anything else is not a derivation</title>
1271+<programlisting><![CDATA[
1272+lib.attrsets.isDerivation "foobar"
1273+=> false
1274+ ]]></programlisting>
1275+ </example>
1276+ </section>
1277+
1278+ <section xml:id="function-library-lib.attrsets.toDerivation">
1279+ <title><function>lib.attrsets.toDerivation</function></title>
1280+
1281+ <subtitle><literal>toDerivation :: Path -> Derivation</literal>
1282+ </subtitle>
1283+
1284+ <xi:include href="./locations.xml" xpointer="lib.attrsets.toDerivation" />
1285+
1286+ <para>
1287+ Converts a store path to a fake derivation.
1288+ </para>
1289+
1290+ <variablelist>
1291+ <varlistentry>
1292+ <term>
1293+ <varname>path</varname>
1294+ </term>
1295+ <listitem>
1296+ <para>
1297+ A store path to convert to a derivation.
1298+ </para>
1299+ </listitem>
1300+ </varlistentry>
1301+ </variablelist>
1302+ </section>
1303+
1304+ <section xml:id="function-library-lib.attrsets.optionalAttrs">
1305+ <title><function>lib.attrsets.optionalAttrs</function></title>
1306+
1307+ <subtitle><literal>optionalAttrs :: Bool -> AttrSet</literal>
1308+ </subtitle>
1309+
1310+ <xi:include href="./locations.xml" xpointer="lib.attrsets.optionalAttrs" />
1311+
1312+ <para>
1313+ Conditionally return an attribute set or an empty attribute set.
1314+ </para>
1315+
1316+ <variablelist>
1317+ <varlistentry>
1318+ <term>
1319+ <varname>cond</varname>
1320+ </term>
1321+ <listitem>
1322+ <para>
1323+ Condition under which the <varname>as</varname> attribute set is
1324+ returned.
1325+ </para>
1326+ </listitem>
1327+ </varlistentry>
1328+ <varlistentry>
1329+ <term>
1330+ <varname>as</varname>
1331+ </term>
1332+ <listitem>
1333+ <para>
1334+ The attribute set to return if <varname>cond</varname> is true.
1335+ </para>
1336+ </listitem>
1337+ </varlistentry>
1338+ </variablelist>
1339+
1340+ <example xml:id="function-library-lib.attrsets.optionalAttrs-example-true">
1341+ <title>Return the provided attribute set when <varname>cond</varname> is true</title>
1342+<programlisting><![CDATA[
1343+lib.attrsets.optionalAttrs true { my = "set"; }
1344+=> { my = "set"; }
1345+ ]]></programlisting>
1346+ </example>
1347+
1348+ <example xml:id="function-library-lib.attrsets.optionalAttrs-example-false">
1349+ <title>Return an empty attribute set when <varname>cond</varname> is false</title>
1350+<programlisting><![CDATA[
1351+lib.attrsets.optionalAttrs false { my = "set"; }
1352+=> { }
1353+ ]]></programlisting>
1354+ </example>
1355+ </section>
1356+
1357+ <section xml:id="function-library-lib.attrsets.zipAttrsWithNames">
1358+ <title><function>lib.attrsets.zipAttrsWithNames</function></title>
1359+
1360+ <subtitle><literal>zipAttrsWithNames :: [ String ] -> (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet</literal>
1361+ </subtitle>
1362+
1363+ <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrsWithNames" />
1364+
1365+ <para>
1366+ Merge sets of attributes and use the function <varname>f</varname> to merge
1367+ attribute values where the attribute name is in <varname>names</varname>.
1368+ </para>
1369+
1370+ <variablelist>
1371+ <varlistentry>
1372+ <term>
1373+ <varname>names</varname>
1374+ </term>
1375+ <listitem>
1376+ <para>
1377+ A list of attribute names to zip.
1378+ </para>
1379+ </listitem>
1380+ </varlistentry>
1381+ <varlistentry>
1382+ <term>
1383+ <varname>f</varname>
1384+ </term>
1385+ <listitem>
1386+ <para>
1387+ <literal>(String -> [ Any ] -> Any</literal>
1388+ </para>
1389+ <para>
1390+ Accepts an attribute name, all the values, and returns a combined value.
1391+ </para>
1392+ <variablelist>
1393+ <varlistentry>
1394+ <term>
1395+ <varname>name</varname>
1396+ </term>
1397+ <listitem>
1398+ <para>
1399+ The name of the attribute each value came from.
1400+ </para>
1401+ </listitem>
1402+ </varlistentry>
1403+ <varlistentry>
1404+ <term>
1405+ <varname>vs</varname>
1406+ </term>
1407+ <listitem>
1408+ <para>
1409+ A list of values collected from the list of attribute sets.
1410+ </para>
1411+ </listitem>
1412+ </varlistentry>
1413+ </variablelist>
1414+ </listitem>
1415+ </varlistentry>
1416+ <varlistentry>
1417+ <term>
1418+ <varname>sets</varname>
1419+ </term>
1420+ <listitem>
1421+ <para>
1422+ A list of attribute sets to zip together.
1423+ </para>
1424+ </listitem>
1425+ </varlistentry>
1426+ </variablelist>
1427+
1428+ <example xml:id="function-library-lib.attrsets.zipAttrsWithNames-example">
1429+ <title>Summing a list of attribute sets of numbers</title>
1430+<programlisting><![CDATA[
1431+lib.attrsets.zipAttrsWithNames
1432+ [ "a" "b" ]
1433+ (name: vals: "${name} ${toString (builtins.foldl' (a: b: a + b) 0 vals)}")
1434+ [
1435+ { a = 1; b = 1; c = 1; }
1436+ { a = 10; }
1437+ { b = 100; }
1438+ { c = 1000; }
1439+ ]
1440+=> { a = "a 11"; b = "b 101"; }
1441+ ]]></programlisting>
1442+ </example>
1443+ </section>
1444+
1445+ <section xml:id="function-library-lib.attrsets.zipAttrsWith">
1446+ <title><function>lib.attrsets.zipAttrsWith</function></title>
1447+
1448+ <subtitle><literal>zipAttrsWith :: (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet</literal>
1449+ </subtitle>
1450+
1451+ <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrsWith" />
1452+
1453+ <para>
1454+ Merge sets of attributes and use the function <varname>f</varname> to merge
1455+ attribute values. Similar to
1456+ <xref
1457+ linkend="function-library-lib.attrsets.zipAttrsWithNames" /> where
1458+ all key names are passed for <varname>names</varname>.
1459+ </para>
1460+
1461+ <variablelist>
1462+ <varlistentry>
1463+ <term>
1464+ <varname>f</varname>
1465+ </term>
1466+ <listitem>
1467+ <para>
1468+ <literal>(String -> [ Any ] -> Any</literal>
1469+ </para>
1470+ <para>
1471+ Accepts an attribute name, all the values, and returns a combined value.
1472+ </para>
1473+ <variablelist>
1474+ <varlistentry>
1475+ <term>
1476+ <varname>name</varname>
1477+ </term>
1478+ <listitem>
1479+ <para>
1480+ The name of the attribute each value came from.
1481+ </para>
1482+ </listitem>
1483+ </varlistentry>
1484+ <varlistentry>
1485+ <term>
1486+ <varname>vs</varname>
1487+ </term>
1488+ <listitem>
1489+ <para>
1490+ A list of values collected from the list of attribute sets.
1491+ </para>
1492+ </listitem>
1493+ </varlistentry>
1494+ </variablelist>
1495+ </listitem>
1496+ </varlistentry>
1497+ <varlistentry>
1498+ <term>
1499+ <varname>sets</varname>
1500+ </term>
1501+ <listitem>
1502+ <para>
1503+ A list of attribute sets to zip together.
1504+ </para>
1505+ </listitem>
1506+ </varlistentry>
1507+ </variablelist>
1508+
1509+ <example xml:id="function-library-lib.attrsets.zipAttrsWith-example">
1510+ <title>Summing a list of attribute sets of numbers</title>
1511+<programlisting><![CDATA[
1512+lib.attrsets.zipAttrsWith
1513+ (name: vals: "${name} ${toString (builtins.foldl' (a: b: a + b) 0 vals)}")
1514+ [
1515+ { a = 1; b = 1; c = 1; }
1516+ { a = 10; }
1517+ { b = 100; }
1518+ { c = 1000; }
1519+ ]
1520+=> { a = "a 11"; b = "b 101"; c = "c 1001"; }
1521+ ]]></programlisting>
1522+ </example>
1523+ </section>
1524+
1525+ <section xml:id="function-library-lib.attrsets.zipAttrs">
1526+ <title><function>lib.attrsets.zipAttrs</function></title>
1527+
1528+ <subtitle><literal>zipAttrsWith :: [ AttrSet ] -> AttrSet</literal>
1529+ </subtitle>
1530+
1531+ <xi:include href="./locations.xml" xpointer="lib.attrsets.zipAttrs" />
1532+
1533+ <para>
1534+ Merge sets of attributes and combine each attribute value in to a list.
1535+ Similar to <xref linkend="function-library-lib.attrsets.zipAttrsWith" />
1536+ where the merge function returns a list of all values.
1537+ </para>
1538+
1539+ <variablelist>
1540+ <varlistentry>
1541+ <term>
1542+ <varname>sets</varname>
1543+ </term>
1544+ <listitem>
1545+ <para>
1546+ A list of attribute sets to zip together.
1547+ </para>
1548+ </listitem>
1549+ </varlistentry>
1550+ </variablelist>
1551+
1552+ <example xml:id="function-library-lib.attrsets.zipAttrs-example">
1553+ <title>Combining a list of attribute sets</title>
1554+<programlisting><![CDATA[
1555+lib.attrsets.zipAttrs
1556+ [
1557+ { a = 1; b = 1; c = 1; }
1558+ { a = 10; }
1559+ { b = 100; }
1560+ { c = 1000; }
1561+ ]
1562+=> { a = [ 1 10 ]; b = [ 1 100 ]; c = [ 1 1000 ]; }
1563+ ]]></programlisting>
1564+ </example>
1565+ </section>
1566+
1567+ <section xml:id="function-library-lib.attrsets.recursiveUpdateUntil">
1568+ <title><function>lib.attrsets.recursiveUpdateUntil</function></title>
1569+
1570+ <subtitle><literal>recursiveUpdateUntil :: ( [ String ] -> AttrSet -> AttrSet -> Bool ) -> AttrSet -> AttrSet -> AttrSet</literal>
1571+ </subtitle>
1572+
1573+ <xi:include href="./locations.xml" xpointer="lib.attrsets.recursiveUpdateUntil" />
1574+
1575+ <para>
1576+ Does the same as the update operator <literal>//</literal> except that
1577+ attributes are merged until the given predicate is verified. The predicate
1578+ should accept 3 arguments which are the path to reach the attribute, a part
1579+ of the first attribute set and a part of the second attribute set. When the
1580+ predicate is verified, the value of the first attribute set is replaced by
1581+ the value of the second attribute set.
1582+ </para>
1583+
1584+ <variablelist>
1585+ <varlistentry>
1586+ <term>
1587+ <varname>pred</varname>
1588+ </term>
1589+ <listitem>
1590+ <para>
1591+ <literal>[ String ] -> AttrSet -> AttrSet -> Bool</literal>
1592+ </para>
1593+ <variablelist>
1594+ <varlistentry>
1595+ <term>
1596+ <varname>path</varname>
1597+ </term>
1598+ <listitem>
1599+ <para>
1600+ The path to the values in the left and right hand sides.
1601+ </para>
1602+ </listitem>
1603+ </varlistentry>
1604+ <varlistentry>
1605+ <term>
1606+ <varname>l</varname>
1607+ </term>
1608+ <listitem>
1609+ <para>
1610+ The left hand side value.
1611+ </para>
1612+ </listitem>
1613+ </varlistentry>
1614+ <varlistentry>
1615+ <term>
1616+ <varname>r</varname>
1617+ </term>
1618+ <listitem>
1619+ <para>
1620+ The right hand side value.
1621+ </para>
1622+ </listitem>
1623+ </varlistentry>
1624+ </variablelist>
1625+ </listitem>
1626+ </varlistentry>
1627+ <varlistentry>
1628+ <term>
1629+ <varname>lhs</varname>
1630+ </term>
1631+ <listitem>
1632+ <para>
1633+ The left hand attribute set of the merge.
1634+ </para>
1635+ </listitem>
1636+ </varlistentry>
1637+ <varlistentry>
1638+ <term>
1639+ <varname>rhs</varname>
1640+ </term>
1641+ <listitem>
1642+ <para>
1643+ The right hand attribute set of the merge.
1644+ </para>
1645+ </listitem>
1646+ </varlistentry>
1647+ </variablelist>
1648+
1649+ <example xml:id="function-library-lib.attrsets.recursiveUpdateUntil-example">
1650+ <title>Recursively merging two attribute sets</title>
1651+<programlisting><![CDATA[
1652+lib.attrsets.recursiveUpdateUntil (path: l: r: path == ["foo"])
1653+ {
1654+ # first attribute set
1655+ foo.bar = 1;
1656+ foo.baz = 2;
1657+ bar = 3;
1658+ }
1659+ {
1660+ #second attribute set
1661+ foo.bar = 1;
1662+ foo.quz = 2;
1663+ baz = 4;
1664+ }
1665+=> {
1666+ foo.bar = 1; # 'foo.*' from the second set
1667+ foo.quz = 2; #
1668+ bar = 3; # 'bar' from the first set
1669+ baz = 4; # 'baz' from the second set
1670+}
1671+ ]]></programlisting>
1672+ </example>
1673+ </section>
1674+
1675+ <section xml:id="function-library-lib.attrsets.recursiveUpdate">
1676+ <title><function>lib.attrsets.recursiveUpdate</function></title>
1677+
1678+ <subtitle><literal>recursiveUpdate :: AttrSet -> AttrSet -> AttrSet</literal>
1679+ </subtitle>
1680+
1681+ <xi:include href="./locations.xml" xpointer="lib.attrsets.recursiveUpdate" />
1682+
1683+ <para>
1684+ A recursive variant of the update operator <literal>//</literal>. The
1685+ recursion stops when one of the attribute values is not an attribute set, in
1686+ which case the right hand side value takes precedence over the left hand
1687+ side value.
1688+ </para>
1689+
1690+ <variablelist>
1691+ <varlistentry>
1692+ <term>
1693+ <varname>lhs</varname>
1694+ </term>
1695+ <listitem>
1696+ <para>
1697+ The left hand attribute set of the merge.
1698+ </para>
1699+ </listitem>
1700+ </varlistentry>
1701+ <varlistentry>
1702+ <term>
1703+ <varname>rhs</varname>
1704+ </term>
1705+ <listitem>
1706+ <para>
1707+ The right hand attribute set of the merge.
1708+ </para>
1709+ </listitem>
1710+ </varlistentry>
1711+ </variablelist>
1712+
1713+ <example xml:id="function-library-lib.attrsets.recursiveUpdate-example">
1714+ <title>Recursively merging two attribute sets</title>
1715+<programlisting><![CDATA[
1716+recursiveUpdate
1717+ {
1718+ boot.loader.grub.enable = true;
1719+ boot.loader.grub.device = "/dev/hda";
1720+ }
1721+ {
1722+ boot.loader.grub.device = "";
1723+ }
1724+=> {
1725+ boot.loader.grub.enable = true;
1726+ boot.loader.grub.device = "";
1727+}
1728+]]></programlisting>
1729+ </example>
9691730 </section>
9701731</section>
doc/functions/overrides.xml+13−4
@@ -6,8 +6,14 @@
66
77 <para>
88 Sometimes one wants to override parts of <literal>nixpkgs</literal>, e.g.
9− derivation attributes, the results of derivations or even the whole package
10− set.
9+ derivation attributes, the results of derivations.
10+ </para>
11+
12+ <para>
13+ These functions are used to make changes to packages, returning only single
14+ packages. <link xlink:href="#chap-overlays">Overlays</link>, on the other
15+ hand, can be used to combine the overridden packages across the entire
16+ package set of Nixpkgs.
1117 </para>
1218
1319 <section xml:id="sec-pkg-override">
@@ -25,6 +31,9 @@
2531 <para>
2632 Example usages:
2733<programlisting>pkgs.foo.override { arg1 = val1; arg2 = val2; ... }</programlisting>
34+<!-- TODO: move below programlisting to a new section about extending and overlays
35+ and reference it
36+ -->
2837<programlisting>
2938import pkgs.path { overlays = [ (self: super: {
3039 foo = super.foo.override { barSupport = true ; };
@@ -86,11 +95,11 @@ helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
8695 in this case, as it overrides only the attributes of the final derivation.
8796 It is for this reason that <varname>overrideAttrs</varname> should be
8897 preferred in (almost) all cases to <varname>overrideDerivation</varname>,
89− i.e. to allow using <varname>sdenv.mkDerivation</varname> to process input
98+ i.e. to allow using <varname>stdenv.mkDerivation</varname> to process input
9099 arguments, as well as the fact that it is easier to use (you can use the
91100 same attribute names you see in your Nix code, instead of the ones
92101 generated (e.g. <varname>buildInputs</varname> vs
93− <varname>nativeBuildInputs</varname>, and involves less typing.
102+ <varname>nativeBuildInputs</varname>), and it involves less typing).
94103 </para>
95104 </note>
96105 </section>
doc/functions/prefer-remote-fetch.xmlnew file+27
@@ -0,0 +1,27 @@
1+<section xmlns="http://docbook.org/ns/docbook"
2+ xmlns:xlink="http://www.w3.org/1999/xlink"
3+ xmlns:xi="http://www.w3.org/2001/xinclude"
4+ xml:id="sec-prefer-remote-fetch">
5+ <title>prefer-remote-fetch overlay</title>
6+
7+ <para>
8+ <function>prefer-remote-fetch</function> is an overlay that download sources
9+ on remote builder. This is useful when the evaluating machine has a slow
10+ upload while the builder can fetch faster directly from the source.
11+ To use it, put the following snippet as a new overlay:
12+ <programlisting>
13+ self: super:
14+ (super.prefer-remote-fetch self super)
15+ </programlisting>
16+
17+ A full configuration example for that sets the overlay up for your own account,
18+ could look like this
19+
20+ <programlisting>
21+ $ mkdir ~/.config/nixpkgs/overlays/
22+ $ cat &gt; ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix &lt;&lt;EOF
23+ self: super: super.prefer-remote-fetch self super
24+ EOF
25+ </programlisting>
26+ </para>
27+</section>
doc/languages-frameworks/android.section.mdnew file+240
@@ -0,0 +1,240 @@
1+---
2+title: Android
3+author: Sander van der Burg
4+date: 2018-11-18
5+---
6+# Android
7+
8+The Android build environment provides three major features and a number of
9+supporting features.
10+
11+Deploying an Android SDK installation with plugins
12+--------------------------------------------------
13+The first use case is deploying the SDK with a desired set of plugins or subsets
14+of an SDK.
15+
16+```nix
17+with import <nixpkgs> {};
18+
19+let
20+ androidComposition = androidenv.composeAndroidPackages {
21+ toolsVersion = "25.2.5";
22+ platformToolsVersion = "27.0.1";
23+ buildToolsVersions = [ "27.0.3" ];
24+ includeEmulator = false;
25+ emulatorVersion = "27.2.0";
26+ platformVersions = [ "24" ];
27+ includeSources = false;
28+ includeDocs = false;
29+ includeSystemImages = false;
30+ systemImageTypes = [ "default" ];
31+ abiVersions = [ "armeabi-v7a" ];
32+ lldbVersions = [ "2.0.2558144" ];
33+ cmakeVersions = [ "3.6.4111459" ];
34+ includeNDK = false;
35+ ndkVersion = "16.1.4479499";
36+ useGoogleAPIs = false;
37+ useGoogleTVAddOns = false;
38+ includeExtras = [
39+ "extras;google;gcm"
40+ ];
41+ };
42+in
43+androidComposition.androidsdk
44+```
45+
46+The above function invocation states that we want an Android SDK with the above
47+specified plugin versions. By default, most plugins are disabled. Notable
48+exceptions are the tools, platform-tools and build-tools sub packages.
49+
50+The following parameters are supported:
51+
52+* `toolsVersion`, specifies the version of the tools package to use
53+* `platformsToolsVersion` specifies the version of the `platform-tools` plugin
54+* `buildToolsVersion` specifies the versions of the `build-tools` plugins to
55+ use.
56+* `includeEmulator` specifies whether to deploy the emulator package (`false`
57+ by default). When enabled, the version of the emulator to deploy can be
58+ specified by setting the `emulatorVersion` parameter.
59+* `includeDocs` specifies whether the documentation catalog should be included.
60+* `lldbVersions` specifies what LLDB versions should be deployed.
61+* `cmakeVersions` specifies which CMake versions should be deployed.
62+* `includeNDK` specifies that the Android NDK bundle should be included.
63+ Defaults to: `false`.
64+* `ndkVersion` specifies the NDK version that we want to use.
65+* `includeExtras` is an array of identifier strings referring to arbitrary
66+ add-on packages that should be installed.
67+* `platformVersions` specifies which platform SDK versions should be included.
68+
69+For each platform version that has been specified, we can apply the following
70+options:
71+
72+* `includeSystemImages` specifies whether a system image for each platform SDK
73+ should be included.
74+* `includeSources` specifies whether the sources for each SDK version should be
75+ included.
76+* `useGoogleAPIs` specifies that for each selected platform version the
77+ Google API should be included.
78+* `useGoogleTVAddOns` specifies that for each selected platform version the
79+ Google TV add-on should be included.
80+
81+For each requested system image we can specify the following options:
82+
83+* `systemImageTypes` specifies what kind of system images should be included.
84+ Defaults to: `default`.
85+* `abiVersions` specifies what kind of ABI version of each system image should
86+ be included. Defaults to: `armeabi-v7a`.
87+
88+Most of the function arguments have reasonable default settings.
89+
90+When building the above expression with:
91+
92+```bash
93+$ nix-build
94+```
95+
96+The Android SDK gets deployed with all desired plugin versions.
97+
98+We can also deploy subsets of the Android SDK. For example, to only the the
99+`platform-tools` package, you can evaluate the following expression:
100+
101+```nix
102+with import <nixpkgs> {};
103+
104+let
105+ androidComposition = androidenv.composeAndroidPackages {
106+ # ...
107+ };
108+in
109+androidComposition.platform-tools
110+```
111+
112+Using predefine Android package compositions
113+--------------------------------------------
114+In addition to composing an Android package set manually, it is also possible
115+to use a predefined composition that contains all basic packages for a specific
116+Android version, such as version 9.0 (API-level 28).
117+
118+The following Nix expression can be used to deploy the entire SDK with all basic
119+plugins:
120+
121+```nix
122+with import <nixpkgs> {};
123+
124+androidenv.androidPkgs_9_0.androidsdk
125+```
126+
127+It is also possible to use one plugin only:
128+
129+```nix
130+with import <nixpkgs> {};
131+
132+androidenv.androidPkgs_9_0.platform-tools
133+```
134+
135+Building an Android application
136+-------------------------------
137+In addition to the SDK, it is also possible to build an Ant-based Android
138+project and automatically deploy all the Android plugins that a project
139+requires.
140+
141+```nix
142+with import <nixpkgs> {};
143+
144+androidenv.buildApp {
145+ name = "MyAndroidApp";
146+ src = ./myappsources;
147+ release = true;
148+
149+ # If release is set to true, you need to specify the following parameters
150+ keyStore = ./keystore;
151+ keyAlias = "myfirstapp";
152+ keyStorePassword = "mykeystore";
153+ keyAliasPassword = "myfirstapp";
154+
155+ # Any Android SDK parameters that install all the relevant plugins that a
156+ # build requires
157+ platformVersions = [ "24" ];
158+
159+ # When we include the NDK, then ndk-build is invoked before Ant gets invoked
160+ includeNDK = true;
161+}
162+```
163+
164+Aside from the app-specific build parameters (`name`, `src`, `release` and
165+keystore parameters), the `buildApp {}` function supports all the function
166+parameters that the SDK composition function (the function shown in the
167+previous section) supports.
168+
169+This build function is particularly useful when it is desired to use
170+[Hydra](http://nixos.org/hydra): the Nix-based continuous integration solution
171+to build Android apps. An Android APK gets exposed as a build product and can be
172+installed on any Android device with a web browser by navigating to the build
173+result page.
174+
175+Spawning emulator instances
176+---------------------------
177+For testing purposes, it can also be quite convenient to automatically generate
178+scripts that spawn emulator instances with all desired configuration settings.
179+
180+An emulator spawn script can be configured by invoking the `emulateApp {}`
181+function:
182+
183+```nix
184+with import <nixpkgs> {};
185+
186+androidenv.emulateApp {
187+ name = "emulate-MyAndroidApp";
188+ platformVersion = "24";
189+ abiVersion = "armeabi-v7a"; # mips, x86 or x86_64
190+ systemImageType = "default";
191+ useGoogleAPIs = false;
192+}
193+```
194+
195+It is also possible to specify an APK to deploy inside the emulator
196+and the package and activity names to launch it:
197+
198+```nix
199+with import <nixpkgs> {};
200+
201+androidenv.emulateApp {
202+ name = "emulate-MyAndroidApp";
203+ platformVersion = "24";
204+ abiVersion = "armeabi-v7a"; # mips, x86 or x86_64
205+ systemImageType = "default";
206+ useGoogleAPIs = false;
207+ app = ./MyApp.apk;
208+ package = "MyApp";
209+ activity = "MainActivity";
210+}
211+```
212+
213+In addition to prebuilt APKs, you can also bind the APK parameter to a
214+`buildApp {}` function invocation shown in the previous example.
215+
216+Querying the available versions of each plugin
217+----------------------------------------------
218+When using any of the previously shown functions, it may be a bit inconvenient
219+to find out what options are supported, since the Android SDK provides many
220+plugins.
221+
222+A shell script in the `pkgs/development/mobile/androidenv/` sub directory can be used to retrieve all
223+possible options:
224+
225+```bash
226+sh ./querypackages.sh packages build-tools
227+```
228+
229+The above command-line instruction queries all build-tools versions in the
230+generated `packages.nix` expression.
231+
232+Updating the generated expressions
233+----------------------------------
234+Most of the Nix expressions are generated from XML files that the Android
235+package manager uses. To update the expressions run the `generate.sh` script
236+that is stored in the `pkgs/development/mobile/androidenv/` sub directory:
237+
238+```bash
239+sh ./generate.sh
240+```
doc/languages-frameworks/coq.xml+3−4
@@ -11,10 +11,9 @@
1111 </para>
1212
1313 <para>
14− Some libraries require OCaml and sometimes also Camlp5 or findlib. The exact
15− versions that were used to build Coq are saved in the
16− <literal>coq.ocaml</literal> and <literal>coq.camlp5</literal> and
17− <literal>coq.findlib</literal> attributes.
14+ Some extensions (plugins) might require OCaml and sometimes other OCaml
15+ packages. The <literal>coq.ocamlPackages</literal> attribute can be used to
16+ depend on the same package set Coq was built against.
1817 </para>
1918
2019 <para>
doc/languages-frameworks/haskell.section.md+1−1
@@ -935,7 +935,7 @@ The implementation can be found in the
935935[integer-gmp](http://hackage.haskell.org/package/integer-gmp) package.
936936
937937A potential problem with this is that GMP is licensed under the
938−[GNU Lesser General Public License (LGPL)](http://www.gnu.org/copyleft/lesser.html),
938+[GNU Lesser General Public License (LGPL)](https://www.gnu.org/copyleft/lesser.html),
939939a kind of "copyleft" license. According to the terms of the LGPL, paragraph 5,
940940you may distribute a program that is designed to be compiled and dynamically
941941linked with the library under the terms of your choice (i.e., commercially) but
doc/languages-frameworks/idris.section.md+104−28
@@ -1,39 +1,115 @@
1−Idris packages
2−==============
1+# Idris packages
32
4−This directory contains build rules for idris packages. In addition,
5−it contains several functions to build and compose those packages.
6−Everything is exposed to the user via the `idrisPackages` attribute.
3+## Installing Idris
74
8−callPackage
9−------------
5+The easiest way to get a working idris version is to install the `idris` attribute:
106
11−This is like the normal nixpkgs callPackage function, specialized to
12−idris packages.
7+```
8+$ # On NixOS
9+$ nix-env -i nixos.idris
10+$ # On non-NixOS
11+$ nix-env -i nixpkgs.idris
12+```
1313
14−builtins
15−---------
14+This however only provides the `prelude` and `base` libraries. To install additional libraries:
1615
17−This is a list of all of the libraries that come packaged with Idris
18−itself.
16+```
17+$ nix-env -iE 'pkgs: pkgs.idrisPackages.with-packages (with pkgs.idrisPackages; [ contrib pruviloj ])'
18+```
1919
20−build-idris-package
21−--------------------
20+To see all available Idris packages:
21+```
22+$ # On NixOS
23+$ nix-env -qaPA nixos.idrisPackages
24+$ # On non-NixOS
25+$ nix-env -qaPA nixpkgs.idrisPackages
26+```
2227
23−A function to build an idris package. Its sole argument is a set like
24−you might pass to `stdenv.mkDerivation`, except `build-idris-package`
25−sets several attributes for you. See `build-idris-package.nix` for
26−details.
28+Similarly, entering a `nix-shell`:
29+```
30+$ nix-shell -p 'idrisPackages.with-packages (with idrisPackages; [ contrib pruviloj ])'
31+```
2732
28−build-builtin-package
29−----------------------
33+## Starting Idris with library support
3034
31−A version of `build-idris-package` specialized to builtin libraries.
32−Mostly for internal use.
35+To have access to these libraries in idris, call it with an argument `-p <library name>` for each library:
3336
34−with-packages
35−-------------
37+```
38+$ nix-shell -p 'idrisPackages.with-packages (with idrisPackages; [ contrib pruviloj ])'
39+[nix-shell:~]$ idris -p contrib -p pruviloj
40+```
3641
37−Bundle idris together with a list of packages. Because idris currently
38−only supports a single directory in its library path, you must include
39−all desired libraries here, including `prelude` and `base`.
42+A listing of all available packages the Idris binary has access to is available via `--listlibs`:
43+
44+```
45+$ idris --listlibs
46+00prelude-idx.ibc
47+pruviloj
48+base
49+contrib
50+prelude
51+00pruviloj-idx.ibc
52+00base-idx.ibc
53+00contrib-idx.ibc
54+```
55+
56+## Building an Idris project with Nix
57+
58+As an example of how a Nix expression for an Idris package can be created, here is the one for `idrisPackages.yaml`:
59+
60+```nix
61+{ build-idris-package
62+, fetchFromGitHub
63+, contrib
64+, lightyear
65+, lib
66+}:
67+build-idris-package {
68+ name = "yaml";
69+ version = "2018-01-25";
70+
71+ # This is the .ipkg file that should be built, defaults to the package name
72+ # In this case it should build `Yaml.ipkg` instead of `yaml.ipkg`
73+ # This is only necessary because the yaml packages ipkg file is
74+ # different from its package name here.
75+ ipkgName = "Yaml";
76+ # Idris dependencies to provide for the build
77+ idrisDeps = [ contrib lightyear ];
78+
79+ src = fetchFromGitHub {
80+ owner = "Heather";
81+ repo = "Idris.Yaml";
82+ rev = "5afa51ffc839844862b8316faba3bafa15656db4";
83+ sha256 = "1g4pi0swmg214kndj85hj50ccmckni7piprsxfdzdfhg87s0avw7";
84+ };
85+
86+ meta = {
87+ description = "Idris YAML lib";
88+ homepage = https://github.com/Heather/Idris.Yaml;
89+ license = lib.licenses.mit;
90+ maintainers = [ lib.maintainers.brainrape ];
91+ };
92+}
93+```
94+
95+Assuming this file is saved as `yaml.nix`, it's buildable using
96+
97+```
98+$ nix-build -E '(import <nixpkgs> {}).idrisPackages.callPackage ./yaml.nix {}'
99+```
100+
101+Or it's possible to use
102+
103+```nix
104+with import <nixpkgs> {};
105+
106+{
107+ yaml = idrisPackages.callPackage ./yaml.nix {};
108+}
109+```
110+
111+in another file (say `default.nix`) to be able to build it with
112+
113+```
114+$ nix-build -A yaml
115+```
doc/languages-frameworks/index.xml+4
@@ -10,15 +10,18 @@
1010 Nixpkgs to easily build packages for other programming languages, such as
1111 Perl or Haskell. These are described in this chapter.
1212 </para>
13+ <xi:include href="android.section.xml" />
1314 <xi:include href="beam.xml" />
1415 <xi:include href="bower.xml" />
1516 <xi:include href="coq.xml" />
1617 <xi:include href="go.xml" />
1718 <xi:include href="haskell.section.xml" />
1819 <xi:include href="idris.section.xml" />
20+ <xi:include href="ios.section.xml" />
1921 <xi:include href="java.xml" />
2022 <xi:include href="lua.xml" />
2123 <xi:include href="node.section.xml" />
24+ <xi:include href="ocaml.xml" />
2225 <xi:include href="perl.xml" />
2326 <xi:include href="python.section.xml" />
2427 <xi:include href="qt.xml" />
@@ -26,6 +29,7 @@
2629 <xi:include href="ruby.xml" />
2730 <xi:include href="rust.section.xml" />
2831 <xi:include href="texlive.xml" />
32+ <xi:include href="titanium.section.xml" />
2933 <xi:include href="vim.section.xml" />
3034 <xi:include href="emscripten.section.xml" />
3135</chapter>
doc/languages-frameworks/ios.section.mdnew file+219
@@ -0,0 +1,219 @@
1+---
2+title: iOS
3+author: Sander van der Burg
4+date: 2018-11-18
5+---
6+# iOS
7+
8+This component is basically a wrapper/workaround that makes it possible to
9+expose an Xcode installation as a Nix package by means of symlinking to the
10+relevant executables on the host system.
11+
12+Since Xcode can't be packaged with Nix, nor we can publish it as a Nix package
13+(because of its license) this is basically the only integration strategy
14+making it possible to do iOS application builds that integrate with other
15+components of the Nix ecosystem
16+
17+The primary objective of this project is to use the Nix expression language to
18+specify how iOS apps can be built from source code, and to automatically spawn
19+iOS simulator instances for testing.
20+
21+This component also makes it possible to use [Hydra](http://nixos.org/hydra),
22+the Nix-based continuous integration server to regularly build iOS apps and to
23+do wireless ad-hoc installations of enterprise IPAs on iOS devices through
24+Hydra.
25+
26+The Xcode build environment implements a number of features.
27+
28+Deploying a proxy component wrapper exposing Xcode
29+--------------------------------------------------
30+The first use case is deploying a Nix package that provides symlinks to the Xcode
31+installation on the host system. This package can be used as a build input to
32+any build function implemented in the Nix expression language that requires
33+Xcode.
34+
35+```nix
36+let
37+ pkgs = import <nixpkgs> {};
38+
39+ xcodeenv = import ./xcodeenv {
40+ inherit (pkgs) stdenv;
41+ };
42+in
43+xcodeenv.composeXcodeWrapper {
44+ version = "9.2";
45+ xcodeBaseDir = "/Applications/Xcode.app";
46+}
47+```
48+
49+By deploying the above expression with `nix-build` and inspecting its content
50+you will notice that several Xcode-related executables are exposed as a Nix
51+package:
52+
53+```bash
54+$ ls result/bin
55+lrwxr-xr-x 1 sander staff 94 1 jan 1970 Simulator -> /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator
56+lrwxr-xr-x 1 sander staff 17 1 jan 1970 codesign -> /usr/bin/codesign
57+lrwxr-xr-x 1 sander staff 17 1 jan 1970 security -> /usr/bin/security
58+lrwxr-xr-x 1 sander staff 21 1 jan 1970 xcode-select -> /usr/bin/xcode-select
59+lrwxr-xr-x 1 sander staff 61 1 jan 1970 xcodebuild -> /Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild
60+lrwxr-xr-x 1 sander staff 14 1 jan 1970 xcrun -> /usr/bin/xcrun
61+```
62+
63+Building an iOS application
64+---------------------------
65+We can build an iOS app executable for the simulator, or an IPA/xcarchive file
66+for release purposes, e.g. ad-hoc, enterprise or store installations, by
67+executing the `xcodeenv.buildApp {}` function:
68+
69+```nix
70+let
71+ pkgs = import <nixpkgs> {};
72+
73+ xcodeenv = import ./xcodeenv {
74+ inherit (pkgs) stdenv;
75+ };
76+in
77+xcodeenv.buildApp {
78+ name = "MyApp";
79+ src = ./myappsources;
80+ sdkVersion = "11.2";
81+
82+ target = null; # Corresponds to the name of the app by default
83+ configuration = null; # Release for release builds, Debug for debug builds
84+ scheme = null; # -scheme will correspond to the app name by default
85+ sdk = null; # null will set it to 'iphonesimulator` for simulator builds or `iphoneos` to real builds
86+ xcodeFlags = "";
87+
88+ release = true;
89+ certificateFile = ./mycertificate.p12;
90+ certificatePassword = "secret";
91+ provisioningProfile = ./myprovisioning.profile;
92+ signMethod = "ad-hoc"; # 'enterprise' or 'store'
93+ generateIPA = true;
94+ generateXCArchive = false;
95+
96+ enableWirelessDistribution = true;
97+ installURL = "/installipa.php";
98+ bundleId = "mycompany.myapp";
99+ appVersion = "1.0";
100+
101+ # Supports all xcodewrapper parameters as well
102+ xcodeBaseDir = "/Applications/Xcode.app";
103+}
104+```
105+
106+The above function takes a variety of parameters:
107+* The `name` and `src` parameters are mandatory and specify the name of the app
108+ and the location where the source code resides
109+* `sdkVersion` specifies which version of the iOS SDK to use.
110+
111+It also possile to adjust the `xcodebuild` parameters. This is only needed in
112+rare circumstances. In most cases the default values should suffice:
113+
114+* Specifies which `xcodebuild` target to build. By default it takes the target
115+ that has the same name as the app.
116+* The `configuration` parameter can be overridden if desired. By default, it
117+ will do a debug build for the simulator and a release build for real devices.
118+* The `scheme` parameter specifies which `-scheme` parameter to propagate to
119+ `xcodebuild`. By default, it corresponds to the app name.
120+* The `sdk` parameter specifies which SDK to use. By default, it picks
121+ `iphonesimulator` for simulator builds and `iphoneos` for release builds.
122+* The `xcodeFlags` parameter specifies arbitrary command line parameters that
123+ should be propagated to `xcodebuild`.
124+
125+By default, builds are carried out for the iOS simulator. To do release builds
126+(builds for real iOS devices), you must set the `release` parameter to `true`.
127+In addition, you need to set the following parameters:
128+
129+* `certificateFile` refers to a P12 certificate file.
130+* `certificatePassword` specifies the password of the P12 certificate.
131+* `provisioningProfile` refers to the provision profile needed to sign the app
132+* `signMethod` should refer to `ad-hoc` for signing the app with an ad-hoc
133+ certificate, `enterprise` for enterprise certificates and `app-store` for App
134+ store certificates.
135+* `generateIPA` specifies that we want to produce an IPA file (this is probably
136+ what you want)
137+* `generateXCArchive` specifies thet we want to produce an xcarchive file.
138+
139+When building IPA files on Hydra and when it is desired to allow iOS devices to
140+install IPAs by browsing to the Hydra build products page, you can enable the
141+`enableWirelessDistribution` parameter.
142+
143+When enabled, you need to configure the following options:
144+
145+* The `installURL` parameter refers to the URL of a PHP script that composes the
146+ `itms-services://` URL allowing iOS devices to install the IPA file.
147+* `bundleId` refers to the bundle ID value of the app
148+* `appVersion` refers to the app's version number
149+
150+To use wireless adhoc distributions, you must also install the corresponding
151+PHP script on a web server (see section: 'Installing the PHP script for wireless
152+ad hoc installations from Hydra' for more information).
153+
154+In addition to the build parameters, you can also specify any parameters that
155+the `xcodeenv.composeXcodeWrapper {}` function takes. For example, the
156+`xcodeBaseDir` parameter can be overridden to refer to a different Xcode
157+version.
158+
159+Spawning simulator instances
160+----------------------------
161+In addition to building iOS apps, we can also automatically spawn simulator
162+instances:
163+
164+```nix
165+let
166+ pkgs = import <nixpkgs> {};
167+
168+ xcodeenv = import ./xcodeenv {
169+ inherit (pkgs) stdenv;
170+ };
171+in
172+xcode.simulateApp {
173+ name = "simulate";
174+
175+ # Supports all xcodewrapper parameters as well
176+ xcodeBaseDir = "/Applications/Xcode.app";
177+}
178+```
179+
180+The above expression produces a script that starts the simulator from the
181+provided Xcode installation. The script can be started as follows:
182+
183+```bash
184+./result/bin/run-test-simulator
185+```
186+
187+By default, the script will show an overview of UDID for all available simulator
188+instances and asks you to pick one. You can also provide a UDID as a
189+command-line parameter to launch an instance automatically:
190+
191+```bash
192+./result/bin/run-test-simulator 5C93129D-CF39-4B1A-955F-15180C3BD4B8
193+```
194+
195+You can also extend the simulator script to automatically deploy and launch an
196+app in the requested simulator instance:
197+
198+```nix
199+let
200+ pkgs = import <nixpkgs> {};
201+
202+ xcodeenv = import ./xcodeenv {
203+ inherit (pkgs) stdenv;
204+ };
205+in
206+xcode.simulateApp {
207+ name = "simulate";
208+ bundleId = "mycompany.myapp";
209+ app = xcode.buildApp {
210+ # ...
211+ };
212+
213+ # Supports all xcodewrapper parameters as well
214+ xcodeBaseDir = "/Applications/Xcode.app";
215+}
216+```
217+
218+By providing the result of an `xcode.buildApp {}` function and configuring the
219+app bundle id, the app gets deployed automatically and started.
doc/languages-frameworks/node.section.md+5−5
@@ -14,7 +14,7 @@ project.
1414
1515The package set also provides support for multiple Node.js versions. The policy
1616is that a new package should be added to the collection for the latest stable LTS
17−release (which is currently 8.x), unless there is an explicit reason to support
17+release (which is currently 10.x), unless there is an explicit reason to support
1818a different release.
1919
2020If your package uses native addons, you need to examine what kind of native
@@ -26,7 +26,7 @@ build system it uses. Here are some examples:
2626
2727After you have identified the correct system, you need to override your package
2828expression while adding in build system as a build input. For example, `dat`
29−requires `node-gyp-build`, so we override its expression in `default-v8.nix`:
29+requires `node-gyp-build`, so we override its expression in `default-v10.nix`:
3030
3131```nix
3232dat = nodePackages.dat.override (oldAttrs: {
@@ -36,9 +36,9 @@ dat = nodePackages.dat.override (oldAttrs: {
3636
3737To add a package from NPM to nixpkgs:
3838
39− 1. Modify `pkgs/development/node-packages/node-packages-v8.json` to add, update
40− or remove package entries. (Or `pkgs/development/node-packages/node-packages-v10.json`
41− for packages depending on Node.js 10.x)
39+ 1. Modify `pkgs/development/node-packages/node-packages-v10.json` to add, update
40+ or remove package entries. (Or `pkgs/development/node-packages/node-packages-v8.json`
41+ for packages depending on Node.js 8.x)
4242 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
4343 3. Build your new package to test your changes:
4444 `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
doc/languages-frameworks/ocaml.xmlnew file+99
@@ -0,0 +1,99 @@
1+<section xmlns="http://docbook.org/ns/docbook"
2+ xmlns:xlink="http://www.w3.org/1999/xlink"
3+ xml:id="sec-language-ocaml">
4+ <title>OCaml</title>
5+
6+ <para>
7+ OCaml libraries should be installed in
8+ <literal>$(out)/lib/ocaml/${ocaml.version}/site-lib/</literal>. Such
9+ directories are automatically added to the <literal>$OCAMLPATH</literal>
10+ environment variable when building another package that depends on them
11+ or when opening a <literal>nix-shell</literal>.
12+ </para>
13+
14+ <para>
15+ Given that most of the OCaml ecosystem is now built with dune,
16+ nixpkgs includes a convenience build support function called
17+ <literal>buildDunePackage</literal> that will build an OCaml package
18+ using dune, OCaml and findlib and any additional dependencies provided
19+ as <literal>buildInputs</literal> or <literal>propagatedBuildInputs</literal>.
20+ </para>
21+
22+ <para>
23+ Here is a simple package example. It defines an (optional) attribute
24+ <literal>minimumOCamlVersion</literal> that will be used to throw a
25+ descriptive evaluation error if building with an older OCaml is attempted.
26+ It uses the <literal>fetchFromGitHub</literal> fetcher to get its source.
27+ It sets the <literal>doCheck</literal> (optional) attribute to
28+ <literal>true</literal> which means that tests will be run with
29+ <literal>dune runtest -p angstrom</literal> after the build
30+ (<literal>dune build -p angstrom</literal>) is complete.
31+ It uses <literal>alcotest</literal> as a build input (because it is needed
32+ to run the tests) and <literal>bigstringaf</literal> and
33+ <literal>result</literal> as propagated build inputs (thus they will also
34+ be available to libraries depending on this library).
35+ The library will be installed using the <literal>angstrom.install</literal>
36+ file that dune generates.
37+ </para>
38+
39+ <programlisting>
40+{ stdenv, fetchFromGitHub, buildDunePackage, alcotest, result, bigstringaf }:
41+
42+buildDunePackage rec {
43+ pname = "angstrom";
44+ version = "0.10.0";
45+
46+ minimumOCamlVersion = "4.03";
47+
48+ src = fetchFromGitHub {
49+ owner = "inhabitedtype";
50+ repo = pname;
51+ rev = version;
52+ sha256 = "0lh6024yf9ds0nh9i93r9m6p5psi8nvrqxl5x7jwl13zb0r9xfpw";
53+ };
54+
55+ buildInputs = [ alcotest ];
56+ propagatedBuildInputs = [ bigstringaf result ];
57+ doCheck = true;
58+
59+ meta = {
60+ homepage = https://github.com/inhabitedtype/angstrom;
61+ description = "OCaml parser combinators built for speed and memory efficiency";
62+ license = stdenv.lib.licenses.bsd3;
63+ maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
64+ };
65+}
66+ </programlisting>
67+
68+ <para>
69+ Here is a second example, this time using a source archive generated with
70+ <literal>dune-release</literal>. It is a good idea to use this archive when
71+ it is available as it will usually contain substituted variables such as a
72+ <literal>%%VERSION%%</literal> field. This library does not depend
73+ on any other OCaml library and no tests are run after building it.
74+ </para>
75+
76+ <programlisting>
77+{ stdenv, fetchurl, buildDunePackage }:
78+
79+buildDunePackage rec {
80+ pname = "wtf8";
81+ version = "1.0.1";
82+
83+ minimumOCamlVersion = "4.01";
84+
85+ src = fetchurl {
86+ url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
87+ sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq";
88+ };
89+
90+ meta = with stdenv.lib; {
91+ homepage = https://github.com/flowtype/ocaml-wtf8;
92+ description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";
93+ license = licenses.mit;
94+ maintainers = [ maintainers.eqyiel ];
95+ };
96+}
97+ </programlisting>
98+
99+</section>
doc/languages-frameworks/python.section.md+95−35
@@ -186,7 +186,7 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th
186186`toolz` package.
187187
188188```nix
189−{ # ...
189+{ lib, buildPythonPackage, fetchPypi }:
190190
191191 toolz = buildPythonPackage rec {
192192 pname = "toolz";
@@ -199,8 +199,8 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th
199199
200200 doCheck = false;
201201
202− meta = {
203− homepage = "https://github.com/pytoolz/toolz/";
202+ meta = with lib; {
203+ homepage = https://github.com/pytoolz/toolz;
204204 description = "List processing tools and functional utilities";
205205 license = licenses.bsd3;
206206 maintainers = with maintainers; [ fridh ];
@@ -267,12 +267,13 @@ that we introduced with the `let` expression.
267267
268268#### Handling dependencies
269269
270−Our example, `toolz`, does not have any dependencies on other Python
271−packages or system libraries. According to the manual, `buildPythonPackage`
272−uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is
273−exclusively a build-time dependency, then the dependency should be included as a
274−`buildInput`, but if it is (also) a runtime dependency, then it should be added
275−to `propagatedBuildInputs`. Test dependencies are considered build-time dependencies.
270+Our example, `toolz`, does not have any dependencies on other Python packages or
271+system libraries. According to the manual, `buildPythonPackage` uses the
272+arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If
273+something is exclusively a build-time dependency, then the dependency should be
274+included as a `buildInput`, but if it is (also) a runtime dependency, then it
275+should be added to `propagatedBuildInputs`. Test dependencies are considered
276+build-time dependencies and passed to `checkInputs`.
276277
277278The following example shows which arguments are given to `buildPythonPackage` in
278279order to build [`datashape`](https://github.com/blaze/datashape).
@@ -292,7 +293,7 @@ order to build [`datashape`](https://github.com/blaze/datashape).
292293 checkInputs = with self; [ pytest ];
293294 propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ];
294295
295− meta = {
296+ meta = with lib; {
296297 homepage = https://github.com/ContinuumIO/datashape;
297298 description = "A data description language";
298299 license = licenses.bsd2;
@@ -326,7 +327,7 @@ when building the bindings and are therefore added as `buildInputs`.
326327
327328 buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ];
328329
329− meta = {
330+ meta = with lib; {
330331 description = "Pythonic binding for the libxml2 and libxslt libraries";
331332 homepage = https://lxml.de;
332333 license = licenses.bsd3;
@@ -370,9 +371,9 @@ and `CFLAGS`.
370371 export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include"
371372 '';
372373
373− meta = {
374+ meta = with lib; {
374375 description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
375− homepage = http://hgomersall.github.com/pyFFTW/;
376+ homepage = http://hgomersall.github.com/pyFFTW;
376377 license = with licenses; [ bsd2 bsd3 ];
377378 maintainers = with maintainers; [ fridh ];
378379 };
@@ -478,18 +479,18 @@ don't explicitly define which `python` derivation should be used. In the above
478479example we use `buildPythonPackage` that is part of the set `python35Packages`,
479480and in this case the `python35` interpreter is automatically used.
480481
481−
482−
483482## Reference
484483
485484### Interpreters
486485
487−Versions 2.7, 3.4, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
488−respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter
489−is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
490−`python35`. The default interpreter, `python`, maps to `python2`.
491−The Nix expressions for the interpreters can be found in
492−`pkgs/development/interpreters/python`.
486+Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
487+respectively `python27`, `python35`, `python36` and `python37`. The aliases
488+`python2` and `python3` correspond to respectively `python27` and
489+`python37`. The default interpreter, `python`, maps to `python2`. The PyPy
490+interpreters compatible with Python 2.7 and 3 are available as `pypy27` and
491+`pypy3`, with aliases `pypy2` mapping to `pypy27` and `pypy` mapping to
492+`pypy2`. The Nix expressions for the interpreters can be
493+found in `pkgs/development/interpreters/python`.
493494
494495All packages depending on any Python interpreter get appended
495496`out/{python.sitePackages}` to `$PYTHONPATH` if such directory
@@ -508,7 +509,7 @@ Each interpreter has the following attributes:
508509- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation.
509510- `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation.
510511- `sitePackages`. Alias for `lib/${libPrefix}/site-packages`.
511−- `executable`. Name of the interpreter executable, e.g. `python3.4`.
512+- `executable`. Name of the interpreter executable, e.g. `python3.7`.
512513- `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`.
513514
514515### Building packages and applications
@@ -530,7 +531,6 @@ attribute set is created for each available Python interpreter. The available
530531sets are
531532
532533* `pkgs.python27Packages`
533−* `pkgs.python34Packages`
534534* `pkgs.python35Packages`
535535* `pkgs.python36Packages`
536536* `pkgs.python37Packages`
@@ -539,7 +539,7 @@ sets are
539539and the aliases
540540
541541* `pkgs.python2Packages` pointing to `pkgs.python27Packages`
542−* `pkgs.python3Packages` pointing to `pkgs.python36Packages`
542+* `pkgs.python3Packages` pointing to `pkgs.python37Packages`
543543* `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
544544
545545#### `buildPythonPackage` function
@@ -549,31 +549,31 @@ The `buildPythonPackage` function is implemented in
549549
550550The following is an example:
551551```nix
552+{ lib, buildPythonPackage, fetchPypi, hypothesis, setuptools_scm, attrs, py, setuptools, six, pluggy }:
552553
553554buildPythonPackage rec {
554− version = "3.3.1";
555555 pname = "pytest";
556−
557− preCheck = ''
558− # don't test bash builtins
559− rm testing/test_argcomplete.py
560− '';
556+ version = "3.3.1";
561557
562558 src = fetchPypi {
563559 inherit pname version;
564560 sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93";
565561 };
566562
563+ postPatch = ''
564+ # don't test bash builtins
565+ rm testing/test_argcomplete.py
566+ '';
567+
567568 checkInputs = [ hypothesis ];
568569 buildInputs = [ setuptools_scm ];
569570 propagatedBuildInputs = [ attrs py setuptools six pluggy ];
570571
571− meta = with stdenv.lib; {
572+ meta = with lib; {
572573 maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
573574 description = "Framework for writing tests";
574575 };
575576}
576−
577577```
578578
579579The `buildPythonPackage` mainly does four things:
@@ -655,6 +655,39 @@ Another difference is that `buildPythonPackage` by default prefixes the names of
655655the packages with the version of the interpreter. Because this is irrelevant for
656656applications, the prefix is omitted.
657657
658+When packaging a python application with `buildPythonApplication`, it should be
659+called with `callPackage` and passed `python` or `pythonPackages` (possibly
660+specifying an interpreter version), like this:
661+
662+```nix
663+{ lib, python3Packages }:
664+
665+python3Packages.buildPythonApplication rec {
666+ pname = "luigi";
667+ version = "2.7.9";
668+
669+ src = python3Packages.fetchPypi {
670+ inherit pname version;
671+ sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x";
672+ };
673+
674+ propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ];
675+
676+ meta = with lib; {
677+ ...
678+ };
679+}
680+```
681+
682+This is then added to `all-packages.nix` just as any other application would be.
683+
684+```nix
685+luigi = callPackage ../applications/networking/cluster/luigi { };
686+```
687+
688+Since the package is an application, a consumer doesn't need to care about
689+python versions or modules, which is why they don't go in `pythonPackages`.
690+
658691#### `toPythonApplication` function
659692
660693A distinction is made between applications and libraries, however, sometimes a
@@ -805,7 +838,7 @@ community to help save time. No tool is preferred at the moment.
805838
806839### Deterministic builds
807840
808−Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.
841+The Python interpreters are now built deterministically.
809842Minor modifications had to be made to the interpreters in order to generate
810843deterministic bytecode. This has security implications and is relevant for
811844those using Python in a `nix-shell`.
@@ -1047,8 +1080,7 @@ To modify only a Python package set instead of a whole Python derivation, use th
10471080Use the following overlay template:
10481081
10491082```nix
1050−self: super:
1051−{
1083+self: super: {
10521084 python = super.python.override {
10531085 packageOverrides = python-self: python-super: {
10541086 zerobin = python-super.zerobin.overrideAttrs (oldAttrs: {
@@ -1063,6 +1095,34 @@ self: super:
10631095}
10641096```
10651097
1098+### How to use Intel's MKL with numpy and scipy?
1099+
1100+A `site.cfg` is created that configures BLAS based on the `blas` parameter
1101+of the `numpy` derivation. By passing in `mkl`, `numpy` and packages depending
1102+on `numpy` will be built with `mkl`.
1103+
1104+The following is an overlay that configures `numpy` to use `mkl`:
1105+```nix
1106+self: super: {
1107+ python37 = super.python37.override {
1108+ packageOverrides = python-self: python-super: {
1109+ numpy = python-super.numpy.override {
1110+ blas = super.pkgs.mkl;
1111+ };
1112+ };
1113+ };
1114+}
1115+```
1116+
1117+`mkl` requires an `openmp` implementation when running with multiple processors.
1118+By default, `mkl` will use Intel's `iomp` implementation if no other is
1119+specified, but this is a runtime-only dependency and binary compatible with the
1120+LLVM implementation. To use that one instead, Intel recommends users set it with
1121+`LD_PRELOAD`.
1122+
1123+Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms;
1124+moreover, Hydra is not building and distributing pre-compiled binaries using it.
1125+
10661126## Contributing
10671127
10681128### Contributing guidelines
doc/languages-frameworks/ruby.xml+11
@@ -50,6 +50,17 @@ bundlerEnv rec {
5050 future updates can be run easily.
5151 </para>
5252
53+ <para>
54+ Updating Ruby packages can then be done like this:
55+ </para>
56+
57+<screen>
58+<![CDATA[$ cd pkgs/servers/monitoring/sensu
59+$ nix-shell -p bundler --run 'bundle lock --update'
60+$ nix-shell -p bundix --run 'bundix'
61+]]>
62+</screen>
63+
5364 <para>
5465 For tools written in Ruby - i.e. where the desire is to install a package and
5566 then execute e.g. <command>rake</command> at the command line, there is an
doc/languages-frameworks/rust.section.md+7−3
@@ -303,11 +303,15 @@ with import <nixpkgs> {};
303303
304304stdenv.mkDerivation {
305305 name = "rust-env";
306− buildInputs = [
306+ nativeBuildInputs = [
307307 rustc cargo
308308
309− # Example Additional Dependencies
310− pkgconfig openssl
309+ # Example Build-time Additional Dependencies
310+ pkgconfig
311+ ];
312+ buildInputs = [
313+ # Example Run-time Additional Dependencies
314+ openssl
311315 ];
312316
313317 # Set Environment Variables
doc/languages-frameworks/texlive.xml+6−6
@@ -49,12 +49,12 @@ texlive.combine {
4949 </listitem>
5050 <listitem>
5151 <para>
52− You can list packages e.g. by <command>nix-repl</command>.
53−<programlisting>
54−$ nix-repl
55−nix-repl> :l &lt;nixpkgs>
56−nix-repl> texlive.collection-&lt;TAB>
57− </programlisting>
52+ You can list packages e.g. by <command>nix repl</command>.
53+<programlisting><![CDATA[
54+$ nix repl
55+nix-repl> :l <nixpkgs>
56+nix-repl> texlive.collection-<TAB>
57+]]></programlisting>
5858 </para>
5959 </listitem>
6060 <listitem>
doc/languages-frameworks/titanium.section.mdnew file+115
@@ -0,0 +1,115 @@
1+---
2+title: Titanium
3+author: Sander van der Burg
4+date: 2018-11-18
5+---
6+# Titanium
7+
8+The Nixpkgs repository contains facilities to deploy a variety of versions of
9+the [Titanium SDK](https://www.appcelerator.com) versions, a cross-platform
10+mobile app development framework using JavaScript as an implementation language,
11+and includes a function abstraction making it possible to build Titanium
12+applications for Android and iOS devices from source code.
13+
14+Not all Titanium features supported -- currently, it can only be used to build
15+Android and iOS apps.
16+
17+Building a Titanium app
18+-----------------------
19+We can build a Titanium app from source for Android or iOS and for debugging or
20+release purposes by invoking the `titaniumenv.buildApp {}` function:
21+
22+```nix
23+titaniumenv.buildApp {
24+ name = "myapp";
25+ src = ./myappsource;
26+
27+ preBuild = "";
28+ target = "android"; # or 'iphone'
29+ tiVersion = "7.1.0.GA";
30+ release = true;
31+
32+ androidsdkArgs = {
33+ platformVersions = [ "25" "26" ];
34+ };
35+ androidKeyStore = ./keystore;
36+ androidKeyAlias = "myfirstapp";
37+ androidKeyStorePassword = "secret";
38+
39+ xcodeBaseDir = "/Applications/Xcode.app";
40+ xcodewrapperArgs = {
41+ version = "9.3";
42+ };
43+ iosMobileProvisioningProfile = ./myprovisioning.profile;
44+ iosCertificateName = "My Company";
45+ iosCertificate = ./mycertificate.p12;
46+ iosCertificatePassword = "secret";
47+ iosVersion = "11.3";
48+ iosBuildStore = false;
49+
50+ enableWirelessDistribution = true;
51+ installURL = "/installipa.php";
52+}
53+```
54+
55+The `titaniumenv.buildApp {}` function takes the following parameters:
56+
57+* The `name` parameter refers to the name in the Nix store.
58+* The `src` parameter refers to the source code location of the app that needs
59+ to be built.
60+* `preRebuild` contains optional build instructions that are carried out before
61+ the build starts.
62+* `target` indicates for which device the app must be built. Currently only
63+ 'android' and 'iphone' (for iOS) are supported.
64+* `tiVersion` can be used to optionally override the requested Titanium version
65+ in `tiapp.xml`. If not specified, it will use the version in `tiapp.xml`.
66+* `release` should be set to true when building an app for submission to the
67+ Google Playstore or Apple Appstore. Otherwise, it should be false.
68+
69+When the `target` has been set to `android`, we can configure the following
70+parameters:
71+
72+* The `androidSdkArgs` parameter refers to an attribute set that propagates all
73+ parameters to the `androidenv.composeAndroidPackages {}` function. This can
74+ be used to install all relevant Android plugins that may be needed to perform
75+ the Android build. If no parameters are given, it will deploy the platform
76+ SDKs for API-levels 25 and 26 by default.
77+
78+When the `release` parameter has been set to true, you need to provide
79+parameters to sign the app:
80+
81+* `androidKeyStore` is the path to the keystore file
82+* `androidKeyAlias` is the key alias
83+* `androidKeyStorePassword` refers to the password to open the keystore file.
84+
85+When the `target` has been set to `iphone`, we can configure the following
86+parameters:
87+
88+* The `xcodeBaseDir` parameter refers to the location where Xcode has been
89+ installed. When none value is given, the above value is the default.
90+* The `xcodewrapperArgs` parameter passes arbitrary parameters to the
91+ `xcodeenv.composeXcodeWrapper {}` function. This can, for example, be used
92+ to adjust the default version of Xcode.
93+
94+When `release` has been set to true, you also need to provide the following
95+parameters:
96+
97+* `iosMobileProvisioningProfile` refers to a mobile provisioning profile needed
98+ for signing.
99+* `iosCertificateName` refers to the company name in the P12 certificate.
100+* `iosCertificate` refers to the path to the P12 file.
101+* `iosCertificatePassword` contains the password to open the P12 file.
102+* `iosVersion` refers to the iOS SDK version to use. It defaults to the latest
103+ version.
104+* `iosBuildStore` should be set to `true` when building for the Apple Appstore
105+ submission. For enterprise or ad-hoc builds it should be set to `false`.
106+
107+When `enableWirelessDistribution` has been enabled, you must also provide the
108+path of the PHP script (`installURL`) (that is included with the iOS build
109+environment) to enable wireless ad-hoc installations.
110+
111+Emulating or simulating the app
112+-------------------------------
113+It is also possible to simulate the correspond iOS simulator build by using
114+`xcodeenv.simulateApp {}` and emulate an Android APK by using
115+`androidenv.emulateApp {}`.
doc/languages-frameworks/vim.section.md+25−1
@@ -23,6 +23,7 @@ Adding custom .vimrc lines can be done using the following code:
2323
2424```
2525vim_configurable.customize {
26+ # `name` specifies the name of the executable and package
2627 name = "vim-with-plugins";
2728
2829 vimrcConfig.customRC = ''
@@ -31,6 +32,8 @@ vim_configurable.customize {
3132}
3233```
3334
35+This configuration is used when vim is invoked with the command specified as name, in this case `vim-with-plugins`.
36+
3437For Neovim the `configure` argument can be overridden to achieve the same:
3538
3639```
@@ -43,9 +46,24 @@ neovim.override {
4346}
4447```
4548
49+If you want to use `neovim-qt` as a graphical editor, you can configure it by overriding neovim in an overlay
50+or passing it an overridden neovimn:
51+
52+```
53+neovim-qt.override {
54+ neovim = neovim.override {
55+ configure = {
56+ customRC = ''
57+ # your custom configuration
58+ '';
59+ };
60+ };
61+}
62+```
63+
4664## Managing plugins with Vim packages
4765
48−To store you plugins in Vim packages the following example can be used:
66+To store you plugins in Vim packages (the native vim plugin manager, see `:help packages`) the following example can be used:
4967
5068```
5169vim_configurable.customize {
@@ -53,6 +71,8 @@ vim_configurable.customize {
5371 # loaded on launch
5472 start = [ youcompleteme fugitive ];
5573 # manually loadable by calling `:packadd $plugin-name`
74+ # however, if a vim plugin has a dependency that is not explicitly listed in
75+ # opt that dependency will always be added to start to avoid confusion.
5676 opt = [ phpCompletion elm-vim ];
5777 # To automatically load a plugin when opening a filetype, add vimrc lines like:
5878 # autocmd FileType php :packadd phpCompletion
@@ -60,6 +80,7 @@ vim_configurable.customize {
6080}
6181```
6282
83+`myVimPackage` is an arbitrary name for the generated package. You can choose any name you like.
6384For Neovim the syntax is:
6485
6586```
@@ -71,6 +92,8 @@ neovim.override {
7192 packages.myVimPackage = with pkgs.vimPlugins; {
7293 # see examples below how to use custom packages
7394 start = [ ];
95+ # If a vim plugin has a dependency that is not explicitly listed in
96+ # opt that dependency will always be added to start to avoid confusion.
7497 opt = [ ];
7598 };
7699 };
@@ -83,6 +106,7 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n
83106{
84107 packageOverrides = pkgs: with pkgs; {
85108 myVim = vim_configurable.customize {
109+ # `name` specifies the name of the executable and package
86110 name = "vim-with-plugins";
87111 # add here code from the example section
88112 };
doc/lib-function-docs.nixnew file+26
@@ -0,0 +1,26 @@
1+# Generates the documentation for library functons via nixdoc. To add
2+# another library function file to this list, the include list in the
3+# file `doc/functions/library.xml` must also be updated.
4+
5+{ pkgs ? import ./.. {}, locationsXml }:
6+
7+with pkgs; stdenv.mkDerivation {
8+ name = "nixpkgs-lib-docs";
9+ src = ./../lib;
10+
11+ buildInputs = [ nixdoc ];
12+ installPhase = ''
13+ function docgen {
14+ nixdoc -c "$1" -d "$2" -f "../lib/$1.nix" > "$out/$1.xml"
15+ }
16+
17+ mkdir -p $out
18+ ln -s ${locationsXml} $out/locations.xml
19+
20+ docgen strings 'String manipulation functions'
21+ docgen trivial 'Miscellaneous functions'
22+ docgen lists 'List manipulation functions'
23+ docgen debug 'Debugging functions'
24+ docgen options 'NixOS / nixpkgs option handling'
25+ '';
26+}
doc/meta.xml+58−4
@@ -14,7 +14,7 @@ meta = with stdenv.lib; {
1414 GNU Hello is a program that prints "Hello, world!" when you run it.
1515 It is fully customizable.
1616 '';
17− homepage = http://www.gnu.org/software/hello/manual/;
17+ homepage = https://www.gnu.org/software/hello/manual/;
1818 license = licenses.gpl3Plus;
1919 maintainers = [ maintainers.eelco ];
2020 platforms = platforms.all;
@@ -35,7 +35,7 @@ $ nix-env -qa hello --json
3535 "hello": {
3636 "meta": {
3737 "description": "A program that produces a familiar, friendly greeting",
38− "homepage": "http://www.gnu.org/software/hello/manual/",
38+ "homepage": "https://www.gnu.org/software/hello/manual/",
3939 "license": {
4040 "fullName": "GNU General Public License version 3 or later",
4141 "shortName": "GPLv3+",
@@ -135,7 +135,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
135135 <listitem>
136136 <para>
137137 The package’s homepage. Example:
138− <literal>http://www.gnu.org/software/hello/manual/</literal>
138+ <literal>https://www.gnu.org/software/hello/manual/</literal>
139139 </para>
140140 </listitem>
141141 </varlistentry>
@@ -146,7 +146,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
146146 <listitem>
147147 <para>
148148 The page where a link to the current version can be found. Example:
149− <literal>http://ftp.gnu.org/gnu/hello/</literal>
149+ <literal>https://ftp.gnu.org/gnu/hello/</literal>
150150 </para>
151151 </listitem>
152152 </varlistentry>
@@ -250,6 +250,60 @@ meta.platforms = stdenv.lib.platforms.linux;
250250 </para>
251251 </listitem>
252252 </varlistentry>
253+ <varlistentry>
254+ <term>
255+ <varname>tests</varname>
256+ </term>
257+ <listitem>
258+ <warning>
259+ <para>
260+ This attribute is special in that it is not actually under the
261+ <literal>meta</literal> attribute set but rather under the
262+ <literal>passthru</literal> attribute set. This is due to a current
263+ limitation of Nix, and will change as soon as Nixpkgs will be able to
264+ depend on a new enough version of Nix. See
265+ <link xlink:href="https://github.com/NixOS/nix/issues/2532">the relevant
266+ issue</link> for more details.
267+ </para>
268+ </warning>
269+ <para>
270+ An attribute set with as values tests. A test is a derivation, which
271+ builds successfully when the test passes, and fails to build otherwise. A
272+ derivation that is a test needs to have <literal>meta.timeout</literal>
273+ defined.
274+ </para>
275+ <para>
276+ The NixOS tests are available as <literal>nixosTests</literal> in
277+ parameters of derivations. For instance, the OpenSMTPD derivation
278+ includes lines similar to:
279+<programlisting>
280+{ /* ... */, nixosTests }:
281+{
282+ # ...
283+ passthru.tests = {
284+ basic-functionality-and-dovecot-integration = nixosTests.opensmtpd;
285+ };
286+}
287+</programlisting>
288+ </para>
289+ </listitem>
290+ </varlistentry>
291+ <varlistentry>
292+ <term>
293+ <varname>timeout</varname>
294+ </term>
295+ <listitem>
296+ <para>
297+ A timeout (in seconds) for building the derivation. If the derivation
298+ takes longer than this time to build, it can fail due to breaking the
299+ timeout. However, all computers do not have the same computing power,
300+ hence some builders may decide to apply a multiplicative factor to this
301+ value. When filling this value in, try to keep it approximately
302+ consistent with other values already present in
303+ <literal>nixpkgs</literal>.
304+ </para>
305+ </listitem>
306+ </varlistentry>
253307 <varlistentry>
254308 <term>
255309 <varname>hydraPlatforms</varname>
doc/multiple-output.xml+1−1
@@ -12,7 +12,7 @@
1212 <para>
1313 The Nix language allows a derivation to produce multiple outputs, which is
1414 similar to what is utilized by other Linux distribution packaging systems.
15− The outputs reside in separate nix store paths, so they can be mostly
15+ The outputs reside in separate Nix store paths, so they can be mostly
1616 handled independently of each other, including passing to build inputs,
1717 garbage collection or binary substitution. The exception is that building
1818 from source always produces all the outputs.
doc/overlays.xml+114−83
@@ -3,9 +3,9 @@
33 xml:id="chap-overlays">
44 <title>Overlays</title>
55 <para>
6− This chapter describes how to extend and change Nixpkgs packages using
7− overlays. Overlays are used to add layers in the fix-point used by Nixpkgs to
8− compose the set of all packages.
6+ This chapter describes how to extend and change Nixpkgs using overlays.
7+ Overlays are used to add layers in the fixed-point used by Nixpkgs to compose
8+ the set of all packages.
99 </para>
1010 <para>
1111 Nixpkgs can be configured with a list of overlays, which are applied in
@@ -17,91 +17,122 @@
1717 <title>Installing overlays</title>
1818
1919 <para>
20− The list of overlays is determined as follows.
20+ The list of overlays can be set either explicitly in a Nix expression, or
21+ through <literal>&lt;nixpkgs-overlays></literal> or user configuration
22+ files.
2123 </para>
2224
23− <para>
24− If the <varname>overlays</varname> argument is not provided explicitly, we
25− look for overlays in a path. The path is determined as follows:
26− <orderedlist>
27− <listitem>
28− <para>
29− First, if an <varname>overlays</varname> argument to the nixpkgs function
30− itself is given, then that is used.
31− </para>
32− <para>
33− This can be passed explicitly when importing nipxkgs, for example
34− <literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ];
35− }</literal>.
36− </para>
37− </listitem>
38− <listitem>
39− <para>
40− Otherwise, if the Nix path entry <literal>&lt;nixpkgs-overlays></literal>
41− exists, we look for overlays at that path, as described below.
42− </para>
43− <para>
44− See the section on <literal>NIX_PATH</literal> in the Nix manual for more
45− details on how to set a value for
46− <literal>&lt;nixpkgs-overlays>.</literal>
47− </para>
48− </listitem>
49− <listitem>
50− <para>
51− If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and
52− <filename>~/.config/nixpkgs/overlays/</filename> exists, then we look for
53− overlays at that path, as described below. It is an error if both exist.
54− </para>
55− </listitem>
56− </orderedlist>
57− </para>
25+ <section xml:id="sec-overlays-argument">
26+ <title>Set overlays in NixOS or Nix expressions</title>
5827
59− <para>
60− If we are looking for overlays at a path, then there are two cases:
61− <itemizedlist>
62− <listitem>
63− <para>
64− If the path is a file, then the file is imported as a Nix expression and
65− used as the list of overlays.
66− </para>
67− </listitem>
68− <listitem>
69− <para>
70− If the path is a directory, then we take the content of the directory,
71− order it lexicographically, and attempt to interpret each as an overlay
72− by:
73− <itemizedlist>
74− <listitem>
75− <para>
76− Importing the file, if it is a <literal>.nix</literal> file.
77− </para>
78− </listitem>
79− <listitem>
80− <para>
81− Importing a top-level <filename>default.nix</filename> file, if it is
82− a directory.
83− </para>
84− </listitem>
85− </itemizedlist>
86− </para>
87− </listitem>
88− </itemizedlist>
89− </para>
28+ <para>
29+ On a NixOS system the value of the <literal>nixpkgs.overlays</literal>
30+ option, if present, is passed to the system Nixpkgs directly as an
31+ argument. Note that this does not affect the overlays for non-NixOS
32+ operations (e.g. <literal>nix-env</literal>), which are
33+ <link xlink:href="#sec-overlays-lookup">looked</link> up independently.
34+ </para>
9035
91− <para>
92− On a NixOS system the value of the <literal>nixpkgs.overlays</literal>
93− option, if present, is passed to the system Nixpkgs directly as an argument.
94− Note that this does not affect the overlays for non-NixOS operations (e.g.
95− <literal>nix-env</literal>), which are looked up independently.
96− </para>
36+ <para>
37+ The list of overlays can be passed explicitly when importing nixpkgs, for
38+ example <literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ];
39+ }</literal>.
40+ </para>
9741
98− <para>
99− The <filename>overlays.nix</filename> option therefore provides a convenient
100− way to use the same overlays for a NixOS system configuration and user
101− configuration: the same file can be used as
102− <filename>overlays.nix</filename> and imported as the value of
103− <literal>nixpkgs.overlays</literal>.
104− </para>
42+ <para>
43+ Further overlays can be added by calling the <literal>pkgs.extend</literal>
44+ or <literal>pkgs.appendOverlays</literal>, although it is often preferable
45+ to avoid these functions, because they recompute the Nixpkgs fixpoint,
46+ which is somewhat expensive to do.
47+ </para>
48+ </section>
49+
50+ <section xml:id="sec-overlays-lookup">
51+ <title>Install overlays via configuration lookup</title>
52+
53+ <para>
54+ The list of overlays is determined as follows.
55+ </para>
56+
57+ <para>
58+ <orderedlist>
59+ <listitem>
60+ <para>
61+ First, if an
62+ <link xlink:href="#sec-overlays-argument"><varname>overlays</varname>
63+ argument</link> to the Nixpkgs function itself is given, then that is
64+ used and no path lookup will be performed.
65+ </para>
66+ </listitem>
67+ <listitem>
68+ <para>
69+ Otherwise, if the Nix path entry
70+ <literal>&lt;nixpkgs-overlays></literal> exists, we look for overlays at
71+ that path, as described below.
72+ </para>
73+ <para>
74+ See the section on <literal>NIX_PATH</literal> in the Nix manual for
75+ more details on how to set a value for
76+ <literal>&lt;nixpkgs-overlays>.</literal>
77+ </para>
78+ </listitem>
79+ <listitem>
80+ <para>
81+ If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and
82+ <filename>~/.config/nixpkgs/overlays/</filename> exists, then we look
83+ for overlays at that path, as described below. It is an error if both
84+ exist.
85+ </para>
86+ </listitem>
87+ </orderedlist>
88+ </para>
89+
90+ <para>
91+ If we are looking for overlays at a path, then there are two cases:
92+ <itemizedlist>
93+ <listitem>
94+ <para>
95+ If the path is a file, then the file is imported as a Nix expression and
96+ used as the list of overlays.
97+ </para>
98+ </listitem>
99+ <listitem>
100+ <para>
101+ If the path is a directory, then we take the content of the directory,
102+ order it lexicographically, and attempt to interpret each as an overlay
103+ by:
104+ <itemizedlist>
105+ <listitem>
106+ <para>
107+ Importing the file, if it is a <literal>.nix</literal> file.
108+ </para>
109+ </listitem>
110+ <listitem>
111+ <para>
112+ Importing a top-level <filename>default.nix</filename> file, if it is
113+ a directory.
114+ </para>
115+ </listitem>
116+ </itemizedlist>
117+ </para>
118+ </listitem>
119+ </itemizedlist>
120+ </para>
121+
122+ <para>
123+ Because overlays that are set in NixOS configuration do not affect
124+ non-NixOS operations such as <literal>nix-env</literal>, the
125+ <filename>overlays.nix</filename> option provides a convenient way to use
126+ the same overlays for a NixOS system configuration and user configuration:
127+ the same file can be used as <filename>overlays.nix</filename> and imported
128+ as the value of <literal>nixpkgs.overlays</literal>.
129+ </para>
130+
131+<!-- TODO: Example of sharing overlays between NixOS configuration
132+ and configuration lookup. Also reference the example
133+ from the sec-overlays-argument paragraph about NixOS.
134+ -->
135+ </section>
105136 </section>
106137<!--============================================================-->
107138 <section xml:id="sec-overlays-definition">
doc/package-notes.xml+14−17
@@ -205,7 +205,7 @@ $ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \
205205
206206 <para>
207207 Nixpkgs provides a number of packages that will install Eclipse in its
208− various forms, these range from the bare-bones Eclipse Platform to the more
208+ various forms. These range from the bare-bones Eclipse Platform to the more
209209 fully featured Eclipse SDK or Scala-IDE packages and multiple version are
210210 often available. It is possible to list available Eclipse packages by
211211 issuing the command:
@@ -307,23 +307,19 @@ packageOverrides = pkgs: {
307307</screen>
308308 </para>
309309 </section>
310+
310311 <section xml:id="sec-elm">
311312 <title>Elm</title>
312313
313314 <para>
314− The Nix expressions for Elm reside in
315− <filename>pkgs/development/compilers/elm</filename>. They are generated
316− automatically by <command>update-elm.rb</command> script. One should specify
317− versions of Elm packages inside the script, clear the
318− <filename>packages</filename> directory and run the script from inside it.
319− <literal>elm-reactor</literal> is special because it also has Elm package
320− dependencies. The process is not automated very much for now -- you should
321− get the <literal>elm-reactor</literal> source tree (e.g. with
322− <command>nix-shell</command>) and run <command>elm2nix.rb</command> inside
323− it. Place the resulting <filename>package.nix</filename> file into
324− <filename>packages/elm-reactor-elm.nix</filename>.
315+ To update Elm compiler, see <filename>nixpkgs/pkgs/development/compilers/elm/README.md</filename>.
316+ </para>
317+
318+ <para>
319+ To package Elm applications, <link xlink:href="https://github.com/hercules-ci/elm2nix#elm2nix">read about elm2nix</link>.
325320 </para>
326321 </section>
322+
327323 <section xml:id="sec-shell-helpers">
328324 <title>Interactive shell helpers</title>
329325
@@ -413,7 +409,8 @@ packageOverrides = pkgs: {
413409 in your <filename>/etc/nixos/configuration.nix</filename>. You'll also need
414410<programlisting>hardware.pulseaudio.support32Bit = true;</programlisting>
415411 if you are using PulseAudio - this will enable 32bit ALSA apps integration.
416− To use the Steam controller or other Steam supported controllers such as the DualShock 4 or Nintendo Switch Pro, you need to add
412+ To use the Steam controller or other Steam supported controllers such as
413+ the DualShock 4 or Nintendo Switch Pro, you need to add
417414<programlisting>hardware.steam-hardware.enable = true;</programlisting>
418415 to your configuration.
419416 </para>
@@ -680,10 +677,10 @@ overrides = self: super: rec {
680677 </para>
681678
682679 <para>
683− The python plugin allows the addition of extra libraries. For instance, the
684− <literal>inotify.py</literal> script in weechat-scripts requires D-Bus or
685− libnotify, and the <literal>fish.py</literal> script requires pycrypto. To
686− use these scripts, use the <literal>python</literal> plugin's
680+ The python and perl plugins allows the addition of extra libraries. For
681+ instance, the <literal>inotify.py</literal> script in weechat-scripts
682+ requires D-Bus or libnotify, and the <literal>fish.py</literal> script
683+ requires pycrypto. To use these scripts, use the plugin's
687684 <literal>withPackages</literal> attribute:
688685<programlisting>weechat.override { configure = {availablePlugins, ...}: {
689686 plugins = with availablePlugins; [
doc/platform-notes.xml+5−5
@@ -6,13 +6,13 @@
66 <title>Darwin (macOS)</title>
77
88 <para>
9− Some common issues when packaging software for darwin:
9+ Some common issues when packaging software for Darwin:
1010 </para>
1111
1212 <itemizedlist>
1313 <listitem>
1414 <para>
15− The darwin <literal>stdenv</literal> uses clang instead of gcc. When
15+ The Darwin <literal>stdenv</literal> uses clang instead of gcc. When
1616 referring to the compiler <varname>$CC</varname> or <command>cc</command>
1717 will work in both cases. Some builds hardcode gcc/g++ in their build
1818 scripts, that can usually be fixed with using something like
@@ -31,7 +31,7 @@
3131 </listitem>
3232 <listitem>
3333 <para>
34− On darwin libraries are linked using absolute paths, libraries are
34+ On Darwin, libraries are linked using absolute paths, libraries are
3535 resolved by their <literal>install_name</literal> at link time. Sometimes
3636 packages won't set this correctly causing the library lookups to fail at
3737 runtime. This can be fixed by adding extra linker flags or by running
@@ -96,8 +96,8 @@
9696 </programlisting>
9797 <para>
9898 The package <literal>xcbuild</literal> can be used to build projects that
99− really depend on Xcode, however projects that build some kind of graphical
100− interface won't work without using Xcode in an impure way.
99+ really depend on Xcode. However, this replacement is not 100%
100+ compatible with Xcode and can occasionally cause issues.
101101 </para>
102102 </listitem>
103103 </itemizedlist>
doc/quick-start.xml+2−2
@@ -147,8 +147,8 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen>
147147 </listitem>
148148 <listitem>
149149 <para>
150− You can use <command>nix-prefetch-url</command> (or similar
151− nix-prefetch-git, etc) <replaceable>url</replaceable> to get the
150+ You can use <command>nix-prefetch-url</command>
151+ <replaceable>url</replaceable> to get the
152152 SHA-256 hash of source distributions. There are similar commands as
153153 <command>nix-prefetch-git</command> and
154154 <command>nix-prefetch-hg</command> available in
doc/reviewing-contributions.xml+32−34
@@ -17,22 +17,20 @@
1717 </para>
1818 </warning>
1919 <para>
20− The nixpkgs project receives a fairly high number of contributions via GitHub
21− pull-requests. Reviewing and approving these is an important task and a way
20+ The Nixpkgs project receives a fairly high number of contributions via GitHub
21+ pull requests. Reviewing and approving these is an important task and a way
2222 to contribute to the project.
2323 </para>
2424 <para>
25− The high change rate of nixpkgs makes any pull request that remains open for
25+ The high change rate of Nixpkgs makes any pull request that remains open for
2626 too long subject to conflicts that will require extra work from the submitter
27− or the merger. Reviewing pull requests in a timely manner and being
28− responsive to the comments is the key to avoid these. GitHub provides sort
29− filters that can be used to see the
30− <link
31− xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most
32− recently</link> and the
33− <link
34− xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc">least
35− recently</link> updated pull-requests. We highly encourage looking at
27+ or the merger. Reviewing pull requests in a timely manner and being responsive
28+ to the comments is the key to avoid this issue. GitHub provides sort filters
29+ that can be used to see the <link
30+ xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most
31+ recently</link> and the <link
32+ xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc">least
33+ recently</link> updated pull requests. We highly encourage looking at
3634 <link xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+review%3Anone+status%3Asuccess+-label%3A%222.status%3A+work-in-progress%22+no%3Aproject+no%3Aassignee+no%3Amilestone">
3735 this list of ready to merge, unreviewed pull requests</link>.
3836 </para>
@@ -43,12 +41,12 @@
4341 </para>
4442 <para>
4543 GitHub provides reactions as a simple and quick way to provide feedback to
46− pull-requests or any comments. The thumb-down reaction should be used with
44+ pull requests or any comments. The thumb-down reaction should be used with
4745 care and if possible accompanied with some explanation so the submitter has
4846 directions to improve their contribution.
4947 </para>
5048 <para>
51− Pull-request reviews should include a list of what has been reviewed in a
49+ pull request reviews should include a list of what has been reviewed in a
5250 comment, so other reviewers and mergers can know the state of the review.
5351 </para>
5452 <para>
@@ -60,8 +58,8 @@
6058 <title>Package updates</title>
6159
6260 <para>
63− A package update is the most trivial and common type of pull-request. These
64− pull-requests mainly consist of updating the version part of the package
61+ A package update is the most trivial and common type of pull request. These
62+ pull requests mainly consist of updating the version part of the package
6563 name and the source hash.
6664 </para>
6765
@@ -77,7 +75,7 @@
7775 <itemizedlist>
7876 <listitem>
7977 <para>
80− Add labels to the pull-request. (Requires commit rights)
78+ Add labels to the pull request. (Requires commit rights)
8179 </para>
8280 <itemizedlist>
8381 <listitem>
@@ -144,8 +142,8 @@
144142 <itemizedlist>
145143 <listitem>
146144 <para>
147− Pull-requests are often targeted to the master or staging branch, and
148− building the pull-request locally when it is submitted can trigger many
145+ pull requests are often targeted to the master or staging branch, and
146+ building the pull request locally when it is submitted can trigger many
149147 source builds.
150148 </para>
151149 <para>
@@ -174,14 +172,14 @@ $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD <co
174172 </callout>
175173 <callout arearefs='reviewing-rebase-3'>
176174 <para>
177− Fetching the pull-request changes, <varname>PRNUMBER</varname> is the
178− number at the end of the pull-request title and
179− <varname>BASEBRANCH</varname> the base branch of the pull-request.
175+ Fetching the pull request changes, <varname>PRNUMBER</varname> is the
176+ number at the end of the pull request title and
177+ <varname>BASEBRANCH</varname> the base branch of the pull request.
180178 </para>
181179 </callout>
182180 <callout arearefs='reviewing-rebase-4'>
183181 <para>
184− Rebasing the pull-request changes to the nixos-unstable branch.
182+ Rebasing the pull request changes to the nixos-unstable branch.
185183 </para>
186184 </callout>
187185 </calloutlist>
@@ -190,10 +188,10 @@ $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD <co
190188 <listitem>
191189 <para>
192190 The <link xlink:href="https://github.com/madjar/nox">nox</link> tool can
193− be used to review a pull-request content in a single command. It doesn't
191+ be used to review a pull request content in a single command. It doesn't
194192 rebase on a channel branch so it might trigger multiple source builds.
195193 <varname>PRNUMBER</varname> should be replaced by the number at the end
196− of the pull-request title.
194+ of the pull request title.
197195 </para>
198196<screen>
199197$ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
@@ -230,7 +228,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
230228 <title>New packages</title>
231229
232230 <para>
233− New packages are a common type of pull-requests. These pull requests
231+ New packages are a common type of pull requests. These pull requests
234232 consists in adding a new nix-expression for a package.
235233 </para>
236234
@@ -241,7 +239,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
241239 <itemizedlist>
242240 <listitem>
243241 <para>
244− Add labels to the pull-request. (Requires commit rights)
242+ Add labels to the pull request. (Requires commit rights)
245243 </para>
246244 <itemizedlist>
247245 <listitem>
@@ -279,7 +277,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
279277 </listitem>
280278 <listitem>
281279 <para>
282− A maintainer must be set, this can be the package submitter or a
280+ A maintainer must be set. This can be the package submitter or a
283281 community member that accepts to take maintainership of the package.
284282 </para>
285283 </listitem>
@@ -361,7 +359,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
361359 <itemizedlist>
362360 <listitem>
363361 <para>
364− Add labels to the pull-request. (Requires commit rights)
362+ Add labels to the pull request. (Requires commit rights)
365363 </para>
366364 <itemizedlist>
367365 <listitem>
@@ -474,7 +472,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
474472 <itemizedlist>
475473 <listitem>
476474 <para>
477− Add labels to the pull-request. (Requires commit rights)
475+ Add labels to the pull request. (Requires commit rights)
478476 </para>
479477 <itemizedlist>
480478 <listitem>
@@ -576,7 +574,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
576574 like to be a long-term reviewer for related submissions, please contact the
577575 current reviewers for that topic. They will give you information about the
578576 reviewing process. The main reviewers for a topic can be hard to find as
579− there is no list, but checking past pull-requests to see who reviewed or
577+ there is no list, but checking past pull requests to see who reviewed or
580578 git-blaming the code to see who committed to that topic can give some hints.
581579 </para>
582580
@@ -586,7 +584,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
586584 </para>
587585 </section>
588586 <section xml:id="reviewing-contributions--merging-pull-requests">
589− <title>Merging pull-requests</title>
587+ <title>Merging pull requests</title>
590588
591589 <para>
592590 It is possible for community members that have enough knowledge and
@@ -607,11 +605,11 @@ policy.
607605-->
608606
609607 <para>
610− In a case a contributor leaves definitively the Nix community, he should
608+ In a case a contributor definitively leaves the Nix community, they should
611609 create an issue or post on
612610 <link
613611 xlink:href="https://discourse.nixos.org">Discourse</link> with
614− references of packages and modules he maintains so the maintainership can be
612+ references of packages and modules they maintain so the maintainership can be
615613 taken over by other contributors.
616614 </para>
617615 </section>
doc/stdenv.xml+429−257
@@ -228,18 +228,19 @@ genericBuild
228228 </para>
229229
230230 <para>
231− The extension of <envar>PATH</envar> with dependencies, alluded to above,
232− proceeds according to the relative platforms alone. The process is carried
233− out only for dependencies whose host platform matches the new derivation's
234− build platform–i.e. which run on the platform where the new derivation
235− will be built.
231+ The extension of <envar>PATH</envar> with dependencies, alluded to
232+ above, proceeds according to the relative platforms alone. The
233+ process is carried out only for dependencies whose host platform
234+ matches the new derivation's build platform i.e. dependencies which
235+ run on the platform where the new derivation will be built.
236236 <footnote xml:id="footnote-stdenv-native-dependencies-in-path">
237237 <para>
238− Currently, that means for native builds all dependencies are put on the
239− <envar>PATH</envar>. But in the future that may not be the case for sake
240− of matching cross: the platforms would be assumed to be unique for native
241− and cross builds alike, so only the <varname>depsBuild*</varname> and
242− <varname>nativeBuildDependencies</varname> dependencies would affect the
238+ Currently, this means for native builds all dependencies are put
239+ on the <envar>PATH</envar>. But in the future that may not be the
240+ case for sake of matching cross: the platforms would be assumed
241+ to be unique for native and cross builds alike, so only the
242+ <varname>depsBuild*</varname> and
243+ <varname>nativeBuildInputs</varname> would be added to the
243244 <envar>PATH</envar>.
244245 </para>
245246 </footnote>
@@ -251,28 +252,27 @@ genericBuild
251252 <para>
252253 The dependency is propagated when it forces some of its other-transitive
253254 (non-immediate) downstream dependencies to also take it on as an immediate
254− dependency. Nix itself already takes a package's transitive dependencies
255− into account, but this propagation ensures nixpkgs-specific infrastructure
256− like setup hooks (mentioned above) also are run as if the propagated
257− dependency.
255+ dependency. Nix itself already takes a package's transitive dependencies into
256+ account, but this propagation ensures nixpkgs-specific infrastructure like
257+ setup hooks (mentioned above) also are run as if the propagated dependency.
258258 </para>
259259
260260 <para>
261− It is important to note dependencies are not necessary propagated as the
262− same sort of dependency that they were before, but rather as the
261+ It is important to note that dependencies are not necessarily propagated as
262+ the same sort of dependency that they were before, but rather as the
263263 corresponding sort so that the platform rules still line up. The exact rules
264− for dependency propagation can be given by assigning each sort of dependency
265− two integers based one how it's host and target platforms are offset from
266− the depending derivation's platforms. Those offsets are given are given
267− below in the descriptions of each dependency list attribute.
268− Algorithmically, we traverse propagated inputs, accumulating every
269− propagated dep's propagated deps and adjusting them to account for the
270− "shift in perspective" described by the current dep's platform offsets. This
271− results in sort a transitive closure of the dependency relation, with the
272− offsets being approximately summed when two dependency links are combined.
273− We also prune transitive deps whose combined offsets go out-of-bounds, which
274− can be viewed as a filter over that transitive closure removing dependencies
275− that are blatantly absurd.
264+ for dependency propagation can be given by assigning to each dependency two
265+ integers based one how its host and target platforms are offset from the
266+ depending derivation's platforms. Those offsets are given below in the
267+ descriptions of each dependency list attribute. Algorithmically, we traverse
268+ propagated inputs, accumulating every propagated dependency's propagated
269+ dependencies and adjusting them to account for the "shift in perspective"
270+ described by the current dependency's platform offsets. This results in sort
271+ a transitive closure of the dependency relation, with the offsets being
272+ approximately summed when two dependency links are combined. We also prune
273+ transitive dependencies whose combined offsets go out-of-bounds, which can be
274+ viewed as a filter over that transitive closure removing dependencies that
275+ are blatantly absurd.
276276 </para>
277277
278278 <para>
@@ -287,8 +287,8 @@ genericBuild
287287 propagation logic.
288288 </para>
289289 </footnote>
290− They're confusing in very different ways so...hopefully if something doesn't
291− make sense in one presentation, it does in the other!
290+ They're confusing in very different ways so... hopefully if something doesn't
291+ make sense in one presentation, it will in the other!
292292<programlisting>
293293let mapOffset(h, t, i) = i + (if i &lt;= 0 then h else t - 1)
294294
@@ -307,13 +307,13 @@ dep(h0, _, A, B)
307307propagated-dep(h1, t1, B, C)
308308h0 + h1 in {-1, 0, 1}
309309h0 + t1 in {-1, 0, -1}
310−-------------------------------------- Take immediate deps' propagated deps
310+----------------------------- Take immediate dependencies' propagated dependencies
311311propagated-dep(mapOffset(h0, t0, h1),
312312 mapOffset(h0, t0, t1),
313313 A, C)</programlisting>
314314<programlisting>
315315propagated-dep(h, t, A, B)
316−-------------------------------------- Propagated deps count as deps
316+----------------------------- Propagated dependencies count as dependencies
317317dep(h, t, A, B)</programlisting>
318318 Some explanation of this monstrosity is in order. In the common case, the
319319 target offset of a dependency is the successor to the target offset:
@@ -324,31 +324,31 @@ let f(h, h + 1, i) = i + (if i &lt;= 0 then h else (h + 1) - 1)
324324let f(h, h + 1, i) = i + (if i &lt;= 0 then h else h)
325325let f(h, h + 1, i) = i + h
326326 </programlisting>
327− This is where the "sum-like" comes from above: We can just sum all the host
328− offset to get the host offset of the transitive dependency. The target
329− offset is the transitive dep is simply the host offset + 1, just as it was
330− with the dependencies composed to make this transitive one; it can be
327+ This is where "sum-like" comes in from above: We can just sum all of the host
328+ offsets to get the host offset of the transitive dependency. The target
329+ offset is the transitive dependency is simply the host offset + 1, just as it
330+ was with the dependencies composed to make this transitive one; it can be
331331 ignored as it doesn't add any new information.
332332 </para>
333333
334334 <para>
335− Because of the bounds checks, the uncommon cases are <literal>h =
336− t</literal> and <literal>h + 2 = t</literal>. In the former case, the
337− motivation for <function>mapOffset</function> is that since its host and
338− target platforms are the same, no transitive dep of it should be able to
339− "discover" an offset greater than its reduced target offsets.
335+ Because of the bounds checks, the uncommon cases are <literal>h = t</literal>
336+ and <literal>h + 2 = t</literal>. In the former case, the motivation for
337+ <function>mapOffset</function> is that since its host and target platforms
338+ are the same, no transitive dependency of it should be able to "discover" an
339+ offset greater than its reduced target offsets.
340340 <function>mapOffset</function> effectively "squashes" all its transitive
341341 dependencies' offsets so that none will ever be greater than the target
342342 offset of the original <literal>h = t</literal> package. In the other case,
343− <literal>h + 1</literal> is skipped over between the host and target
344− offsets. Instead of squashing the offsets, we need to "rip" them apart so no
343+ <literal>h + 1</literal> is skipped over between the host and target offsets.
344+ Instead of squashing the offsets, we need to "rip" them apart so no
345345 transitive dependencies' offset is that one.
346346 </para>
347347
348348 <para>
349− Overall, the unifying theme here is that propagation shouldn't be
350− introducing transitive dependencies involving platforms the needing package
351− is unaware of. The offset bounds checking and definition of
349+ Overall, the unifying theme here is that propagation shouldn't be introducing
350+ transitive dependencies involving platforms the depending package is unaware
351+ of. The offset bounds checking and definition of
352352 <function>mapOffset</function> together ensure that this is the case.
353353 Discovering a new offset is discovering a new platform, and since those
354354 platforms weren't in the derivation "spec" of the needing package, they
@@ -369,20 +369,20 @@ let f(h, h + 1, i) = i + h
369369 A list of dependencies whose host and target platforms are the new
370370 derivation's build platform. This means a <literal>-1</literal> host and
371371 <literal>-1</literal> target offset from the new derivation's platforms.
372− They are programs/libraries used at build time that furthermore produce
373− programs/libraries also used at build time. If the dependency doesn't
374− care about the target platform (i.e. isn't a compiler or similar tool),
375− put it in <varname>nativeBuildInputs</varname>instead. The most common
376− use for this <literal>buildPackages.stdenv.cc</literal>, the default C
377− compiler for this role. That example crops up more than one might think
378− in old commonly used C libraries.
372+ These are programs and libraries used at build time that produce programs
373+ and libraries also used at build time. If the dependency doesn't care
374+ about the target platform (i.e. isn't a compiler or similar tool), put it
375+ in <varname>nativeBuildInputs</varname> instead. The most common use of
376+ this <literal>buildPackages.stdenv.cc</literal>, the default C compiler
377+ for this role. That example crops up more than one might think in old
378+ commonly used C libraries.
379379 </para>
380380 <para>
381− Since these packages are able to be run at build time, that are always
381+ Since these packages are able to be run at build-time, they are always
382382 added to the <envar>PATH</envar>, as described above. But since these
383383 packages are only guaranteed to be able to run then, they shouldn't
384− persist as run-time dependencies. This isn't currently enforced, but
385− could be in the future.
384+ persist as run-time dependencies. This isn't currently enforced, but could
385+ be in the future.
386386 </para>
387387 </listitem>
388388 </varlistentry>
@@ -395,21 +395,20 @@ let f(h, h + 1, i) = i + h
395395 A list of dependencies whose host platform is the new derivation's build
396396 platform, and target platform is the new derivation's host platform. This
397397 means a <literal>-1</literal> host offset and <literal>0</literal> target
398− offset from the new derivation's platforms. They are programs/libraries
399− used at build time that, if they are a compiler or similar tool, produce
400− code to run at run time—i.e. tools used to build the new derivation. If
401− the dependency doesn't care about the target platform (i.e. isn't a
402− compiler or similar tool), put it here, rather than in
398+ offset from the new derivation's platforms. These are programs and
399+ libraries used at build-time that, if they are a compiler or similar tool,
400+ produce code to run at run-time—i.e. tools used to build the new
401+ derivation. If the dependency doesn't care about the target platform (i.e.
402+ isn't a compiler or similar tool), put it here, rather than in
403403 <varname>depsBuildBuild</varname> or <varname>depsBuildTarget</varname>.
404− This would be called <varname>depsBuildHost</varname> but for historical
405− continuity.
404+ This could be called <varname>depsBuildHost</varname> but
405+ <varname>nativeBuildInputs</varname> is used for historical continuity.
406406 </para>
407407 <para>
408− Since these packages are able to be run at build time, that are added to
409− the <envar>PATH</envar>, as described above. But since these packages
410− only are guaranteed to be able to run then, they shouldn't persist as
411− run-time dependencies. This isn't currently enforced, but could be in the
412− future.
408+ Since these packages are able to be run at build-time, they are added to
409+ the <envar>PATH</envar>, as described above. But since these packages are
410+ only guaranteed to be able to run then, they shouldn't persist as run-time
411+ dependencies. This isn't currently enforced, but could be in the future.
413412 </para>
414413 </listitem>
415414 </varlistentry>
@@ -422,34 +421,33 @@ let f(h, h + 1, i) = i + h
422421 A list of dependencies whose host platform is the new derivation's build
423422 platform, and target platform is the new derivation's target platform.
424423 This means a <literal>-1</literal> host offset and <literal>1</literal>
425− target offset from the new derivation's platforms. They are programs used
426− at build time that produce code to run at run with code produced by the
427− depending package. Most commonly, these would tools used to build the
428− runtime or standard library the currently-being-built compiler will
429− inject into any code it compiles. In many cases, the currently-being
430− built compiler is itself employed for that task, but when that compiler
431− won't run (i.e. its build and host platform differ) this is not possible.
432− Other times, the compiler relies on some other tool, like binutils, that
433− is always built separately so the dependency is unconditional.
434− </para>
435− <para>
436− This is a somewhat confusing dependency to wrap ones head around, and for
437− good reason. As the only one where the platform offsets are not adjacent
438− integers, it requires thinking of a bootstrapping stage
439− <emphasis>two</emphasis> away from the current one. It and it's use-case
440− go hand in hand and are both considered poor form: try not to need this
441− sort dependency, and try not avoid building standard libraries / runtimes
424+ target offset from the new derivation's platforms. These are programs used
425+ at build time that produce code to run with code produced by the depending
426+ package. Most commonly, these are tools used to build the runtime or
427+ standard library that the currently-being-built compiler will inject into
428+ any code it compiles. In many cases, the currently-being-built-compiler is
429+ itself employed for that task, but when that compiler won't run (i.e. its
430+ build and host platform differ) this is not possible. Other times, the
431+ compiler relies on some other tool, like binutils, that is always built
432+ separately so that the dependency is unconditional.
433+ </para>
434+ <para>
435+ This is a somewhat confusing concept to wrap one’s head around, and for
436+ good reason. As the only dependency type where the platform offsets are
437+ not adjacent integers, it requires thinking of a bootstrapping stage
438+ <emphasis>two</emphasis> away from the current one. It and its use-case go
439+ hand in hand and are both considered poor form: try to not need this sort
440+ of dependency, and try to avoid building standard libraries and runtimes
442441 in the same derivation as the compiler produces code using them. Instead
443442 strive to build those like a normal library, using the newly-built
444443 compiler just as a normal library would. In short, do not use this
445444 attribute unless you are packaging a compiler and are sure it is needed.
446445 </para>
447446 <para>
448− Since these packages are able to be run at build time, that are added to
449− the <envar>PATH</envar>, as described above. But since these packages
450− only are guaranteed to be able to run then, they shouldn't persist as
451− run-time dependencies. This isn't currently enforced, but could be in the
452− future.
447+ Since these packages are able to run at build time, they are added to the
448+ <envar>PATH</envar>, as described above. But since these packages are only
449+ guaranteed to be able to run then, they shouldn't persist as run-time
450+ dependencies. This isn't currently enforced, but could be in the future.
453451 </para>
454452 </listitem>
455453 </varlistentry>
@@ -460,15 +458,15 @@ let f(h, h + 1, i) = i + h
460458 <listitem>
461459 <para>
462460 A list of dependencies whose host and target platforms match the new
463− derivation's host platform. This means a both <literal>0</literal> host
464− offset and <literal>0</literal> target offset from the new derivation's
465− host platform. These are packages used at run-time to generate code also
466− used at run-time. In practice, that would usually be tools used by
467− compilers for metaprogramming/macro systems, or libraries used by the
468− macros/metaprogramming code itself. It's always preferable to use a
469− <varname>depsBuildBuild</varname> dependency in the derivation being
470− built than a <varname>depsHostHost</varname> on the tool doing the
471− building for this purpose.
461+ derivation's host platform. This means a <literal>0</literal> host offset
462+ and <literal>0</literal> target offset from the new derivation's host
463+ platform. These are packages used at run-time to generate code also used
464+ at run-time. In practice, this would usually be tools used by compilers
465+ for macros or a metaprogramming system, or libraries used by the macros or
466+ metaprogramming code itself. It's always preferable to use a
467+ <varname>depsBuildBuild</varname> dependency in the derivation being built
468+ over a <varname>depsHostHost</varname> on the tool doing the building for
469+ this purpose.
472470 </para>
473471 </listitem>
474472 </varlistentry>
@@ -479,20 +477,20 @@ let f(h, h + 1, i) = i + h
479477 <listitem>
480478 <para>
481479 A list of dependencies whose host platform and target platform match the
482− new derivation's. This means a <literal>0</literal> host offset and
480+ new derivation's. This means a <literal>0</literal> host offset and a
483481 <literal>1</literal> target offset from the new derivation's host
484482 platform. This would be called <varname>depsHostTarget</varname> but for
485483 historical continuity. If the dependency doesn't care about the target
486− platform (i.e. isn't a compiler or similar tool), put it here, rather
487− than in <varname>depsBuildBuild</varname>.
484+ platform (i.e. isn't a compiler or similar tool), put it here, rather than
485+ in <varname>depsBuildBuild</varname>.
488486 </para>
489487 <para>
490− These often are programs/libraries used by the new derivation at
488+ These are often programs and libraries used by the new derivation at
491489 <emphasis>run</emphasis>-time, but that isn't always the case. For
492− example, the machine code in a statically linked library is only used at
493− run time, but the derivation containing the library is only needed at
494− build time. Even in the dynamic case, the library may also be needed at
495− build time to appease the linker.
490+ example, the machine code in a statically-linked library is only used at
491+ run-time, but the derivation containing the library is only needed at
492+ build-time. Even in the dynamic case, the library may also be needed at
493+ build-time to appease the linker.
496494 </para>
497495 </listitem>
498496 </varlistentry>
@@ -581,7 +579,7 @@ let f(h, h + 1, i) = i + h
581579 </varlistentry>
582580 <varlistentry>
583581 <term>
584− <varname>depsTargetTarget</varname>
582+ <varname>depsTargetTargetPropagated</varname>
585583 </term>
586584 <listitem>
587585 <para>
@@ -604,10 +602,10 @@ let f(h, h + 1, i) = i + h
604602 <listitem>
605603 <para>
606604 A natural number indicating how much information to log. If set to 1 or
607− higher, <literal>stdenv</literal> will print moderate debug information
608− during the build. In particular, the <command>gcc</command> and
609− <command>ld</command> wrapper scripts will print out the complete command
610− line passed to the wrapped tools. If set to 6 or higher, the
605+ higher, <literal>stdenv</literal> will print moderate debugging
606+ information during the build. In particular, the <command>gcc</command>
607+ and <command>ld</command> wrapper scripts will print out the complete
608+ command line passed to the wrapped tools. If set to 6 or higher, the
611609 <literal>stdenv</literal> setup script will be run with <literal>set
612610 -x</literal> tracing. If set to 7 or higher, the <command>gcc</command>
613611 and <command>ld</command> wrapper scripts will also be run with
@@ -618,7 +616,7 @@ let f(h, h + 1, i) = i + h
618616 </variablelist>
619617
620618 <variablelist>
621− <title>Variables affecting build properties</title>
619+ <title>Attributes affecting build properties</title>
622620 <varlistentry>
623621 <term>
624622 <varname>enableParallelBuilding</varname>
@@ -637,21 +635,6 @@ let f(h, h + 1, i) = i + h
637635 </para>
638636 </listitem>
639637 </varlistentry>
640− <varlistentry>
641− <term>
642− <varname>preferLocalBuild</varname>
643− </term>
644− <listitem>
645− <para>
646− If set, specifies that the package is so lightweight in terms of build
647− operations (e.g. write a text file from a Nix string to the store) that
648− there's no need to look for it in binary caches -- it's faster to just
649− build it locally. It also tells Hydra and other facilities that this
650− package doesn't need to be exported in binary caches (noone would use it,
651− after all).
652− </para>
653− </listitem>
654− </varlistentry>
655638 </variablelist>
656639
657640 <variablelist>
@@ -681,11 +664,47 @@ passthru = {
681664 <literal>hello.baz.value1</literal>. We don't specify any usage or schema
682665 of <literal>passthru</literal> - it is meant for values that would be
683666 useful outside the derivation in other parts of a Nix expression (e.g. in
684− other derivations). An example would be to convey some specific
685− dependency of your derivation which contains a program with plugins
686− support. Later, others who make derivations with plugins can use
687− passed-through dependency to ensure that their plugin would be
688− binary-compatible with built program.
667+ other derivations). An example would be to convey some specific dependency
668+ of your derivation which contains a program with plugins support. Later,
669+ others who make derivations with plugins can use passed-through dependency
670+ to ensure that their plugin would be binary-compatible with built program.
671+ </para>
672+ </listitem>
673+ </varlistentry>
674+ <varlistentry>
675+ <term>
676+ <varname>passthru.updateScript</varname>
677+ </term>
678+ <listitem>
679+ <para>
680+ A script to be run by <filename>maintainers/scripts/update.nix</filename> when
681+ the package is matched. It needs to be an executable file, either on the file
682+ system:
683+<programlisting>
684+passthru.updateScript = ./update.sh;
685+</programlisting>
686+ or inside the expression itself:
687+<programlisting>
688+passthru.updateScript = writeScript "update-zoom-us" ''
689+ #!/usr/bin/env nix-shell
690+ #!nix-shell -i bash -p curl pcre common-updater-scripts
691+
692+ set -eu -o pipefail
693+
694+ version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')"
695+ update-source-version zoom-us "$version"
696+'';
697+</programlisting>
698+ The attribute can also contain a list, a script followed by arguments to be passed to it:
699+<programlisting>
700+passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ];
701+</programlisting>
702+ Note that the update scripts will be run in parallel by default; you should avoid running <command>git commit</command> or any other commands that cannot handle that.
703+ </para>
704+
705+ <para>
706+ For information about how to run the updates, execute
707+ <cmdsynopsis><command>nix-shell</command> <arg>maintainers/scripts/update.nix</arg></cmdsynopsis>.
689708 </para>
690709 </listitem>
691710 </varlistentry>
@@ -851,7 +870,7 @@ passthru = {
851870 <para>
852871 Zip files are unpacked using <command>unzip</command>. However,
853872 <command>unzip</command> is not in the standard environment, so you
854− should add it to <varname>buildInputs</varname> yourself.
873+ should add it to <varname>nativeBuildInputs</varname> yourself.
855874 </para>
856875 </listitem>
857876 </varlistentry>
@@ -1091,6 +1110,17 @@ passthru = {
10911110 </para>
10921111 </listitem>
10931112 </varlistentry>
1113+ <varlistentry>
1114+ <term>
1115+ <varname>prefixKey</varname>
1116+ </term>
1117+ <listitem>
1118+ <para>
1119+ The key to use when specifying the prefix. By default, this is set to
1120+ <option>--prefix=</option> as that is used by the majority of packages.
1121+ </para>
1122+ </listitem>
1123+ </varlistentry>
10941124 <varlistentry>
10951125 <term>
10961126 <varname>dontAddDisableDepTrack</varname>
@@ -1148,12 +1178,11 @@ passthru = {
11481178 By default, when cross compiling, the configure script has
11491179 <option>--build=...</option> and <option>--host=...</option> passed.
11501180 Packages can instead pass <literal>[ "build" "host" "target" ]</literal>
1151− or a subset to control exactly which platform flags are passed.
1152− Compilers and other tools should use this to also pass the target
1153− platform, for example.
1181+ or a subset to control exactly which platform flags are passed. Compilers
1182+ and other tools can use this to also pass the target platform.
11541183 <footnote xml:id="footnote-stdenv-build-time-guessing-impurity">
11551184 <para>
1156− Eventually these will be passed when in native builds too, to improve
1185+ Eventually these will be passed building natively as well, to improve
11571186 determinism: build-time guessing, as is done today, is a risk of
11581187 impurity.
11591188 </para>
@@ -1218,17 +1247,6 @@ passthru = {
12181247 </para>
12191248 </listitem>
12201249 </varlistentry>
1221− <varlistentry>
1222− <term>
1223− <varname>checkInputs</varname>
1224− </term>
1225− <listitem>
1226− <para>
1227− A list of dependencies used by the phase. This gets included in
1228− <varname>buildInputs</varname> when <varname>doCheck</varname> is set.
1229− </para>
1230− </listitem>
1231− </varlistentry>
12321250 <varlistentry>
12331251 <term>
12341252 <varname>makeFlags</varname>
@@ -1261,7 +1279,9 @@ makeFlags = [ "PREFIX=$(out)" ];
12611279 <command>make</command>. You must use this instead of
12621280 <varname>makeFlags</varname> if the arguments contain spaces, e.g.
12631281<programlisting>
1264−makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
1282+preBuild = ''
1283+ makeFlagsArray+=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
1284+'';
12651285</programlisting>
12661286 Note that shell arrays cannot be passed through environment variables,
12671287 so you cannot set <varname>makeFlagsArray</varname> in a derivation
@@ -1378,6 +1398,18 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
13781398 </para>
13791399 </listitem>
13801400 </varlistentry>
1401+ <varlistentry>
1402+ <term>
1403+ <varname>checkInputs</varname>
1404+ </term>
1405+ <listitem>
1406+ <para>
1407+ A list of dependencies used by the phase. This gets included in
1408+ <varname>nativeBuildInputs</varname> when <varname>doCheck</varname> is
1409+ set.
1410+ </para>
1411+ </listitem>
1412+ </varlistentry>
13811413 <varlistentry>
13821414 <term>
13831415 <varname>preCheck</varname>
@@ -1650,13 +1682,11 @@ installTargets = "install-bin install-doc";</programlisting>
16501682 </term>
16511683 <listitem>
16521684 <para>
1653− A package can export a <link
1654− linkend="ssec-setup-hooks">setup
1655− hook</link> by setting this variable. The setup hook, if defined, is
1656− copied to <filename>$out/nix-support/setup-hook</filename>. Environment
1657− variables are then substituted in it using
1658− <function
1659− linkend="fun-substituteAll">substituteAll</function>.
1685+ A package can export a <link linkend="ssec-setup-hooks">setup hook</link>
1686+ by setting this variable. The setup hook, if defined, is copied to
1687+ <filename>$out/nix-support/setup-hook</filename>. Environment variables
1688+ are then substituted in it using <function
1689+ linkend="fun-substituteAll">substituteAll</function>.
16601690 </para>
16611691 </listitem>
16621692 </varlistentry>
@@ -2089,40 +2119,39 @@ someVar=$(stripHash $name)
20892119 <title>Package setup hooks</title>
20902120
20912121 <para>
2092− Nix itself considers a build-time dependency merely something that should
2122+ Nix itself considers a build-time dependency as merely something that should
20932123 previously be built and accessible at build time—packages themselves are
20942124 on their own to perform any additional setup. In most cases, that is fine,
2095− and the downstream derivation can deal with it's own dependencies. But for a
2125+ and the downstream derivation can deal with its own dependencies. But for a
20962126 few common tasks, that would result in almost every package doing the same
2097− sort of setup work---depending not on the package itself, but entirely on
2127+ sort of setup work—depending not on the package itself, but entirely on
20982128 which dependencies were used.
20992129 </para>
21002130
21012131 <para>
2102− In order to alleviate this burden, the <firstterm>setup
2103− hook></firstterm>mechanism was written, where any package can include a
2104− shell script that [by convention rather than enforcement by Nix], any
2105− downstream reverse-dependency will source as part of its build process. That
2106− allows the downstream dependency to merely specify its dependencies, and
2107− lets those dependencies effectively initialize themselves. No boilerplate
2108− mirroring the list of dependencies is needed.
2132+ In order to alleviate this burden, the <firstterm>setup hook</firstterm>
2133+ mechanism was written, where any package can include a shell script that [by
2134+ convention rather than enforcement by Nix], any downstream
2135+ reverse-dependency will source as part of its build process. That allows the
2136+ downstream dependency to merely specify its dependencies, and lets those
2137+ dependencies effectively initialize themselves. No boilerplate mirroring the
2138+ list of dependencies is needed.
21092139 </para>
21102140
21112141 <para>
2112− The Setup hook mechanism is a bit of a sledgehammer though: a powerful
2142+ The setup hook mechanism is a bit of a sledgehammer though: a powerful
21132143 feature with a broad and indiscriminate area of effect. The combination of
21142144 its power and implicit use may be expedient, but isn't without costs. Nix
2115− itself is unchanged, but the spirit of adding dependencies being effect-free
2145+ itself is unchanged, but the spirit of added dependencies being effect-free
21162146 is violated even if the letter isn't. For example, if a derivation path is
21172147 mentioned more than once, Nix itself doesn't care and simply makes sure the
21182148 dependency derivation is already built just the same—depending is just
21192149 needing something to exist, and needing is idempotent. However, a dependency
21202150 specified twice will have its setup hook run twice, and that could easily
2121− change the build environment (though a well-written setup hook will
2122− therefore strive to be idempotent so this is in fact not observable). More
2123− broadly, setup hooks are anti-modular in that multiple dependencies, whether
2124− the same or different, should not interfere and yet their setup hooks may
2125− well do so.
2151+ change the build environment (though a well-written setup hook will therefore
2152+ strive to be idempotent so this is in fact not observable). More broadly,
2153+ setup hooks are anti-modular in that multiple dependencies, whether the same
2154+ or different, should not interfere and yet their setup hooks may well do so.
21262155 </para>
21272156
21282157 <para>
@@ -2141,15 +2170,14 @@ someVar=$(stripHash $name)
21412170 <para>
21422171 Packages adding a hook should not hard code a specific hook, but rather
21432172 choose a variable <emphasis>relative</emphasis> to how they are included.
2144− Returning to the C compiler wrapper example, if it itself is an
2173+ Returning to the C compiler wrapper example, if the wrapper itself is an
21452174 <literal>n</literal> dependency, then it only wants to accumulate flags from
21462175 <literal>n + 1</literal> dependencies, as only those ones match the
2147− compiler's target platform. The <envar>hostOffset</envar> variable is
2148− defined with the current dependency's host offset
2149− <envar>targetOffset</envar> with its target offset, before it's setup hook
2150− is sourced. Additionally, since most environment hooks don't care about the
2151− target platform, That means the setup hook can append to the right bash
2152− array by doing something like
2176+ compiler's target platform. The <envar>hostOffset</envar> variable is defined
2177+ with the current dependency's host offset <envar>targetOffset</envar> with
2178+ its target offset, before its setup hook is sourced. Additionally, since most
2179+ environment hooks don't care about the target platform, that means the setup
2180+ hook can append to the right bash array by doing something like
21532181<programlisting language="bash">
21542182addEnvHooks "$hostOffset" myBashFunction
21552183 </programlisting>
@@ -2157,7 +2185,7 @@ addEnvHooks "$hostOffset" myBashFunction
21572185
21582186 <para>
21592187 The <emphasis>existence</emphasis> of setups hooks has long been documented
2160− and packages inside Nixpkgs are free to use these mechanism. Other packages,
2188+ and packages inside Nixpkgs are free to use this mechanism. Other packages,
21612189 however, should not rely on these mechanisms not changing between Nixpkgs
21622190 versions. Because of the existing issues with this system, there's little
21632191 benefit from mandating it be stable for any period of time.
@@ -2174,19 +2202,19 @@ addEnvHooks "$hostOffset" myBashFunction
21742202 </term>
21752203 <listitem>
21762204 <para>
2177− Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous
2178− purposes. These are GNU Binutils when targetting Linux, and a mix of
2179− cctools and GNU binutils for Darwin. [The "Bintools" name is supposed to
2180− be a compromise between "Binutils" and "cctools" not denoting any
2181− specific implementation.] Specifically, the underlying bintools package,
2182− and a C standard library (glibc or Darwin's libSystem, just for the
2183− dynamic loader) are all fed in, and dependency finding, hardening (see
2184− below), and purity checks for each are handled by Bintools Wrapper.
2185− Packages typically depend on CC Wrapper, which in turn (at run time)
2186− depends on Bintools Wrapper.
2205+ The Bintools Wrapper wraps the binary utilities for a bunch of
2206+ miscellaneous purposes. These are GNU Binutils when targetting Linux, and
2207+ a mix of cctools and GNU binutils for Darwin. [The "Bintools" name is
2208+ supposed to be a compromise between "Binutils" and "cctools" not denoting
2209+ any specific implementation.] Specifically, the underlying bintools
2210+ package, and a C standard library (glibc or Darwin's libSystem, just for
2211+ the dynamic loader) are all fed in, and dependency finding, hardening
2212+ (see below), and purity checks for each are handled by the Bintools
2213+ Wrapper. Packages typically depend on CC Wrapper, which in turn (at run
2214+ time) depends on the Bintools Wrapper.
21872215 </para>
21882216 <para>
2189− Bintools Wrapper was only just recently split off from CC Wrapper, so
2217+ The Bintools Wrapper was only just recently split off from CC Wrapper, so
21902218 the division of labor is still being worked out. For example, it
21912219 shouldn't care about about the C standard library, but just take a
21922220 derivation with the dynamic loader (which happens to be the glibc on
@@ -2194,24 +2222,24 @@ addEnvHooks "$hostOffset" myBashFunction
21942222 to need to share, and probably the most important to understand. It is
21952223 currently accomplished by collecting directories of host-platform
21962224 dependencies (i.e. <varname>buildInputs</varname> and
2197− <varname>nativeBuildInputs</varname>) in environment variables. Bintools
2198− Wrapper's setup hook causes any <filename>lib</filename> and
2225+ <varname>nativeBuildInputs</varname>) in environment variables. The
2226+ Bintools Wrapper's setup hook causes any <filename>lib</filename> and
21992227 <filename>lib64</filename> subdirectories to be added to
2200− <envar>NIX_LDFLAGS</envar>. Since CC Wrapper and Bintools Wrapper use
2201− the same strategy, most of the Bintools Wrapper code is sparsely
2202− commented and refers to CC Wrapper. But CC Wrapper's code, by contrast,
2203− has quite lengthy comments. Bintools Wrapper merely cites those, rather
2204− than repeating them, to avoid falling out of sync.
2228+ <envar>NIX_LDFLAGS</envar>. Since the CC Wrapper and the Bintools Wrapper
2229+ use the same strategy, most of the Bintools Wrapper code is sparsely
2230+ commented and refers to the CC Wrapper. But the CC Wrapper's code, by
2231+ contrast, has quite lengthy comments. The Bintools Wrapper merely cites
2232+ those, rather than repeating them, to avoid falling out of sync.
22052233 </para>
22062234 <para>
22072235 A final task of the setup hook is defining a number of standard
2208− environment variables to tell build systems which executables full-fill
2236+ environment variables to tell build systems which executables fulfill
22092237 which purpose. They are defined to just be the base name of the tools,
2210− under the assumption that Bintools Wrapper's binaries will be on the
2238+ under the assumption that the Bintools Wrapper's binaries will be on the
22112239 path. Firstly, this helps poorly-written packages, e.g. ones that look
22122240 for just <command>gcc</command> when <envar>CC</envar> isn't defined yet
2213− <command>clang</command> is to be used. Secondly, this helps packages
2214− not get confused when cross-compiling, in which case multiple Bintools
2241+ <command>clang</command> is to be used. Secondly, this helps packages not
2242+ get confused when cross-compiling, in which case multiple Bintools
22152243 Wrappers may simultaneously be in use.
22162244 <footnote xml:id="footnote-stdenv-per-platform-wrapper">
22172245 <para>
@@ -2223,20 +2251,20 @@ addEnvHooks "$hostOffset" myBashFunction
22232251 </para>
22242252 </footnote>
22252253 <envar>BUILD_</envar>- and <envar>TARGET_</envar>-prefixed versions of
2226− the normal environment variable are defined for the additional Bintools
2254+ the normal environment variable are defined for additional Bintools
22272255 Wrappers, properly disambiguating them.
22282256 </para>
22292257 <para>
2230− A problem with this final task is that Bintools Wrapper is honest and
2258+ A problem with this final task is that the Bintools Wrapper is honest and
22312259 defines <envar>LD</envar> as <command>ld</command>. Most packages,
22322260 however, firstly use the C compiler for linking, secondly use
22332261 <envar>LD</envar> anyways, defining it as the C compiler, and thirdly,
2234− only so define <envar>LD</envar> when it is undefined as a fallback.
2235− This triple-threat means Bintools Wrapper will break those packages, as
2236− LD is already defined as the actual linker which the package won't
2237− override yet doesn't want to use. The workaround is to define, just for
2238− the problematic package, <envar>LD</envar> as the C compiler. A good way
2239− to do this would be <command>preConfigure = "LD=$CC"</command>.
2262+ only so define <envar>LD</envar> when it is undefined as a fallback. This
2263+ triple-threat means Bintools Wrapper will break those packages, as LD is
2264+ already defined as the actual linker which the package won't override yet
2265+ doesn't want to use. The workaround is to define, just for the
2266+ problematic package, <envar>LD</envar> as the C compiler. A good way to
2267+ do this would be <command>preConfigure = "LD=$CC"</command>.
22402268 </para>
22412269 </listitem>
22422270 </varlistentry>
@@ -2246,30 +2274,31 @@ addEnvHooks "$hostOffset" myBashFunction
22462274 </term>
22472275 <listitem>
22482276 <para>
2249− CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
2277+ The CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
22502278 Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C
22512279 standard library (glibc or Darwin's libSystem, just for the dynamic
22522280 loader) are all fed in, and dependency finding, hardening (see below),
2253− and purity checks for each are handled by CC Wrapper. Packages typically
2254− depend on CC Wrapper, which in turn (at run time) depends on Bintools
2255− Wrapper.
2281+ and purity checks for each are handled by the CC Wrapper. Packages
2282+ typically depend on the CC Wrapper, which in turn (at run-time) depends
2283+ on the Bintools Wrapper.
22562284 </para>
22572285 <para>
2258− Dependency finding is undoubtedly the main task of CC Wrapper. This
2259− works just like Bintools Wrapper, except that any
2286+ Dependency finding is undoubtedly the main task of the CC Wrapper. This
2287+ works just like the Bintools Wrapper, except that any
22602288 <filename>include</filename> subdirectory of any relevant dependency is
22612289 added to <envar>NIX_CFLAGS_COMPILE</envar>. The setup hook itself
22622290 contains some lengthy comments describing the exact convoluted mechanism
22632291 by which this is accomplished.
22642292 </para>
22652293 <para>
2266− CC Wrapper also like Bintools Wrapper defines standard environment
2267− variables with the names of the tools it wraps, for the same reasons
2268− described above. Importantly, while it includes a <command>cc</command>
2269− symlink to the c compiler for portability, the <envar>CC</envar> will be
2270− defined using the compiler's "real name" (i.e. <command>gcc</command> or
2271− <command>clang</command>). This helps lousy build systems that inspect
2272− on the name of the compiler rather than run it.
2294+ Similarly, the CC Wrapper follows the Bintools Wrapper in defining
2295+ standard environment variables with the names of the tools it wraps, for
2296+ the same reasons described above. Importantly, while it includes a
2297+ <command>cc</command> symlink to the c compiler for portability, the
2298+ <envar>CC</envar> will be defined using the compiler's "real name" (i.e.
2299+ <command>gcc</command> or <command>clang</command>). This helps lousy
2300+ build systems that inspect on the name of the compiler rather than run
2301+ it.
22732302 </para>
22742303 </listitem>
22752304 </varlistentry>
@@ -2329,9 +2358,11 @@ addEnvHooks "$hostOffset" myBashFunction
23292358 <listitem>
23302359 <para>
23312360 The <varname>autoreconfHook</varname> derivation adds
2332− <varname>autoreconfPhase</varname>, which runs autoreconf, libtoolize
2333− and automake, essentially preparing the configure script in
2334− autotools-based builds.
2361+ <varname>autoreconfPhase</varname>, which runs autoreconf, libtoolize and
2362+ automake, essentially preparing the configure script in autotools-based
2363+ builds. Most autotools-based packages come with the configure script
2364+ pre-generated, but this hook is necessary for a few packages and when you
2365+ need to patch the package’s configure scripts.
23352366 </para>
23362367 </listitem>
23372368 </varlistentry>
@@ -2375,9 +2406,9 @@ addEnvHooks "$hostOffset" myBashFunction
23752406 </term>
23762407 <listitem>
23772408 <para>
2378− Exports <envar>GDK_PIXBUF_MODULE_FILE</envar> environment variable the
2379− the builder. Add librsvg package to <varname>buildInputs</varname> to
2380− get svg support.
2409+ Exports <envar>GDK_PIXBUF_MODULE_FILE</envar> environment variable to the
2410+ builder. Add librsvg package to <varname>buildInputs</varname> to get svg
2411+ support.
23812412 </para>
23822413 </listitem>
23832414 </varlistentry>
@@ -2406,46 +2437,187 @@ addEnvHooks "$hostOffset" myBashFunction
24062437 </varlistentry>
24072438 <varlistentry>
24082439 <term>
2409− paxctl
2440+ autoPatchelfHook
24102441 </term>
24112442 <listitem>
24122443 <para>
2413− Defines the <varname>paxmark</varname> helper for setting per-executable
2414− PaX flags on Linux (where it is available by default; on all other
2415− platforms, <varname>paxmark</varname> is a no-op). For example, to
2416− disable secure memory protections on the executable
2417− <replaceable>foo</replaceable>:
2418−<programlisting>
2419− postFixup = ''
2420− paxmark m $out/bin/<replaceable>foo</replaceable>
2421− '';
2422− </programlisting>
2423− The <literal>m</literal> flag is the most common flag and is typically
2424− required for applications that employ JIT compilation or otherwise need
2425− to execute code generated at run-time. Disabling PaX protections should
2426− be considered a last resort: if possible, problematic features should be
2427− disabled or patched to work with PaX.
2444+ This is a special setup hook which helps in packaging proprietary
2445+ software in that it automatically tries to find missing shared library
2446+ dependencies of ELF files based on the given
2447+ <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname>.
2448+ </para>
2449+ <para>
2450+ You can also specify a <envar>runtimeDependencies</envar> environment
2451+ variable which lists dependencies that are unconditionally added to all
2452+ executables.
2453+ </para>
2454+ <para>
2455+ This is useful for programs that use <citerefentry>
2456+ <refentrytitle>dlopen</refentrytitle>
2457+ <manvolnum>3</manvolnum>
2458+ </citerefentry> to load libraries at runtime.
2459+ </para>
2460+ <para>
2461+ In certain situations you may want to run the main command
2462+ (<command>autoPatchelf</command>) of the setup hook on a file or a set
2463+ of directories instead of unconditionally patching all outputs. This
2464+ can be done by setting the <envar>dontAutoPatchelf</envar> environment
2465+ variable to a non-empty value.
2466+ </para>
2467+ <para>
2468+ The <command>autoPatchelf</command> command also recognizes a
2469+ <parameter class="command">--no-recurse</parameter> command line flag,
2470+ which prevents it from recursing into subdirectories.
24282471 </para>
24292472 </listitem>
24302473 </varlistentry>
24312474 <varlistentry>
24322475 <term>
2433− autoPatchelfHook
2476+ breakpointHook
24342477 </term>
24352478 <listitem>
24362479 <para>
2437− This is a special setup hook which helps in packaging proprietary
2438− software in that it automatically tries to find missing shared library
2439− dependencies of ELF files. All packages within the
2440− <envar>runtimeDependencies</envar> environment variable are
2441− unconditionally added to executables, which is useful for programs that
2442− use <citerefentry>
2443− <refentrytitle>dlopen</refentrytitle>
2444− <manvolnum>3</manvolnum> </citerefentry> to load libraries at runtime.
2480+ This hook will make a build pause instead of stopping when a failure
2481+ happens. It prevents nix from cleaning up the build environment immediately and
2482+ allows the user to attach to a build environment using the
2483+ <command>cntr</command> command. Upon build error it will print
2484+ instructions on how to use <command>cntr</command>. Installing
2485+ cntr and running the command will provide shell access to the build
2486+ sandbox of failed build. At <filename>/var/lib/cntr</filename> the
2487+ sandboxed filesystem is mounted. All commands and files of the system are
2488+ still accessible within the shell. To execute commands from the sandbox
2489+ use the cntr exec subcommand. Note that <command>cntr</command> also
2490+ needs to be executed on the machine that is doing the build, which might
2491+ not be the case when remote builders are enabled.
2492+ <command>cntr</command> is only supported on Linux-based platforms. To
2493+ use it first add <literal>cntr</literal> to your
2494+ <literal>environment.systemPackages</literal> on NixOS or alternatively to
2495+ the root user on non-NixOS systems. Then in the package that is supposed
2496+ to be inspected, add <literal>breakpointHook</literal> to
2497+ <literal>nativeBuildInputs</literal>.
2498+<programlisting>
2499+ nativeBuildInputs = [ breakpointHook ];
2500+ </programlisting>
2501+ When a build failure happens there will be an instruction printed that
2502+ shows how to attach with <literal>cntr</literal> to the build sandbox.
24452503 </para>
24462504 </listitem>
24472505 </varlistentry>
2448− </variablelist>
2506+ <varlistentry>
2507+ <term>
2508+ libiconv, libintl
2509+ </term>
2510+ <listitem>
2511+ <para>
2512+ A few libraries automatically add to
2513+ <literal>NIX_LDFLAGS</literal> their library, making their
2514+ symbols automatically available to the linker. This includes
2515+ libiconv and libintl (gettext). This is done to provide
2516+ compatibility between GNU Linux, where libiconv and libintl
2517+ are bundled in, and other systems where that might not be the
2518+ case. Sometimes, this behavior is not desired. To disable
2519+ this behavior, set <literal>dontAddExtraLibs</literal>.
2520+ </para>
2521+ </listitem>
2522+ </varlistentry>
2523+ <varlistentry>
2524+ <term>
2525+ cmake
2526+ </term>
2527+ <listitem>
2528+ <para>
2529+ Overrides the default configure phase to run the CMake command. By
2530+ default, we use the Make generator of CMake. In
2531+ addition, dependencies are added automatically to CMAKE_PREFIX_PATH so
2532+ that packages are correctly detected by CMake. Some additional flags
2533+ are passed in to give similar behavior to configure-based packages. You
2534+ can disable this hook’s behavior by setting configurePhase to a custom
2535+ value, or by setting dontUseCmakeConfigure. cmakeFlags controls flags
2536+ passed only to CMake. By default, parallel building is enabled as CMake
2537+ supports parallel building almost everywhere. When Ninja is also in
2538+ use, CMake will detect that and use the ninja generator.
2539+ </para>
2540+ </listitem>
2541+ </varlistentry>
2542+ <varlistentry>
2543+ <term>
2544+ xcbuildHook
2545+ </term>
2546+ <listitem>
2547+ <para>
2548+ Overrides the build and install phases to run the “xcbuild” command.
2549+ This hook is needed when a project only comes with build files for the
2550+ XCode build system. You can disable this behavior by setting buildPhase
2551+ and configurePhase to a custom value. xcbuildFlags controls flags
2552+ passed only to xcbuild.
2553+ </para>
2554+ </listitem>
2555+ </varlistentry>
2556+ <varlistentry>
2557+ <term>
2558+ meson
2559+ </term>
2560+ <listitem>
2561+ <para>
2562+ Overrides the configure phase to run meson to generate Ninja files. You
2563+ can disable this behavior by setting configurePhase to a custom value,
2564+ or by setting dontUseMesonConfigure. To run these files, you should
2565+ accompany meson with ninja. mesonFlags controls only the flags passed
2566+ to meson. By default, parallel building is enabled as Meson supports
2567+ parallel building almost everywhere.
2568+ </para>
2569+ </listitem>
2570+ </varlistentry>
2571+ <varlistentry>
2572+ <term>
2573+ ninja
2574+ </term>
2575+ <listitem>
2576+ <para>
2577+ Overrides the build, install, and check phase to run ninja instead of
2578+ make. You can disable this behavior with the dontUseNinjaBuild,
2579+ dontUseNinjaInstall, and dontUseNinjaCheck, respectively. Parallel
2580+ building is enabled by default in Ninja.
2581+ </para>
2582+ </listitem>
2583+ </varlistentry>
2584+ <varlistentry>
2585+ <term>
2586+ unzip
2587+ </term>
2588+ <listitem>
2589+ <para>
2590+ This setup hook will allow you to unzip .zip files specified in $src.
2591+ There are many similar packages like unrar, undmg, etc.
2592+ </para>
2593+ </listitem>
2594+ </varlistentry>
2595+ <varlistentry>
2596+ <term>
2597+ wafHook
2598+ </term>
2599+ <listitem>
2600+ <para>
2601+ Overrides the configure, build, and install phases. This will run the
2602+ "waf" script used by many projects. If waf doesn’t exist, it will copy
2603+ the version of waf available in Nixpkgs wafFlags can be used to pass
2604+ flags to the waf script.
2605+ </para>
2606+ </listitem>
2607+ </varlistentry>
2608+ <varlistentry>
2609+ <term>
2610+ scons
2611+ </term>
2612+ <listitem>
2613+ <para>
2614+ Overrides the build, install, and check phases. This uses the scons
2615+ build system as a replacement for make. scons does not provide a
2616+ configure phase, so everything is managed at build and install time.
2617+ </para>
2618+ </listitem>
2619+ </varlistentry>
2620+ </variablelist>
24492621 </para>
24502622 </section>
24512623 <section xml:id="sec-purity-in-nixpkgs">
doc/style.css+22−2
@@ -9,6 +9,7 @@
99body
1010{
1111 font-family: "Nimbus Sans L", sans-serif;
12+ font-size: 1em;
1213 background: white;
1314 margin: 2em 1em 2em 1em;
1415}
@@ -28,6 +29,25 @@ h2 /* chapters, appendices, subtitle */
2829 font-size: 180%;
2930}
3031
32+div.book
33+{
34+ text-align: center;
35+}
36+
37+div.book > div
38+{
39+ /*
40+ * based on https://medium.com/@zkareemz/golden-ratio-62b3b6d4282a
41+ * we do 70 characters per line to fit code listings better
42+ * 70 * (font-size / 1.618)
43+ * expression for emacs:
44+ * (* 70 (/ 1 1.618))
45+ */
46+ max-width: 43.2em;
47+ text-align: left;
48+ margin: auto;
49+}
50+
3151/* Extra space between chapters, appendices. */
3252div.chapter > div.titlepage h2, div.appendix > div.titlepage h2
3353{
@@ -102,8 +122,8 @@ pre.screen, pre.programlisting
102122{
103123 border: 1px solid #b0b0b0;
104124 padding: 3px 3px;
105− margin-left: 1.5em;
106− margin-right: 1.5em;
125+ margin-left: 0.5em;
126+ margin-right: 0.5em;
107127
108128 background: #f4f4f8;
109129 font-family: monospace;
lib/attrsets.nix+9
@@ -94,6 +94,15 @@ rec {
9494 attrValues = builtins.attrValues or (attrs: attrVals (attrNames attrs) attrs);
9595
9696
97+ /* Given a set of attribute names, return the set of the corresponding
98+ attributes from the given set.
99+
100+ Example:
101+ getAttrs [ "a" "b" ] { a = 1; b = 2; c = 3; }
102+ => { a = 1; b = 2; }
103+ */
104+ getAttrs = names: attrs: genAttrs names (name: attrs.${name});
105+
97106 /* Collect each attribute named `attr' from a list of attribute
98107 sets. Sets that don't contain the named attribute are ignored.
99108
lib/composable-derivation.nixdeleted−113
@@ -1,113 +0,0 @@
1−{lib, pkgs}:
2−let inherit (lib) nvs; in
3−{
4−
5− # composableDerivation basically mixes these features:
6− # - fix function
7− # - mergeAttrBy
8− # - provides shortcuts for "options" such as "--enable-foo" and adding
9− # buildInputs, see php example
10− #
11− # It predates styles which are common today, such as
12− # * the config attr
13− # * mkDerivation.override feature
14− # * overrideDerivation (lib/customization.nix)
15− #
16− # Some of the most more important usage examples (which could be rewritten if it was important):
17− # * php
18− # * postgis
19− # * vim_configurable
20− #
21− # A minimal example illustrating most features would look like this:
22− # let base = composableDerivation { (fixed: let inherit (fixed.fixed) name in {
23− # src = fetchurl {
24− # }
25− # buildInputs = [A];
26− # preConfigre = "echo ${name}";
27− # # attention, "name" attr is missing, thus you cannot instantiate "base".
28− # }
29− # in {
30− # # These all add name attribute, thus you can instantiate those:
31− # v1 = base.merge ({ name = "foo-add-B"; buildInputs = [B]; }); // B gets merged into buildInputs
32− # v2 = base.merge ({ name = "mix-in-pre-configure-lines" preConfigre = ""; });
33− # v3 = base.replace ({ name = "foo-no-A-only-B;" buildInputs = [B]; });
34− # }
35− #
36− # So yes, you can think about it being something like nixos modules, and
37− # you'd be merging "features" in one at a time using .merge or .replace
38− # Thanks Shea for telling me that I rethink the documentation ..
39− #
40− # issues:
41− # * its complicated to understand
42− # * some "features" such as exact merge behaviour are buried in mergeAttrBy
43− # and defaultOverridableDelayableArgs assuming the default behaviour does
44− # the right thing in the common case
45− # * Eelco once said using such fix style functions are slow to evaluate
46− # * Too quick & dirty. Hard to understand for others. The benefit was that
47− # you were able to create a kernel builder like base derivation and replace
48− # / add patches the way you want without having to declare function arguments
49− #
50− # nice features:
51− # declaring "optional features" is modular. For instance:
52− # flags.curl = {
53− # configureFlags = ["--with-curl=${curl.dev}" "--with-curlwrappers"];
54− # buildInputs = [curl openssl];
55− # };
56− # flags.other = { .. }
57− # (Example taken from PHP)
58− #
59− # alternative styles / related features:
60− # * Eg see function supporting building the kernel
61− # * versionedDerivation (discussion about this is still going on - or ended)
62− # * composedArgsAndFun
63− # * mkDerivation.override
64− # * overrideDerivation
65− # * using { .., *Support ? false }: like configurable options.
66− # To find those examples use grep
67− #
68− # To sum up: It exists for historical reasons - and for most commonly used
69− # tasks the alternatives should be used
70− #
71− # If you have questions about this code ping Marc Weber.
72− composableDerivation = {
73− mkDerivation ? pkgs.stdenv.mkDerivation,
74−
75− # list of functions to be applied before defaultOverridableDelayableArgs removes removeAttrs names
76− # prepareDerivationArgs handles derivation configurations
77− applyPreTidy ? [ lib.prepareDerivationArgs ],
78−
79− # consider adding addtional elements by derivation.merge { removeAttrs = ["elem"]; };
80− removeAttrs ? ["cfg" "flags"]
81−
82− }: (lib.defaultOverridableDelayableArgs ( a: mkDerivation a)
83− {
84− inherit applyPreTidy removeAttrs;
85− }).merge;
86−
87− # some utility functions
88− # use this function to generate flag attrs for prepareDerivationArgs
89− # E nable D isable F eature
90− edf = {name, feat ? name, enable ? {}, disable ? {} , value ? ""}:
91− nvs name {
92− set = {
93− configureFlags = ["--enable-${feat}${if value == "" then "" else "="}${value}"];
94− } // enable;
95− unset = {
96− configureFlags = ["--disable-${feat}"];
97− } // disable;
98− };
99−
100− # same for --with and --without-
101− # W ith or W ithout F eature
102− wwf = {name, feat ? name, enable ? {}, disable ? {}, value ? ""}:
103− nvs name {
104− set = enable // {
105− configureFlags = ["--with-${feat}${if value == "" then "" else "="}${value}"]
106− ++ lib.maybeAttr "configureFlags" [] enable;
107− };
108− unset = disable // {
109− configureFlags = ["--without-${feat}"]
110− ++ lib.maybeAttr "configureFlags" [] disable;
111− };
112− };
113−}
lib/customisation.nix+1−1
@@ -196,7 +196,7 @@ rec {
196196 newScope = scope: newScope (self // scope);
197197 callPackage = self.newScope {};
198198 overrideScope = g: lib.warn
199− "`overrideScope` (from `lib.makeScope`) is deprecated. Do `overrideScope' (self: self: { … })` instead of `overrideScope (super: self: { … })`. All other overrides have the parameters in that order, including other definitions of `overrideScope`. This was the only definition violating the pattern."
199+ "`overrideScope` (from `lib.makeScope`) is deprecated. Do `overrideScope' (self: super: { … })` instead of `overrideScope (super: self: { … })`. All other overrides have the parameters in that order, including other definitions of `overrideScope`. This was the only definition violating the pattern."
200200 (makeScope newScope (lib.fixedPoints.extends (lib.flip g) f));
201201 overrideScope' = g: makeScope newScope (lib.fixedPoints.extends g f);
202202 packages = f;
lib/debug.nix+75−19
@@ -23,27 +23,54 @@ rec {
2323
2424 # -- TRACING --
2525
26− /* Trace msg, but only if pred is true.
26+ /* Conditionally trace the supplied message, based on a predicate.
27+
28+ Type: traceIf :: bool -> string -> a -> a
2729
2830 Example:
2931 traceIf true "hello" 3
3032 trace: hello
3133 => 3
3234 */
33− traceIf = pred: msg: x: if pred then trace msg x else x;
35+ traceIf =
36+ # Predicate to check
37+ pred:
38+ # Message that should be traced
39+ msg:
40+ # Value to return
41+ x: if pred then trace msg x else x;
42+
43+ /* Trace the supplied value after applying a function to it, and
44+ return the original value.
3445
35− /* Trace the value and also return it.
46+ Type: traceValFn :: (a -> b) -> a -> a
3647
3748 Example:
3849 traceValFn (v: "mystring ${v}") "foo"
3950 trace: mystring foo
4051 => "foo"
4152 */
42− traceValFn = f: x: trace (f x) x;
53+ traceValFn =
54+ # Function to apply
55+ f:
56+ # Value to trace and return
57+ x: trace (f x) x;
58+
59+ /* Trace the supplied value and return it.
60+
61+ Type: traceVal :: a -> a
62+
63+ Example:
64+ traceVal 42
65+ # trace: 42
66+ => 42
67+ */
4368 traceVal = traceValFn id;
4469
4570 /* `builtins.trace`, but the value is `builtins.deepSeq`ed first.
4671
72+ Type: traceSeq :: a -> b -> b
73+
4774 Example:
4875 trace { a.b.c = 3; } null
4976 trace: { a = <CODE>; }
@@ -52,7 +79,11 @@ rec {
5279 trace: { a = { b = { c = 3; }; }; }
5380 => null
5481 */
55− traceSeq = x: y: trace (builtins.deepSeq x x) y;
82+ traceSeq =
83+ # The value to trace
84+ x:
85+ # The value to return
86+ y: trace (builtins.deepSeq x x) y;
5687
5788 /* Like `traceSeq`, but only evaluate down to depth n.
5889 This is very useful because lots of `traceSeq` usages
@@ -76,27 +107,49 @@ rec {
76107 in trace (generators.toPretty { allowPrettyValues = true; }
77108 (modify depth snip x)) y;
78109
79− /* A combination of `traceVal` and `traceSeq` */
80− traceValSeqFn = f: v: traceValFn f (builtins.deepSeq v v);
110+ /* A combination of `traceVal` and `traceSeq` that applies a
111+ provided function to the value to be traced after `deepSeq`ing
112+ it.
113+ */
114+ traceValSeqFn =
115+ # Function to apply
116+ f:
117+ # Value to trace
118+ v: traceValFn f (builtins.deepSeq v v);
119+
120+ /* A combination of `traceVal` and `traceSeq`. */
81121 traceValSeq = traceValSeqFn id;
82122
123+ /* A combination of `traceVal` and `traceSeqN` that applies a
124+ provided function to the value to be traced. */
125+ traceValSeqNFn =
126+ # Function to apply
127+ f:
128+ depth:
129+ # Value to trace
130+ v: traceSeqN depth (f v) v;
131+
83132 /* A combination of `traceVal` and `traceSeqN`. */
84− traceValSeqNFn = f: depth: v: traceSeqN depth (f v) v;
85133 traceValSeqN = traceValSeqNFn id;
86134
87135
88136 # -- TESTING --
89137
90− /* Evaluate a set of tests. A test is an attribute set {expr,
91− expected}, denoting an expression and its expected result. The
92− result is a list of failed tests, each represented as {name,
93− expected, actual}, denoting the attribute name of the failing
94− test and its expected and actual results. Used for regression
95− testing of the functions in lib; see tests.nix for an example.
96− Only tests having names starting with "test" are run.
97− Add attr { tests = ["testName"]; } to run these test only
138+ /* Evaluate a set of tests. A test is an attribute set `{expr,
139+ expected}`, denoting an expression and its expected result. The
140+ result is a list of failed tests, each represented as `{name,
141+ expected, actual}`, denoting the attribute name of the failing
142+ test and its expected and actual results.
143+
144+ Used for regression testing of the functions in lib; see
145+ tests.nix for an example. Only tests having names starting with
146+ "test" are run.
147+
148+ Add attr { tests = ["testName"]; } to run these tests only.
98149 */
99− runTests = tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test:
150+ runTests =
151+ # Tests to run
152+ tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test:
100153 let testsToRun = if tests ? tests then tests.tests else [];
101154 in if (substring 0 4 name == "test" || elem name testsToRun)
102155 && ((testsToRun == []) || elem name tests.tests)
@@ -105,8 +158,11 @@ rec {
105158 then [ { inherit name; expected = test.expected; result = test.expr; } ]
106159 else [] ) tests));
107160
108− # create a test assuming that list elements are true
109− # usage: { testX = allTrue [ true ]; }
161+ /* Create a test assuming that list elements are `true`.
162+
163+ Example:
164+ { testX = allTrue [ true ]; }
165+ */
110166 testAllTrue = expr: { inherit expr; expected = map (x: true) expr; };
111167
112168
lib/default.nix+8−8
@@ -61,10 +61,10 @@ let
6161 boolToString mergeAttrs flip mapNullable inNixShell min max
6262 importJSON warn info nixpkgsVersion version mod compare
6363 splitByAndCompare functionArgs setFunctionArgs isFunction;
64− inherit (fixedPoints) fix fix' extends composeExtensions
64+ inherit (fixedPoints) fix fix' converge extends composeExtensions
6565 makeExtensible makeExtensibleWithCustomName;
6666 inherit (attrsets) attrByPath hasAttrByPath setAttrByPath
67− getAttrFromPath attrVals attrValues catAttrs filterAttrs
67+ getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs
6868 filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs
6969 mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond
7070 genAttrs isDerivation toDerivation optionalAttrs
@@ -80,7 +80,7 @@ let
8080 inherit (strings) concatStrings concatMapStrings concatImapStrings
8181 intersperse concatStringsSep concatMapStringsSep
8282 concatImapStringsSep makeSearchPath makeSearchPathOutput
83− makeLibraryPath makeBinPath makePerlPath makeFullPerlPath optionalString
83+ makeLibraryPath makeBinPath optionalString
8484 hasPrefix hasSuffix stringToCharacters stringAsChars escape
8585 escapeShellArg escapeShellArgs replaceChars lowerChars
8686 upperChars toLower toUpper addContextFrom splitString
@@ -94,7 +94,7 @@ let
9494 callPackageWith callPackagesWith extendDerivation hydraJob
9595 makeScope;
9696 inherit (meta) addMetaAttrs dontDistribute setName updateName
97− appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio
97+ appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio
9898 hiPrioSet;
9999 inherit (sources) pathType pathIsDirectory cleanSourceFilter
100100 cleanSource sourceByRegex sourceFilesBySuffices
@@ -109,7 +109,7 @@ let
109109 mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions
110110 mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule
111111 mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule
112− mkAliasOptionModule doRename filterModules;
112+ mkAliasOptionModule mkAliasOptionModuleWithPriority doRename filterModules;
113113 inherit (options) isOption mkEnableOption mkSinkUndeclaredOptions
114114 mergeDefaultOption mergeOneOption mergeEqualOption getValues
115115 getFiles optionAttrSetToDocList optionAttrSetToDocList'
@@ -125,14 +125,14 @@ let
125125 traceShowValMarked showVal traceCall traceCall2 traceCall3
126126 traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr;
127127 inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs
128− defaultOverridableDelayableArgs composedArgsAndFun
129128 maybeAttrNullable maybeAttr ifEnable checkFlag getValue
130129 checkReqs uniqList uniqListExt condConcat lazyGenericClosure
131130 innerModifySumArgs modifySumArgs innerClosePropagation
132131 closePropagation mapAttrsFlatten nvs setAttr setAttrMerge
133132 mergeAttrsWithFunc mergeAttrsConcatenateValues
134133 mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults
135− mergeAttrsByFuncDefaultsClean mergeAttrBy prepareDerivationArgs
136− nixType imap overridableDelayableArgs;
134+ mergeAttrsByFuncDefaultsClean mergeAttrBy
135+ fakeSha256 fakeSha512
136+ nixType imap;
137137 });
138138in lib
lib/deprecated.nix+5−121
@@ -35,74 +35,6 @@ rec {
3535 withStdOverrides;
3636
3737
38− # predecessors: proposed replacement for applyAndFun (which has a bug cause it merges twice)
39− # the naming "overridableDelayableArgs" tries to express that you can
40− # - override attr values which have been supplied earlier
41− # - use attr values before they have been supplied by accessing the fix point
42− # name "fixed"
43− # f: the (delayed overridden) arguments are applied to this
44− #
45− # initial: initial attrs arguments and settings. see defaultOverridableDelayableArgs
46− #
47− # returns: f applied to the arguments // special attributes attrs
48− # a) merge: merge applied args with new args. Wether an argument is overridden depends on the merge settings
49− # b) replace: this let's you replace and remove names no matter which merge function has been set
50− #
51− # examples: see test cases "res" below;
52− overridableDelayableArgs =
53− f: # the function applied to the arguments
54− initial: # you pass attrs, the functions below are passing a function taking the fix argument
55− let
56− takeFixed = if lib.isFunction initial then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument
57− tidy = args:
58− let # apply all functions given in "applyPreTidy" in sequence
59− applyPreTidyFun = fold ( n: a: x: n ( a x ) ) lib.id (maybeAttr "applyPreTidy" [] args);
60− in removeAttrs (applyPreTidyFun args) ( ["applyPreTidy"] ++ (maybeAttr "removeAttrs" [] args) ); # tidy up args before applying them
61− fun = n: x:
62− let newArgs = fixed:
63− let args = takeFixed fixed;
64− mergeFun = args.${n};
65− in if isAttrs x then (mergeFun args x)
66− else assert lib.isFunction x;
67− mergeFun args (x ( args // { inherit fixed; }));
68− in overridableDelayableArgs f newArgs;
69− in
70− (f (tidy (lib.fix takeFixed))) // {
71− merge = fun "mergeFun";
72− replace = fun "keepFun";
73− };
74− defaultOverridableDelayableArgs = f:
75− let defaults = {
76− mergeFun = mergeAttrByFunc; # default merge function. merge strategie (concatenate lists, strings) is given by mergeAttrBy
77− keepFun = a: b: { inherit (a) removeAttrs mergeFun keepFun mergeAttrBy; } // b; # even when using replace preserve these values
78− applyPreTidy = []; # list of functions applied to args before args are tidied up (usage case : prepareDerivationArgs)
79− mergeAttrBy = mergeAttrBy // {
80− applyPreTidy = a: b: a ++ b;
81− removeAttrs = a: b: a ++ b;
82− };
83− removeAttrs = ["mergeFun" "keepFun" "mergeAttrBy" "removeAttrs" "fixed" ]; # before applying the arguments to the function make sure these names are gone
84− };
85− in (overridableDelayableArgs f defaults).merge;
86−
87−
88−
89− # rec { # an example of how composedArgsAndFun can be used
90− # a = composedArgsAndFun (x: x) { a = ["2"]; meta = { d = "bar";}; };
91− # # meta.d will be lost ! It's your task to preserve it (eg using a merge function)
92− # b = a.passthru.function { a = [ "3" ]; meta = { d2 = "bar2";}; };
93− # # instead of passing/ overriding values you can use a merge function:
94− # c = b.passthru.function ( x: { a = x.a ++ ["4"]; }); # consider using (maybeAttr "a" [] x)
95− # }
96− # result:
97− # {
98− # a = { a = ["2"]; meta = { d = "bar"; }; passthru = { function = .. }; };
99− # b = { a = ["3"]; meta = { d2 = "bar2"; }; passthru = { function = .. }; };
100− # c = { a = ["3" "4"]; meta = { d2 = "bar2"; }; passthru = { function = .. }; };
101− # # c2 is equal to c
102− # }
103− composedArgsAndFun = f: foldArgs defaultMerge f {};
104−
105−
10638 # shortcut for attrByPath ["name"] default attrs
10739 maybeAttrNullable = maybeAttr;
10840
@@ -285,7 +217,7 @@ rec {
285217 # };
286218 # will result in
287219 # { mergeAttrsBy = [...]; buildInputs = [ a b c d ]; }
288− # is used by prepareDerivationArgs, defaultOverridableDelayableArgs and can be used when composing using
220+ # is used by defaultOverridableDelayableArgs and can be used when composing using
289221 # foldArgs, composedArgsAndFun or applyAndFun. Example: composableDerivation in all-packages.nix
290222 mergeAttrByFunc = x: y:
291223 let
@@ -318,58 +250,6 @@ rec {
318250 // listToAttrs (map (n: nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ])
319251 ;
320252
321− # prepareDerivationArgs tries to make writing configurable derivations easier
322− # example:
323− # prepareDerivationArgs {
324− # mergeAttrBy = {
325− # myScript = x: y: x ++ "\n" ++ y;
326− # };
327− # cfg = {
328− # readlineSupport = true;
329− # };
330− # flags = {
331− # readline = {
332− # set = {
333− # configureFlags = [ "--with-compiler=${compiler}" ];
334− # buildInputs = [ compiler ];
335− # pass = { inherit compiler; READLINE=1; };
336− # assertion = compiler.dllSupport;
337− # myScript = "foo";
338− # };
339− # unset = { configureFlags = ["--without-compiler"]; };
340− # };
341− # };
342− # src = ...
343− # buildPhase = '' ... '';
344− # name = ...
345− # myScript = "bar";
346− # };
347− # if you don't have need for unset you can omit the surrounding set = { .. } attr
348− # all attrs except flags cfg and mergeAttrBy will be merged with the
349− # additional data from flags depending on config settings
350− # It's used in composableDerivation in all-packages.nix. It's also used
351− # heavily in the new python and libs implementation
352− #
353− # should we check for misspelled cfg options?
354− # TODO use args.mergeFun here as well?
355− prepareDerivationArgs = args:
356− let args2 = { cfg = {}; flags = {}; } // args;
357− flagName = name: "${name}Support";
358− cfgWithDefaults = (listToAttrs (map (n: nameValuePair (flagName n) false) (attrNames args2.flags)))
359− // args2.cfg;
360− opts = attrValues (mapAttrs (a: v:
361− let v2 = if v ? set || v ? unset then v else { set = v; };
362− n = if cfgWithDefaults.${flagName a} then "set" else "unset";
363− attr = maybeAttr n {} v2; in
364− if (maybeAttr "assertion" true attr)
365− then attr
366− else throw "assertion of flag ${a} of derivation ${args.name} failed"
367− ) args2.flags );
368− in removeAttrs
369− (mergeAttrsByFuncDefaults ([args] ++ opts ++ [{ passthru = cfgWithDefaults; }]))
370− ["flags" "cfg" "mergeAttrBy" ];
371−
372−
373253 nixType = x:
374254 if isAttrs x then
375255 if x ? outPath then "derivation"
@@ -390,4 +270,8 @@ rec {
390270 starting at zero.
391271 */
392272 imap = imap1;
273+
274+ # Fake hashes. Can be used as hash placeholders, when computing hash ahead isn't trivial
275+ fakeSha256 = "0000000000000000000000000000000000000000000000000000000000000000";
276+ fakeSha512 = "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
393277}
lib/fixed-points.nix+22
@@ -24,6 +24,16 @@ rec {
2424 # for a concrete example.
2525 fix' = f: let x = f x // { __unfix__ = f; }; in x;
2626
27+ # Return the fixpoint that `f` converges to when called recursively, starting
28+ # with the input `x`.
29+ #
30+ # nix-repl> converge (x: x / 2) 16
31+ # 0
32+ converge = f: x:
33+ if (f x) == x
34+ then x
35+ else converge f (f x);
36+
2737 # Modify the contents of an explicitly recursive attribute set in a way that
2838 # honors `self`-references. This is accomplished with a function
2939 #
@@ -41,6 +51,18 @@ rec {
4151 # think of it as an infix operator `g extends f` that mimics the syntax from
4252 # Java. It may seem counter-intuitive to have the "base class" as the second
4353 # argument, but it's nice this way if several uses of `extends` are cascaded.
54+ #
55+ # To get a better understanding how `extends` turns a function with a fix
56+ # point (the package set we start with) into a new function with a different fix
57+ # point (the desired packages set) lets just see, how `extends g f`
58+ # unfolds with `g` and `f` defined above:
59+ #
60+ # extends g f = self: let super = f self; in super // g self super;
61+ # = self: let super = { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }; in super // g self super
62+ # = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } // g self { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }
63+ # = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } // { foo = "foo" + " + "; }
64+ # = self: { foo = "foo + "; bar = "bar"; foobar = self.foo + self.bar; }
65+ #
4466 extends = f: rattrs: self: let super = rattrs self; in super // f self super;
4567
4668 # Compose two extending functions of the type expected by 'extends'
lib/generators.nix+1
@@ -143,6 +143,7 @@ rec {
143143 }@args: v: with builtins;
144144 let isPath = v: typeOf v == "path";
145145 in if isInt v then toString v
146+ else if isFloat v then "~${toString v}"
146147 else if isString v then ''"${libStr.escape [''"''] v}"''
147148 else if true == v then "true"
148149 else if false == v then "false"
lib/licenses.nix+72−26
@@ -13,6 +13,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
1313 * add it to this list. The URL mentioned above is a good source for inspiration.
1414 */
1515
16+ abstyles = spdx {
17+ spdxId = "Abstyles";
18+ fullName = "Abstyles License";
19+ };
20+
1621 afl21 = spdx {
1722 spdxId = "AFL-2.1";
1823 fullName = "Academic Free License v2.1";
@@ -24,13 +29,13 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
2429 };
2530
2631 agpl3 = spdx {
27− spdxId = "AGPL-3.0";
28− fullName = "GNU Affero General Public License v3.0";
32+ spdxId = "AGPL-3.0-only";
33+ fullName = "GNU Affero General Public License v3.0 only";
2934 };
3035
31− agpl3Plus = {
36+ agpl3Plus = spdx {
37+ spdxId = "AGPL-3.0-or-later";
3238 fullName = "GNU Affero General Public License v3.0 or later";
33− inherit (agpl3) url;
3439 };
3540
3641 amazonsl = {
@@ -42,6 +47,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
4247 amd = {
4348 fullName = "AMD License Agreement";
4449 url = http://developer.amd.com/amd-license-agreement/;
50+ free = false;
4551 };
4652
4753 apsl20 = spdx {
@@ -99,14 +105,10 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
99105 fullName = ''BSD 4-clause "Original" or "Old" License'';
100106 };
101107
102− bsl10 = {
103− fullName = "Business Source License 1.0";
104− url = https://mariadb.com/bsl10;
105− };
106−
107108 bsl11 = {
108109 fullName = "Business Source License 1.1";
109110 url = https://mariadb.com/bsl11;
111+ free = false;
110112 };
111113
112114 clArtistic = spdx {
@@ -264,13 +266,23 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
264266 };
265267
266268 fdl12 = spdx {
267− spdxId = "GFDL-1.2";
268− fullName = "GNU Free Documentation License v1.2";
269+ spdxId = "GFDL-1.2-only";
270+ fullName = "GNU Free Documentation License v1.2 only";
271+ };
272+
273+ fdl12Plus = spdx {
274+ spdxId = "GFDL-1.2-or-later";
275+ fullName = "GNU Free Documentation License v1.2 or later";
269276 };
270277
271278 fdl13 = spdx {
272− spdxId = "GFDL-1.3";
273− fullName = "GNU Free Documentation License v1.3";
279+ spdxId = "GFDL-1.3-only";
280+ fullName = "GNU Free Documentation License v1.3 only";
281+ };
282+
283+ fdl13Plus = spdx {
284+ spdxId = "GFDL-1.3-or-later";
285+ fullName = "GNU Free Documentation License v1.3 or later";
274286 };
275287
276288 ffsl = {
@@ -295,20 +307,25 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
295307 };
296308
297309 gpl1 = spdx {
298− spdxId = "GPL-1.0";
310+ spdxId = "GPL-1.0-only";
299311 fullName = "GNU General Public License v1.0 only";
300312 };
301313
302314 gpl1Plus = spdx {
303− spdxId = "GPL-1.0+";
315+ spdxId = "GPL-1.0-or-later";
304316 fullName = "GNU General Public License v1.0 or later";
305317 };
306318
307319 gpl2 = spdx {
308− spdxId = "GPL-2.0";
320+ spdxId = "GPL-2.0-only";
309321 fullName = "GNU General Public License v2.0 only";
310322 };
311323
324+ gpl2Classpath = spdx {
325+ spdxId = "GPL-2.0-with-classpath-exception";
326+ fullName = "GNU General Public License v2.0 only (with Classpath exception)";
327+ };
328+
312329 gpl2ClasspathPlus = {
313330 fullName = "GNU General Public License v2.0 or later (with Classpath exception)";
314331 url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
@@ -320,17 +337,17 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
320337 };
321338
322339 gpl2Plus = spdx {
323− spdxId = "GPL-2.0+";
340+ spdxId = "GPL-2.0-or-later";
324341 fullName = "GNU General Public License v2.0 or later";
325342 };
326343
327344 gpl3 = spdx {
328− spdxId = "GPL-3.0";
345+ spdxId = "GPL-3.0-only";
329346 fullName = "GNU General Public License v3.0 only";
330347 };
331348
332349 gpl3Plus = spdx {
333− spdxId = "GPL-3.0+";
350+ spdxId = "GPL-3.0-or-later";
334351 fullName = "GNU General Public License v3.0 or later";
335352 };
336353
@@ -387,33 +404,45 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
387404 fullName = "ISC License";
388405 };
389406
407+ # Proprietary binaries; free to redistribute without modification.
408+ issl = {
409+ fullName = "Intel Simplified Software License";
410+ url = https://software.intel.com/en-us/license/intel-simplified-software-license;
411+ free = false;
412+ };
413+
414+ jasper = spdx {
415+ spdxId = "JasPer-2.0";
416+ fullName = "JasPer License";
417+ };
418+
390419 lgpl2 = spdx {
391− spdxId = "LGPL-2.0";
420+ spdxId = "LGPL-2.0-only";
392421 fullName = "GNU Library General Public License v2 only";
393422 };
394423
395424 lgpl2Plus = spdx {
396− spdxId = "LGPL-2.0+";
425+ spdxId = "LGPL-2.0-or-later";
397426 fullName = "GNU Library General Public License v2 or later";
398427 };
399428
400429 lgpl21 = spdx {
401− spdxId = "LGPL-2.1";
430+ spdxId = "LGPL-2.1-only";
402431 fullName = "GNU Library General Public License v2.1 only";
403432 };
404433
405434 lgpl21Plus = spdx {
406− spdxId = "LGPL-2.1+";
435+ spdxId = "LGPL-2.1-or-later";
407436 fullName = "GNU Library General Public License v2.1 or later";
408437 };
409438
410439 lgpl3 = spdx {
411− spdxId = "LGPL-3.0";
440+ spdxId = "LGPL-3.0-only";
412441 fullName = "GNU Lesser General Public License v3.0 only";
413442 };
414443
415444 lgpl3Plus = spdx {
416− spdxId = "LGPL-3.0+";
445+ spdxId = "LGPL-3.0-or-later";
417446 fullName = "GNU Lesser General Public License v3.0 or later";
418447 };
419448
@@ -485,6 +514,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
485514 free = false;
486515 };
487516
517+ nasa13 = spdx {
518+ spdxId = "NASA-1.3";
519+ fullName = "NASA Open Source Agreement 1.3";
520+ free = false;
521+ };
522+
488523 ncsa = spdx {
489524 spdxId = "NCSA";
490525 fullName = "University of Illinois/NCSA Open Source License";
@@ -500,6 +535,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
500535 fullName = "Non-Profit Open Software License 3.0";
501536 };
502537
538+ ocamlpro_nc = {
539+ fullName = "OCamlPro Non Commercial license version 1";
540+ url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-2.2.0/OCamlPro-Non-Commercial-License.pdf";
541+ free = false;
542+ };
543+
503544 ofl = spdx {
504545 spdxId = "OFL-1.1";
505546 fullName = "SIL Open Font License 1.1";
@@ -571,6 +612,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
571612 fullName = "Ruby License";
572613 };
573614
615+ sendmail = spdx {
616+ spdxId = "Sendmail";
617+ fullName = "Sendmail License";
618+ };
619+
574620 sgi-b-20 = spdx {
575621 spdxId = "SGI-B-2.0";
576622 fullName = "SGI Free Software License B v2.0";
@@ -660,7 +706,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
660706 };
661707
662708 wxWindows = spdx {
663− spdxId = "WXwindows";
709+ spdxId = "wxWindows";
664710 fullName = "wxWindows Library Licence, Version 3.1";
665711 };
666712
lib/lists.nix+136−48
@@ -1,4 +1,5 @@
11# General list operations.
2+
23{ lib }:
34with lib.trivial;
45let
@@ -8,21 +9,23 @@ rec {
89
910 inherit (builtins) head tail length isList elemAt concatLists filter elem genList;
1011
11− /* Create a list consisting of a single element. `singleton x' is
12− sometimes more convenient with respect to indentation than `[x]'
12+ /* Create a list consisting of a single element. `singleton x` is
13+ sometimes more convenient with respect to indentation than `[x]`
1314 when x spans multiple lines.
1415
16+ Type: singleton :: a -> [a]
17+
1518 Example:
1619 singleton "foo"
1720 => [ "foo" ]
1821 */
1922 singleton = x: [x];
2023
21− /* “right fold” a binary function `op' between successive elements of
22− `list' with `nul' as the starting value, i.e.,
23− `foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'.
24− Type:
25− foldr :: (a -> b -> b) -> b -> [a] -> b
24+ /* “right fold” a binary function `op` between successive elements of
25+ `list` with `nul' as the starting value, i.e.,
26+ `foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))`.
27+
28+ Type: foldr :: (a -> b -> b) -> b -> [a] -> b
2629
2730 Example:
2831 concat = foldr (a: b: a + b) "z"
@@ -42,16 +45,15 @@ rec {
4245 else op (elemAt list n) (fold' (n + 1));
4346 in fold' 0;
4447
45− /* `fold' is an alias of `foldr' for historic reasons */
48+ /* `fold` is an alias of `foldr` for historic reasons */
4649 # FIXME(Profpatsch): deprecate?
4750 fold = foldr;
4851
4952
50− /* “left fold”, like `foldr', but from the left:
53+ /* “left fold”, like `foldr`, but from the left:
5154 `foldl op nul [x_1 x_2 ... x_n] == op (... (op (op nul x_1) x_2) ... x_n)`.
5255
53− Type:
54− foldl :: (b -> a -> b) -> b -> [a] -> b
56+ Type: foldl :: (b -> a -> b) -> b -> [a] -> b
5557
5658 Example:
5759 lconcat = foldl (a: b: a + b) "z"
@@ -70,16 +72,20 @@ rec {
7072 else op (foldl' (n - 1)) (elemAt list n);
7173 in foldl' (length list - 1);
7274
73− /* Strict version of `foldl'.
75+ /* Strict version of `foldl`.
7476
7577 The difference is that evaluation is forced upon access. Usually used
7678 with small whole results (in contract with lazily-generated list or large
7779 lists where only a part is consumed.)
80+
81+ Type: foldl' :: (b -> a -> b) -> b -> [a] -> b
7882 */
7983 foldl' = builtins.foldl' or foldl;
8084
8185 /* Map with index starting from 0
8286
87+ Type: imap0 :: (int -> a -> b) -> [a] -> [b]
88+
8389 Example:
8490 imap0 (i: v: "${v}-${toString i}") ["a" "b"]
8591 => [ "a-0" "b-1" ]
@@ -88,6 +94,8 @@ rec {
8894
8995 /* Map with index starting from 1
9096
97+ Type: imap1 :: (int -> a -> b) -> [a] -> [b]
98+
9199 Example:
92100 imap1 (i: v: "${v}-${toString i}") ["a" "b"]
93101 => [ "a-1" "b-2" ]
@@ -96,6 +104,8 @@ rec {
96104
97105 /* Map and concatenate the result.
98106
107+ Type: concatMap :: (a -> [b]) -> [a] -> [b]
108+
99109 Example:
100110 concatMap (x: [x] ++ ["z"]) ["a" "b"]
101111 => [ "a" "z" "b" "z" ]
@@ -118,15 +128,21 @@ rec {
118128
119129 /* Remove elements equal to 'e' from a list. Useful for buildInputs.
120130
131+ Type: remove :: a -> [a] -> [a]
132+
121133 Example:
122134 remove 3 [ 1 3 4 3 ]
123135 => [ 1 4 ]
124136 */
125− remove = e: filter (x: x != e);
137+ remove =
138+ # Element to remove from the list
139+ e: filter (x: x != e);
126140
127141 /* Find the sole element in the list matching the specified
128− predicate, returns `default' if no such element exists, or
129− `multiple' if there are multiple matching elements.
142+ predicate, returns `default` if no such element exists, or
143+ `multiple` if there are multiple matching elements.
144+
145+ Type: findSingle :: (a -> bool) -> a -> a -> [a] -> a
130146
131147 Example:
132148 findSingle (x: x == 3) "none" "multiple" [ 1 3 3 ]
@@ -136,14 +152,24 @@ rec {
136152 findSingle (x: x == 3) "none" "multiple" [ 1 9 ]
137153 => "none"
138154 */
139− findSingle = pred: default: multiple: list:
155+ findSingle =
156+ # Predicate
157+ pred:
158+ # Default value to return if element was not found.
159+ default:
160+ # Default value to return if more than one element was found
161+ multiple:
162+ # Input list
163+ list:
140164 let found = filter pred list; len = length found;
141165 in if len == 0 then default
142166 else if len != 1 then multiple
143167 else head found;
144168
145169 /* Find the first element in the list matching the specified
146− predicate or returns `default' if no such element exists.
170+ predicate or return `default` if no such element exists.
171+
172+ Type: findFirst :: (a -> bool) -> a -> [a] -> a
147173
148174 Example:
149175 findFirst (x: x > 3) 7 [ 1 6 4 ]
@@ -151,12 +177,20 @@ rec {
151177 findFirst (x: x > 9) 7 [ 1 6 4 ]
152178 => 7
153179 */
154− findFirst = pred: default: list:
180+ findFirst =
181+ # Predicate
182+ pred:
183+ # Default value to return
184+ default:
185+ # Input list
186+ list:
155187 let found = filter pred list;
156188 in if found == [] then default else head found;
157189
158− /* Return true iff function `pred' returns true for at least element
159− of `list'.
190+ /* Return true if function `pred` returns true for at least one
191+ element of `list`.
192+
193+ Type: any :: (a -> bool) -> [a] -> bool
160194
161195 Example:
162196 any isString [ 1 "a" { } ]
@@ -166,8 +200,10 @@ rec {
166200 */
167201 any = builtins.any or (pred: foldr (x: y: if pred x then true else y) false);
168202
169− /* Return true iff function `pred' returns true for all elements of
170− `list'.
203+ /* Return true if function `pred` returns true for all elements of
204+ `list`.
205+
206+ Type: all :: (a -> bool) -> [a] -> bool
171207
172208 Example:
173209 all (x: x < 3) [ 1 2 ]
@@ -177,19 +213,25 @@ rec {
177213 */
178214 all = builtins.all or (pred: foldr (x: y: if pred x then y else false) true);
179215
180− /* Count how many times function `pred' returns true for the elements
181− of `list'.
216+ /* Count how many elements of `list` match the supplied predicate
217+ function.
218+
219+ Type: count :: (a -> bool) -> [a] -> int
182220
183221 Example:
184222 count (x: x == 3) [ 3 2 3 4 6 ]
185223 => 2
186224 */
187− count = pred: foldl' (c: x: if pred x then c + 1 else c) 0;
225+ count =
226+ # Predicate
227+ pred: foldl' (c: x: if pred x then c + 1 else c) 0;
188228
189229 /* Return a singleton list or an empty list, depending on a boolean
190230 value. Useful when building lists with optional elements
191231 (e.g. `++ optional (system == "i686-linux") flashplayer').
192232
233+ Type: optional :: bool -> a -> [a]
234+
193235 Example:
194236 optional true "foo"
195237 => [ "foo" ]
@@ -200,13 +242,19 @@ rec {
200242
201243 /* Return a list or an empty list, depending on a boolean value.
202244
245+ Type: optionals :: bool -> [a] -> [a]
246+
203247 Example:
204248 optionals true [ 2 3 ]
205249 => [ 2 3 ]
206250 optionals false [ 2 3 ]
207251 => [ ]
208252 */
209− optionals = cond: elems: if cond then elems else [];
253+ optionals =
254+ # Condition
255+ cond:
256+ # List to return if condition is true
257+ elems: if cond then elems else [];
210258
211259
212260 /* If argument is a list, return it; else, wrap it in a singleton
@@ -223,20 +271,28 @@ rec {
223271
224272 /* Return a list of integers from `first' up to and including `last'.
225273
274+ Type: range :: int -> int -> [int]
275+
226276 Example:
227277 range 2 4
228278 => [ 2 3 4 ]
229279 range 3 2
230280 => [ ]
231281 */
232− range = first: last:
282+ range =
283+ # First integer in the range
284+ first:
285+ # Last integer in the range
286+ last:
233287 if first > last then
234288 []
235289 else
236290 genList (n: first + n) (last - first + 1);
237291
238− /* Splits the elements of a list in two lists, `right' and
239− `wrong', depending on the evaluation of a predicate.
292+ /* Splits the elements of a list in two lists, `right` and
293+ `wrong`, depending on the evaluation of a predicate.
294+
295+ Type: (a -> bool) -> [a] -> { right :: [a], wrong :: [a] }
240296
241297 Example:
242298 partition (x: x > 2) [ 5 1 2 3 4 ]
@@ -252,7 +308,7 @@ rec {
252308 /* Splits the elements of a list into many lists, using the return value of a predicate.
253309 Predicate should return a string which becomes keys of attrset `groupBy' returns.
254310
255− `groupBy'' allows to customise the combining function and initial value
311+ `groupBy'` allows to customise the combining function and initial value
256312
257313 Example:
258314 groupBy (x: boolToString (x > 2)) [ 5 1 2 3 4 ]
@@ -268,10 +324,6 @@ rec {
268324 xfce = [ { name = "xfce"; script = "xfce4-session &"; } ];
269325 }
270326
271−
272− groupBy' allows to customise the combining function and initial value
273−
274− Example:
275327 groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ]
276328 => { true = 12; false = 3; }
277329 */
@@ -289,17 +341,27 @@ rec {
289341 the merging stops at the shortest. How both lists are merged is defined
290342 by the first argument.
291343
344+ Type: zipListsWith :: (a -> b -> c) -> [a] -> [b] -> [c]
345+
292346 Example:
293347 zipListsWith (a: b: a + b) ["h" "l"] ["e" "o"]
294348 => ["he" "lo"]
295349 */
296− zipListsWith = f: fst: snd:
350+ zipListsWith =
351+ # Function to zip elements of both lists
352+ f:
353+ # First list
354+ fst:
355+ # Second list
356+ snd:
297357 genList
298358 (n: f (elemAt fst n) (elemAt snd n)) (min (length fst) (length snd));
299359
300360 /* Merges two lists of the same size together. If the sizes aren't the same
301361 the merging stops at the shortest.
302362
363+ Type: zipLists :: [a] -> [b] -> [{ fst :: a, snd :: b}]
364+
303365 Example:
304366 zipLists [ 1 2 ] [ "a" "b" ]
305367 => [ { fst = 1; snd = "a"; } { fst = 2; snd = "b"; } ]
@@ -308,6 +370,8 @@ rec {
308370
309371 /* Reverse the order of the elements of a list.
310372
373+ Type: reverseList :: [a] -> [a]
374+
311375 Example:
312376
313377 reverseList [ "b" "o" "j" ]
@@ -321,8 +385,7 @@ rec {
321385 `before a b == true` means that `b` depends on `a` (there's an
322386 edge from `b` to `a`).
323387
324− Examples:
325−
388+ Example:
326389 listDfs true hasPrefix [ "/home/user" "other" "/" "/home" ]
327390 == { minimal = "/"; # minimal element
328391 visited = [ "/home/user" ]; # seen elements (in reverse order)
@@ -336,7 +399,6 @@ rec {
336399 rest = [ "/home" "other" ]; # everything else
337400
338401 */
339−
340402 listDfs = stopOnCycles: before: list:
341403 let
342404 dfs' = us: visited: rest:
@@ -361,7 +423,7 @@ rec {
361423 `before a b == true` means that `b` should be after `a`
362424 in the result.
363425
364− Examples:
426+ Example:
365427
366428 toposort hasPrefix [ "/home/user" "other" "/" "/home" ]
367429 == { result = [ "/" "/home" "/home/user" "other" ]; }
@@ -376,7 +438,6 @@ rec {
376438 toposort (a: b: a < b) [ 3 2 1 ] == { result = [ 1 2 3 ]; }
377439
378440 */
379−
380441 toposort = before: list:
381442 let
382443 dfsthis = listDfs true before list;
@@ -467,26 +528,38 @@ rec {
467528
468529 /* Return the first (at most) N elements of a list.
469530
531+ Type: take :: int -> [a] -> [a]
532+
470533 Example:
471534 take 2 [ "a" "b" "c" "d" ]
472535 => [ "a" "b" ]
473536 take 2 [ ]
474537 => [ ]
475538 */
476− take = count: sublist 0 count;
539+ take =
540+ # Number of elements to take
541+ count: sublist 0 count;
477542
478543 /* Remove the first (at most) N elements of a list.
479544
545+ Type: drop :: int -> [a] -> [a]
546+
480547 Example:
481548 drop 2 [ "a" "b" "c" "d" ]
482549 => [ "c" "d" ]
483550 drop 2 [ ]
484551 => [ ]
485552 */
486− drop = count: list: sublist count (length list) list;
553+ drop =
554+ # Number of elements to drop
555+ count:
556+ # Input list
557+ list: sublist count (length list) list;
558+
559+ /* Return a list consisting of at most `count` elements of `list`,
560+ starting at index `start`.
487561
488− /* Return a list consisting of at most ‘count’ elements of ‘list’,
489− starting at index ‘start’.
562+ Type: sublist :: int -> int -> [a] -> [a]
490563
491564 Example:
492565 sublist 1 3 [ "a" "b" "c" "d" "e" ]
@@ -494,7 +567,13 @@ rec {
494567 sublist 1 3 [ ]
495568 => [ ]
496569 */
497− sublist = start: count: list:
570+ sublist =
571+ # Index at which to start the sublist
572+ start:
573+ # Number of elements to take
574+ count:
575+ # Input list
576+ list:
498577 let len = length list; in
499578 genList
500579 (n: elemAt list (n + start))
@@ -504,6 +583,10 @@ rec {
504583
505584 /* Return the last element of a list.
506585
586+ This function throws an error if the list is empty.
587+
588+ Type: last :: [a] -> a
589+
507590 Example:
508591 last [ 1 2 3 ]
509592 => 3
@@ -512,7 +595,11 @@ rec {
512595 assert lib.assertMsg (list != []) "lists.last: list must not be empty!";
513596 elemAt list (length list - 1);
514597
515− /* Return all elements but the last
598+ /* Return all elements but the last.
599+
600+ This function throws an error if the list is empty.
601+
602+ Type: init :: [a] -> [a]
516603
517604 Example:
518605 init [ 1 2 3 ]
@@ -523,7 +610,7 @@ rec {
523610 take (length list - 1) list;
524611
525612
526− /* return the image of the cross product of some lists by a function
613+ /* Return the image of the cross product of some lists by a function.
527614
528615 Example:
529616 crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]]
@@ -534,8 +621,9 @@ rec {
534621
535622 /* Remove duplicate elements from the list. O(n^2) complexity.
536623
537− Example:
624+ Type: unique :: [a] -> [a]
538625
626+ Example:
539627 unique [ 3 2 3 4 ]
540628 => [ 3 2 4 ]
541629 */
lib/meta.nix+6−5
@@ -41,16 +41,18 @@ rec {
4141 let x = builtins.parseDrvName name; in "${x.name}-${suffix}-${x.version}");
4242
4343
44− /* Apply a function to each derivation and only to derivations in an attrset
44+ /* Apply a function to each derivation and only to derivations in an attrset.
4545 */
4646 mapDerivationAttrset = f: set: lib.mapAttrs (name: pkg: if lib.isDerivation pkg then (f pkg) else pkg) set;
4747
48+ /* Set the nix-env priority of the package.
49+ */
50+ setPrio = priority: addMetaAttrs { inherit priority; };
4851
4952 /* Decrease the nix-env priority of the package, i.e., other
5053 versions/variants of the package will be preferred.
5154 */
52− lowPrio = drv: addMetaAttrs { priority = 10; } drv;
53−
55+ lowPrio = setPrio 10;
5456
5557 /* Apply lowPrio to an attrset with derivations
5658 */
@@ -60,8 +62,7 @@ rec {
6062 /* Increase the nix-env priority of the package, i.e., this
6163 version/variant of the package will be preferred.
6264 */
63− hiPrio = drv: addMetaAttrs { priority = -10; } drv;
64−
65+ hiPrio = setPrio (-10);
6566
6667 /* Apply hiPrio to an attrset with derivations
6768 */
lib/modules.nix+29−5
@@ -450,8 +450,7 @@ rec {
450450
451451 filterOverrides' = defs:
452452 let
453− defaultPrio = 100;
454− getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPrio;
453+ getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPriority;
455454 highestPrio = foldl' (prio: def: min (getPrio def) prio) 9999 defs;
456455 strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def;
457456 in {
@@ -534,6 +533,8 @@ rec {
534533 mkBefore = mkOrder 500;
535534 mkAfter = mkOrder 1500;
536535
536+ # The default priority for things that don't have a priority specified.
537+ defaultPriority = 100;
537538
538539 # Convenient property used to transfer all definitions and their
539540 # properties from one option to another. This property is useful for
@@ -556,8 +557,20 @@ rec {
556557 #
557558 mkAliasDefinitions = mkAliasAndWrapDefinitions id;
558559 mkAliasAndWrapDefinitions = wrap: option:
559− mkIf (isOption option && option.isDefined) (wrap (mkMerge option.definitions));
560+ mkAliasIfDef option (wrap (mkMerge option.definitions));
560561
562+ # Similar to mkAliasAndWrapDefinitions but copies over the priority from the
563+ # option as well.
564+ #
565+ # If a priority is not set, it assumes a priority of defaultPriority.
566+ mkAliasAndWrapDefsWithPriority = wrap: option:
567+ let
568+ prio = option.highestPrio or defaultPriority;
569+ defsWithPrio = map (mkOverride prio) option.definitions;
570+ in mkAliasIfDef option (wrap (mkMerge defsWithPrio));
571+
572+ mkAliasIfDef = option:
573+ mkIf (isOption option && option.isDefined);
561574
562575 /* Compatibility. */
563576 fixMergeModules = modules: args: evalModules { inherit modules args; check = false; };
@@ -690,7 +703,16 @@ rec {
690703 use = id;
691704 };
692705
693− doRename = { from, to, visible, warn, use }:
706+ /* Like ‘mkAliasOptionModule’, but copy over the priority of the option as well. */
707+ mkAliasOptionModuleWithPriority = from: to: doRename {
708+ inherit from to;
709+ visible = true;
710+ warn = false;
711+ use = id;
712+ withPriority = true;
713+ };
714+
715+ doRename = { from, to, visible, warn, use, withPriority ? false }:
694716 { config, options, ... }:
695717 let
696718 fromOpt = getAttrFromPath from options;
@@ -708,7 +730,9 @@ rec {
708730 warnings = optional (warn && fromOpt.isDefined)
709731 "The option `${showOption from}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption to}'.";
710732 }
711− (mkAliasAndWrapDefinitions (setAttrByPath to) fromOpt)
733+ (if withPriority
734+ then mkAliasAndWrapDefsWithPriority (setAttrByPath to) fromOpt
735+ else mkAliasAndWrapDefinitions (setAttrByPath to) fromOpt)
712736 ];
713737 };
714738
lib/options.nix+88−67
@@ -8,61 +8,72 @@ with lib.strings;
88
99rec {
1010
11− # Returns true when the given argument is an option
12− #
13− # Examples:
14− # isOption 1 // => false
15− # isOption (mkOption {}) // => true
11+ /* Returns true when the given argument is an option
12+
13+ Type: isOption :: a -> bool
14+
15+ Example:
16+ isOption 1 // => false
17+ isOption (mkOption {}) // => true
18+ */
1619 isOption = lib.isType "option";
1720
18− # Creates an Option attribute set. mkOption accepts an attribute set with the following keys:
19− #
20− # default: Default value used when no definition is given in the configuration.
21− # defaultText: Textual representation of the default, for in the manual.
22− # example: Example value used in the manual.
23− # description: String describing the option.
24− # type: Option type, providing type-checking and value merging.
25− # apply: Function that converts the option value to something else.
26− # internal: Whether the option is for NixOS developers only.
27− # visible: Whether the option shows up in the manual.
28− # readOnly: Whether the option can be set only once
29− # options: Obsolete, used by types.optionSet.
30− #
31− # All keys default to `null` when not given.
32− #
33− # Examples:
34− # mkOption { } // => { _type = "option"; }
35− # mkOption { defaultText = "foo"; } // => { _type = "option"; defaultText = "foo"; }
21+ /* Creates an Option attribute set. mkOption accepts an attribute set with the following keys:
22+
23+ All keys default to `null` when not given.
24+
25+ Example:
26+ mkOption { } // => { _type = "option"; }
27+ mkOption { defaultText = "foo"; } // => { _type = "option"; defaultText = "foo"; }
28+ */
3629 mkOption =
37− { default ? null # Default value used when no definition is given in the configuration.
38− , defaultText ? null # Textual representation of the default, for in the manual.
39− , example ? null # Example value used in the manual.
40− , description ? null # String describing the option.
41− , relatedPackages ? null # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix).
42− , type ? null # Option type, providing type-checking and value merging.
43− , apply ? null # Function that converts the option value to something else.
44− , internal ? null # Whether the option is for NixOS developers only.
45− , visible ? null # Whether the option shows up in the manual.
46− , readOnly ? null # Whether the option can be set only once
47− , options ? null # Obsolete, used by types.optionSet.
30+ {
31+ # Default value used when no definition is given in the configuration.
32+ default ? null,
33+ # Textual representation of the default, for the manual.
34+ defaultText ? null,
35+ # Example value used in the manual.
36+ example ? null,
37+ # String describing the option.
38+ description ? null,
39+ # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix).
40+ relatedPackages ? null,
41+ # Option type, providing type-checking and value merging.
42+ type ? null,
43+ # Function that converts the option value to something else.
44+ apply ? null,
45+ # Whether the option is for NixOS developers only.
46+ internal ? null,
47+ # Whether the option shows up in the manual.
48+ visible ? null,
49+ # Whether the option can be set only once
50+ readOnly ? null,
51+ # Obsolete, used by types.optionSet.
52+ options ? null
4853 } @ attrs:
4954 attrs // { _type = "option"; };
5055
51− # Creates a Option attribute set for a boolean value option i.e an option to be toggled on or off:
52− #
53− # Examples:
54− # mkEnableOption "foo" // => { _type = "option"; default = false; description = "Whether to enable foo."; example = true; type = { ... }; }
55− mkEnableOption = name: mkOption {
56+ /* Creates an Option attribute set for a boolean value option i.e an
57+ option to be toggled on or off:
58+
59+ Example:
60+ mkEnableOption "foo"
61+ => { _type = "option"; default = false; description = "Whether to enable foo."; example = true; type = { ... }; }
62+ */
63+ mkEnableOption =
64+ # Name for the created option
65+ name: mkOption {
5666 default = false;
5767 example = true;
5868 description = "Whether to enable ${name}.";
5969 type = lib.types.bool;
6070 };
6171
62− # This option accept anything, but it does not produce any result. This
63− # is useful for sharing a module across different module sets without
64− # having to implement similar features as long as the value of the options
65− # are not expected.
72+ /* This option accepts anything, but it does not produce any result.
73+
74+ This is useful for sharing a module across different module sets
75+ without having to implement similar features as long as the
76+ values of the options are not accessed. */
6677 mkSinkUndeclaredOptions = attrs: mkOption ({
6778 internal = true;
6879 visible = false;
@@ -102,18 +113,24 @@ rec {
102113 else
103114 val) (head defs).value defs;
104115
105− # Extracts values of all "value" keys of the given list
106− #
107− # Examples:
108− # getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ]
109− # getValues [ ] // => [ ]
116+ /* Extracts values of all "value" keys of the given list.
117+
118+ Type: getValues :: [ { value :: a } ] -> [a]
119+
120+ Example:
121+ getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ]
122+ getValues [ ] // => [ ]
123+ */
110124 getValues = map (x: x.value);
111125
112− # Extracts values of all "file" keys of the given list
113− #
114− # Examples:
115− # getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ]
116− # getFiles [ ] // => [ ]
126+ /* Extracts values of all "file" keys of the given list
127+
128+ Type: getFiles :: [ { file :: a } ] -> [a]
129+
130+ Example:
131+ getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ]
132+ getFiles [ ] // => [ ]
133+ */
117134 getFiles = map (x: x.file);
118135
119136 # Generate documentation template from the list of option declaration like
@@ -146,10 +163,13 @@ rec {
146163
147164
148165 /* This function recursively removes all derivation attributes from
149− `x' except for the `name' attribute. This is to make the
150− generation of `options.xml' much more efficient: the XML
151− representation of derivations is very large (on the order of
152− megabytes) and is not actually used by the manual generator. */
166+ `x` except for the `name` attribute.
167+
168+ This is to make the generation of `options.xml` much more
169+ efficient: the XML representation of derivations is very large
170+ (on the order of megabytes) and is not actually used by the
171+ manual generator.
172+ */
153173 scrubOptionValue = x:
154174 if isDerivation x then
155175 { type = "derivation"; drvPath = x.name; outPath = x.name; name = x.name; }
@@ -158,20 +178,21 @@ rec {
158178 else x;
159179
160180
161− /* For use in the ‘example’ option attribute. It causes the given
162− text to be included verbatim in documentation. This is necessary
163− for example values that are not simple values, e.g.,
164− functions. */
181+ /* For use in the `example` option attribute. It causes the given
182+ text to be included verbatim in documentation. This is necessary
183+ for example values that are not simple values, e.g., functions.
184+ */
165185 literalExample = text: { _type = "literalExample"; inherit text; };
166186
187+ # Helper functions.
167188
168− /* Helper functions. */
189+ /* Convert an option, described as a list of the option parts in to a
190+ safe, human readable version.
169191
170− # Convert an option, described as a list of the option parts in to a
171− # safe, human readable version. ie:
172− #
173− # (showOption ["foo" "bar" "baz"]) == "foo.bar.baz"
174− # (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux"
192+ Example:
193+ (showOption ["foo" "bar" "baz"]) == "foo.bar.baz"
194+ (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux"
195+ */
175196 showOption = parts: let
176197 escapeOptionPart = part:
177198 let
lib/sources.nix+3−3
@@ -73,7 +73,7 @@ rec {
7373 # Get the commit id of a git repo
7474 # Example: commitIdFromGitRepo <nixpkgs/.git>
7575 commitIdFromGitRepo =
76− let readCommitFromFile = path: file:
76+ let readCommitFromFile = file: path:
7777 with builtins;
7878 let fileName = toString path + "/" + file;
7979 packedRefsName = toString path + "/packed-refs";
@@ -85,7 +85,7 @@ rec {
8585 matchRef = match "^ref: (.*)$" fileContent;
8686 in if isNull matchRef
8787 then fileContent
88− else readCommitFromFile path (lib.head matchRef)
88+ else readCommitFromFile (lib.head matchRef) path
8989 # Sometimes, the file isn't there at all and has been packed away in the
9090 # packed-refs file, so we have to grep through it:
9191 else if lib.pathExists packedRefsName
@@ -96,7 +96,7 @@ rec {
9696 then throw ("Could not find " + file + " in " + packedRefsName)
9797 else lib.head matchRef
9898 else throw ("Not a .git directory: " + path);
99− in lib.flip readCommitFromFile "HEAD";
99+ in readCommitFromFile "HEAD";
100100
101101 pathHasContext = builtins.hasContext or (lib.hasPrefix builtins.storeDir);
102102
lib/strings.nix+178−73
@@ -12,6 +12,8 @@ rec {
1212
1313 /* Concatenate a list of strings.
1414
15+ Type: concatStrings :: [string] -> string
16+
1517 Example:
1618 concatStrings ["foo" "bar"]
1719 => "foobar"
@@ -20,15 +22,19 @@ rec {
2022
2123 /* Map a function over a list and concatenate the resulting strings.
2224
25+ Type: concatMapStrings :: (a -> string) -> [a] -> string
26+
2327 Example:
2428 concatMapStrings (x: "a" + x) ["foo" "bar"]
2529 => "afooabar"
2630 */
2731 concatMapStrings = f: list: concatStrings (map f list);
2832
29− /* Like `concatMapStrings' except that the f functions also gets the
33+ /* Like `concatMapStrings` except that the f functions also gets the
3034 position as a parameter.
3135
36+ Type: concatImapStrings :: (int -> a -> string) -> [a] -> string
37+
3238 Example:
3339 concatImapStrings (pos: x: "${toString pos}-${x}") ["foo" "bar"]
3440 => "1-foo2-bar"
@@ -37,17 +43,25 @@ rec {
3743
3844 /* Place an element between each element of a list
3945
46+ Type: intersperse :: a -> [a] -> [a]
47+
4048 Example:
4149 intersperse "/" ["usr" "local" "bin"]
4250 => ["usr" "/" "local" "/" "bin"].
4351 */
44− intersperse = separator: list:
52+ intersperse =
53+ # Separator to add between elements
54+ separator:
55+ # Input list
56+ list:
4557 if list == [] || length list == 1
4658 then list
4759 else tail (lib.concatMap (x: [separator x]) list);
4860
4961 /* Concatenate a list of strings with a separator between each element
5062
63+ Type: concatStringsSep :: string -> [string] -> string
64+
5165 Example:
5266 concatStringsSep "/" ["usr" "local" "bin"]
5367 => "usr/local/bin"
@@ -55,43 +69,77 @@ rec {
5569 concatStringsSep = builtins.concatStringsSep or (separator: list:
5670 concatStrings (intersperse separator list));
5771
58− /* First maps over the list and then concatenates it.
72+ /* Maps a function over a list of strings and then concatenates the
73+ result with the specified separator interspersed between
74+ elements.
75+
76+ Type: concatMapStringsSep :: string -> (string -> string) -> [string] -> string
5977
6078 Example:
6179 concatMapStringsSep "-" (x: toUpper x) ["foo" "bar" "baz"]
6280 => "FOO-BAR-BAZ"
6381 */
64− concatMapStringsSep = sep: f: list: concatStringsSep sep (map f list);
82+ concatMapStringsSep =
83+ # Separator to add between elements
84+ sep:
85+ # Function to map over the list
86+ f:
87+ # List of input strings
88+ list: concatStringsSep sep (map f list);
6589
66− /* First imaps over the list and then concatenates it.
90+ /* Same as `concatMapStringsSep`, but the mapping function
91+ additionally receives the position of its argument.
6792
68− Example:
93+ Type: concatMapStringsSep :: string -> (int -> string -> string) -> [string] -> string
6994
95+ Example:
7096 concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ]
7197 => "6-3-2"
7298 */
73− concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap1 f list);
99+ concatImapStringsSep =
100+ # Separator to add between elements
101+ sep:
102+ # Function that receives elements and their positions
103+ f:
104+ # List of input strings
105+ list: concatStringsSep sep (lib.imap1 f list);
106+
107+ /* Construct a Unix-style, colon-separated search path consisting of
108+ the given `subDir` appended to each of the given paths.
74109
75− /* Construct a Unix-style search path consisting of each `subDir"
76− directory of the given list of packages.
110+ Type: makeSearchPath :: string -> [string] -> string
77111
78112 Example:
79113 makeSearchPath "bin" ["/root" "/usr" "/usr/local"]
80114 => "/root/bin:/usr/bin:/usr/local/bin"
81− makeSearchPath "bin" ["/"]
82− => "//bin"
115+ makeSearchPath "bin" [""]
116+ => "/bin"
83117 */
84− makeSearchPath = subDir: packages:
85− concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) packages));
118+ makeSearchPath =
119+ # Directory name to append
120+ subDir:
121+ # List of base paths
122+ paths:
123+ concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) paths));
86124
87− /* Construct a Unix-style search path, using given package output.
88− If no output is found, fallback to `.out` and then to the default.
125+ /* Construct a Unix-style search path by appending the given
126+ `subDir` to the specified `output` of each of the packages. If no
127+ output by the given name is found, fallback to `.out` and then to
128+ the default.
129+
130+ Type: string -> string -> [package] -> string
89131
90132 Example:
91133 makeSearchPathOutput "dev" "bin" [ pkgs.openssl pkgs.zlib ]
92134 => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin"
93135 */
94− makeSearchPathOutput = output: subDir: pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs);
136+ makeSearchPathOutput =
137+ # Package output to use
138+ output:
139+ # Directory name to append
140+ subDir:
141+ # List of packages
142+ pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs);
95143
96144 /* Construct a library search path (such as RPATH) containing the
97145 libraries for a set of packages
@@ -114,64 +162,80 @@ rec {
114162 */
115163 makeBinPath = makeSearchPathOutput "bin" "bin";
116164
117−
118− /* Construct a perl search path (such as $PERL5LIB)
119−
120− FIXME(zimbatm): this should be moved in perl-specific code
121−
122− Example:
123− pkgs = import <nixpkgs> { }
124− makePerlPath [ pkgs.perlPackages.libnet ]
125− => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl"
126− */
127− makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl";
128−
129− /* Construct a perl search path recursively including all dependencies (such as $PERL5LIB)
130−
131− Example:
132− pkgs = import <nixpkgs> { }
133− makeFullPerlPath [ pkgs.perlPackages.CGI ]
134− => "/nix/store/fddivfrdc1xql02h9q500fpnqy12c74n-perl-CGI-4.38/lib/perl5/site_perl:/nix/store/8hsvdalmsxqkjg0c5ifigpf31vc4vsy2-perl-HTML-Parser-3.72/lib/perl5/site_perl:/nix/store/zhc7wh0xl8hz3y3f71nhlw1559iyvzld-perl-HTML-Tagset-3.20/lib/perl5/site_perl"
135− */
136− makeFullPerlPath = deps: makePerlPath (lib.misc.closePropagation deps);
137−
138165 /* Depending on the boolean `cond', return either the given string
139166 or the empty string. Useful to concatenate against a bigger string.
140167
168+ Type: optionalString :: bool -> string -> string
169+
141170 Example:
142171 optionalString true "some-string"
143172 => "some-string"
144173 optionalString false "some-string"
145174 => ""
146175 */
147− optionalString = cond: string: if cond then string else "";
176+ optionalString =
177+ # Condition
178+ cond:
179+ # String to return if condition is true
180+ string: if cond then string else "";
148181
149182 /* Determine whether a string has given prefix.
150183
184+ Type: hasPrefix :: string -> string -> bool
185+
151186 Example:
152187 hasPrefix "foo" "foobar"
153188 => true
154189 hasPrefix "foo" "barfoo"
155190 => false
156191 */
157− hasPrefix = pref: str:
158− substring 0 (stringLength pref) str == pref;
192+ hasPrefix =
193+ # Prefix to check for
194+ pref:
195+ # Input string
196+ str: substring 0 (stringLength pref) str == pref;
159197
160198 /* Determine whether a string has given suffix.
161199
200+ Type: hasSuffix :: string -> string -> bool
201+
162202 Example:
163203 hasSuffix "foo" "foobar"
164204 => false
165205 hasSuffix "foo" "barfoo"
166206 => true
167207 */
168− hasSuffix = suffix: content:
208+ hasSuffix =
209+ # Suffix to check for
210+ suffix:
211+ # Input string
212+ content:
169213 let
170214 lenContent = stringLength content;
171215 lenSuffix = stringLength suffix;
172216 in lenContent >= lenSuffix &&
173217 substring (lenContent - lenSuffix) lenContent content == suffix;
174218
219+ /* Determine whether a string contains the given infix
220+
221+ Type: hasInfix :: string -> string -> bool
222+
223+ Example:
224+ hasInfix "bc" "abcd"
225+ => true
226+ hasInfix "ab" "abcd"
227+ => true
228+ hasInfix "cd" "abcd"
229+ => true
230+ hasInfix "foo" "abcd"
231+ => false
232+ */
233+ hasInfix = infix: content:
234+ let
235+ drop = x: substring 1 (stringLength x) x;
236+ in hasPrefix infix content
237+ || content != "" && hasInfix infix (drop content);
238+
175239 /* Convert a string to a list of characters (i.e. singleton strings).
176240 This allows you to, e.g., map a function over each character. However,
177241 note that this will likely be horribly inefficient; Nix is not a
@@ -180,6 +244,8 @@ rec {
180244 Also note that Nix treats strings as a list of bytes and thus doesn't
181245 handle unicode.
182246
247+ Type: stringtoCharacters :: string -> [string]
248+
183249 Example:
184250 stringToCharacters ""
185251 => [ ]
@@ -194,18 +260,25 @@ rec {
194260 /* Manipulate a string character by character and replace them by
195261 strings before concatenating the results.
196262
263+ Type: stringAsChars :: (string -> string) -> string -> string
264+
197265 Example:
198266 stringAsChars (x: if x == "a" then "i" else x) "nax"
199267 => "nix"
200268 */
201− stringAsChars = f: s:
202− concatStrings (
269+ stringAsChars =
270+ # Function to map over each individual character
271+ f:
272+ # Input string
273+ s: concatStrings (
203274 map f (stringToCharacters s)
204275 );
205276
206− /* Escape occurrence of the elements of ‘list’ in ‘string’ by
277+ /* Escape occurrence of the elements of `list` in `string` by
207278 prefixing it with a backslash.
208279
280+ Type: escape :: [string] -> string -> string
281+
209282 Example:
210283 escape ["(" ")"] "(foo)"
211284 => "\\(foo\\)"
@@ -214,6 +287,8 @@ rec {
214287
215288 /* Quote string to be used safely within the Bourne shell.
216289
290+ Type: escapeShellArg :: string -> string
291+
217292 Example:
218293 escapeShellArg "esc'ape\nme"
219294 => "'esc'\\''ape\nme'"
@@ -222,6 +297,8 @@ rec {
222297
223298 /* Quote all arguments to be safely passed to the Bourne shell.
224299
300+ Type: escapeShellArgs :: [string] -> string
301+
225302 Example:
226303 escapeShellArgs ["one" "two three" "four'five"]
227304 => "'one' 'two three' 'four'\\''five'"
@@ -230,13 +307,15 @@ rec {
230307
231308 /* Turn a string into a Nix expression representing that string
232309
310+ Type: string -> string
311+
233312 Example:
234313 escapeNixString "hello\${}\n"
235314 => "\"hello\\\${}\\n\""
236315 */
237316 escapeNixString = s: escape ["$"] (builtins.toJSON s);
238317
239− /* Obsolete - use replaceStrings instead. */
318+ # Obsolete - use replaceStrings instead.
240319 replaceChars = builtins.replaceStrings or (
241320 del: new: s:
242321 let
@@ -256,6 +335,8 @@ rec {
256335
257336 /* Converts an ASCII string to lower-case.
258337
338+ Type: toLower :: string -> string
339+
259340 Example:
260341 toLower "HOME"
261342 => "home"
@@ -264,6 +345,8 @@ rec {
264345
265346 /* Converts an ASCII string to upper-case.
266347
348+ Type: toUpper :: string -> string
349+
267350 Example:
268351 toUpper "home"
269352 => "HOME"
@@ -273,7 +356,7 @@ rec {
273356 /* Appends string context from another string. This is an implementation
274357 detail of Nix.
275358
276− Strings in Nix carry an invisible `context' which is a list of strings
359+ Strings in Nix carry an invisible `context` which is a list of strings
277360 representing store paths. If the string is later used in a derivation
278361 attribute, the derivation will properly populate the inputDrvs and
279362 inputSrcs.
@@ -319,8 +402,9 @@ rec {
319402 in
320403 recurse 0 0;
321404
322− /* Return the suffix of the second argument if the first argument matches
323− its prefix.
405+ /* Return a string without the specified prefix, if the prefix matches.
406+
407+ Type: string -> string -> string
324408
325409 Example:
326410 removePrefix "foo." "foo.bar.baz"
@@ -328,18 +412,23 @@ rec {
328412 removePrefix "xxx" "foo.bar.baz"
329413 => "foo.bar.baz"
330414 */
331− removePrefix = pre: s:
415+ removePrefix =
416+ # Prefix to remove if it matches
417+ prefix:
418+ # Input string
419+ str:
332420 let
333− preLen = stringLength pre;
334− sLen = stringLength s;
421+ preLen = stringLength prefix;
422+ sLen = stringLength str;
335423 in
336− if hasPrefix pre s then
337− substring preLen (sLen - preLen) s
424+ if hasPrefix prefix str then
425+ substring preLen (sLen - preLen) str
338426 else
339− s;
427+ str;
428+
429+ /* Return a string without the specified suffix, if the suffix matches.
340430
341− /* Return the prefix of the second argument if the first argument matches
342− its suffix.
431+ Type: string -> string -> string
343432
344433 Example:
345434 removeSuffix "front" "homefront"
@@ -347,17 +436,21 @@ rec {
347436 removeSuffix "xxx" "homefront"
348437 => "homefront"
349438 */
350− removeSuffix = suf: s:
439+ removeSuffix =
440+ # Suffix to remove if it matches
441+ suffix:
442+ # Input string
443+ str:
351444 let
352− sufLen = stringLength suf;
353− sLen = stringLength s;
445+ sufLen = stringLength suffix;
446+ sLen = stringLength str;
354447 in
355− if sufLen <= sLen && suf == substring (sLen - sufLen) sufLen s then
356− substring 0 (sLen - sufLen) s
448+ if sufLen <= sLen && suffix == substring (sLen - sufLen) sufLen str then
449+ substring 0 (sLen - sufLen) str
357450 else
358− s;
451+ str;
359452
360− /* Return true iff string v1 denotes a version older than v2.
453+ /* Return true if string v1 denotes a version older than v2.
361454
362455 Example:
363456 versionOlder "1.1" "1.2"
@@ -367,7 +460,7 @@ rec {
367460 */
368461 versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
369462
370− /* Return true iff string v1 denotes a version equal to or newer than v2.
463+ /* Return true if string v1 denotes a version equal to or newer than v2.
371464
372465 Example:
373466 versionAtLeast "1.1" "1.0"
@@ -459,6 +552,11 @@ rec {
459552 /* Create a fixed width string with additional prefix to match
460553 required width.
461554
555+ This function will fail if the input string is longer than the
556+ requested length.
557+
558+ Type: fixedWidthString :: int -> string -> string
559+
462560 Example:
463561 fixedWidthString 5 "0" (toString 15)
464562 => "00015"
@@ -502,12 +600,16 @@ rec {
502600 => false
503601 */
504602 isStorePath = x:
505− isCoercibleToString x
506− && builtins.substring 0 1 (toString x) == "/"
507− && dirOf x == builtins.storeDir;
603+ if isCoercibleToString x then
604+ let str = toString x; in
605+ builtins.substring 0 1 str == "/"
606+ && dirOf str == builtins.storeDir
607+ else
608+ false;
508609
509− /* Convert string to int
510− Obviously, it is a bit hacky to use fromJSON that way.
610+ /* Parse a string string as an int.
611+
612+ Type: string -> int
511613
512614 Example:
513615 toInt "1337"
@@ -517,17 +619,18 @@ rec {
517619 toInt "3.14"
518620 => error: floating point JSON numbers are not supported
519621 */
622+ # Obviously, it is a bit hacky to use fromJSON this way.
520623 toInt = str:
521624 let may_be_int = builtins.fromJSON str; in
522625 if builtins.isInt may_be_int
523626 then may_be_int
524627 else throw "Could not convert ${str} to int.";
525628
526− /* Read a list of paths from `file', relative to the `rootPath'. Lines
527− beginning with `#' are treated as comments and ignored. Whitespace
528− is significant.
629+ /* Read a list of paths from `file`, relative to the `rootPath`.
630+ Lines beginning with `#` are treated as comments and ignored.
631+ Whitespace is significant.
529632
530− NOTE: this function is not performant and should be avoided
633+ NOTE: This function is not performant and should be avoided.
531634
532635 Example:
533636 readPathsFromFile /prefix
@@ -549,6 +652,8 @@ rec {
549652
550653 /* Read the contents of a file removing the trailing \n
551654
655+ Type: fileContents :: path -> string
656+
552657 Example:
553658 $ echo "1.0" > ./version
554659
lib/systems/default.nix+60
@@ -32,6 +32,7 @@ rec {
3232 else if final.isUClibc then "uclibc"
3333 else if final.isAndroid then "bionic"
3434 else if final.isLinux /* default */ then "glibc"
35+ else if final.isAvr then "avrlibc"
3536 # TODO(@Ericson2314) think more about other operating systems
3637 else "native/impure";
3738 extensions = {
@@ -46,6 +47,65 @@ rec {
4647 # Misc boolean options
4748 useAndroidPrebuilt = false;
4849 useiOSPrebuilt = false;
50+
51+ # Output from uname
52+ uname = {
53+ # uname -s
54+ system = {
55+ "linux" = "Linux";
56+ "windows" = "Windows";
57+ "darwin" = "Darwin";
58+ "netbsd" = "NetBSD";
59+ "freebsd" = "FreeBSD";
60+ "openbsd" = "OpenBSD";
61+ }.${final.parsed.kernel.name} or null;
62+
63+ # uname -p
64+ processor = final.parsed.cpu.name;
65+
66+ # uname -r
67+ release = null;
68+ };
69+
70+ qemuArch =
71+ if final.isArm then "arm"
72+ else if final.isx86_64 then "x86_64"
73+ else if final.isx86 then "i386"
74+ else {
75+ "powerpc" = "ppc";
76+ "powerpc64" = "ppc64";
77+ "powerpc64le" = "ppc64";
78+ "mips64" = "mips";
79+ "mipsel64" = "mipsel";
80+ }.${final.parsed.cpu.name} or final.parsed.cpu.name;
81+
82+ emulator = pkgs: let
83+ qemu-user = pkgs.qemu.override {
84+ smartcardSupport = false;
85+ spiceSupport = false;
86+ openGLSupport = false;
87+ virglSupport = false;
88+ vncSupport = false;
89+ gtkSupport = false;
90+ sdlSupport = false;
91+ pulseSupport = false;
92+ smbdSupport = false;
93+ seccompSupport = false;
94+ hostCpuTargets = ["${final.qemuArch}-linux-user"];
95+ };
96+ wine-name = "wine${toString final.parsed.cpu.bits}";
97+ wine = (pkgs.winePackagesFor wine-name).minimal;
98+ in
99+ if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name &&
100+ (final.parsed.cpu.name == pkgs.stdenv.hostPlatform.parsed.cpu.name ||
101+ (final.isi686 && pkgs.stdenv.hostPlatform.isx86_64))
102+ then pkgs.runtimeShell
103+ else if final.isWindows
104+ then "${wine}/bin/${wine-name}"
105+ else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux
106+ then "${qemu-user}/bin/qemu-${final.qemuArch}"
107+ else throw "Don't know how to run ${final.config} executables.";
108+
49109 } // mapAttrs (n: v: v final.parsed) inspect.predicates
50110 // args;
51111 in assert final.useAndroidPrebuilt -> final.isAndroid;
lib/systems/doubles.nix+4−1
@@ -15,6 +15,8 @@ let
1515
1616 "x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux"
1717 "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris"
18+
19+ "x86_64-windows" "i686-windows"
1820 ];
1921
2022 allParsed = map parse.mkSystemFromString all;
@@ -37,12 +39,13 @@ in rec {
3739 darwin = filterDoubles predicates.isDarwin;
3840 freebsd = filterDoubles predicates.isFreeBSD;
3941 # Should be better, but MinGW is unclear.
40− gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; });
42+ gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; });
4143 illumos = filterDoubles predicates.isSunOS;
4244 linux = filterDoubles predicates.isLinux;
4345 netbsd = filterDoubles predicates.isNetBSD;
4446 openbsd = filterDoubles predicates.isOpenBSD;
4547 unix = filterDoubles predicates.isUnix;
48+ windows = filterDoubles predicates.isWindows;
4649
4750 mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "powerpc64le-linux"];
4851}
lib/systems/examples.nix+58−8
@@ -2,7 +2,14 @@
22# `crossSystem`. They are put here for user convenience, but also used by cross
33# tests and linux cross stdenv building, so handle with care!
44{ lib }:
5−let platforms = import ./platforms.nix { inherit lib; }; in
5+let
6+ platforms = import ./platforms.nix { inherit lib; };
7+
8+ riscv = bits: {
9+ config = "riscv${bits}-unknown-linux-gnu";
10+ platform = platforms.riscv-multiplatform bits;
11+ };
12+in
613
714rec {
815 #
@@ -40,7 +47,7 @@ rec {
4047 armv5te-android-prebuilt = rec {
4148 config = "armv5tel-unknown-linux-androideabi";
4249 sdkVer = "21";
43− ndkVer = "10e";
50+ ndkVer = "18b";
4451 platform = platforms.armv5te-android;
4552 useAndroidPrebuilt = true;
4653 };
@@ -48,7 +55,7 @@ rec {
4855 armv7a-android-prebuilt = rec {
4956 config = "armv7a-unknown-linux-androideabi";
5057 sdkVer = "24";
51− ndkVer = "17c";
58+ ndkVer = "18b";
5259 platform = platforms.armv7a-android;
5360 useAndroidPrebuilt = true;
5461 };
@@ -56,7 +63,7 @@ rec {
5663 aarch64-android-prebuilt = rec {
5764 config = "aarch64-unknown-linux-android";
5865 sdkVer = "24";
59− ndkVer = "17c";
66+ ndkVer = "18b";
6067 platform = platforms.aarch64-multiplatform;
6168 useAndroidPrebuilt = true;
6269 };
@@ -92,13 +99,56 @@ rec {
9299 musl64 = { config = "x86_64-unknown-linux-musl"; };
93100 musl32 = { config = "i686-unknown-linux-musl"; };
94101
95− riscv = bits: {
96− config = "riscv${bits}-unknown-linux-gnu";
97− platform = platforms.riscv-multiplatform bits;
98− };
99102 riscv64 = riscv "64";
100103 riscv32 = riscv "32";
101104
105+ avr = {
106+ config = "avr";
107+ };
108+
109+ arm-embedded = {
110+ config = "arm-none-eabi";
111+ libc = "newlib";
112+ };
113+ armhf-embedded = {
114+ config = "arm-none-eabihf";
115+ libc = "newlib";
116+ };
117+
118+ aarch64-embedded = {
119+ config = "aarch64-none-elf";
120+ libc = "newlib";
121+ };
122+
123+ aarch64be-embedded = {
124+ config = "aarch64_be-none-elf";
125+ libc = "newlib";
126+ };
127+
128+ ppc-embedded = {
129+ config = "powerpc-none-eabi";
130+ libc = "newlib";
131+ };
132+
133+ ppcle-embedded = {
134+ config = "powerpcle-none-eabi";
135+ libc = "newlib";
136+ };
137+
138+ alpha-embedded = {
139+ config = "alpha-elf";
140+ libc = "newlib";
141+ };
142+
143+ i686-embedded = {
144+ config = "i686-elf";
145+ libc = "newlib";
146+ };
147+
148+ x86_64-embedded = {
149+ config = "x86_64-elf";
150+ libc = "newlib";
151+ };
102152
103153 #
104154 # Darwin
lib/systems/inspect.nix+1
@@ -19,6 +19,7 @@ rec {
1919 isRiscV = { cpu = { family = "riscv"; }; };
2020 isSparc = { cpu = { family = "sparc"; }; };
2121 isWasm = { cpu = { family = "wasm"; }; };
22+ isAvr = { cpu = { family = "avr"; }; };
2223
2324 is32bit = { cpu = { bits = 32; }; };
2425 is64bit = { cpu = { bits = 64; }; };
lib/systems/parse.nix+34−4
@@ -80,7 +80,11 @@ rec {
8080 armv8r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; };
8181 armv8m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; };
8282 aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; };
83+ aarch64_be = { bits = 64; significantByte = bigEndian; family = "arm"; version = "8"; };
8384
85+ i386 = { bits = 32; significantByte = littleEndian; family = "x86"; };
86+ i486 = { bits = 32; significantByte = littleEndian; family = "x86"; };
87+ i586 = { bits = 32; significantByte = littleEndian; family = "x86"; };
8488 i686 = { bits = 32; significantByte = littleEndian; family = "x86"; };
8589 x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; };
8690
@@ -92,6 +96,7 @@ rec {
9296 powerpc = { bits = 32; significantByte = bigEndian; family = "power"; };
9397 powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; };
9498 powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; };
99+ powerpcle = { bits = 32; significantByte = littleEndian; family = "power"; };
95100
96101 riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; };
97102 riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; };
@@ -101,6 +106,10 @@ rec {
101106
102107 wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; };
103108 wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; };
109+
110+ alpha = { bits = 64; significantByte = littleEndian; family = "alpha"; };
111+
112+ avr = { bits = 8; family = "avr"; };
104113 };
105114
106115 ################################################################################
@@ -117,6 +126,7 @@ rec {
117126 apple = {};
118127 pc = {};
119128
129+ none = {};
120130 unknown = {};
121131 };
122132
@@ -199,7 +209,15 @@ rec {
199209 abis = setTypes types.openAbi {
200210 cygnus = {};
201211 msvc = {};
202− eabi = {};
212+
213+ # Note: eabi is specific to ARM and PowerPC.
214+ # On PowerPC, this corresponds to PPCEABI.
215+ # On ARM, this corresponds to ARMEABI.
216+ eabi = { float = "soft"; };
217+ eabihf = { float = "hard"; };
218+
219+ # Other architectures should use ELF in embedded situations.
220+ elf = {};
203221
204222 androideabi = {};
205223 android = {
@@ -255,9 +273,20 @@ rec {
255273 setType "system" components;
256274
257275 mkSkeletonFromList = l: {
276+ "1" = if elemAt l 0 == "avr"
277+ then { cpu = elemAt l 0; kernel = "none"; abi = "unknown"; }
278+ else throw "Target specification with 1 components is ambiguous";
258279 "2" = # We only do 2-part hacks for things Nix already supports
259280 if elemAt l 1 == "cygwin"
260281 then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; }
282+ # MSVC ought to be the default ABI so this case isn't needed. But then it
283+ # becomes difficult to handle the gnu* variants for Aarch32 correctly for
284+ # minGW. So it's easier to make gnu* the default for the MinGW, but
285+ # hack-in MSVC for the non-MinGW case right here.
286+ else if elemAt l 1 == "windows"
287+ then { cpu = elemAt l 0; kernel = "windows"; abi = "msvc"; }
288+ else if (elemAt l 1) == "elf"
289+ then { cpu = elemAt l 0; vendor = "unknown"; kernel = "none"; abi = elemAt l 1; }
261290 else { cpu = elemAt l 0; kernel = elemAt l 1; };
262291 "3" = # Awkwards hacks, beware!
263292 if elemAt l 1 == "apple"
@@ -265,9 +294,11 @@ rec {
265294 else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu")
266295 then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; }
267296 else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window
268− then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; abi = "gnu"; }
297+ then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; }
269298 else if hasPrefix "netbsd" (elemAt l 2)
270299 then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
300+ else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
301+ then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 1; abi = elemAt l 2; }
271302 else throw "Target specification with 3 components is ambiguous";
272303 "4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
273304 }.${toString (length l)}
@@ -299,13 +330,12 @@ rec {
299330 else getKernel args.kernel;
300331 abi =
301332 /**/ if args ? abi then getAbi args.abi
302− else if isLinux parsed then
333+ else if isLinux parsed || isWindows parsed then
303334 if isAarch32 parsed then
304335 if lib.versionAtLeast (parsed.cpu.version or "0") "6"
305336 then abis.gnueabihf
306337 else abis.gnueabi
307338 else abis.gnu
308− else if isWindows parsed then abis.gnu
309339 else abis.unknown;
310340 };
311341
lib/systems/platforms.nix+1
@@ -471,6 +471,7 @@ rec {
471471 "x86_64-linux" = pc64;
472472 "armv5tel-linux" = sheevaplug;
473473 "armv6l-linux" = raspberrypi;
474+ "armv7a-linux" = armv7l-hf-multiplatform;
474475 "armv7l-linux" = armv7l-hf-multiplatform;
475476 "aarch64-linux" = aarch64-multiplatform;
476477 "mipsel-linux" = fuloong2f_n32;
lib/tests/misc.nix+3−39
@@ -112,7 +112,7 @@ runTests {
112112 storePathAppendix = isStorePath
113113 "${goodPath}/bin/python";
114114 nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath)));
115− asPath = isStorePath goodPath;
115+ asPath = isStorePath (/. + goodPath);
116116 otherPath = isStorePath "/something/else";
117117 otherVals = {
118118 attrset = isStorePath {};
@@ -369,6 +369,7 @@ runTests {
369369 testToPretty = {
370370 expr = mapAttrs (const (generators.toPretty {})) rec {
371371 int = 42;
372+ float = 0.1337;
372373 bool = true;
373374 string = ''fno"rd'';
374375 path = /. + "/foo";
@@ -381,6 +382,7 @@ runTests {
381382 };
382383 expected = rec {
383384 int = "42";
385+ float = "~0.133700";
384386 bool = "true";
385387 string = ''"fno\"rd"'';
386388 path = "/foo";
@@ -399,42 +401,4 @@ runTests {
399401 expected = "«foo»";
400402 };
401403
402−
403−# MISC
404−
405− testOverridableDelayableArgsTest = {
406− expr =
407− let res1 = defaultOverridableDelayableArgs id {};
408− res2 = defaultOverridableDelayableArgs id { a = 7; };
409− res3 = let x = defaultOverridableDelayableArgs id { a = 7; };
410− in (x.merge) { b = 10; };
411− res4 = let x = defaultOverridableDelayableArgs id { a = 7; };
412− in (x.merge) ( x: { b = 10; });
413− res5 = let x = defaultOverridableDelayableArgs id { a = 7; };
414− in (x.merge) ( x: { a = builtins.add x.a 3; });
415− res6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = builtins.add; }; };
416− y = x.merge {};
417− in (y.merge) { a = 10; };
418−
419− resRem7 = res6.replace (a: removeAttrs a ["a"]);
420−
421− # fixed tests (delayed args): (when using them add some comments, please)
422− resFixed1 =
423− let x = defaultOverridableDelayableArgs id ( x: { a = 7; c = x.fixed.b; });
424− y = x.merge (x: { name = "name-${builtins.toString x.fixed.c}"; });
425− in (y.merge) { b = 10; };
426− strip = attrs: removeAttrs attrs ["merge" "replace"];
427− in all id
428− [ ((strip res1) == { })
429− ((strip res2) == { a = 7; })
430− ((strip res3) == { a = 7; b = 10; })
431− ((strip res4) == { a = 7; b = 10; })
432− ((strip res5) == { a = 10; })
433− ((strip res6) == { a = 17; })
434− ((strip resRem7) == {})
435− ((strip resFixed1) == { a = 7; b = 10; c =10; name = "name-10"; })
436− ];
437− expected = true;
438− };
439−
440404}
lib/tests/modules.sh+6
@@ -149,6 +149,12 @@ checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.ni
149149# Check loaOf with many merges of lists.
150150checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix
151151
152+# Check mkAliasOptionModuleWithPriority.
153+checkConfigOutput "true" config.enable ./alias-with-priority.nix
154+checkConfigOutput "true" config.enableAlias ./alias-with-priority.nix
155+checkConfigOutput "false" config.enable ./alias-with-priority-can-override.nix
156+checkConfigOutput "false" config.enableAlias ./alias-with-priority-can-override.nix
157+
152158cat <<EOF
153159====== module tests ======
154160$pass Pass
lib/tests/modules/alias-with-priority-can-override.nixnew file+52
@@ -0,0 +1,52 @@
1+# This is a test to show that mkAliasOptionModule sets the priority correctly
2+# for aliased options.
3+
4+{ config, lib, ... }:
5+
6+with lib;
7+
8+{
9+ options = {
10+ # A simple boolean option that can be enabled or disabled.
11+ enable = lib.mkOption {
12+ type = types.nullOr types.bool;
13+ default = null;
14+ example = true;
15+ description = ''
16+ Some descriptive text
17+ '';
18+ };
19+
20+ # mkAliasOptionModule sets warnings, so this has to be defined.
21+ warnings = mkOption {
22+ internal = true;
23+ default = [];
24+ type = types.listOf types.str;
25+ example = [ "The `foo' service is deprecated and will go away soon!" ];
26+ description = ''
27+ This option allows modules to show warnings to users during
28+ the evaluation of the system configuration.
29+ '';
30+ };
31+ };
32+
33+ imports = [
34+ # Create an alias for the "enable" option.
35+ (mkAliasOptionModuleWithPriority [ "enableAlias" ] [ "enable" ])
36+
37+ # Disable the aliased option, but with a default (low) priority so it
38+ # should be able to be overridden by the next import.
39+ ( { config, lib, ... }:
40+ {
41+ enableAlias = lib.mkForce false;
42+ }
43+ )
44+
45+ # Enable the normal (non-aliased) option.
46+ ( { config, lib, ... }:
47+ {
48+ enable = true;
49+ }
50+ )
51+ ];
52+}
lib/tests/modules/alias-with-priority.nixnew file+52
@@ -0,0 +1,52 @@
1+# This is a test to show that mkAliasOptionModule sets the priority correctly
2+# for aliased options.
3+
4+{ config, lib, ... }:
5+
6+with lib;
7+
8+{
9+ options = {
10+ # A simple boolean option that can be enabled or disabled.
11+ enable = lib.mkOption {
12+ type = types.nullOr types.bool;
13+ default = null;
14+ example = true;
15+ description = ''
16+ Some descriptive text
17+ '';
18+ };
19+
20+ # mkAliasOptionModule sets warnings, so this has to be defined.
21+ warnings = mkOption {
22+ internal = true;
23+ default = [];
24+ type = types.listOf types.str;
25+ example = [ "The `foo' service is deprecated and will go away soon!" ];
26+ description = ''
27+ This option allows modules to show warnings to users during
28+ the evaluation of the system configuration.
29+ '';
30+ };
31+ };
32+
33+ imports = [
34+ # Create an alias for the "enable" option.
35+ (mkAliasOptionModuleWithPriority [ "enableAlias" ] [ "enable" ])
36+
37+ # Disable the aliased option, but with a default (low) priority so it
38+ # should be able to be overridden by the next import.
39+ ( { config, lib, ... }:
40+ {
41+ enableAlias = lib.mkDefault false;
42+ }
43+ )
44+
45+ # Enable the normal (non-aliased) option.
46+ ( { config, lib, ... }:
47+ {
48+ enable = true;
49+ }
50+ )
51+ ];
52+}
lib/tests/systems.nix+15−14
@@ -12,20 +12,21 @@ let
1212 expected = lib.sort lib.lessThan y;
1313 };
1414in with lib.systems.doubles; lib.runTests {
15− all = assertTrue (mseteq all (linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos));
15+ testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ windows);
1616
17− arm = assertTrue (mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]);
18− i686 = assertTrue (mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" ]);
19− mips = assertTrue (mseteq mips [ "mipsel-linux" ]);
20− x86_64 = assertTrue (mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" ]);
17+ testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ];
18+ testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" ];
19+ testmips = mseteq mips [ "mipsel-linux" ];
20+ testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" ];
2121
22− cygwin = assertTrue (mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]);
23− darwin = assertTrue (mseteq darwin [ "x86_64-darwin" ]);
24− freebsd = assertTrue (mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]);
25− gnu = assertTrue (mseteq gnu (linux /* ++ kfreebsd ++ ... */));
26− illumos = assertTrue (mseteq illumos [ "x86_64-solaris" ]);
27− linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ]);
28− netbsd = assertTrue (mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]);
29− openbsd = assertTrue (mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]);
30− unix = assertTrue (mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos));
22+ testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
23+ testdarwin = mseteq darwin [ "x86_64-darwin" ];
24+ testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ];
25+ testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
26+ testillumos = mseteq illumos [ "x86_64-solaris" ];
27+ testlinux = mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ];
28+ testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ];
29+ testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
30+ testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
31+ testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin);
3132}
lib/trivial.nix+94−30
@@ -9,23 +9,37 @@ rec {
99
1010 Type: id :: a -> a
1111 */
12− id = x: x;
12+ id =
13+ # The value to return
14+ x: x;
1315
1416 /* The constant function
15− Ignores the second argument.
16− Or: Construct a function that always returns a static value.
17+
18+ Ignores the second argument. If called with only one argument,
19+ constructs a function that always returns a static value.
1720
1821 Type: const :: a -> b -> a
1922 Example:
2023 let f = const 5; in f 10
2124 => 5
2225 */
23− const = x: y: x;
26+ const =
27+ # Value to return
28+ x:
29+ # Value to ignore
30+ y: x;
2431
2532
2633 ## Named versions corresponding to some builtin operators.
2734
28− /* Concatenate two lists */
35+ /* Concatenate two lists
36+
37+ Type: concat :: [a] -> [a] -> [a]
38+
39+ Example:
40+ concat [ 1 2 ] [ 3 4 ]
41+ => [ 1 2 3 4 ]
42+ */
2943 concat = x: y: x ++ y;
3044
3145 /* boolean “or” */
@@ -53,27 +67,40 @@ rec {
5367 bitNot = builtins.sub (-1);
5468
5569 /* Convert a boolean to a string.
56− Note that toString on a bool returns "1" and "".
70+
71+ This function uses the strings "true" and "false" to represent
72+ boolean values. Calling `toString` on a bool instead returns "1"
73+ and "" (sic!).
74+
75+ Type: boolToString :: bool -> string
5776 */
5877 boolToString = b: if b then "true" else "false";
5978
6079 /* Merge two attribute sets shallowly, right side trumps left
6180
81+ mergeAttrs :: attrs -> attrs -> attrs
82+
6283 Example:
6384 mergeAttrs { a = 1; b = 2; } { b = 3; c = 4; }
6485 => { a = 1; b = 3; c = 4; }
6586 */
66− mergeAttrs = x: y: x // y;
87+ mergeAttrs =
88+ # Left attribute set
89+ x:
90+ # Right attribute set (higher precedence for equal keys)
91+ y: x // y;
6792
6893 /* Flip the order of the arguments of a binary function.
6994
95+ Type: flip :: (a -> b -> c) -> (b -> a -> c)
96+
7097 Example:
7198 flip concat [1] [2]
7299 => [ 2 1 ]
73100 */
74101 flip = f: a: b: f b a;
75102
76− /* Apply function if argument is non-null.
103+ /* Apply function if the supplied argument is non-null.
77104
78105 Example:
79106 mapNullable (x: x+1) null
@@ -81,7 +108,11 @@ rec {
81108 mapNullable (x: x+1) 22
82109 => 23
83110 */
84− mapNullable = f: a: if isNull a then a else f a;
111+ mapNullable =
112+ # Function to call
113+ f:
114+ # Argument to check for null before passing it to `f`
115+ a: if isNull a then a else f a;
85116
86117 # Pull in some builtins not included elsewhere.
87118 inherit (builtins)
@@ -92,21 +123,34 @@ rec {
92123
93124 ## nixpks version strings
94125
95− # The current full nixpkgs version number.
126+ /* Returns the current full nixpkgs version number. */
96127 version = release + versionSuffix;
97128
98− # The current nixpkgs version number as string.
129+ /* Returns the current nixpkgs release number as string. */
99130 release = lib.strings.fileContents ../.version;
100131
101− # The current nixpkgs version suffix as string.
132+ /* Returns the current nixpkgs release code name.
133+
134+ On each release the first letter is bumped and a new animal is chosen
135+ starting with that new letter.
136+ */
137+ codeName = "Koi";
138+
139+ /* Returns the current nixpkgs version suffix as string. */
102140 versionSuffix =
103141 let suffixFile = ../.version-suffix;
104142 in if pathExists suffixFile
105143 then lib.strings.fileContents suffixFile
106144 else "pre-git";
107145
108− # Attempt to get the revision nixpkgs is from
109− revisionWithDefault = default:
146+ /* Attempts to return the the current revision of nixpkgs and
147+ returns the supplied default value otherwise.
148+
149+ Type: revisionWithDefault :: string -> string
150+ */
151+ revisionWithDefault =
152+ # Default value to return if revision can not be determined
153+ default:
110154 let
111155 revisionFile = "${toString ./..}/.git-revision";
112156 gitRepo = "${toString ./..}/.git";
@@ -117,14 +161,20 @@ rec {
117161
118162 nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version;
119163
120− # Whether we're being called by nix-shell.
164+ /* Determine whether the function is being called from inside a Nix
165+ shell.
166+
167+ Type: inNixShell :: bool
168+ */
121169 inNixShell = builtins.getEnv "IN_NIX_SHELL" != "";
122170
123171
124172 ## Integer operations
125173
126− # Return minimum/maximum of two numbers.
174+ /* Return minimum of two numbers. */
127175 min = x: y: if x < y then x else y;
176+
177+ /* Return maximum of two numbers. */
128178 max = x: y: if x > y then x else y;
129179
130180 /* Integer modulus
@@ -158,8 +208,9 @@ rec {
158208 second subtype, compare elements of a single subtype with `yes`
159209 and `no` respectively.
160210
161− Example:
211+ Type: (a -> bool) -> (a -> a -> int) -> (a -> a -> int) -> (a -> a -> int)
162212
213+ Example:
163214 let cmp = splitByAndCompare (hasPrefix "foo") compare compare; in
164215
165216 cmp "a" "z" => -1
@@ -170,31 +221,44 @@ rec {
170221 # while
171222 compare "fooa" "a" => 1
172223 */
173− splitByAndCompare = p: yes: no: a: b:
224+ splitByAndCompare =
225+ # Predicate
226+ p:
227+ # Comparison function if predicate holds for both values
228+ yes:
229+ # Comparison function if predicate holds for neither value
230+ no:
231+ # First value to compare
232+ a:
233+ # Second value to compare
234+ b:
174235 if p a
175236 then if p b then yes a b else -1
176237 else if p b then 1 else no a b;
177238
178239
179− /* Reads a JSON file. */
240+ /* Reads a JSON file.
241+
242+ Type :: path -> any
243+ */
180244 importJSON = path:
181245 builtins.fromJSON (builtins.readFile path);
182246
183247
184248 ## Warnings
185249
186− /* See https://github.com/NixOS/nix/issues/749. Eventually we'd like these
187− to expand to Nix builtins that carry metadata so that Nix can filter out
188− the INFO messages without parsing the message string.
250+ # See https://github.com/NixOS/nix/issues/749. Eventually we'd like these
251+ # to expand to Nix builtins that carry metadata so that Nix can filter out
252+ # the INFO messages without parsing the message string.
253+ #
254+ # Usage:
255+ # {
256+ # foo = lib.warn "foo is deprecated" oldFoo;
257+ # }
258+ #
259+ # TODO: figure out a clever way to integrate location information from
260+ # something like __unsafeGetAttrPos.
189261
190− Usage:
191− {
192− foo = lib.warn "foo is deprecated" oldFoo;
193− }
194−
195− TODO: figure out a clever way to integrate location information from
196− something like __unsafeGetAttrPos.
197− */
198262 warn = msg: builtins.trace "WARNING: ${msg}";
199263 info = msg: builtins.trace "INFO: ${msg}";
200264
lib/types.nix+7−1
@@ -169,6 +169,9 @@ rec {
169169 # s32 = sign 32 4294967296;
170170 };
171171
172+ # Alias of u16 for a port number
173+ port = ints.u16;
174+
172175 float = mkOptionType rec {
173176 name = "float";
174177 description = "floating point number";
@@ -194,7 +197,10 @@ rec {
194197 # separator between the values).
195198 separatedString = sep: mkOptionType rec {
196199 name = "separatedString";
197− description = "string";
200+ description = if sep == ""
201+ then "Concatenated string" # for types.string.
202+ else "strings concatenated with ${builtins.toJSON sep}"
203+ ;
198204 check = isString;
199205 merge = loc: defs: concatStringsSep sep (getValues defs);
200206 functor = (defaultFunctor name) // {
maintainers/maintainer-list.nix+407−22
@@ -1,21 +1,41 @@
11/* List of NixOS maintainers.
22
33 handle = {
4− name = "Real name";
4+ # Required
5+ name = "Your name";
56 email = "address@example.org";
7+
8+ # Optional
69 github = "GithubUsername";
10+ keys = [{
11+ longkeyid = "rsa2048/0x0123456789ABCDEF";
12+ fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333";
13+ }];
714 };
815
9− where `name` is your real name, `email` is your maintainer email
10− address and `github` is your GitHub handle (as it appears in the
11− URL of your profile page, `https://github.com/<userhandle>`).
12− address
13− The only required fields are `name` and `email`.
16+ where
17+
18+ - `handle` is the handle you are going to use in nixpkgs expressions,
19+ - `name` is your, preferably real, name,
20+ - `email` is your maintainer email address, and
21+ - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`),
22+ - `keys` is a list of your PGP/GPG key IDs and fingerprints.
23+
24+ `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient.
25+
26+ Add PGP/GPG keys only if you actually use them to sign commits and/or mail.
27+
28+ To get the required PGP/GPG values for a key run
29+ ```shell
30+ gpg --keyid-format 0xlong --fingerprint <email> | head -n 2
31+ ```
32+
33+ !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth.
34+
1435 More fields may be added in the future.
1536
1637 Please keep the list alphabetically sorted.
17− See `../maintainers/scripts/check-maintainer-github-handles.sh`
18− for an example on how to work with this data.
38+ See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data.
1939 */
2040{
2141 "1000101" = {
@@ -73,6 +93,11 @@
7393 github = "acowley";
7494 name = "Anthony Cowley";
7595 };
96+ adamt = {
97+ email = "mail@adamtulinius.dk";
98+ github = "adamtulinius";
99+ name = "Adam Tulinius";
100+ };
76101 adelbertc = {
77102 email = "adelbertc@gmail.com";
78103 github = "adelbertc";
@@ -143,6 +168,11 @@
143168 github = "ahmedtd";
144169 name = "Taahir Ahmed";
145170 };
171+ ahuzik = {
172+ email = "ales.guzik@gmail.com";
173+ github = "alesguzik";
174+ name = "Ales Huzik";
175+ };
146176 aij = {
147177 email = "aij+git@mrph.org";
148178 github = "aij";
@@ -158,6 +188,11 @@
158188 github = "alexanderkjeldaas";
159189 name = "Alexander Kjeldaas";
160190 };
191+ akavel = {
192+ email = "czapkofan@gmail.com";
193+ github = "akavel";
194+ name = "Mateusz Czapliński";
195+ };
161196 akaWolf = {
162197 email = "akawolf0@gmail.com";
163198 github = "akaWolf";
@@ -202,10 +237,15 @@
202237 name = "Nix Committers";
203238 };
204239 alunduil = {
205− email = "alunduil@alunduil.com";
240+ email = "alunduil@gmail.com";
206241 github = "alunduil";
207242 name = "Alex Brandt";
208243 };
244+ amar1729 = {
245+ email = "amar.paul16@gmail.com";
246+ github = "amar1729";
247+ name = "Amar Paul";
248+ };
209249 ambrop72 = {
210250 email = "ambrop7@gmail.com";
211251 github = "ambrop72";
@@ -236,6 +276,11 @@
236276 github = "AndrewMorsillo";
237277 name = "Andrew Morsillo";
238278 };
279+ andersk = {
280+ email = "andersk@mit.edu";
281+ github = "andersk";
282+ name = "Anders Kaseorg";
283+ };
239284 AndersonTorres = {
240285 email = "torres.anderson.85@protonmail.com";
241286 github = "AndersonTorres";
@@ -316,6 +361,11 @@
316361 github = "apeyroux";
317362 name = "Alexandre Peyroux";
318363 };
364+ ar1a = {
365+ email = "aria@ar1as.space";
366+ github = "ar1a";
367+ name = "Aria Edmonds";
368+ };
319369 arcadio = {
320370 email = "arc@well.ox.ac.uk";
321371 github = "arcadio";
@@ -366,6 +416,11 @@
366416 github = "asppsa";
367417 name = "Alastair Pharo";
368418 };
419+ astro = {
420+ email = "astro@spaceboyz.net";
421+ github = "astro";
422+ name = "Astro";
423+ };
369424 astsmtl = {
370425 email = "astsmtl@yandex.ru";
371426 github = "astsmtl";
@@ -381,6 +436,11 @@
381436 github = "aszlig";
382437 name = "aszlig";
383438 };
439+ atnnn = {
440+ email = "etienne@atnnn.com";
441+ github = "atnnn";
442+ name = "Etienne Laurin";
443+ };
384444 auntie = {
385445 email = "auntieNeo@gmail.com";
386446 github = "auntie";
@@ -396,6 +456,11 @@
396456 github = "AveryLychee";
397457 name = "Avery Lychee";
398458 };
459+ averelld = {
460+ email = "averell+nixos@rxd4.com";
461+ github = "averelld";
462+ name = "averelld";
463+ };
399464 avnik = {
400465 email = "avn@avnik.info";
401466 github = "avnik";
@@ -435,6 +500,11 @@
435500 github = "bandresen";
436501 name = "Benjamin Andresen";
437502 };
503+ baracoder = {
504+ email = "baracoder@googlemail.com";
505+ github = "baracoder";
506+ name = "Herman Fries";
507+ };
438508 barrucadu = {
439509 email = "mike@barrucadu.co.uk";
440510 github = "barrucadu";
@@ -490,6 +560,11 @@
490560 github = "bennofs";
491561 name = "Benno Fünfstück";
492562 };
563+ benpye = {
564+ email = "ben@curlybracket.co.uk";
565+ github = "benpye";
566+ name = "Ben Pye";
567+ };
493568 benwbooth = {
494569 email = "benwbooth@gmail.com";
495570 github = "benwbooth";
@@ -520,6 +595,11 @@
520595 github = "bgamari";
521596 name = "Ben Gamari";
522597 };
598+ bhall = {
599+ email = "brendan.j.hall@bath.edu";
600+ github = "brendan-hall";
601+ name = "Brendan Hall";
602+ };
523603 bhipple = {
524604 email = "bhipple@protonmail.com";
525605 github = "bhipple";
@@ -599,6 +679,11 @@
599679 github = "bramd";
600680 name = "Bram Duvigneau";
601681 };
682+ braydenjw = {
683+ email = "nixpkgs@willenborg.ca";
684+ github = "braydenjw";
685+ name = "Brayden Willenborg";
686+ };
602687 brian-dawn = {
603688 email = "brian.t.dawn@gmail.com";
604689 github = "brian-dawn";
@@ -614,6 +699,11 @@
614699 github = "bstrik";
615700 name = "Berno Strik";
616701 };
702+ buffet = {
703+ email = "niclas@countingsort.com";
704+ github = "buffet";
705+ name = "Niclas Meyer";
706+ };
617707 bugworm = {
618708 email = "bugworm@zoho.com";
619709 github = "bugworm";
@@ -653,6 +743,11 @@
653743 github = "campadrenalin";
654744 name = "Philip Horger";
655745 };
746+ candeira = {
747+ email = "javier@candeira.com";
748+ github = "candeira";
749+ name = "Javier Candeira";
750+ };
656751 canndrew = {
657752 email = "shum@canndrew.org";
658753 github = "canndrew";
@@ -727,6 +822,11 @@
727822 github = "ChengCat";
728823 name = "Yucheng Zhang";
729824 };
825+ chessai = {
826+ email = "chessai1996@gmail.com";
827+ github = "chessai";
828+ name = "Daniel Cartwright";
829+ };
730830 chiiruno = {
731831 email = "okinan@protonmail.com";
732832 github = "chiiruno";
@@ -862,11 +962,6 @@
862962 github = "couchemar";
863963 name = "Andrey Pavlov";
864964 };
865− countingsort = {
866− email = "niclas@countingsort.com";
867− github = "countingsort";
868− name = "Niclas Meyer";
869− };
870965 cpages = {
871966 email = "page@ruiec.cat";
872967 github = "cpages";
@@ -937,6 +1032,11 @@
9371032 github = "danielfullmer";
9381033 name = "Daniel Fullmer";
9391034 };
1035+ das-g = {
1036+ email = "nixpkgs@raphael.dasgupta.ch";
1037+ github = "das-g";
1038+ name = "Raphael Das Gupta";
1039+ };
9401040 das_j = {
9411041 email = "janne@hess.ooo";
9421042 github = "dasJ";
@@ -981,6 +1081,11 @@
9811081 github = "deepfire";
9821082 name = "Kosyrev Serge";
9831083 };
1084+ delroth = {
1085+ email = "delroth@gmail.com";
1086+ github = "delroth";
1087+ name = "Pierre Bourdon";
1088+ };
9841089 deltaevo = {
9851090 email = "deltaduartedavid@gmail.com";
9861091 github = "DeltaEvo";
@@ -1259,6 +1364,16 @@
12591364 github = "ellis";
12601365 name = "Ellis Whitehead";
12611366 };
1367+ elohmeier = {
1368+ email = "elo-nixos@nerdworks.de";
1369+ github = "elohmeier";
1370+ name = "Enno Lohmeier";
1371+ };
1372+ elseym = {
1373+ email = "elseym@me.com";
1374+ github = "elseym";
1375+ name = "Simon Waibl";
1376+ };
12621377 elvishjerricco = {
12631378 email = "elvishjerricco@gmail.com";
12641379 github = "ElvishJerricco";
@@ -1341,6 +1456,10 @@
13411456 email = "elis@hirwing.se";
13421457 github = "etu";
13431458 name = "Elis Hirwing";
1459+ keys = [{
1460+ longkeyid = "rsa4096/0xD57EFA625C9A925F";
1461+ fingerprint = "67FE 98F2 8C44 CF22 1828 E12F D57E FA62 5C9A 925F";
1462+ }];
13441463 };
13451464 evck = {
13461465 email = "eric@evenchick.com";
@@ -1367,6 +1486,11 @@
13671486 github = "expipiplus1";
13681487 name = "Joe Hermaszewski";
13691488 };
1489+ f--t = {
1490+ email = "git@f-t.me";
1491+ github = "f--t";
1492+ name = "f--t";
1493+ };
13701494 f-breidenstein = {
13711495 email = "mail@felixbreidenstein.de";
13721496 github = "f-breidenstein";
@@ -1393,7 +1517,7 @@
13931517 name = "Felipe Espinoza";
13941518 };
13951519 fgaz = {
1396− email = "francygazz@gmail.com";
1520+ email = "fgaz@fgaz.me";
13971521 github = "fgaz";
13981522 name = "Francesco Gazzetta";
13991523 };
@@ -1482,15 +1606,30 @@
14821606 github = "ftrvxmtrx";
14831607 name = "Siarhei Zirukin";
14841608 };
1609+ fuerbringer = {
1610+ email = "severin@fuerbringer.info";
1611+ github = "fuerbringer";
1612+ name = "Severin Fürbringer";
1613+ };
14851614 funfunctor = {
14861615 email = "eocallaghan@alterapraxis.com";
14871616 name = "Edward O'Callaghan";
14881617 };
1618+ fusion809 = {
1619+ email = "brentonhorne77@gmail.com";
1620+ github = "fusion809";
1621+ name = "Brenton Horne";
1622+ };
14891623 fuuzetsu = {
14901624 email = "fuuzetsu@fuuzetsu.co.uk";
14911625 github = "fuuzetsu";
14921626 name = "Mateusz Kowalczyk";
14931627 };
1628+ fuwa = {
1629+ email = "echowss@gmail.com";
1630+ github = "fuwa0529";
1631+ name = "Haruka Akiyama";
1632+ };
14941633 fuzzy-id = {
14951634 email = "hacking+nixos@babibo.de";
14961635 name = "Thomas Bach";
@@ -1650,6 +1789,16 @@
16501789 github = "hamhut1066";
16511790 name = "Hamish Hutchings";
16521791 };
1792+ hansjoergschurr = {
1793+ email = "commits@schurr.at";
1794+ github = "hansjoergschurr";
1795+ name = "Hans-Jörg Schurr";
1796+ };
1797+ HaoZeke = {
1798+ email = "r95g10@gmail.com";
1799+ github = "haozeke";
1800+ name = "Rohit Goswami";
1801+ };
16531802 haslersn = {
16541803 email = "haslersn@fius.informatik.uni-stuttgart.de";
16551804 github = "haslersn";
@@ -1709,6 +1858,11 @@
17091858 email = "t@larkery.com";
17101859 name = "Tom Hinton";
17111860 };
1861+ hlolli = {
1862+ email = "hlolli@gmail.com";
1863+ github = "hlolli";
1864+ name = "Hlodver Sigurdsson";
1865+ };
17121866 hodapp = {
17131867 email = "hodapp87@gmail.com";
17141868 github = "Hodapp87";
@@ -1799,15 +1953,34 @@
17991953 github = "infinisil";
18001954 name = "Silvan Mosberger";
18011955 };
1956+ ingenieroariel = {
1957+ email = "ariel@nunez.co";
1958+ github = "ingenieroariel";
1959+ name = "Ariel Nunez";
1960+ };
18021961 ironpinguin = {
18031962 email = "michele@catalano.de";
18041963 github = "ironpinguin";
18051964 name = "Michele Catalano";
18061965 };
1966+ ivan = {
1967+ email = "ivan@ludios.org";
1968+ github = "ivan";
1969+ name = "Ivan Kozik";
1970+ };
18071971 ivan-tkatchev = {
18081972 email = "tkatchev@gmail.com";
18091973 name = "Ivan Tkatchev";
18101974 };
1975+ ivegotasthma = {
1976+ email = "ivegotasthma@protonmail.com";
1977+ github = "ivegotasthma";
1978+ name = "John Doe";
1979+ keys = [{
1980+ longkeyid = "rsa4096/09AC52AEA87817A4";
1981+ fingerprint = "4008 2A5B 56A4 79B9 83CB 95FD 09AC 52AE A878 17A4";
1982+ }];
1983+ };
18111984 ixmatus = {
18121985 email = "parnell@digitalmentat.com";
18131986 github = "ixmatus";
@@ -1833,6 +2006,16 @@
18332006 github = "jagajaga";
18342007 name = "Arseniy Seroka";
18352008 };
2009+ jakelogemann = {
2010+ email = "jake.logemann@gmail.com";
2011+ github = "jakelogemann";
2012+ name = "Jake Logemann";
2013+ };
2014+ jakewaksbaum = {
2015+ email = "jake.waksbaum@gmail.com";
2016+ github = "jbaum98";
2017+ name = "Jake Waksbaum";
2018+ };
18362019 jammerful = {
18372020 email = "jammerful@gmail.com";
18382021 github = "jammerful";
@@ -1877,6 +2060,11 @@
18772060 github = "jdagilliland";
18782061 name = "Jason Gilliland";
18792062 };
2063+ jdehaas = {
2064+ email = "qqlq@nullptr.club";
2065+ github = "jeroendehaas";
2066+ name = "Jeroen de Haas";
2067+ };
18802068 jefdaj = {
18812069 email = "jefdaj@gmail.com";
18822070 github = "jefdaj";
@@ -1942,6 +2130,11 @@
19422130 github = "jhhuh";
19432131 name = "Ji-Haeng Huh";
19442132 };
2133+ jhillyerd = {
2134+ email = "james+nixos@hillyerd.com";
2135+ github = "jhillyerd";
2136+ name = "James Hillyerd";
2137+ };
19452138 jirkamarsik = {
19462139 email = "jiri.marsik89@gmail.com";
19472140 github = "jirkamarsik";
@@ -1957,6 +2150,11 @@
19572150 github = "jluttine";
19582151 name = "Jaakko Luttinen";
19592152 };
2153+ jmagnusj = {
2154+ email = "jmagnusj@gmail.com";
2155+ github = "magnusjonsson";
2156+ name = "Johan Magnus Jonsson";
2157+ };
19602158 jmettes = {
19612159 email = "jonathan@jmettes.com";
19622160 github = "jmettes";
@@ -2040,6 +2238,11 @@
20402238 github = "joncojonathan";
20412239 name = "Jonathan Haddock";
20422240 };
2241+ jorsn = {
2242+ name = "Johannes Rosenberger";
2243+ email = "johannes@jorsn.eu";
2244+ github = "jorsn";
2245+ };
20432246 jpdoyle = {
20442247 email = "joethedoyle@gmail.com";
20452248 github = "jpdoyle";
@@ -2153,6 +2356,11 @@
21532356 github = "kiloreux";
21542357 name = "Kiloreux Emperex";
21552358 };
2359+ kimburgess = {
2360+ email = "kim@acaprojects.com";
2361+ github = "kimburgess";
2362+ name = "Kim Burgess";
2363+ };
21562364 kini = {
21572365 email = "keshav.kini@gmail.com";
21582366 github = "kini";
@@ -2163,11 +2371,20 @@
21632371 github = "kirelagin";
21642372 name = "Kirill Elagin";
21652373 };
2374+ kisonecat = {
2375+ email = "kisonecat@gmail.com";
2376+ github = "kisonecat";
2377+ name = "Jim Fowler";
2378+ };
21662379 kkallio = {
21672380 email = "tierpluspluslists@gmail.com";
21682381 name = "Karn Kallio";
21692382 };
2170−
2383+ klntsky = {
2384+ email = "klntsky@gmail.com";
2385+ name = "Vladimir Kalnitsky";
2386+ github = "8084";
2387+ };
21712388 kmeakin = {
21722389 email = "karlwfmeakin@gmail.com";
21732390 name = "Karl Meakin";
@@ -2179,6 +2396,11 @@
21792396 github = "knedlsepp";
21802397 name = "Josef Kemetmüller";
21812398 };
2399+ knl = {
2400+ email = "nikola@knezevic.co";
2401+ github = "knl";
2402+ name = "Nikola Knežević";
2403+ };
21822404 konimex = {
21832405 email = "herdiansyah@netc.eu";
21842406 github = "konimex";
@@ -2354,6 +2576,11 @@
23542576 github = "listx";
23552577 name = "Linus Arver";
23562578 };
2579+ lionello = {
2580+ email = "lio@lunesu.com";
2581+ github = "lionello";
2582+ name = "Lionello Lunesu";
2583+ };
23572584 lluchs = {
23582585 email = "lukas.werling@gmail.com";
23592586 github = "lluchs";
@@ -2626,6 +2853,11 @@
26262853 github = "melsigl";
26272854 name = "Melanie B. Sigl";
26282855 };
2856+ melkor333 = {
2857+ email = "samuel@ton-kunst.ch";
2858+ github = "melkor333";
2859+ name = "Samuel Ruprecht";
2860+ };
26292861 metabar = {
26302862 email = "softs@metabarcoding.org";
26312863 name = "Celine Mercier";
@@ -2635,6 +2867,11 @@
26352867 github = "mgdelacroix";
26362868 name = "Miguel de la Cruz";
26372869 };
2870+ mgregoire = {
2871+ email = "gregoire@martinache.net";
2872+ github = "M-Gregoire";
2873+ name = "Gregoire Martinache";
2874+ };
26382875 mgttlinger = {
26392876 email = "megoettlinger@gmail.com";
26402877 github = "mgttlinger";
@@ -2649,6 +2886,11 @@
26492886 email = "joerg@thalheim.io";
26502887 github = "mic92";
26512888 name = "Jörg Thalheim";
2889+ keys = [{
2890+ # compare with https://keybase.io/Mic92
2891+ longkeyid = "rsa4096/0x003F2096411B5F92";
2892+ fingerprint = "3DEE 1C55 6E1C 3DC5 54F5 875A 003F 2096 411B 5F92";
2893+ }];
26522894 };
26532895 michaelpj = {
26542896 email = "michaelpj@gmail.com";
@@ -2893,6 +3135,11 @@
28933135 github = "nadrieril";
28943136 name = "Nadrieril Feneanar";
28953137 };
3138+ nalbyuites = {
3139+ email = "ashijit007@gmail.com";
3140+ github = "nalbyuites";
3141+ name = "Ashijit Pramanik";
3142+ };
28963143 namore = {
28973144 email = "namor@hemio.de";
28983145 github = "namore";
@@ -2937,6 +3184,11 @@
29373184 github = "nequissimus";
29383185 name = "Tim Steinbach";
29393186 };
3187+ nikitavoloboev = {
3188+ email = "nikita.voloboev@gmail.com";
3189+ github = "nikitavoloboev";
3190+ name = "Nikita Voloboev";
3191+ };
29403192 nfjinjing = {
29413193 email = "nfjinjing@gmail.com";
29423194 github = "nfjinjing";
@@ -3046,6 +3298,11 @@
30463298 github = "nyarly";
30473299 name = "Judson Lester";
30483300 };
3301+ nzhang-zh = {
3302+ email = "n.zhang.hp.au@gmail.com";
3303+ github = "nzhang-zh";
3304+ name = "Ning Zhang";
3305+ };
30493306 obadz = {
30503307 email = "obadz-nixos@obadz.com";
30513308 github = "obadz";
@@ -3090,6 +3347,11 @@
30903347 github = "olynch";
30913348 name = "Owen Lynch";
30923349 };
3350+ OPNA2608 = {
3351+ email = "christoph.neidahl@gmail.com";
3352+ github = "OPNA2608";
3353+ name = "Christoph Neidahl";
3354+ };
30933355 orbekk = {
30943356 email = "kjetil.orbekk@gmail.com";
30953357 github = "orbekk";
@@ -3119,6 +3381,10 @@
31193381 email = "oxij@oxij.org";
31203382 github = "oxij";
31213383 name = "Jan Malakhovski";
3384+ keys = [{
3385+ longkeyid = "rsa2048/0x0E6CA66E5C557AA8";
3386+ fingerprint = "514B B966 B46E 3565 0508 86E8 0E6C A66E 5C55 7AA8";
3387+ }];
31223388 };
31233389 oyren = {
31243390 email = "m.scheuren@oyra.eu";
@@ -3130,6 +3396,11 @@
31303396 github = "pacien";
31313397 name = "Pacien Tran-Girard";
31323398 };
3399+ paddygord = {
3400+ email = "pgpatrickgordon@gmail.com";
3401+ github = "paddygord";
3402+ name = "Patrick Gordon";
3403+ };
31333404 paholg = {
31343405 email = "paho@paholg.com";
31353406 github = "paholg";
@@ -3274,6 +3545,11 @@
32743545 github = "pkmx";
32753546 name = "Chih-Mao Chen";
32763547 };
3548+ plchldr = {
3549+ email = "mail@oddco.de";
3550+ github = "plchldr";
3551+ name = "Jonas Beyer";
3552+ };
32773553 plcplc = {
32783554 email = "plcplc@gmail.com";
32793555 github = "plcplc";
@@ -3304,6 +3580,11 @@
33043580 github = "pmyjavec";
33053581 name = "Pauly Myjavec";
33063582 };
3583+ pnelson = {
3584+ email = "me@pnelson.ca";
3585+ github = "pnelson";
3586+ name = "Philip Nelson";
3587+ };
33073588 pneumaticat = {
33083589 email = "kevin@potatofrom.space";
33093590 github = "pneumaticat";
@@ -3328,6 +3609,14 @@
33283609 email = "dev.primeos@gmail.com";
33293610 github = "primeos";
33303611 name = "Michael Weiss";
3612+ keys = [
3613+ { longkeyid = "ed25519/0x130826A6C2A389FD"; # Git only
3614+ fingerprint = "86A7 4A55 07D0 58D1 322E 37FD 1308 26A6 C2A3 89FD";
3615+ }
3616+ { longkeyid = "rsa3072/0xBCA9943DD1DF4C04"; # Email, etc.
3617+ fingerprint = "AF85 991C C950 49A2 4205 1933 BCA9 943D D1DF 4C04";
3618+ }
3619+ ];
33313620 };
33323621 Profpatsch = {
33333622 email = "mail@profpatsch.de";
@@ -3365,7 +3654,7 @@
33653654 };
33663655 psyanticy = {
33673656 email = "iuns@outlook.fr";
3368− github = "Assassinkin";
3657+ github = "PsyanticY";
33693658 name = "Psyanticy";
33703659 };
33713660 puffnfresh = {
@@ -3396,6 +3685,10 @@
33963685 email = "hi@alyssa.is";
33973686 github = "alyssais";
33983687 name = "Alyssa Ross";
3688+ keys = [{
3689+ longkeyid = "rsa4096/736CCDF9EF51BD97";
3690+ fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97";
3691+ }];
33993692 };
34003693 ragge = {
34013694 email = "r.dahlen@gmail.com";
@@ -3596,6 +3889,11 @@
35963889 github = "roosemberth";
35973890 name = "Roosembert (Roosemberth) Palacios";
35983891 };
3892+ royneary = {
3893+ email = "christian@ulrich.earth";
3894+ github = "royneary";
3895+ name = "Christian Ulrich";
3896+ };
35993897 rprospero = {
36003898 email = "rprospero+nix@gmail.com";
36013899 github = "rprospero";
@@ -3711,11 +4009,30 @@
37114009 github = "sauyon";
37124010 name = "Sauyon Lee";
37134011 };
4012+ sb0 = {
4013+ email = "sb@m-labs.hk";
4014+ github = "sbourdeauducq";
4015+ name = "Sébastien Bourdeauducq";
4016+ };
4017+ sboosali = {
4018+ email = "SamBoosalis@gmail.com";
4019+ github = "sboosali";
4020+ name = "Sam Boosalis";
4021+ };
4022+ scalavision = {
4023+ email = "scalavision@gmail.com";
4024+ github = "scalavision";
4025+ name = "Tom Sorlie";
4026+ };
37144027 schmitthenner = {
37154028 email = "development@schmitthenner.eu";
37164029 github = "fkz";
37174030 name = "Fabian Schmitthenner";
37184031 };
4032+ schmittlauch = {
4033+ email = "t.schmittlauch+nixos@orlives.de";
4034+ github = "schmittlauch";
4035+ };
37194036 schneefux = {
37204037 email = "schneefux+nixos_pkg@schneefux.xyz";
37214038 github = "schneefux";
@@ -3735,6 +4052,11 @@
37354052 github = "scolobb";
37364053 name = "Sergiu Ivanov";
37374054 };
4055+ screendriver = {
4056+ email = "nix@echooff.de";
4057+ github = "screendriver";
4058+ name = "Christian Rackerseder";
4059+ };
37384060 Scriptkiddi = {
37394061 email = "nixos@scriptkiddi.de";
37404062 github = "scriptkiddi";
@@ -3775,6 +4097,11 @@
37754097 github = "seppeljordan";
37764098 name = "Sebastian Jordan";
37774099 };
4100+ seqizz = {
4101+ email = "seqizz@gmail.com";
4102+ github = "seqizz";
4103+ name = "Gurkan Gur";
4104+ };
37784105 sfrijters = {
37794106 email = "sfrijters@gmail.com";
37804107 github = "sfrijters";
@@ -3845,6 +4172,11 @@
38454172 github = "sjagoe";
38464173 name = "Simon Jagoe";
38474174 };
4175+ sjau = {
4176+ email = "nixos@sjau.ch";
4177+ github = "sjau";
4178+ name = "Stephan Jau";
4179+ };
38484180 sjmackenzie = {
38494181 email = "setori88@gmail.com";
38504182 github = "sjmackenzie";
@@ -3872,6 +4204,10 @@
38724204 email = "sebastien.maret@icloud.com";
38734205 github = "smaret";
38744206 name = "Sébastien Maret";
4207+ keys = [{
4208+ longkeyid = "rsa4096/0x86E30E5A0F5FC59C";
4209+ fingerprint = "4242 834C D401 86EF 8281 4093 86E3 0E5A 0F5F C59C";
4210+ }];
38754211 };
38764212 smironov = {
38774213 email = "grrwlf@gmail.com";
@@ -3913,6 +4249,11 @@
39134249 github = "spacefrogg";
39144250 name = "Michael Raitza";
39154251 };
4252+ spacekookie = {
4253+ email = "kookie@spacekookie.de";
4254+ github = "spacekookie";
4255+ name = "Katharina Fey";
4256+ };
39164257 spencerjanssen = {
39174258 email = "spencerjanssen@gmail.com";
39184259 github = "spencerjanssen";
@@ -4053,6 +4394,15 @@
40534394 github = "t184256";
40544395 name = "Alexander Sosedkin";
40554396 };
4397+ tadeokondrak = {
4398+ email = "me@tadeo.ca";
4399+ github = "tadeokondrak";
4400+ name = "Tadeo Kondrak";
4401+ keys = [{
4402+ longkeyid = "ed25519/0xFBE607FCC49516D3";
4403+ fingerprint = "0F2B C0C7 E77C 5B42 AC5B 4C18 FBE6 07FC C495 16D3";
4404+ }];
4405+ };
40564406 tadfisher = {
40574407 email = "tadfisher@gmail.com";
40584408 github = "tadfisher";
@@ -4093,6 +4443,16 @@
40934443 github = "taku0";
40944444 name = "Takuo Yonezawa";
40954445 };
4446+ talyz = {
4447+ email = "kim.lindberger@gmail.com";
4448+ github = "talyz";
4449+ name = "Kim Lindberger";
4450+ };
4451+ taneb = {
4452+ email = "nvd1234@gmail.com";
4453+ github = "Taneb";
4454+ name = "Nathan van Doorn";
4455+ };
40964456 tari = {
40974457 email = "peter@taricorp.net";
40984458 github = "tari";
@@ -4108,10 +4468,10 @@
41084468 github = "tazjin";
41094469 name = "Vincent Ambo";
41104470 };
4111− TealG = {
4112− email = "~@Teal.Gr";
4113− github = "TealG";
4114− name = "Teal Gaure";
4471+ tbenst = {
4472+ email = "nix@tylerbenster.com";
4473+ github = "tbenst";
4474+ name = "Tyler Benster";
41154475 };
41164476 teh = {
41174477 email = "tehunger@gmail.com";
@@ -4138,6 +4498,11 @@
41384498 github = "tex";
41394499 name = "Milan Svoboda";
41404500 };
4501+ tg-x = {
4502+ email = "*@tg-x.net";
4503+ github = "tg-x";
4504+ name = "TG ⊗ Θ";
4505+ };
41414506 thall = {
41424507 email = "niclas.thall@gmail.com";
41434508 github = "thall";
@@ -4457,6 +4822,11 @@
44574822 github = "vklquevs";
44584823 name = "vklquevs";
44594824 };
4825+ vlaci = {
4826+ email = "laszlo.vasko@outlook.com";
4827+ github = "vlaci";
4828+ name = "László Vaskó";
4829+ };
44604830 vlstill = {
44614831 email = "xstill@fi.muni.cz";
44624832 github = "vlstill";
@@ -4573,6 +4943,11 @@
45734943 github = "wucke13";
45744944 name = "Wucke";
45754945 };
4946+ wykurz = {
4947+ email = "wykurz@gmail.com";
4948+ github = "wykurz";
4949+ name = "Mateusz Wykurz";
4950+ };
45764951 wyvie = {
45774952 email = "elijahrum@gmail.com";
45784953 github = "wyvie";
@@ -4634,7 +5009,7 @@
46345009 name = "Dmitry V.";
46355010 };
46365011 yegortimoshenko = {
4637− email = "yegortimoshenko@gmail.com";
5012+ email = "yegortimoshenko@riseup.net";
46385013 github = "yegortimoshenko";
46395014 name = "Yegor Timoshenko";
46405015 };
@@ -4698,6 +5073,11 @@
46985073 github = "umazalakain";
46995074 name = "Unai Zalakain";
47005075 };
5076+ zaninime = {
5077+ email = "francesco@zanini.me";
5078+ github = "zaninime";
5079+ name = "Francesco Zanini";
5080+ };
47015081 zarelit = {
47025082 email = "david@zarel.net";
47035083 github = "zarelit";
@@ -4752,4 +5132,9 @@
47525132 github = "zzamboni";
47535133 name = "Diego Zamboni";
47545134 };
5135+ mredaelli = {
5136+ email = "massimo@typish.io";
5137+ github = "mredaelli";
5138+ name = "Massimo Redaelli";
5139+ };
47555140}
maintainers/scripts/copy-tarballs.pl+5−5
@@ -1,5 +1,5 @@
11#! /usr/bin/env nix-shell
2−#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable nixUnstable.perl-bindings
2+#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nixUnstable nixUnstable.perl-bindings
33
44# This command uploads tarballs to tarballs.nixos.org, the
55# content-addressed cache used by fetchurl as a fallback for when
@@ -101,8 +101,8 @@ sub uploadFile {
101101 my ($name, $dest) = @_;
102102 #print STDERR "linking $name to $dest...\n";
103103 $bucket->add_key($name, "", {
104− 'x-amz-website-redirect-location' => "/" . $dest,
105− 'x-amz-acl' => "public-read"
104+ 'x-amz-website-redirect-location' => "/" . $dest,
105+ 'x-amz-acl' => "public-read"
106106 })
107107 or die "failed to create redirect from $name to $dest\n";
108108 $cache{$name} = 1;
@@ -116,8 +116,8 @@ sub uploadFile {
116116 # Upload the file as sha512/<hash-in-base-16>.
117117 print STDERR "uploading $fn to $mainKey...\n";
118118 $bucket->add_key_filename($mainKey, $fn, {
119− 'x-amz-meta-original-name' => $name,
120− 'x-amz-acl' => "public-read"
119+ 'x-amz-meta-original-name' => $name,
120+ 'x-amz-acl' => "public-read"
121121 })
122122 or die "failed to upload $fn to $mainKey\n";
123123 $cache{$mainKey} = 1;
maintainers/scripts/test-eval-release.sh → maintainers/scripts/eval-release.shrenamed+4
@@ -4,4 +4,8 @@ if [[ -z "$VERBOSE" ]]; then
44 echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent"
55fi
66unset HOME NIXPKGS_CONFIG # Force empty config
7+
8+# With the default heap size (380MB), nix-instantiate fails:
9+# Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS
10+export GC_INITIAL_HEAP_SIZE=${GC_INITIAL_HEAP_SIZE:-2000000000} # 2GB
711nix-instantiate --strict --eval-only --xml --show-trace "$(dirname "$0")"/eval-release.nix 2>&1 > /dev/null
maintainers/scripts/find-tarballs.nix+1−1
@@ -31,7 +31,7 @@ let
3131 if !canEval x then []
3232 else if isDerivation x then optional (canEval x.drvPath) x
3333 else if isList x then concatLists (map derivationsIn' x)
34− else if isAttrs x then concatLists (mapAttrsToList (n: v: derivationsIn' v) x)
34+ else if isAttrs x then concatLists (mapAttrsToList (n: v: addErrorContext "while finding tarballs in '${n}':" (derivationsIn' v)) x)
3535 else [ ];
3636
3737 keyDrv = drv: if canEval drv.drvPath then { key = drv.drvPath; value = drv; } else { };
maintainers/scripts/nix-generate-from-cpan.nix+1−1
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
44 name = "nix-generate-from-cpan-3";
55
66 buildInputs = with perlPackages; [
7− makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly LogLog4perl
7+ makeWrapper perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl
88 ];
99
1010 phases = [ "installPhase" ];
maintainers/scripts/update-python-libraries+4−360
@@ -1,361 +1,5 @@
1−#! /usr/bin/env nix-shell
2−#! nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git
1+#!/bin/sh
2+build=`nix-build -E "with import (fetchTarball "channel:nixpkgs-unstable") {}; python3.withPackages(ps: with ps; [ packaging requests toolz ])"`
3+python=${build}/bin/python
4+exec ${python} pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@
35
4−"""
5−Update a Python package expression by passing in the `.nix` file, or the directory containing it.
6−You can pass in multiple files or paths.
7−
8−You'll likely want to use
9−``
10− $ ./update-python-libraries ../../pkgs/development/python-modules/*
11−``
12−to update all libraries in that folder.
13−"""
14−
15−import argparse
16−import logging
17−import os
18−import re
19−import requests
20−import toolz
21−from concurrent.futures import ThreadPoolExecutor as Pool
22−from packaging.version import Version as _Version
23−from packaging.version import InvalidVersion
24−from packaging.specifiers import SpecifierSet
25−import collections
26−import subprocess
27−
28−INDEX = "https://pypi.io/pypi"
29−"""url of PyPI"""
30−
31−EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip', '.whl']
32−"""Permitted file extensions. These are evaluated from left to right and the first occurance is returned."""
33−
34−PRERELEASES = False
35−
36−import logging
37−logging.basicConfig(level=logging.INFO)
38−
39−
40−class Version(_Version, collections.abc.Sequence):
41−
42− def __init__(self, version):
43− super().__init__(version)
44− # We cannot use `str(Version(0.04.21))` because that becomes `0.4.21`
45− # https://github.com/avian2/unidecode/issues/13#issuecomment-354538882
46− self.raw_version = version
47−
48− def __getitem__(self, i):
49− return self._version.release[i]
50−
51− def __len__(self):
52− return len(self._version.release)
53−
54− def __iter__(self):
55− yield from self._version.release
56−
57−
58−def _get_values(attribute, text):
59− """Match attribute in text and return all matches.
60−
61− :returns: List of matches.
62− """
63− regex = '{}\s+=\s+"(.*)";'.format(attribute)
64− regex = re.compile(regex)
65− values = regex.findall(text)
66− return values
67−
68−def _get_unique_value(attribute, text):
69− """Match attribute in text and return unique match.
70−
71− :returns: Single match.
72− """
73− values = _get_values(attribute, text)
74− n = len(values)
75− if n > 1:
76− raise ValueError("found too many values for {}".format(attribute))
77− elif n == 1:
78− return values[0]
79− else:
80− raise ValueError("no value found for {}".format(attribute))
81−
82−def _get_line_and_value(attribute, text):
83− """Match attribute in text. Return the line and the value of the attribute."""
84− regex = '({}\s+=\s+"(.*)";)'.format(attribute)
85− regex = re.compile(regex)
86− value = regex.findall(text)
87− n = len(value)
88− if n > 1:
89− raise ValueError("found too many values for {}".format(attribute))
90− elif n == 1:
91− return value[0]
92− else:
93− raise ValueError("no value found for {}".format(attribute))
94−
95−
96−def _replace_value(attribute, value, text):
97− """Search and replace value of attribute in text."""
98− old_line, old_value = _get_line_and_value(attribute, text)
99− new_line = old_line.replace(old_value, value)
100− new_text = text.replace(old_line, new_line)
101− return new_text
102−
103−def _fetch_page(url):
104− r = requests.get(url)
105− if r.status_code == requests.codes.ok:
106− return r.json()
107− else:
108− raise ValueError("request for {} failed".format(url))
109−
110−
111−SEMVER = {
112− 'major' : 0,
113− 'minor' : 1,
114− 'patch' : 2,
115−}
116−
117−
118−def _determine_latest_version(current_version, target, versions):
119− """Determine latest version, given `target`.
120− """
121− current_version = Version(current_version)
122−
123− def _parse_versions(versions):
124− for v in versions:
125− try:
126− yield Version(v)
127− except InvalidVersion:
128− pass
129−
130− versions = _parse_versions(versions)
131−
132− index = SEMVER[target]
133−
134− ceiling = list(current_version[0:index])
135− if len(ceiling) == 0:
136− ceiling = None
137− else:
138− ceiling[-1]+=1
139− ceiling = Version(".".join(map(str, ceiling)))
140−
141− # We do not want prereleases
142− versions = SpecifierSet(prereleases=PRERELEASES).filter(versions)
143−
144− if ceiling is not None:
145− versions = SpecifierSet(f"<{ceiling}").filter(versions)
146−
147− return (max(sorted(versions))).raw_version
148−
149−
150−def _get_latest_version_pypi(package, extension, current_version, target):
151− """Get latest version and hash from PyPI."""
152− url = "{}/{}/json".format(INDEX, package)
153− json = _fetch_page(url)
154−
155− versions = json['releases'].keys()
156− version = _determine_latest_version(current_version, target, versions)
157−
158− try:
159− releases = json['releases'][version]
160− except KeyError as e:
161− raise KeyError('Could not find version {} for {}'.format(version, package)) from e
162− for release in releases:
163− if release['filename'].endswith(extension):
164− # TODO: In case of wheel we need to do further checks!
165− sha256 = release['digests']['sha256']
166− break
167− else:
168− sha256 = None
169− return version, sha256
170−
171−
172−def _get_latest_version_github(package, extension, current_version, target):
173− raise ValueError("updating from GitHub is not yet supported.")
174−
175−
176−FETCHERS = {
177− 'fetchFromGitHub' : _get_latest_version_github,
178− 'fetchPypi' : _get_latest_version_pypi,
179− 'fetchurl' : _get_latest_version_pypi,
180−}
181−
182−
183−DEFAULT_SETUPTOOLS_EXTENSION = 'tar.gz'
184−
185−
186−FORMATS = {
187− 'setuptools' : DEFAULT_SETUPTOOLS_EXTENSION,
188− 'wheel' : 'whl'
189−}
190−
191−def _determine_fetcher(text):
192− # Count occurences of fetchers.
193− nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys())
194− if nfetchers == 0:
195− raise ValueError("no fetcher.")
196− elif nfetchers > 1:
197− raise ValueError("multiple fetchers.")
198− else:
199− # Then we check which fetcher to use.
200− for fetcher in FETCHERS.keys():
201− if 'src = {}'.format(fetcher) in text:
202− return fetcher
203−
204−
205−def _determine_extension(text, fetcher):
206− """Determine what extension is used in the expression.
207−
208− If we use:
209− - fetchPypi, we check if format is specified.
210− - fetchurl, we determine the extension from the url.
211− - fetchFromGitHub we simply use `.tar.gz`.
212− """
213− if fetcher == 'fetchPypi':
214− try:
215− src_format = _get_unique_value('format', text)
216− except ValueError as e:
217− src_format = None # format was not given
218−
219− try:
220− extension = _get_unique_value('extension', text)
221− except ValueError as e:
222− extension = None # extension was not given
223−
224− if extension is None:
225− if src_format is None:
226− src_format = 'setuptools'
227− elif src_format == 'flit':
228− raise ValueError("Don't know how to update a Flit package.")
229− extension = FORMATS[src_format]
230−
231− elif fetcher == 'fetchurl':
232− url = _get_unique_value('url', text)
233− extension = os.path.splitext(url)[1]
234− if 'pypi' not in url:
235− raise ValueError('url does not point to PyPI.')
236−
237− elif fetcher == 'fetchFromGitHub':
238− raise ValueError('updating from GitHub is not yet implemented.')
239−
240− return extension
241−
242−
243−def _update_package(path, target):
244−
245− # Read the expression
246− with open(path, 'r') as f:
247− text = f.read()
248−
249− # Determine pname.
250− pname = _get_unique_value('pname', text)
251−
252− # Determine version.
253− version = _get_unique_value('version', text)
254−
255− # First we check how many fetchers are mentioned.
256− fetcher = _determine_fetcher(text)
257−
258− extension = _determine_extension(text, fetcher)
259−
260− new_version, new_sha256 = FETCHERS[fetcher](pname, extension, version, target)
261−
262− if new_version == version:
263− logging.info("Path {}: no update available for {}.".format(path, pname))
264− return False
265− elif Version(new_version) <= Version(version):
266− raise ValueError("downgrade for {}.".format(pname))
267− if not new_sha256:
268− raise ValueError("no file available for {}.".format(pname))
269−
270− text = _replace_value('version', new_version, text)
271− text = _replace_value('sha256', new_sha256, text)
272−
273− with open(path, 'w') as f:
274− f.write(text)
275−
276− logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version))
277−
278− result = {
279− 'path' : path,
280− 'target': target,
281− 'pname': pname,
282− 'old_version' : version,
283− 'new_version' : new_version,
284− #'fetcher' : fetcher,
285− }
286−
287− return result
288−
289−
290−def _update(path, target):
291−
292− # We need to read and modify a Nix expression.
293− if os.path.isdir(path):
294− path = os.path.join(path, 'default.nix')
295−
296− # If a default.nix does not exist, we quit.
297− if not os.path.isfile(path):
298− logging.info("Path {}: does not exist.".format(path))
299− return False
300−
301− # If file is not a Nix expression, we quit.
302− if not path.endswith(".nix"):
303− logging.info("Path {}: does not end with `.nix`.".format(path))
304− return False
305−
306− try:
307− return _update_package(path, target)
308− except ValueError as e:
309− logging.warning("Path {}: {}".format(path, e))
310− return False
311−
312−
313−def _commit(path, pname, old_version, new_version, **kwargs):
314− """Commit result.
315− """
316−
317− msg = f'python: {pname}: {old_version} -> {new_version}'
318−
319− try:
320− subprocess.check_call(['git', 'add', path])
321− subprocess.check_call(['git', 'commit', '-m', msg])
322− except subprocess.CalledProcessError as e:
323− subprocess.check_call(['git', 'checkout', path])
324− raise subprocess.CalledProcessError(f'Could not commit {path}') from e
325−
326− return True
327−
328−
329−def main():
330−
331− parser = argparse.ArgumentParser()
332− parser.add_argument('package', type=str, nargs='+')
333− parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major')
334− parser.add_argument('--commit', action='store_true', help='Create a commit for each package update')
335−
336− args = parser.parse_args()
337− target = args.target
338−
339− packages = list(map(os.path.abspath, args.package))
340−
341− logging.info("Updating packages...")
342−
343− # Use threads to update packages concurrently
344− with Pool() as p:
345− results = list(p.map(lambda pkg: _update(pkg, target), packages))
346−
347− logging.info("Finished updating packages.")
348−
349− # Commits are created sequentially.
350− if args.commit:
351− logging.info("Committing updates...")
352− list(map(lambda x: _commit(**x), filter(bool, results)))
353− logging.info("Finished committing updates")
354−
355− count = sum(map(bool, results))
356− logging.info("{} package(s) updated".format(count))
357−
358−
359−
360−if __name__ == '__main__':
361− main()
maintainers/scripts/update.nix+19−34
@@ -1,6 +1,8 @@
11{ package ? null
22, maintainer ? null
33, path ? null
4+, max-workers ? null
5+, keep-going ? null
46}:
57
68# TODO: add assert statements
@@ -105,27 +107,24 @@ let
105107 % nix-shell maintainers/scripts/update.nix --argstr path gnome3
106108
107109 to run update script for all package under an attribute path.
108− '';
109110
110− runUpdateScript = package: ''
111− echo -ne " - ${package.name}: UPDATING ..."\\r
112− ${package.updateScript} &> ${(builtins.parseDrvName package.name).name}.log
113− CODE=$?
114− if [ "$CODE" != "0" ]; then
115− echo " - ${package.name}: ERROR "
116− echo ""
117− echo "--- SHOWING ERROR LOG FOR ${package.name} ----------------------"
118− echo ""
119− cat ${(builtins.parseDrvName package.name).name}.log
120− echo ""
121− echo "--- SHOWING ERROR LOG FOR ${package.name} ----------------------"
122− exit $CODE
123− else
124− rm ${(builtins.parseDrvName package.name).name}.log
125− fi
126− echo " - ${package.name}: DONE. "
111+ You can also add
112+
113+ --argstr max-workers 8
114+
115+ to increase the number of jobs in parallel, or
116+
117+ --argstr keep-going true
118+
119+ to continue running when a single update fails.
127120 '';
128121
122+ packageData = package: {
123+ name = package.name;
124+ pname = (builtins.parseDrvName package.name).name;
125+ updateScript = pkgs.lib.toList package.updateScript;
126+ };
127+
129128in pkgs.stdenv.mkDerivation {
130129 name = "nixpkgs-update-script";
131130 buildCommand = ''
@@ -139,21 +138,7 @@ in pkgs.stdenv.mkDerivation {
139138 exit 1
140139 '';
141140 shellHook = ''
142− echo ""
143− echo "Going to be running update for following packages:"
144− echo "${builtins.concatStringsSep "\n" (map (x: " - ${x.name}") packages)}"
145− echo ""
146− read -n1 -r -p "Press space to continue..." confirm
147− if [ "$confirm" = "" ]; then
148− echo ""
149− echo "Running update for:"
150− ${builtins.concatStringsSep "\n" (map runUpdateScript packages)}
151− echo ""
152− echo "Packages updated!"
153− exit 0
154− else
155− echo "Aborting!"
156− exit 1
157− fi
141+ unset shellHook # do not contaminate nested shells
142+ exec ${pkgs.python3.interpreter} ${./update.py} ${pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages))}${pkgs.lib.optionalString (max-workers != null) " --max-workers=${max-workers}"}${pkgs.lib.optionalString (keep-going == "true") " --keep-going"}
158143 '';
159144}
maintainers/scripts/update.pynew file+79
@@ -0,0 +1,79 @@
1+import argparse
2+import concurrent.futures
3+import json
4+import os
5+import subprocess
6+import sys
7+
8+updates = {}
9+
10+def eprint(*args, **kwargs):
11+ print(*args, file=sys.stderr, **kwargs)
12+
13+def run_update_script(package):
14+ eprint(f" - {package['name']}: UPDATING ...")
15+
16+ subprocess.run(package['updateScript'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True)
17+
18+
19+def main(max_workers, keep_going, packages):
20+ with open(sys.argv[1]) as f:
21+ packages = json.load(f)
22+
23+ eprint()
24+ eprint('Going to be running update for following packages:')
25+ for package in packages:
26+ eprint(f" - {package['name']}")
27+ eprint()
28+
29+ confirm = input('Press Enter key to continue...')
30+ if confirm == '':
31+ eprint()
32+ eprint('Running update for:')
33+
34+ with concurrent.futures.ProcessPoolExecutor(max_workers=max_workers) as executor:
35+ for package in packages:
36+ updates[executor.submit(run_update_script, package)] = package
37+
38+ for future in concurrent.futures.as_completed(updates):
39+ package = updates[future]
40+
41+ try:
42+ future.result()
43+ eprint(f" - {package['name']}: DONE.")
44+ except subprocess.CalledProcessError as e:
45+ eprint(f" - {package['name']}: ERROR")
46+ eprint()
47+ eprint(f"--- SHOWING ERROR LOG FOR {package['name']} ----------------------")
48+ eprint()
49+ eprint(e.stdout.decode('utf-8'))
50+ with open(f"{package['pname']}.log", 'wb') as f:
51+ f.write(e.stdout)
52+ eprint()
53+ eprint(f"--- SHOWING ERROR LOG FOR {package['name']} ----------------------")
54+
55+ if not keep_going:
56+ sys.exit(1)
57+
58+ eprint()
59+ eprint('Packages updated!')
60+ sys.exit()
61+ else:
62+ eprint('Aborting!')
63+ sys.exit(130)
64+
65+parser = argparse.ArgumentParser(description='Update packages')
66+parser.add_argument('--max-workers', '-j', dest='max_workers', type=int, help='Number of updates to run concurrently', nargs='?', default=4)
67+parser.add_argument('--keep-going', '-k', dest='keep_going', action='store_true', help='Do not stop after first failure')
68+parser.add_argument('packages', help='JSON file containing the list of package names and their update scripts')
69+
70+if __name__ == '__main__':
71+ args = parser.parse_args()
72+
73+ try:
74+ main(args.max_workers, args.keep_going, args.packages)
75+ except (KeyboardInterrupt, SystemExit) as e:
76+ for update in updates:
77+ update.cancel()
78+
79+ sys.exit(e.code if isinstance(e, SystemExit) else 130)
nixos/doc/manual/administration/container-networking.xml+1
@@ -52,6 +52,7 @@ $ ping -c1 10.233.4.2
5252networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
5353</programlisting>
5454 </para>
55+
5556 <para>
5657 You may need to restart your system for the changes to take effect.
5758 </para>
nixos/doc/manual/administration/declarative-containers.xml+1−1
@@ -15,7 +15,7 @@ containers.database =
1515 { config =
1616 { config, pkgs, ... }:
1717 { <xref linkend="opt-services.postgresql.enable"/> = true;
18− <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql96;
18+ <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_9_6;
1919 };
2020 };
2121</programlisting>
nixos/doc/manual/configuration/adding-custom-packages.xml+1−1
@@ -31,7 +31,7 @@ $ cd nixpkgs
3131 <para>
3232 The second possibility is to add the package outside of the Nixpkgs tree. For
3333 instance, here is how you specify a build of the
34− <link xlink:href="http://www.gnu.org/software/hello/">GNU Hello</link>
34+ <link xlink:href="https://www.gnu.org/software/hello/">GNU Hello</link>
3535 package directly in <filename>configuration.nix</filename>:
3636<programlisting>
3737<xref linkend="opt-environment.systemPackages"/> =
nixos/doc/manual/configuration/config-file.xml+2−2
@@ -197,10 +197,10 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
197197 pkgs.emacs
198198 ];
199199
200−<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql90;
200+<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_10;
201201</programlisting>
202202 The latter option definition changes the default PostgreSQL package used
203− by NixOS’s PostgreSQL service to 9.0. For more information on packages,
203+ by NixOS’s PostgreSQL service to 10.x. For more information on packages,
204204 including how to add new ones, see <xref linkend="sec-custom-packages"/>.
205205 </para>
206206 </listitem>
nixos/doc/manual/configuration/configuration.xml+1
@@ -22,5 +22,6 @@
2222 <xi:include href="networking.xml" />
2323 <xi:include href="linux-kernel.xml" />
2424 <xi:include href="../generated/modules.xml" xpointer="xpointer(//section[@id='modules']/*)" />
25+ <xi:include href="profiles.xml" />
2526<!-- Apache; libvirtd virtualisation -->
2627</part>
nixos/doc/manual/configuration/firewall.xml−9
@@ -34,13 +34,4 @@
3434 Similarly, UDP port ranges can be opened through
3535 <xref linkend="opt-networking.firewall.allowedUDPPortRanges"/>.
3636 </para>
37−
38− <para>
39− Also of interest is
40−<programlisting>
41−<xref linkend="opt-networking.firewall.allowPing"/> = true;
42−</programlisting>
43− to allow the machine to respond to ping requests. (ICMPv6 pings are always
44− allowed.)
45− </para>
4637</section>
nixos/doc/manual/configuration/modularity.xml+22−5
@@ -113,12 +113,10 @@ $ nixos-option <xref linkend="opt-boot.kernelModules"/>
113113[ "tun" "ipv6" "loop" <replaceable>...</replaceable> ]
114114</screen>
115115 Interactive exploration of the configuration is possible using
116− <command
117−xlink:href="https://github.com/edolstra/nix-repl">nix-repl</command>,
118− a read-eval-print loop for Nix expressions. It’s not installed by default;
119− run <literal>nix-env -i nix-repl</literal> to get it. A typical use:
116+ <command>nix repl</command>, a read-eval-print loop for Nix expressions.
117+ A typical use:
120118<screen>
121−$ nix-repl '&lt;nixpkgs/nixos>'
119+$ nix repl '&lt;nixpkgs/nixos>'
122120
123121nix-repl> config.<xref linkend="opt-networking.hostName"/>
124122"mandark"
@@ -127,4 +125,23 @@ nix-repl> map (x: x.hostName) config.<xref linkend="opt-services.httpd.virtualHo
127125[ "example.org" "example.gov" ]
128126</screen>
129127 </para>
128+
129+ <para>
130+ While abstracting your configuration, you may find it useful to generate
131+ modules using code, instead of writing files. The example
132+ below would have the same effect as importing a file which sets those
133+ options.
134+ <screen>
135+ { config, pkgs, ... }:
136+
137+ let netConfig = { hostName }: {
138+ networking.hostName = hostName;
139+ networking.useDHCP = false;
140+ };
141+
142+ in
143+
144+ { imports = [ (netConfig "nixos.localdomain") ]; }
145+ </screen>
146+</para>
130147</section>
nixos/doc/manual/configuration/profiles.xmlnew file+39
@@ -0,0 +1,39 @@
1+<chapter xmlns="http://docbook.org/ns/docbook"
2+ xmlns:xlink="http://www.w3.org/1999/xlink"
3+ xmlns:xi="http://www.w3.org/2001/XInclude"
4+ version="5.0"
5+ xml:id="ch-profiles">
6+ <title>Profiles</title>
7+ <para>
8+ In some cases, it may be desirable to take advantage of commonly-used,
9+ predefined configurations provided by nixpkgs, but different from those that
10+ come as default. This is a role fulfilled by NixOS's Profiles, which come as
11+ files living in <filename>&lt;nixpkgs/nixos/modules/profiles&gt;</filename>.
12+ That is to say, expected usage is to add them to the imports list of your
13+ <filename>/etc/configuration.nix</filename> as such:
14+ </para>
15+ <programlisting>
16+ imports = [
17+ &lt;nixpkgs/nixos/modules/profiles/profile-name.nix&gt;
18+ ];
19+ </programlisting>
20+ <para>
21+ Even if some of these profiles seem only useful in the context of
22+ install media, many are actually intended to be used in real installs.
23+ </para>
24+ <para>
25+ What follows is a brief explanation on the purpose and use-case for each
26+ profile. Detailing each option configured by each one is out of scope.
27+ </para>
28+ <xi:include href="profiles/all-hardware.xml" />
29+ <xi:include href="profiles/base.xml" />
30+ <xi:include href="profiles/clone-config.xml" />
31+ <xi:include href="profiles/demo.xml" />
32+ <xi:include href="profiles/docker-container.xml" />
33+ <xi:include href="profiles/graphical.xml" />
34+ <xi:include href="profiles/hardened.xml" />
35+ <xi:include href="profiles/headless.xml" />
36+ <xi:include href="profiles/installation-device.xml" />
37+ <xi:include href="profiles/minimal.xml" />
38+ <xi:include href="profiles/qemu-guest.xml" />
39+</chapter>
nixos/doc/manual/configuration/profiles/all-hardware.xmlnew file+20
@@ -0,0 +1,20 @@
1+
2+<section xmlns="http://docbook.org/ns/docbook"
3+ xmlns:xlink="http://www.w3.org/1999/xlink"
4+ xmlns:xi="http://www.w3.org/2001/XInclude"
5+ version="5.0"
6+ xml:id="sec-profile-all-hardware">
7+ <title>All Hardware</title>
8+ <para>
9+ Enables all hardware supported by NixOS: i.e., all firmware is
10+ included, and all devices from which one may boot are enabled in the initrd.
11+ Its primary use is in the NixOS installation CDs.
12+ </para>
13+ <para>
14+ The enabled kernel modules include support for SATA and PATA, SCSI
15+ (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and
16+ Hyper-V. Additionally, <xref linkend="opt-hardware.enableAllFirmware"/> is
17+ enabled, and the firmware for the ZyDAS ZD1211 chipset is specifically
18+ installed.
19+ </para>
20+</section>
nixos/doc/manual/configuration/profiles/base.xmlnew file+15
@@ -0,0 +1,15 @@
1+
2+<section xmlns="http://docbook.org/ns/docbook"
3+ xmlns:xlink="http://www.w3.org/1999/xlink"
4+ xmlns:xi="http://www.w3.org/2001/XInclude"
5+ version="5.0"
6+ xml:id="sec-profile-base">
7+ <title>Base</title>
8+ <para>
9+ Defines the software packages included in the "minimal"
10+ installation CD. It installs several utilities useful in a simple recovery or
11+ install media, such as a text-mode web browser, and tools for manipulating
12+ block devices, networking, hardware diagnostics, and filesystems (with their
13+ respective kernel modules).
14+ </para>
15+</section>
nixos/doc/manual/configuration/profiles/clone-config.xmlnew file+14
@@ -0,0 +1,14 @@
1+
2+<section xmlns="http://docbook.org/ns/docbook"
3+ xmlns:xlink="http://www.w3.org/1999/xlink"
4+ xmlns:xi="http://www.w3.org/2001/XInclude"
5+ version="5.0"
6+ xml:id="sec-profile-clone-config">
7+ <title>Clone Config</title>
8+ <para>
9+ This profile is used in installer images.
10+ It provides an editable configuration.nix that imports all the modules that
11+ were also used when creating the image in the first place.
12+ As a result it allows users to edit and rebuild the live-system.
13+ </para>
14+</section>
nixos/doc/manual/configuration/profiles/demo.xmlnew file+13
@@ -0,0 +1,13 @@
1+
2+<section xmlns="http://docbook.org/ns/docbook"
3+ xmlns:xlink="http://www.w3.org/1999/xlink"
4+ xmlns:xi="http://www.w3.org/2001/XInclude"
5+ version="5.0"
6+ xml:id="sec-profile-demo">
7+ <title>Demo</title>
8+ <para>
9+ This profile just enables a <systemitem class="username">demo</systemitem> user, with password <literal>demo</literal>, uid <literal>1000</literal>, <systemitem class="groupname">wheel</systemitem>
10+ group and <link linkend="opt-services.xserver.displayManager.sddm.autoLogin">
11+ autologin in the SDDM display manager</link>.
12+ </para>
13+</section>
nixos/doc/manual/configuration/profiles/docker-container.xmlnew file+15
@@ -0,0 +1,15 @@
1+
2+<section xmlns="http://docbook.org/ns/docbook"
3+ xmlns:xlink="http://www.w3.org/1999/xlink"
4+ xmlns:xi="http://www.w3.org/2001/XInclude"
5+ version="5.0"
6+ xml:id="sec-profile-docker-container">
7+ <title>Docker Container</title>
8+ <para>
9+ This is the profile from which the Docker images are generated. It prepares a
10+ working system by importing the <link linkend="sec-profile-minimal">Minimal</link> and
11+ <link linkend="sec-profile-clone-config">Clone Config</link> profiles, and setting appropriate
12+ configuration options that are useful inside a container context, like
13+ <xref linkend="opt-boot.isContainer"/>.
14+ </para>
15+</section>
nixos/doc/manual/configuration/profiles/graphical.xmlnew file+21
@@ -0,0 +1,21 @@
1+
2+<section xmlns="http://docbook.org/ns/docbook"
3+ xmlns:xlink="http://www.w3.org/1999/xlink"
4+ xmlns:xi="http://www.w3.org/2001/XInclude"
5+ version="5.0"
6+ xml:id="sec-profile-graphical">
7+ <title>Graphical</title>
8+ <para>
9+ Defines a NixOS configuration with the Plasma 5 desktop. It's used by the
10+ graphical installation CD.
11+ </para>
12+ <para>
13+ It sets <xref linkend="opt-services.xserver.enable"/>,
14+ <xref linkend="opt-services.xserver.displayManager.sddm.enable"/>,
15+ <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> (
16+ <link linkend="opt-services.xserver.desktopManager.plasma5.enableQt4Support">
17+ without Qt4 Support</link>), and
18+ <xref linkend="opt-services.xserver.libinput.enable"/> to true. It also
19+ includes glxinfo and firefox in the system packages list.
20+ </para>
21+</section>
nixos/doc/manual/configuration/profiles/hardened.xmlnew file+22
@@ -0,0 +1,22 @@
1+
2+<section xmlns="http://docbook.org/ns/docbook"
3+ xmlns:xlink="http://www.w3.org/1999/xlink"
4+ xmlns:xi="http://www.w3.org/2001/XInclude"
5+ version="5.0"
6+ xml:id="sec-profile-hardened">
7+ <title>Hardened</title>
8+ <para>
9+ A profile with most (vanilla) hardening options enabled by default,
10+ potentially at the cost of features and performance.
11+ </para>
12+ <para>
13+ This includes a hardened kernel, and limiting the system information
14+ available to processes through the <filename>/sys</filename> and
15+ <filename>/proc</filename> filesystems. It also disables the User Namespaces
16+ feature of the kernel, which stops Nix from being able to build anything
17+ (this particular setting can be overriden via
18+ <xref linkend="opt-security.allowUserNamespaces"/>). See the <literal
19+ xlink:href="https://github.com/nixos/nixpkgs/tree/master/nixos/modules/profiles/hardened.nix">
20+ profile source</literal> for further detail on which settings are altered.
21+ </para>
22+</section>
nixos/doc/manual/configuration/profiles/headless.xmlnew file+18
@@ -0,0 +1,18 @@
1+
2+<section xmlns="http://docbook.org/ns/docbook"
3+ xmlns:xlink="http://www.w3.org/1999/xlink"
4+ xmlns:xi="http://www.w3.org/2001/XInclude"
5+ version="5.0"
6+ xml:id="sec-profile-headless">
7+ <title>Headless</title>
8+ <para>
9+ Common configuration for headless machines (e.g., Amazon EC2 instances).
10+ </para>
11+ <para>
12+ Disables <link linkend="opt-sound.enable">sound</link>,
13+ <link linkend="opt-boot.vesa">vesa</link>, serial consoles,
14+ <link linkend="opt-systemd.enableEmergencyMode">emergency mode</link>,
15+ <link linkend="opt-boot.loader.grub.splashImage">grub splash images</link> and
16+ configures the kernel to reboot automatically on panic.
17+ </para>
18+</section>
nixos/doc/manual/configuration/profiles/installation-device.xmlnew file+35
@@ -0,0 +1,35 @@
1+
2+<section xmlns="http://docbook.org/ns/docbook"
3+ xmlns:xlink="http://www.w3.org/1999/xlink"
4+ xmlns:xi="http://www.w3.org/2001/XInclude"
5+ version="5.0"
6+ xml:id="sec-profile-installation-device">
7+ <title>Installation Device</title>
8+ <para>
9+ Provides a basic configuration for installation devices like CDs. This means
10+ enabling hardware scans, using the <link linkend="sec-profile-clone-config">
11+ Clone Config profile</link> to guarantee
12+ <filename>/etc/nixos/configuration.nix</filename> exists (for
13+ <command>nixos-rebuild</command> to work), a copy of the Nixpkgs channel
14+ snapshot used to create the install media.
15+ </para>
16+ <para>
17+ Additionally, documentation for <link linkend="opt-documentation.enable">
18+ Nixpkgs</link> and <link linkend="opt-documentation.nixos.enable">NixOS
19+ </link> are forcefully enabled (to override the
20+ <link linkend="sec-profile-minimal">Minimal profile</link> preference); the
21+ NixOS manual is shown automatically on TTY 8, sudo and udisks are disabled.
22+ Autologin is enabled as root.
23+ </para>
24+ <para>
25+ A message is shown to the user to start a display manager if needed,
26+ ssh with <xref linkend="opt-services.openssh.permitRootLogin"/> are enabled (but
27+ doesn't autostart). WPA Supplicant is also enabled without autostart.
28+ </para>
29+ <para>
30+ Finally, vim is installed, root is set to not have a password, the kernel is
31+ made more silent for remote public IP installs, and several settings are
32+ tweaked so that the installer has a better chance of succeeding under
33+ low-memory environments.
34+ </para>
35+</section>
nixos/doc/manual/configuration/profiles/minimal.xmlnew file+17
@@ -0,0 +1,17 @@
1+
2+<section xmlns="http://docbook.org/ns/docbook"
3+ xmlns:xlink="http://www.w3.org/1999/xlink"
4+ xmlns:xi="http://www.w3.org/2001/XInclude"
5+ version="5.0"
6+ xml:id="sec-profile-minimal">
7+ <title>Minimal</title>
8+ <para>
9+ This profile defines a small NixOS configuration. It does not contain any
10+ graphical stuff. It's a very short file that enables
11+ <link linkend="opt-environment.noXlibs">noXlibs</link>, sets
12+ <link linkend="opt-i18n.supportedLocales">i18n.supportedLocales</link>
13+ to only support the user-selected locale,
14+ <link linkend="opt-documentation.enable">disables packages' documentation
15+ </link>, and <link linkend="opt-sound.enable">disables sound</link>.
16+ </para>
17+</section>
nixos/doc/manual/configuration/profiles/qemu-guest.xmlnew file+16
@@ -0,0 +1,16 @@
1+<section xmlns="http://docbook.org/ns/docbook"
2+ xmlns:xlink="http://www.w3.org/1999/xlink"
3+ xmlns:xi="http://www.w3.org/2001/XInclude"
4+ version="5.0"
5+ xml:id="sec-profile-qemu-guest">
6+ <title>QEMU Guest</title>
7+ <para>
8+ This profile contains common configuration for virtual machines running under
9+ QEMU (using virtio).
10+ </para>
11+ <para>
12+ It makes virtio modules available on the initrd, sets the system time from
13+ the hardware clock to work around a bug in qemu-kvm, and
14+ <link linkend="opt-security.rngd.enable">enables rngd</link>.
15+ </para>
16+</section>
nixos/doc/manual/configuration/x-windows.xml+2−2
@@ -35,11 +35,11 @@
3535 </para>
3636 <para>
3737 NixOS’s default <emphasis>display manager</emphasis> (the program that
38− provides a graphical login prompt and manages the X server) is SLiM. You can
38+ provides a graphical login prompt and manages the X server) is LightDM. You can
3939 select an alternative one by picking one of the following lines:
4040<programlisting>
4141<xref linkend="opt-services.xserver.displayManager.sddm.enable"/> = true;
42−<xref linkend="opt-services.xserver.displayManager.lightdm.enable"/> = true;
42+<xref linkend="opt-services.xserver.displayManager.slim.enable"/> = true;
4343</programlisting>
4444 </para>
4545 <para>
nixos/doc/manual/development/debugging-nixos-tests.xmldeleted−37
@@ -1,37 +0,0 @@
1−<section xmlns="http://docbook.org/ns/docbook"
2− xmlns:xlink="http://www.w3.org/1999/xlink"
3− xmlns:xi="http://www.w3.org/2001/XInclude"
4− version="5.0"
5− xml:id="sec-debugging-nixos-tests">
6− <title>Debugging NixOS tests</title>
7−
8− <para>
9− Tests may fail and infrastructure offers access to inspect machine state.
10− </para>
11−
12− <para>
13− To prevent test from stopping and cleaning up, insert a sleep command:
14− </para>
15−
16−<programlisting>
17−$machine->succeed("sleep 84000");
18−</programlisting>
19−
20− <para>
21− As soon as machine starts run as root:
22− </para>
23−
24−<programlisting>
25−nix-shell -p socat --run "socat STDIO,raw,echo=0,escape=0x11 UNIX:/tmp/nix-build-vm-test-run-*.drv-0/vm-state-machine/backdoor"
26−</programlisting>
27−
28− <para>
29− You may need to find the correct path, replacing <literal>/tmp</literal>,
30− <literal>*</literal> or <literal>machine</literal>.
31− </para>
32−
33− <para>
34− Press "enter" to open up console and login as "root". After you're done,
35− press "ctrl-q" to exit the console.
36− </para>
37−</section>
nixos/doc/manual/development/nixos-tests.xml−1
@@ -16,5 +16,4 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/test
1616 <xi:include href="writing-nixos-tests.xml" />
1717 <xi:include href="running-nixos-tests.xml" />
1818 <xi:include href="running-nixos-tests-interactively.xml" />
19− <xi:include href="debugging-nixos-tests.xml" />
2019</chapter>
nixos/doc/manual/development/option-types.xml+12−1
@@ -106,7 +106,7 @@
106106 </para>
107107 </listitem>
108108 </varlistentry>
109− <varlistentry>
109+ <varlistentry xml:id='types.ints.ux'>
110110 <term>
111111 <varname>types.ints.{u8, u16, u32}</varname>
112112 </term>
@@ -131,6 +131,17 @@
131131 </para>
132132 </listitem>
133133 </varlistentry>
134+ <varlistentry>
135+ <term>
136+ <varname>types.port</varname>
137+ </term>
138+ <listitem>
139+ <para>
140+ A port number. This type is an alias to
141+ <link linkend='types.ints.ux'><varname>types.ints.u16</varname></link>.
142+ </para>
143+ </listitem>
144+ </varlistentry>
134145 </variablelist>
135146
136147 <para>
nixos/doc/manual/development/running-nixos-tests-interactively.xml+1−1
@@ -19,7 +19,7 @@ starting VDE switch for network 1
1919&gt; startAll
2020&gt; testScript
2121&gt; $machine->succeed("touch /tmp/foo")
22−&gt; print($machine->succeed("pwd"), "\n") # Show stdout of command
22+&gt; print($machine->succeed("pwd")) # Show stdout of command
2323</screen>
2424 The function <command>testScript</command> executes the entire test script
2525 and drops you back into the test driver command line upon its completion.
nixos/doc/manual/development/writing-nixos-tests.xml+1−1
@@ -108,7 +108,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualis
108108<programlisting>
109109$machine->start;
110110$machine->waitForUnit("default.target");
111−die unless $machine->succeed("uname") =~ /Linux/;
111+$machine->succeed("uname") =~ /Linux/ or die;
112112</programlisting>
113113 The first line is actually unnecessary; machines are implicitly started when
114114 you first execute an action on them (such as <literal>waitForUnit</literal>
nixos/doc/manual/installation/installing-usb.xml+1−1
@@ -23,7 +23,7 @@ $ diskutil list
2323[..]
2424$ diskutil unmountDisk diskN
2525Unmount of all volumes on diskN was successful
26−$ sudo dd bs=1m if=nix.iso of=/dev/rdiskN
26+$ sudo dd bs=1000000 if=nix.iso of=/dev/rdiskN
2727</programlisting>
2828 Using the 'raw' <command>rdiskN</command> device instead of
2929 <command>diskN</command> completes in minutes instead of hours. After
nixos/doc/manual/installation/installing-virtualbox-guest.xml+6−2
@@ -77,18 +77,22 @@
7777 Shared folders can be given a name and a path in the host system in the
7878 VirtualBox settings (Machine / Settings / Shared Folders, then click on the
7979 "Add" icon). Add the following to the
80− <literal>/etc/nixos/configuration.nix</literal> to auto-mount them:
80+ <literal>/etc/nixos/configuration.nix</literal> to auto-mount them. If you
81+ do not add <literal>"nofail"</literal>, the system will no boot properly.
82+ The same goes for disabling <literal>rngd</literal> which is normally used
83+ to get randomness but this does not work in virtual machines.
8184 </para>
8285
8386<programlisting>
8487{ config, pkgs, ...} :
8588{
89+ security.rngd.enable = false; // otherwise vm will not boot
8690 ...
8791
8892 fileSystems."/virtualboxshare" = {
8993 fsType = "vboxsf";
9094 device = "nameofthesharedfolder";
91− options = [ "rw" ];
95+ options = [ "rw" "nofail" ];
9296 };
9397}
9498</programlisting>
nixos/doc/manual/man-nixos-generate-config.xml+4−4
@@ -13,18 +13,18 @@
1313 </refnamediv>
1414 <refsynopsisdiv>
1515 <cmdsynopsis>
16− <command>nixos-generate-config</command>
16+ <command>nixos-generate-config</command>
1717 <arg>
1818 <option>--force</option>
1919 </arg>
20−
20+
2121 <arg>
2222 <arg choice='plain'>
2323 <option>--root</option>
2424 </arg>
2525 <replaceable>root</replaceable>
2626 </arg>
27−
27+
2828 <arg>
2929 <arg choice='plain'>
3030 <option>--dir</option>
@@ -167,7 +167,7 @@ $ nixos-generate-config --root /mnt
167167
168168{
169169 imports =
170− [ &lt;nixos/modules/installer/scan/not-detected.nix>
170+ [ &lt;nixos/modules/installer/scan/not-detected.nix&gt;
171171 ];
172172
173173 boot.initrd.availableKernelModules = [ "ehci_hcd" "ahci" ];
nixos/doc/manual/man-nixos-rebuild.xml+39−14
@@ -13,35 +13,35 @@
1313 </refnamediv>
1414 <refsynopsisdiv>
1515 <cmdsynopsis>
16− <command>nixos-rebuild</command><group choice='req'>
16+ <command>nixos-rebuild</command><group choice='req'>
1717 <arg choice='plain'>
1818 <option>switch</option>
1919 </arg>
20−
20+
2121 <arg choice='plain'>
2222 <option>boot</option>
2323 </arg>
24−
24+
2525 <arg choice='plain'>
2626 <option>test</option>
2727 </arg>
28−
28+
2929 <arg choice='plain'>
3030 <option>build</option>
3131 </arg>
32−
32+
3333 <arg choice='plain'>
3434 <option>dry-build</option>
3535 </arg>
36−
36+
3737 <arg choice='plain'>
3838 <option>dry-activate</option>
3939 </arg>
40−
40+
4141 <arg choice='plain'>
4242 <option>build-vm</option>
4343 </arg>
44−
44+
4545 <arg choice='plain'>
4646 <option>build-vm-with-bootloader</option>
4747 </arg>
@@ -50,29 +50,33 @@
5050 <arg>
5151 <option>--upgrade</option>
5252 </arg>
53−
53+
5454 <arg>
5555 <option>--install-bootloader</option>
5656 </arg>
57−
57+
5858 <arg>
5959 <option>--no-build-nix</option>
6060 </arg>
61−
61+
6262 <arg>
6363 <option>--fast</option>
6464 </arg>
65−
65+
6666 <arg>
6767 <option>--rollback</option>
6868 </arg>
69+ <arg>
70+ <option>--builders</option>
71+ <replaceable>builder-spec</replaceable>
72+ </arg>
6973 <sbr />
7074 <arg>
71− <group choice='req'>
75+ <group choice='req'>
7276 <arg choice='plain'>
7377 <option>--profile-name</option>
7478 </arg>
75−
79+
7680 <arg choice='plain'>
7781 <option>-p</option>
7882 </arg>
@@ -315,6 +319,27 @@ $ ./result/bin/run-*-vm
315319 </para>
316320 </listitem>
317321 </varlistentry>
322+ <varlistentry>
323+ <term>
324+ <option>--builders</option>
325+ <replaceable>builder-spec</replaceable>
326+ </term>
327+ <listitem>
328+ <para>
329+ Allow ad-hoc remote builders for building the new system.
330+ This requires the user executing <command>nixos-rebuild</command> (usually
331+ root) to be configured as a trusted user in the Nix daemon. This can be
332+ achieved by using the <literal>nix.trustedUsers</literal> NixOS option.
333+ Examples values for that option are described in the
334+ <literal>Remote builds chapter</literal> in the Nix manual,
335+ (i.e. <command>--builders "ssh://bigbrother x86_64-linux"</command>).
336+ By specifying an empty string existing builders specified in
337+ <filename>/etc/nix/machines</filename> can be ignored:
338+ <command>--builders ""</command> for example when they are not
339+ reachable due to network connectivity.
340+ </para>
341+ </listitem>
342+ </varlistentry>
318343 <varlistentry>
319344 <term>
320345 <option>--profile-name</option>
nixos/doc/manual/release-notes/rl-1412.xml+1−1
@@ -17,7 +17,7 @@
1717 </listitem>
1818 <listitem>
1919 <para>
20− <link xlink:href="http://thread.gmane.org/gmane.linux.distributions.nixos/15165">
20+ <link xlink:href="https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg13957.html">
2121 Nix has been updated to 1.8.</link>
2222 </para>
2323 </listitem>
nixos/doc/manual/release-notes/rl-1809.xml+47
@@ -475,6 +475,48 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
475475 </para>
476476
477477 <itemizedlist>
478+ <listitem>
479+ <para>
480+ Some licenses that were incorrectly not marked as unfree now are. This is
481+ the case for:
482+ <itemizedlist>
483+ <listitem>
484+ <para>
485+ cc-by-nc-sa-20: Creative Commons Attribution Non Commercial Share Alike
486+ 2.0
487+ </para>
488+ </listitem>
489+ <listitem>
490+ <para>
491+ cc-by-nc-sa-25: Creative Commons Attribution Non Commercial Share Alike
492+ 2.5
493+ </para>
494+ </listitem>
495+ <listitem>
496+ <para>
497+ cc-by-nc-sa-30: Creative Commons Attribution Non Commercial Share Alike
498+ 3.0
499+ </para>
500+ </listitem>
501+ <listitem>
502+ <para>
503+ cc-by-nc-sa-40: Creative Commons Attribution Non Commercial Share Alike
504+ 4.0
505+ </para>
506+ </listitem>
507+ <listitem>
508+ <para>
509+ cc-by-nd-30: Creative Commons Attribution-No Derivative Works v3.00
510+ </para>
511+ </listitem>
512+ <listitem>
513+ <para>
514+ msrla: Microsoft Research License Agreement
515+ </para>
516+ </listitem>
517+ </itemizedlist>
518+ </para>
519+ </listitem>
478520 <listitem>
479521 <para>
480522 The deprecated <varname>services.cassandra</varname> module has seen a
@@ -595,6 +637,11 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
595637 anyways for clarity.
596638 </para>
597639 </listitem>
640+ <listitem>
641+ <para>
642+ Groups <literal>kvm</literal> and <literal>render</literal> are introduced now, as systemd requires them.
643+ </para>
644+ </listitem>
598645 </itemizedlist>
599646 </section>
600647
nixos/doc/manual/release-notes/rl-1903.xml+305−9
@@ -19,7 +19,9 @@
1919
2020 <itemizedlist>
2121 <listitem>
22− <para />
22+ <para>
23+ The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6.
24+ </para>
2325 </listitem>
2426 </itemizedlist>
2527 </section>
@@ -37,7 +39,18 @@
3739
3840 <itemizedlist>
3941 <listitem>
40− <para />
42+ <para>
43+ <literal>./programs/nm-applet.nix</literal>
44+ </para>
45+ </listitem>
46+ <listitem>
47+ <para>
48+ There is a new <varname>security.googleOsLogin</varname> module for using
49+ <link xlink:href="https://cloud.google.com/compute/docs/instances/managing-instance-access">OS Login</link>
50+ to manage SSH access to Google Compute Engine instances, which supersedes
51+ the imperative and broken <literal>google-accounts-daemon</literal> used
52+ in <literal>nixos/modules/virtualisation/google-compute-config.nix</literal>.
53+ </para>
4154 </listitem>
4255 </itemizedlist>
4356 </section>
@@ -99,6 +112,26 @@
99112 </listitem>
100113 </itemizedlist>
101114 </listitem>
115+ <listitem>
116+ <para>
117+ The Syncthing state and configuration data has been moved from
118+ <varname>services.syncthing.dataDir</varname> to the newly defined
119+ <varname>services.syncthing.configDir</varname>, which default to
120+ <literal>/var/lib/syncthing/.config/syncthing</literal>.
121+ This change makes possible to share synced directories using ACLs
122+ without Syncthing resetting the permission on every start.
123+ </para>
124+ </listitem>
125+ <listitem>
126+ <para>
127+ The <literal>ntp</literal> module now has sane default restrictions.
128+ If you're relying on the previous defaults, which permitted all queries
129+ and commands from all firewall-permitted sources, you can set
130+ <varname>services.ntp.restrictDefault</varname> and
131+ <varname>services.ntp.restrictSource</varname> to
132+ <literal>[]</literal>.
133+ </para>
134+ </listitem>
102135 <listitem>
103136 <para>
104137 Package <varname>rabbitmq_server</varname> is renamed to
@@ -106,12 +139,216 @@
106139 </para>
107140 </listitem>
108141 <listitem>
109− <para>
110− The <literal>light</literal> module no longer uses setuid binaries, but
111− udev rules. As a consequence users of that module have to belong to the
112− <literal>video</literal> group in order to use the executable
113− (i.e. <literal>users.users.yourusername.extraGroups = ["video"];</literal>).
114− </para>
142+ <para>
143+ The <literal>light</literal> module no longer uses setuid binaries, but
144+ udev rules. As a consequence users of that module have to belong to the
145+ <literal>video</literal> group in order to use the executable (i.e.
146+ <literal>users.users.yourusername.extraGroups = ["video"];</literal>).
147+ </para>
148+ </listitem>
149+ <listitem>
150+ <para>
151+ Buildbot now supports Python 3 and its packages have been moved to
152+ <literal>pythonPackages</literal>. The options
153+ <option>services.buildbot-master.package</option> and
154+ <option>services.buildbot-worker.package</option> can be used to select
155+ the Python 2 or 3 version of the package.
156+ </para>
157+ </listitem>
158+ <listitem>
159+ <para>
160+ Options
161+ <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.userName</literal> and
162+ <literal>services.znc.confOptions.networks.<replaceable>name</replaceable>.modulePackages</literal>
163+ were removed. They were never used for anything and can therefore safely be removed.
164+ </para>
165+ </listitem>
166+ <listitem>
167+ <para>
168+ Package <literal>wasm</literal> has been renamed <literal>proglodyte-wasm</literal>. The package
169+ <literal>wasm</literal> will be pointed to <literal>ocamlPackages.wasm</literal> in 19.09, so
170+ make sure to update your configuration if you want to keep <literal>proglodyte-wasm</literal>
171+ </para>
172+ </listitem>
173+ <listitem>
174+ <para>
175+ When the <literal>nixpkgs.pkgs</literal> option is set, NixOS will no
176+ longer ignore the <literal>nixpkgs.overlays</literal> option. The old
177+ behavior can be recovered by setting <literal>nixpkgs.overlays =
178+ lib.mkForce [];</literal>.
179+ </para>
180+ </listitem>
181+ <listitem>
182+ <para>
183+ OpenSMTPD has been upgraded to version 6.4.0p1. This release makes
184+ backwards-incompatible changes to the configuration file format. See
185+ <command>man smtpd.conf</command> for more information on the new file
186+ format.
187+ </para>
188+ </listitem>
189+ <listitem>
190+ <para>
191+ The versioned <varname>postgresql</varname> have been renamed to use
192+ underscore number seperators. For example, <varname>postgresql96</varname>
193+ has been renamed to <varname>postgresql_9_6</varname>.
194+ </para>
195+ </listitem>
196+ <listitem>
197+ <para>
198+ Package <literal>consul-ui</literal> and passthrough <literal>consul.ui</literal> have been removed.
199+ The package <literal>consul</literal> now uses upstream releases that vendor the UI into the binary.
200+ See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834">#48714</link>
201+ for details.
202+ </para>
203+ </listitem>
204+ <listitem>
205+ <para>
206+ Slurm introduces the new option
207+ <literal>services.slurm.stateSaveLocation</literal>,
208+ which is now set to <literal>/var/spool/slurm</literal> by default
209+ (instead of <literal>/var/spool</literal>).
210+ Make sure to move all files to the new directory or to set the option accordingly.
211+ </para>
212+ <para>
213+ The slurmctld now runs as user <literal>slurm</literal> instead of <literal>root</literal>.
214+ If you want to keep slurmctld running as <literal>root</literal>, set
215+ <literal>services.slurm.user = root</literal>.
216+ </para>
217+ <para>
218+ The options <literal>services.slurm.nodeName</literal> and
219+ <literal>services.slurm.partitionName</literal> are now sets of
220+ strings to correctly reflect that fact that each of these
221+ options can occour more than once in the configuration.
222+ </para>
223+ </listitem>
224+ <listitem>
225+ <para>
226+ The <literal>solr</literal> package has been upgraded from 4.10.3 to 7.5.0 and has undergone
227+ some major changes. The <literal>services.solr</literal> module has been updated to reflect
228+ these changes. Please review http://lucene.apache.org/solr/ carefully before upgrading.
229+ </para>
230+ </listitem>
231+ <listitem>
232+ <para>
233+ Package <literal>ckb</literal> is renamed to <literal>ckb-next</literal>,
234+ and options <literal>hardware.ckb.*</literal> are renamed to
235+ <literal>hardware.ckb-next.*</literal>.
236+ </para>
237+ </listitem>
238+ <listitem>
239+ <para>
240+ The option <literal>services.xserver.displayManager.job.logToFile</literal> which was
241+ previously set to <literal>true</literal> when using the display managers
242+ <literal>lightdm</literal>, <literal>sddm</literal> or <literal>xpra</literal> has been
243+ reset to the default value (<literal>false</literal>).
244+ </para>
245+ </listitem>
246+ <listitem>
247+ <para>
248+ Network interface indiscriminate NixOS firewall options
249+ (<literal>networking.firewall.allow*</literal>) are now preserved when also
250+ setting interface specific rules such as <literal>networking.firewall.interfaces.en0.allow*</literal>.
251+ These rules continue to use the pseudo device "default"
252+ (<literal>networking.firewall.interfaces.default.*</literal>), and assigning
253+ to this pseudo device will override the (<literal>networking.firewall.allow*</literal>)
254+ options.
255+ </para>
256+ </listitem>
257+ <listitem>
258+ <para>
259+ The <literal>nscd</literal> service now disables all caching of
260+ <literal>passwd</literal> and <literal>group</literal> databases by
261+ default. This was interferring with the correct functioning of the
262+ <literal>libnss_systemd.so</literal> module which is used by
263+ <literal>systemd</literal> to manage uids and usernames in the presence of
264+ <literal>DynamicUser=</literal> in systemd services. This was already the
265+ default behaviour in presence of <literal>services.sssd.enable =
266+ true</literal> because nscd caching would interfere with
267+ <literal>sssd</literal> in unpredictable ways as well. Because we're
268+ using nscd not for caching, but for convincing glibc to find NSS modules
269+ in the nix store instead of an absolute path, we have decided to disable
270+ caching globally now, as it's usually not the behaviour the user wants and
271+ can lead to surprising behaviour. Furthermore, negative caching of host
272+ lookups is also disabled now by default. This should fix the issue of dns
273+ lookups failing in the presence of an unreliable network.
274+ </para>
275+ <para>
276+ If the old behaviour is desired, this can be restored by setting
277+ the <literal>services.nscd.config</literal> option
278+ with the desired caching parameters.
279+ <programlisting>
280+ services.nscd.config =
281+ ''
282+ server-user nscd
283+ threads 1
284+ paranoia no
285+ debug-level 0
286+
287+ enable-cache passwd yes
288+ positive-time-to-live passwd 600
289+ negative-time-to-live passwd 20
290+ suggested-size passwd 211
291+ check-files passwd yes
292+ persistent passwd no
293+ shared passwd yes
294+
295+ enable-cache group yes
296+ positive-time-to-live group 3600
297+ negative-time-to-live group 60
298+ suggested-size group 211
299+ check-files group yes
300+ persistent group no
301+ shared group yes
302+
303+ enable-cache hosts yes
304+ positive-time-to-live hosts 600
305+ negative-time-to-live hosts 5
306+ suggested-size hosts 211
307+ check-files hosts yes
308+ persistent hosts no
309+ shared hosts yes
310+ '';
311+ </programlisting>
312+ See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/50316">#50316</link>
313+ for details.
314+ </para>
315+ </listitem>
316+ <listitem>
317+ <para>
318+ GitLab Shell previously used the nix store paths for the
319+ <literal>gitlab-shell</literal> command in its
320+ <literal>authorized_keys</literal> file, which might stop working after
321+ garbage collection. To circumvent that, we regenerated that file on each
322+ startup. As <literal>gitlab-shell</literal> has now been changed to use
323+ <literal>/var/run/current-system/sw/bin/gitlab-shell</literal>, this is
324+ not necessary anymore, but there might be leftover lines with a nix store
325+ path. Regenerate the <literal>authorized_keys</literal> file via
326+ <command>sudo -u git -H gitlab-rake gitlab:shell:setup</command> in that
327+ case.
328+ </para>
329+ </listitem>
330+ <listitem>
331+ <para>
332+ The <literal>pam_unix</literal> account module is now loaded with its
333+ control field set to <literal>required</literal> instead of
334+ <literal>sufficient</literal>, so that later pam account modules that
335+ might do more extensive checks are being executed.
336+ Previously, the whole account module verification was exited prematurely
337+ in case a nss module provided the account name to
338+ <literal>pam_unix</literal>.
339+ The LDAP and SSSD NixOS modules already add their NSS modules when
340+ enabled. In case your setup breaks due to some later pam account module
341+ previosuly shadowed, or failing NSS lookups, please file a bug. You can
342+ get back the old behaviour by manually setting
343+ <literal><![CDATA[security.pam.services.<name?>.text]]></literal>.
344+ </para>
345+ </listitem>
346+ <listitem>
347+ <para>
348+ <literal>fish</literal> has been upgraded to 3.0.
349+ It comes with a number of improvements and backwards incompatible changes.
350+ See the <literal>fish</literal> <link xlink:href="https://github.com/fish-shell/fish-shell/releases/tag/3.0.0">release notes</link> for more information.
351+ </para>
115352 </listitem>
116353 </itemizedlist>
117354 </section>
@@ -125,7 +362,66 @@
125362
126363 <itemizedlist>
127364 <listitem>
128− <para />
365+ <para>
366+ The <option>services.matomo</option> module gained the option
367+ <option>services.matomo.package</option> which determines the used
368+ Matomo version.
369+ </para>
370+ </listitem>
371+ <listitem>
372+ <para>
373+ <literal>composableDerivation</literal> along with supporting library functions
374+ has been removed.
375+ </para>
376+ </listitem>
377+ <listitem>
378+ <para>
379+ The deprecated <literal>truecrypt</literal> package has been removed
380+ and <literal>truecrypt</literal> attribute is now an alias for
381+ <literal>veracrypt</literal>. VeraCrypt is backward-compatible with
382+ TrueCrypt volumes. Note that <literal>cryptsetup</literal> also
383+ supports loading TrueCrypt volumes.
384+ </para>
385+ </listitem>
386+ <listitem>
387+ <para>
388+ The Kubernetes DNS addons, kube-dns, has been replaced with CoreDNS.
389+ This change is made in accordance with Kubernetes making CoreDNS the official default
390+ starting from
391+ <link xlink:href="https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#sig-cluster-lifecycle">Kubernetes v1.11</link>.
392+ Please beware that upgrading DNS-addon on existing clusters might induce
393+ minor downtime while the DNS-addon terminates and re-initializes.
394+ Also note that the DNS-service now runs with 2 pod replicas by default.
395+ The desired number of replicas can be configured using:
396+ <option>services.kubernetes.addons.dns.replicas</option>.
397+ </para>
398+ </listitem>
399+ <listitem>
400+ <para>
401+ The quassel-webserver package and module was removed from nixpkgs due to the lack
402+ of maintainers.
403+ </para>
404+ </listitem>
405+ <listitem>
406+ <para>
407+ The owncloud server packages and httpd subservice module were removed
408+ from nixpkgs due to the lack of maintainers.
409+ </para>
410+ </listitem>
411+ <listitem>
412+ <para>
413+ It is possible now to uze ZRAM devices as general purpose ephemeral block devices,
414+ not only as swap. Using more than 1 device as ZRAM swap is no longer recommended,
415+ but is still possible by setting <literal>zramSwap.swapDevices</literal> explicitly.
416+ </para>
417+ <para>
418+ Default algorithm for ZRAM swap was changed to <literal>zstd</literal>.
419+ </para>
420+ <para>
421+ Changes to ZRAM algorithm are applied during <literal>nixos-rebuild switch</literal>,
422+ so make sure you have enough swap space on disk to survive ZRAM device rebuild. Alternatively,
423+ use <literal>nixos-rebuild boot; reboot</literal>.
424+ </para>
129425 </listitem>
130426 </itemizedlist>
131427 </section>
nixos/lib/build-vms.nix+14−4
@@ -1,6 +1,13 @@
1−{ system, minimal ? false, config ? {} }:
2−
3−let pkgs = import ../.. { inherit system config; }; in
1+{ system
2+, # Use a minimal kernel?
3+ minimal ? false
4+, # Ignored
5+ config ? null
6+ # Nixpkgs, for qemu, lib and more
7+, pkgs
8+, # NixOS configuration to add to the VMs
9+ extraConfigurations ? []
10+}:
411
512with pkgs.lib;
613with import ../lib/qemu-flags.nix { inherit pkgs; };
@@ -30,7 +37,8 @@ rec {
3037 ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs
3138 { key = "no-manual"; documentation.nixos.enable = false; }
3239 { key = "qemu"; system.build.qemu = qemu; }
33− ] ++ optional minimal ../modules/testing/minimal-kernel.nix;
40+ ] ++ optional minimal ../modules/testing/minimal-kernel.nix
41+ ++ extraConfigurations;
3442 extraArgs = { inherit nodes; };
3543 };
3644
@@ -75,6 +83,8 @@ rec {
7583 (m': let config = (getAttr m' nodes).config; in
7684 optionalString (config.networking.primaryIPAddress != "")
7785 ("${config.networking.primaryIPAddress} " +
86+ optionalString (config.networking.domain != null)
87+ "${config.networking.hostName}.${config.networking.domain} " +
7888 "${config.networking.hostName}\n"));
7989
8090 virtualisation.qemu.options =
nixos/lib/eval-config.nix+2−1
@@ -53,7 +53,8 @@ in rec {
5353 inherit prefix check;
5454 modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ];
5555 args = extraArgs;
56− specialArgs = { modulesPath = ../modules; } // specialArgs;
56+ specialArgs =
57+ { modulesPath = builtins.toString ../modules; } // specialArgs;
5758 }) config options;
5859
5960 # These are the extra arguments passed to every module. In
nixos/lib/make-channel.nix+4
@@ -1,3 +1,7 @@
1+/* Build a channel tarball. These contain, in addition to the nixpkgs
2+ * expressions themselves, files that indicate the version of nixpkgs
3+ * that they represent.
4+ */
15{ pkgs, nixpkgs, version, versionSuffix }:
26
37pkgs.releaseTools.makeSourceTarball {
nixos/lib/make-disk-image.nix+6−3
@@ -27,6 +27,9 @@
2727, # The root file system type.
2828 fsType ? "ext4"
2929
30+, # Filesystem label
31+ label ? "nixos"
32+
3033, # The initial NixOS configuration file to be copied to
3134 # /etc/nixos/configuration.nix.
3235 configFile ? null
@@ -84,7 +87,7 @@ let format' = format; in let
8487 # FIXME: merge with channel.nix / make-channel.nix.
8588 channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}" {} ''
8689 mkdir -p $out
87− cp -prd ${nixpkgs} $out/nixos
90+ cp -prd ${nixpkgs.outPath} $out/nixos
8891 chmod -R u+w $out/nixos
8992 if [ ! -e $out/nixos/nixpkgs ]; then
9093 ln -s . $out/nixos/nixpkgs
@@ -134,9 +137,9 @@ let format' = format; in let
134137 # Get start & length of the root partition in sectors to $START and $SECTORS.
135138 eval $(partx $diskImage -o START,SECTORS --nr ${rootPartition} --pairs)
136139
137− mkfs.${fsType} -F -L nixos $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K
140+ mkfs.${fsType} -F -L ${label} $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K
138141 '' else ''
139− mkfs.${fsType} -F -L nixos $diskImage
142+ mkfs.${fsType} -F -L ${label} $diskImage
140143 ''}
141144
142145 root="$PWD/root"
nixos/lib/make-ext4-fs.nix+29−51
@@ -9,6 +9,7 @@
99, e2fsprogs
1010, libfaketime
1111, perl
12+, lkl
1213}:
1314
1415let
@@ -18,16 +19,13 @@ in
1819pkgs.stdenv.mkDerivation {
1920 name = "ext4-fs.img";
2021
21− nativeBuildInputs = [e2fsprogs.bin libfaketime perl];
22+ nativeBuildInputs = [e2fsprogs.bin libfaketime perl lkl];
2223
2324 buildCommand =
2425 ''
2526 # Add the closures of the top-level store objects.
2627 storePaths=$(cat ${sdClosureInfo}/store-paths)
2728
28− # Also include a manifest of the closures in a format suitable for nix-store --load-db.
29− cp ${sdClosureInfo}/registration nix-path-registration
30−
3129 # Make a crude approximation of the size of the target image.
3230 # If the script starts failing, increase the fudge factors here.
3331 numInodes=$(find $storePaths | wc -l)
@@ -38,55 +36,16 @@ pkgs.stdenv.mkDerivation {
3836 truncate -s $bytes $out
3937 faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $out
4038
41− # Populate the image contents by piping a bunch of commands to the `debugfs` tool from e2fsprogs.
42− # For example, to copy /nix/store/abcd...efg-coreutils-8.23/bin/sleep:
43− # cd /nix/store/abcd...efg-coreutils-8.23/bin
44− # write /nix/store/abcd...efg-coreutils-8.23/bin/sleep sleep
45− # sif sleep mode 040555
46− # sif sleep gid 30000
47− # In particular, debugfs doesn't handle absolute target paths; you have to 'cd' in the virtual
48− # filesystem first. Likewise the intermediate directories must already exist (using `find`
49− # handles that for us). And when setting the file's permissions, the inode type flags (__S_IFDIR,
50− # __S_IFREG) need to be set as well.
51− (
52− echo write nix-path-registration nix-path-registration
53− echo mkdir nix
54− echo cd /nix
55− echo mkdir store
56−
57− # XXX: This explodes in exciting ways if anything in /nix/store has a space in it.
58− find $storePaths -printf '%y %f %h %m\n'| while read -r type file dir perms; do
59− # echo "TYPE=$type DIR=$dir FILE=$file PERMS=$perms" >&2
39+ # Also include a manifest of the closures in a format suitable for nix-store --load-db.
40+ cp ${sdClosureInfo}/registration nix-path-registration
41+ cptofs -t ext4 -i $out nix-path-registration /
6042
61− echo "cd $dir"
62− case $type in
63− d)
64− echo "mkdir $file"
65− echo sif $file mode $((040000 | 0$perms)) # magic constant is __S_IFDIR
66− ;;
67− f)
68− echo "write $dir/$file $file"
69− echo sif $file mode $((0100000 | 0$perms)) # magic constant is __S_IFREG
70− ;;
71− l)
72− echo "symlink $file $(readlink "$dir/$file")"
73− ;;
74− *)
75− echo "Unknown entry: $type $dir $file $perms" >&2
76− exit 1
77− ;;
78− esac
43+ # Create nix/store before copying paths
44+ faketime -f "1970-01-01 00:00:01" mkdir -p nix/store
45+ cptofs -t ext4 -i $out nix /
7946
80− echo sif $file gid 30000 # chgrp to nixbld
81− done
82− ) | faketime -f "1970-01-01 00:00:01" debugfs -w $out -f /dev/stdin > errorlog 2>&1
83−
84− # The debugfs tool doesn't terminate on error nor exit with a non-zero status. Check manually.
85− if egrep -q 'Could not allocate|File not found' errorlog; then
86− cat errorlog
87− echo "--- Failed to create EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---"
88− return 1
89− fi
47+ echo "copying store paths to image..."
48+ cptofs -t ext4 -i $out $storePaths /nix/store/
9049
9150 # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build.
9251 if ! fsck.ext4 -n -f $out; then
@@ -94,5 +53,24 @@ pkgs.stdenv.mkDerivation {
9453 cat errorlog
9554 return 1
9655 fi
56+
57+ (
58+ # Resizes **snugly** to its actual limits (or closer to)
59+ free=$(dumpe2fs $out | grep '^Free blocks:')
60+ blocksize=$(dumpe2fs $out | grep '^Block size:')
61+ blocks=$(dumpe2fs $out | grep '^Block count:')
62+ blocks=$((''${blocks##*:})) # format the number.
63+ blocksize=$((''${blocksize##*:})) # format the number.
64+ # System can't boot with 0 blocks free.
65+ # Add 16MiB of free space
66+ fudge=$(( 16 * 1024 * 1024 / blocksize ))
67+ size=$(( blocks - ''${free##*:} + fudge ))
68+
69+ echo "Resizing from $blocks blocks to $size blocks. (~ $((size*blocksize/1024/1024))MiB)"
70+ EXT2FS_NO_MTAB_OK=yes resize2fs $out -f $size
71+ )
72+
73+ # And a final fsck, because of the previous truncating.
74+ fsck.ext4 -n -f $out
9775 '';
9876}
nixos/lib/make-iso9660-image.sh+3−2
@@ -47,7 +47,8 @@ if test -n "$bootable"; then
4747
4848 isoBootFlags="-eltorito-boot ${bootImage}
4949 -eltorito-catalog .boot.cat
50− -no-emul-boot -boot-load-size 4 -boot-info-table"
50+ -no-emul-boot -boot-load-size 4 -boot-info-table
51+ --sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO
5152fi
5253
5354if test -n "$usbBootable"; then
@@ -112,7 +113,7 @@ xorriso="xorriso
112113 -r
113114 -path-list pathlist
114115 --sort-weight 0 /
115− --sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO
116+"
116117
117118$xorriso -output $out/iso/$isoName
118119
nixos/lib/make-squashfs.nix+4−1
@@ -3,6 +3,9 @@
33, # The root directory of the squashfs filesystem is filled with the
44 # closures of the Nix store paths listed here.
55 storeContents ? []
6+, # Compression parameters.
7+ # For zstd compression you can use "zstd -Xcompression-level 6".
8+ comp ? "xz -Xdict-size 100%"
69}:
710
811stdenv.mkDerivation {
@@ -20,6 +23,6 @@ stdenv.mkDerivation {
2023
2124 # Generate the squashfs image.
2225 mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \
23− -keep-as-directory -all-root -b 1048576 -comp xz -Xdict-size 100%
26+ -keep-as-directory -all-root -b 1048576 -comp ${comp}
2427 '';
2528}
nixos/lib/make-system-tarball.nix+12−8
@@ -1,4 +1,4 @@
1−{ stdenv, perl, pixz, pathsFromGraph
1+{ stdenv, closureInfo, pixz
22
33, # The file name of the resulting tarball
44 fileName ? "nixos-system-${stdenv.hostPlatform.system}"
@@ -29,24 +29,28 @@
2929, extraInputs ? [ pixz ]
3030}:
3131
32+let
33+ symlinks = map (x: x.symlink) storeContents;
34+ objects = map (x: x.object) storeContents;
35+in
36+
3237stdenv.mkDerivation {
3338 name = "tarball";
3439 builder = ./make-system-tarball.sh;
35− buildInputs = [ perl ] ++ extraInputs;
40+ buildInputs = extraInputs;
3641
37− inherit fileName pathsFromGraph extraArgs extraCommands compressCommand;
42+ inherit fileName extraArgs extraCommands compressCommand;
3843
3944 # !!! should use XML.
4045 sources = map (x: x.source) contents;
4146 targets = map (x: x.target) contents;
4247
4348 # !!! should use XML.
44− objects = map (x: x.object) storeContents;
45− symlinks = map (x: x.symlink) storeContents;
49+ inherit symlinks objects;
4650
47− # For obtaining the closure of `storeContents'.
48− exportReferencesGraph =
49− map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
51+ closureInfo = closureInfo {
52+ rootPaths = objects;
53+ };
5054
5155 extension = compressionExtension;
5256}
nixos/lib/make-system-tarball.sh+3−6
@@ -3,7 +3,6 @@ source $stdenv/setup
33sources_=($sources)
44targets_=($targets)
55
6−echo $objects
76objects=($objects)
87symlinks=($symlinks)
98
@@ -14,8 +13,6 @@ stripSlash() {
1413 if test "${res:0:1}" = /; then res=${res:1}; fi
1514}
1615
17−touch pathlist
18−
1916# Add the individual files.
2017for ((i = 0; i < ${#targets_[@]}; i++)); do
2118 stripSlash "${targets_[$i]}"
@@ -25,9 +22,9 @@ done
2522
2623
2724# Add the closures of the top-level store objects.
25+chmod +w .
2826mkdir -p nix/store
29−storePaths=$(perl $pathsFromGraph closure-*)
30−for i in $storePaths; do
27+for i in $(< $closureInfo/store-paths); do
3128 cp -a "$i" "${i:1}"
3229done
3330
@@ -35,7 +32,7 @@ done
3532# TODO tar ruxo
3633# Also include a manifest of the closures in a format suitable for
3734# nix-store --load-db.
38−printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration
35+cp $closureInfo/registration nix-path-registration
3936
4037# Add symlinks to the top-level store objects.
4138for ((n = 0; n < ${#objects[*]}; n++)); do
nixos/lib/test-driver/Logger.pm+3
@@ -4,6 +4,7 @@ use strict;
44use Thread::Queue;
55use XML::Writer;
66use Encode qw(decode encode);
7+use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
78
89sub new {
910 my ($class) = @_;
@@ -46,10 +47,12 @@ sub nest {
4647 print STDERR maybePrefix("$msg\n", $attrs);
4748 $self->{log}->startTag("nest");
4849 $self->{log}->dataElement("head", $msg, %{$attrs});
50+ my $now = clock_gettime(CLOCK_MONOTONIC);
4951 $self->drainLogQueue();
5052 eval { &$coderef };
5153 my $res = $@;
5254 $self->drainLogQueue();
55+ $self->log(sprintf("(%.2f seconds)", clock_gettime(CLOCK_MONOTONIC) - $now));
5356 $self->{log}->endTag("nest");
5457 die $@ if $@;
5558}
nixos/lib/test-driver/Machine.pm+7−5
@@ -10,6 +10,7 @@ use Cwd;
1010use File::Basename;
1111use File::Path qw(make_path);
1212use File::Slurp;
13+use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
1314
1415
1516my $showGraphics = defined $ENV{'DISPLAY'};
@@ -155,10 +156,8 @@ sub start {
155156 $ENV{USE_TMPDIR} = 1;
156157 $ENV{QEMU_OPTS} =
157158 ($self->{allowReboot} ? "" : "-no-reboot ") .
158− "-monitor unix:./monitor " .
159− "-chardev socket,id=shell,path=./shell -device virtio-serial -device virtconsole,chardev=shell " .
160− # socket backdoor, see "Debugging NixOS tests" section in NixOS manual
161− "-chardev socket,id=backdoor,path=./backdoor,server,nowait -device virtio-serial -device virtconsole,chardev=backdoor " .
159+ "-monitor unix:./monitor -chardev socket,id=shell,path=./shell " .
160+ "-device virtio-serial -device virtconsole,chardev=shell " .
162161 "-device virtio-rng-pci " .
163162 ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || "");
164163 chdir $self->{stateDir} or die;
@@ -249,12 +248,15 @@ sub connect {
249248
250249 $self->start;
251250
251+ my $now = clock_gettime(CLOCK_MONOTONIC);
252252 local $SIG{ALRM} = sub { die "timed out waiting for the VM to connect\n"; };
253− alarm 300;
253+ alarm 600;
254254 readline $self->{socket} or die "the VM quit before connecting\n";
255255 alarm 0;
256256
257257 $self->log("connected to guest root shell");
258+ # We're interested in tracking how close we are to `alarm`.
259+ $self->log(sprintf("(connecting took %.2f seconds)", clock_gettime(CLOCK_MONOTONIC) - $now));
258260 $self->{connected} = 1;
259261
260262 });
nixos/lib/testing.nix+31−10
@@ -1,6 +1,13 @@
1−{ system, minimal ? false, config ? {} }:
2−
3−with import ./build-vms.nix { inherit system minimal config; };
1+{ system
2+, pkgs ? import ../.. { inherit system config; }
3+ # Use a minimal kernel?
4+, minimal ? false
5+ # Ignored
6+, config ? null
7+ # Modules to add to each VM
8+, extraConfigurations ? [] }:
9+
10+with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; };
411with pkgs;
512
613let
@@ -27,14 +34,14 @@ in rec {
2734 cp ${./test-driver/test-driver.pl} $out/bin/nixos-test-driver
2835 chmod u+x $out/bin/nixos-test-driver
2936
30− libDir=$out/lib/perl5/site_perl
37+ libDir=$out/${perl.libPrefix}
3138 mkdir -p $libDir
3239 cp ${./test-driver/Machine.pm} $libDir/Machine.pm
3340 cp ${./test-driver/Logger.pm} $libDir/Logger.pm
3441
3542 wrapProgram $out/bin/nixos-test-driver \
3643 --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \
37− --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl"
44+ --prefix PERL5LIB : "${with perlPackages; makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/${perl.libPrefix}"
3845 '';
3946 };
4047
@@ -69,7 +76,7 @@ in rec {
6976 mkdir -p $out/coverage-data
7077 mv $i $out/coverage-data/$(dirname $(dirname $i))
7178 done
72− ''; # */
79+ '';
7380 };
7481
7582
@@ -109,7 +116,7 @@ in rec {
109116
110117 vms = map (m: m.config.system.build.vm) (lib.attrValues nodes);
111118
112− ocrProg = tesseract_4.override { enableLanguages = [ "eng" ]; };
119+ ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; };
113120
114121 imagemagick_tiff = imagemagick_light.override { inherit libtiff; };
115122
@@ -149,9 +156,23 @@ in rec {
149156 test = passMeta (runTests driver);
150157 report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
151158
152− in (if makeCoverageReport then report else test) // {
153− inherit nodes driver test;
154− };
159+ nodeNames = builtins.attrNames nodes;
160+ invalidNodeNames = lib.filter
161+ (node: builtins.match "^[A-z_][A-z0-9_]+$" node == null) nodeNames;
162+
163+ in
164+ if lib.length invalidNodeNames > 0 then
165+ throw ''
166+ Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
167+ All machines are referenced as perl variables in the testing framework which will break the
168+ script when special characters are used.
169+
170+ Please stick to alphanumeric chars and underscores as separation.
171+ ''
172+ else
173+ (if makeCoverageReport then report else test) // {
174+ inherit nodes driver test;
175+ };
155176
156177 runInMachine =
157178 { drv
nixos/lib/utils.nix+2−3
@@ -7,9 +7,8 @@ rec {
77 || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ];
88
99 # Check whenever `b` depends on `a` as a fileSystem
10− # FIXME: it's incorrect to simply use hasPrefix here: "/dev/a" is not a parent of "/dev/ab"
11− fsBefore = a: b: ((any (x: elem x [ "bind" "move" ]) b.options) && (a.mountPoint == b.device))
12− || (hasPrefix a.mountPoint b.mountPoint);
10+ fsBefore = a: b: a.mountPoint == b.device
11+ || hasPrefix "${a.mountPoint}${optionalString (!(hasSuffix "/" a.mountPoint)) "/"}" b.mountPoint;
1312
1413 # Escape a path according to the systemd rules, e.g. /dev/xyzzy
1514 # becomes dev-xyzzy. FIXME: slow.
nixos/maintainers/scripts/gce/create-gce.sh+2−2
@@ -7,9 +7,9 @@ BUCKET_NAME="${BUCKET_NAME:-nixos-cloud-images}"
77TIMESTAMP="$(date +%Y%m%d%H%M)"
88export TIMESTAMP
99
10−nix-build '<nixpkgs/nixos>' \
10+nix-build '<nixpkgs/nixos/lib/eval-config.nix>' \
1111 -A config.system.build.googleComputeImage \
12− --arg configuration "{ imports = [ <nixpkgs/nixos/modules/virtualisation/google-compute-image.nix> ]; }" \
12+ --arg modules "[ <nixpkgs/nixos/modules/virtualisation/google-compute-image.nix> ]" \
1313 --argstr system x86_64-linux \
1414 -o gce \
1515 -j 10
nixos/modules/config/appstream.nixnew file+25
@@ -0,0 +1,25 @@
1+{ config, lib, ... }:
2+
3+with lib;
4+{
5+ options = {
6+ appstream.enable = mkOption {
7+ type = types.bool;
8+ default = true;
9+ description = ''
10+ Whether to install files to support the
11+ <link xlink:href="https://www.freedesktop.org/software/appstream/docs/index.html">AppStream metadata specification</link>.
12+ '';
13+ };
14+ };
15+
16+ config = mkIf config.appstream.enable {
17+ environment.pathsToLink = [
18+ # per component metadata
19+ "/share/metainfo"
20+ # legacy path for above
21+ "/share/appdata"
22+ ];
23+ };
24+
25+}
nixos/modules/config/fonts/fontconfig-penultimate.nix+1−1
@@ -269,7 +269,7 @@ in
269269
270270 };
271271
272− config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {
272+ config = mkIf (config.fonts.fontconfig.enable && config.fonts.fontconfig.penultimate.enable) {
273273
274274 fonts.fontconfig.confPackages = [ penultimateConf ];
275275
nixos/modules/config/gtk/gtk-icon-cache.nixnew file+86
@@ -0,0 +1,86 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+{
5+ options = {
6+ gtk.iconCache.enable = mkOption {
7+ type = types.bool;
8+ default = config.services.xserver.enable;
9+ description = ''
10+ Whether to build icon theme caches for GTK+ applications.
11+ '';
12+ };
13+ };
14+
15+ config = mkIf config.gtk.iconCache.enable {
16+
17+ # (Re)build icon theme caches
18+ # ---------------------------
19+ # Each icon theme has its own cache. The difficult is that many
20+ # packages may contribute with icons to the same theme by installing
21+ # some icons.
22+ #
23+ # For instance, on my current NixOS system, the following packages
24+ # (among many others) have icons installed into the hicolor icon
25+ # theme: hicolor-icon-theme, psensor, wpa_gui, caja, etc.
26+ #
27+ # As another example, the mate icon theme has icons installed by the
28+ # packages mate-icon-theme, mate-settings-daemon, and libmateweather.
29+ #
30+ # The HighContrast icon theme also has icons from different packages,
31+ # like gnome-theme-extras and meld.
32+
33+ # When the cache is built all of its icons has to be known. How to
34+ # implement this?
35+ #
36+ # I think that most themes have all icons installed by only one
37+ # package. On my system there are 71 themes installed. Only 3 of them
38+ # have icons installed from more than one package.
39+ #
40+ # If the main package of the theme provides a cache, presumably most
41+ # of its icons will be available to applications without running this
42+ # module. But additional icons offered by other packages will not be
43+ # available. Therefore I think that it is good that the main theme
44+ # package installs a cache (although it does not completely fixes the
45+ # situation for packages installed with nix-env).
46+ #
47+ # The module solution presented here keeps the cache when there is
48+ # only one package contributing with icons to the theme. Otherwise it
49+ # rebuilds the cache taking into account the icons provided all
50+ # packages.
51+
52+ environment.extraSetup = ''
53+ # For each icon theme directory ...
54+
55+ find $out/share/icons -mindepth 1 -maxdepth 1 -print0 | while read -d $'\0' themedir
56+ do
57+
58+ # In order to build the cache, the theme dir should be
59+ # writable. When the theme dir is a symbolic link to somewhere
60+ # in the nix store it is not writable and it means that only
61+ # one package is contributing to the theme. If it already has
62+ # a cache, no rebuild is needed. Otherwise a cache has to be
63+ # built, and to be able to do that we first remove the
64+ # symbolic link and make a directory, and then make symbolic
65+ # links from the original directory into the new one.
66+
67+ if [ ! -w "$themedir" -a -L "$themedir" -a ! -r "$themedir"/icon-theme.cache ]; then
68+ name=$(basename "$themedir")
69+ path=$(readlink -f "$themedir")
70+ rm "$themedir"
71+ mkdir -p "$themedir"
72+ ln -s "$path"/* "$themedir"/
73+ fi
74+
75+ # (Re)build the cache if the theme dir is writable, replacing any
76+ # existing cache for the theme
77+
78+ if [ -w "$themedir" ]; then
79+ rm -f "$themedir"/icon-theme.cache
80+ ${pkgs.gtk3.out}/bin/gtk-update-icon-cache --ignore-theme-index "$themedir"
81+ fi
82+ done
83+ '';
84+ };
85+
86+}
nixos/modules/config/i18n.nix+13−1
@@ -34,6 +34,17 @@ with lib;
3434 '';
3535 };
3636
37+ extraLocaleSettings = mkOption {
38+ type = types.attrsOf types.str;
39+ default = {};
40+ example = { LC_MESSAGES = "en_US.UTF-8"; LC_TIME = "de_DE.UTF-8"; };
41+ description = ''
42+ A set of additional system-wide locale settings other than
43+ <literal>LANG</literal> which can be configured with
44+ <option>i18n.defaultLocale</option>.
45+ '';
46+ };
47+
3748 supportedLocales = mkOption {
3849 type = types.listOf types.str;
3950 default = ["all"];
@@ -129,7 +140,7 @@ with lib;
129140 environment.sessionVariables =
130141 { LANG = config.i18n.defaultLocale;
131142 LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
132− };
143+ } // config.i18n.extraLocaleSettings;
133144
134145 systemd.globalEnvironment = mkIf (config.i18n.supportedLocales != []) {
135146 LOCALE_ARCHIVE = "${config.i18n.glibcLocales}/lib/locale/locale-archive";
@@ -141,6 +152,7 @@ with lib;
141152 source = pkgs.writeText "locale.conf"
142153 ''
143154 LANG=${config.i18n.defaultLocale}
155+ ${concatStringsSep "\n" (mapAttrsToList (n: v: ''${n}=${v}'') config.i18n.extraLocaleSettings)}
144156 '';
145157 };
146158
nixos/modules/config/krb5/default.nix+1−1
@@ -79,7 +79,7 @@ in {
7979
8080 options = {
8181 krb5 = {
82− enable = mkEnableOption "Whether to enable Kerberos V.";
82+ enable = mkEnableOption "building krb5.conf, configuration file for Kerberos V";
8383
8484 kerberos = mkOption {
8585 type = types.package;
nixos/modules/config/networking.nix+48−27
@@ -16,6 +16,13 @@ let
1616 resolvconfOptions = cfg.resolvconfOptions
1717 ++ optional cfg.dnsSingleRequest "single-request"
1818 ++ optional cfg.dnsExtensionMechanism "edns0";
19+
20+
21+ localhostMapped4 = cfg.hosts ? "127.0.0.1" && elem "localhost" cfg.hosts."127.0.0.1";
22+ localhostMapped6 = cfg.hosts ? "::1" && elem "localhost" cfg.hosts."::1";
23+
24+ localhostMultiple = any (elem "localhost") (attrValues (removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]));
25+
1926in
2027
2128{
@@ -23,8 +30,7 @@ in
2330 options = {
2431
2532 networking.hosts = lib.mkOption {
26− type = types.attrsOf ( types.listOf types.str );
27− default = {};
33+ type = types.attrsOf (types.listOf types.str);
2834 example = literalExample ''
2935 {
3036 "127.0.0.1" = [ "foo.bar.baz" ];
@@ -192,6 +198,29 @@ in
192198
193199 config = {
194200
201+ assertions = [{
202+ assertion = localhostMapped4;
203+ message = ''`networking.hosts` doesn't map "127.0.0.1" to "localhost"'';
204+ } {
205+ assertion = !cfg.enableIPv6 || localhostMapped6;
206+ message = ''`networking.hosts` doesn't map "::1" to "localhost"'';
207+ } {
208+ assertion = !localhostMultiple;
209+ message = ''
210+ `networking.hosts` maps "localhost" to something other than "127.0.0.1"
211+ or "::1". This will break some applications. Please use
212+ `networking.extraHosts` if you really want to add such a mapping.
213+ '';
214+ }];
215+
216+ networking.hosts = {
217+ "127.0.0.1" = [ "localhost" ];
218+ } // optionalAttrs (cfg.hostName != "") {
219+ "127.0.1.1" = [ cfg.hostName ];
220+ } // optionalAttrs cfg.enableIPv6 {
221+ "::1" = [ "localhost" ];
222+ };
223+
195224 environment.etc =
196225 { # /etc/services: TCP/UDP port assignments.
197226 "services".source = pkgs.iana-etc + "/etc/services";
@@ -199,29 +228,14 @@ in
199228 # /etc/protocols: IP protocol numbers.
200229 "protocols".source = pkgs.iana-etc + "/etc/protocols";
201230
202− # /etc/rpc: RPC program numbers.
203− "rpc".source = pkgs.glibc.out + "/etc/rpc";
204−
205231 # /etc/hosts: Hostname-to-IP mappings.
206− "hosts".text =
207− let oneToString = set : ip : ip + " " + concatStringsSep " " ( getAttr ip set );
208− allToString = set : concatMapStringsSep "\n" ( oneToString set ) ( attrNames set );
209− userLocalHosts = optionalString
210− ( builtins.hasAttr "127.0.0.1" cfg.hosts )
211− ( concatStringsSep " " ( remove "localhost" cfg.hosts."127.0.0.1" ));
212− userLocalHosts6 = optionalString
213− ( builtins.hasAttr "::1" cfg.hosts )
214− ( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" ));
215− otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]);
216− in
217− ''
218− 127.0.0.1 ${userLocalHosts} localhost
219− ${optionalString cfg.enableIPv6 ''
220− ::1 ${userLocalHosts6} localhost
221− ''}
222− ${otherHosts}
223− ${cfg.extraHosts}
224− '';
232+ "hosts".text = let
233+ oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip};
234+ allToString = set: concatMapStringsSep "\n" (oneToString set) (attrNames set);
235+ in ''
236+ ${allToString cfg.hosts}
237+ ${cfg.extraHosts}
238+ '';
225239
226240 # /etc/host.conf: resolver configuration file
227241 "host.conf".text = cfg.hostConf;
@@ -233,6 +247,10 @@ in
233247 # a collision with an apparently unrelated environment
234248 # variable with the same name exported by dhcpcd.
235249 interface_order='lo lo[0-9]*'
250+ '' + optionalString config.services.nscd.enable ''
251+ # Invalidate the nscd cache whenever resolv.conf is
252+ # regenerated.
253+ libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null'
236254 '' + optionalString (length resolvconfOptions > 0) ''
237255 # Options as described in resolv.conf(5)
238256 resolv_conf_options='${concatStringsSep " " resolvconfOptions}'
@@ -246,11 +264,14 @@ in
246264 '';
247265
248266 } // optionalAttrs config.services.resolved.enable {
249− # symlink the static version of resolv.conf as recommended by upstream:
267+ # symlink the dynamic stub resolver of resolv.conf as recommended by upstream:
250268 # https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf
251− "resolv.conf".source = "${pkgs.systemd}/lib/systemd/resolv.conf";
269+ "resolv.conf".source = "/run/systemd/resolve/stub-resolv.conf";
252270 } // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) {
253271 "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
272+ } // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") {
273+ # /etc/rpc: RPC program numbers.
274+ "rpc".source = pkgs.glibc.out + "/etc/rpc";
254275 };
255276
256277 networking.proxy.envVars =
@@ -296,4 +317,4 @@ in
296317
297318 };
298319
299− }
320+}
nixos/modules/config/no-x-libs.nix+1−1
@@ -35,7 +35,7 @@ with lib;
3535 networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };
3636 networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
3737 pinentry = super.pinentry_ncurses;
38− gobjectIntrospection = super.gobjectIntrospection.override { x11Support = false; };
38+ gobject-introspection = super.gobject-introspection.override { x11Support = false; };
3939 }));
4040 };
4141}
nixos/modules/config/nsswitch.nix+5−3
@@ -1,6 +1,6 @@
11# Configuration for the Name Service Switch (/etc/nsswitch.conf).
22
3−{ config, lib, ... }:
3+{ config, lib, pkgs, ... }:
44
55with lib;
66
@@ -15,6 +15,7 @@ let
1515 ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch);
1616 sssd = canLoadExternalModules && config.services.sssd.enable;
1717 resolved = canLoadExternalModules && config.services.resolved.enable;
18+ googleOsLogin = canLoadExternalModules && config.security.googleOsLogin.enable;
1819
1920 hostArray = [ "files" ]
2021 ++ optional mymachines "mymachines"
@@ -29,6 +30,7 @@ let
2930 ++ optional sssd "sss"
3031 ++ optional ldap "ldap"
3132 ++ optional mymachines "mymachines"
33+ ++ optional googleOsLogin "cache_oslogin oslogin"
3234 ++ [ "systemd" ];
3335
3436 shadowArray = [ "files" ]
@@ -97,7 +99,7 @@ in {
9799 # configured IP addresses, or ::1 and 127.0.0.2 as
98100 # fallbacks. Systemd also provides nss-mymachines to return IP
99101 # addresses of local containers.
100− system.nssModules = optionals canLoadExternalModules [ config.systemd.package.out ];
101−
102+ system.nssModules = (optionals canLoadExternalModules [ config.systemd.package.out ])
103+ ++ optional googleOsLogin pkgs.google-compute-engine-oslogin.out;
102104 };
103105}
nixos/modules/config/pulseaudio.nix+28−4
@@ -1,4 +1,4 @@
1−{ config, lib, pkgs, pkgs_i686, ... }:
1+{ config, lib, pkgs, ... }:
22
33with pkgs;
44with lib;
@@ -19,7 +19,7 @@ let
1919
2020 # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps
2121 # using 32bit alsa on 64bit linux.
22− enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null);
22+ enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsaLib != null && pkgs.pkgsi686Linux.libpulseaudio != null);
2323
2424
2525 myConfigFile =
@@ -63,7 +63,7 @@ let
6363 pcm_type.pulse {
6464 libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;
6565 ${lib.optionalString enable32BitAlsaPlugins
66− "libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"}
66+ "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"}
6767 }
6868 pcm.!default {
6969 type pulse
@@ -72,7 +72,7 @@ let
7272 ctl_type.pulse {
7373 libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;
7474 ${lib.optionalString enable32BitAlsaPlugins
75− "libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"}
75+ "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"}
7676 }
7777 ctl.!default {
7878 type pulse
@@ -154,6 +154,18 @@ in {
154154 '';
155155 };
156156
157+ extraModules = mkOption {
158+ type = types.listOf types.package;
159+ default = [];
160+ example = literalExample "[ pkgs.pulseaudio-modules-bt ]";
161+ description = ''
162+ Extra pulseaudio modules to use. This is intended for out-of-tree
163+ pulseaudio modules like extra bluetooth codecs.
164+
165+ Extra modules take precedence over built-in pulseaudio modules.
166+ '';
167+ };
168+
157169 daemon = {
158170 logLevel = mkOption {
159171 type = types.str;
@@ -236,6 +248,18 @@ in {
236248 systemd.packages = [ overriddenPackage ];
237249 })
238250
251+ (mkIf (cfg.extraModules != []) {
252+ hardware.pulseaudio.daemon.config.dl-search-path = let
253+ overriddenModules = builtins.map
254+ (drv: drv.override { pulseaudio = overriddenPackage; })
255+ cfg.extraModules;
256+ modulePaths = builtins.map
257+ (drv: "${drv}/lib/pulse-${overriddenPackage.version}/modules")
258+ # User-provided extra modules take precedence
259+ (overriddenModules ++ [ overriddenPackage ]);
260+ in lib.concatStringsSep ":" modulePaths;
261+ })
262+
239263 (mkIf hasZeroconf {
240264 services.avahi.enable = true;
241265 })
nixos/modules/config/shells-environment.nix+9−3
@@ -108,14 +108,14 @@ in
108108 };
109109
110110 environment.shellAliases = mkOption {
111− default = {};
112− example = { ll = "ls -l"; };
111+ example = { l = null; ll = "ls -l"; };
113112 description = ''
114113 An attribute set that maps aliases (the top level attribute names in
115114 this option) to command strings or directly to build outputs. The
116115 aliases are added to all users' shells.
116+ Aliases mapped to <code>null</code> are ignored.
117117 '';
118− type = types.attrs; # types.attrsOf types.stringOrPath;
118+ type = with types; attrsOf (nullOr (either str path));
119119 };
120120
121121 environment.binsh = mkOption {
@@ -157,6 +157,12 @@ in
157157 # terminal instead of logging out of X11).
158158 environment.variables = config.environment.sessionVariables;
159159
160+ environment.shellAliases = mapAttrs (name: mkDefault) {
161+ ls = "ls --color=tty";
162+ ll = "ls -l";
163+ l = "ls -alh";
164+ };
165+
160166 environment.etc."shells".text =
161167 ''
162168 ${concatStringsSep "\n" (map utils.toShellPath cfg.shells)}
nixos/modules/config/system-path.nix+5−7
@@ -7,7 +7,7 @@ with lib;
77
88let
99
10− requiredPackages =
10+ requiredPackages = map lib.lowPrio
1111 [ config.nix.package
1212 pkgs.acl
1313 pkgs.attr
@@ -19,7 +19,9 @@ let
1919 pkgs.diffutils
2020 pkgs.findutils
2121 pkgs.gawk
22− pkgs.glibc # for ldd, getent
22+ pkgs.stdenv.cc.libc
23+ pkgs.getent
24+ pkgs.getconf
2325 pkgs.gnugrep
2426 pkgs.gnupatch
2527 pkgs.gnused
@@ -133,14 +135,10 @@ in
133135 # outputs TODO: note that the tools will often not be linked by default
134136 postBuild =
135137 ''
136− if [ -x $out/bin/gtk-update-icon-cache -a -f $out/share/icons/hicolor/index.theme ]; then
137− $out/bin/gtk-update-icon-cache $out/share/icons/hicolor
138− fi
139−
140138 if [ -x $out/bin/glib-compile-schemas -a -w $out/share/glib-2.0/schemas ]; then
141139 $out/bin/glib-compile-schemas $out/share/glib-2.0/schemas
142140 fi
143−
141+
144142 ${config.environment.extraSetup}
145143 '';
146144 };
nixos/modules/config/users-groups.nix+3−3
@@ -266,7 +266,7 @@ let
266266 (mkIf config.isNormalUser {
267267 group = mkDefault "users";
268268 createHome = mkDefault true;
269− home = mkDefault "/home/${name}";
269+ home = mkDefault "/home/${config.name}";
270270 useDefaultShell = mkDefault true;
271271 isSystemUser = mkDefault false;
272272 })
@@ -534,8 +534,8 @@ in {
534534 install -m 0755 -d /home
535535
536536 ${pkgs.perl}/bin/perl -w \
537− -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl \
538− -I${pkgs.perlPackages.JSON}/lib/perl5/site_perl \
537+ -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix} \
538+ -I${pkgs.perlPackages.JSON}/${pkgs.perl.libPrefix} \
539539 ${./update-users-groups.pl} ${spec}
540540 '';
541541
nixos/modules/config/xdg/mime.nix+2−2
@@ -24,11 +24,11 @@ with lib;
2424
2525 environment.extraSetup = ''
2626 if [ -w $out/share/mime ] && [ -d $out/share/mime/packages ]; then
27− XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null
27+ XDG_DATA_DIRS=$out/share ${pkgs.buildPackages.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null
2828 fi
2929
3030 if [ -w $out/share/applications ]; then
31− ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications
31+ ${pkgs.buildPackages.desktop-file-utils}/bin/update-desktop-database $out/share/applications
3232 fi
3333 '';
3434 };
nixos/modules/config/xdg/sounds.nixnew file+22
@@ -0,0 +1,22 @@
1+{ config, lib, ... }:
2+
3+with lib;
4+{
5+ options = {
6+ xdg.sounds.enable = mkOption {
7+ type = types.bool;
8+ default = true;
9+ description = ''
10+ Whether to install files to support the
11+ <link xlink:href="https://www.freedesktop.org/wiki/Specifications/sound-theme-spec/">XDG Sound Theme specification</link>.
12+ '';
13+ };
14+ };
15+
16+ config = mkIf config.xdg.sounds.enable {
17+ environment.pathsToLink = [
18+ "/share/sounds"
19+ ];
20+ };
21+
22+}
nixos/modules/config/zram.nix+67−14
@@ -6,10 +6,27 @@ let
66
77 cfg = config.zramSwap;
88
9− devices = map (nr: "zram${toString nr}") (range 0 (cfg.numDevices - 1));
9+ # don't set swapDevices as mkDefault, so we can detect user had read our warning
10+ # (see below) and made an action (or not)
11+ devicesCount = if cfg.swapDevices != null then cfg.swapDevices else cfg.numDevices;
12+
13+ devices = map (nr: "zram${toString nr}") (range 0 (devicesCount - 1));
1014
1115 modprobe = "${pkgs.kmod}/bin/modprobe";
1216
17+ warnings =
18+ assert cfg.swapDevices != null -> cfg.numDevices >= cfg.swapDevices;
19+ flatten [
20+ (optional (cfg.numDevices > 1 && cfg.swapDevices == null) ''
21+ Using several small zram devices as swap is no better than using one large.
22+ Set either zramSwap.numDevices = 1 or explicitly set zramSwap.swapDevices.
23+
24+ Previously multiple zram devices were used to enable multithreaded
25+ compression. Linux supports multithreaded compression for 1 device
26+ since 3.15. See https://lkml.org/lkml/2014/2/28/404 for details.
27+ '')
28+ ];
29+
1330in
1431
1532{
@@ -24,9 +41,11 @@ in
2441 default = false;
2542 type = types.bool;
2643 description = ''
27− Enable in-memory compressed swap space provided by the zram kernel
28− module.
29− See https://www.kernel.org/doc/Documentation/blockdev/zram.txt
44+ Enable in-memory compressed devices and swap space provided by the zram
45+ kernel module.
46+ See <link xlink:href="https://www.kernel.org/doc/Documentation/blockdev/zram.txt">
47+ https://www.kernel.org/doc/Documentation/blockdev/zram.txt
48+ </link>.
3049 '';
3150 };
3251
@@ -34,7 +53,19 @@ in
3453 default = 1;
3554 type = types.int;
3655 description = ''
37− Number of zram swap devices to create.
56+ Number of zram devices to create. See also
57+ <literal>zramSwap.swapDevices</literal>
58+ '';
59+ };
60+
61+ swapDevices = mkOption {
62+ default = null;
63+ example = 1;
64+ type = with types; nullOr int;
65+ description = ''
66+ Number of zram devices to be used as swap. Must be
67+ <literal>&lt;= zramSwap.numDevices</literal>.
68+ Default is same as <literal>zramSwap.numDevices</literal>, recommended is 1.
3869 '';
3970 };
4071
@@ -44,7 +75,8 @@ in
4475 description = ''
4576 Maximum amount of memory that can be used by the zram swap devices
4677 (as a percentage of your total memory). Defaults to 1/2 of your total
47− RAM.
78+ RAM. Run <literal>zramctl</literal> to check how good memory is
79+ compressed.
4880 '';
4981 };
5082
@@ -58,12 +90,26 @@ in
5890 '';
5991 };
6092
93+ algorithm = mkOption {
94+ default = "zstd";
95+ example = "lzo";
96+ type = with types; either (enum [ "lzo" "lz4" "zstd" ]) str;
97+ description = ''
98+ Compression algorithm. <literal>lzo</literal> has good compression,
99+ but is slow. <literal>lz4</literal> has bad compression, but is fast.
100+ <literal>zstd</literal> is both good compression and fast.
101+ You can check what other algorithms are supported by your zram device with
102+ <programlisting>cat /sys/class/block/zram*/comp_algorithm</programlisting>
103+ '';
104+ };
61105 };
62106
63107 };
64108
65109 config = mkIf cfg.enable {
66110
111+ inherit warnings;
112+
67113 system.requiredKernelConfig = with config.lib.kernelConfig; [
68114 (isModule "ZRAM")
69115 ];
@@ -85,25 +131,25 @@ in
85131 createZramInitService = dev:
86132 nameValuePair "zram-init-${dev}" {
87133 description = "Init swap on zram-based device ${dev}";
88− bindsTo = [ "dev-${dev}.swap" ];
89134 after = [ "dev-${dev}.device" "zram-reloader.service" ];
90135 requires = [ "dev-${dev}.device" "zram-reloader.service" ];
91136 before = [ "dev-${dev}.swap" ];
92137 requiredBy = [ "dev-${dev}.swap" ];
138+ unitConfig.DefaultDependencies = false; # needed to prevent a cycle
93139 serviceConfig = {
94140 Type = "oneshot";
95141 RemainAfterExit = true;
96142 ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/class/block/${dev}/reset'";
97143 };
98144 script = ''
99− set -u
100− set -o pipefail
101−
145+ set -euo pipefail
146+
102147 # Calculate memory to use for zram
103− totalmem=$(${pkgs.gnugrep}/bin/grep 'MemTotal: ' /proc/meminfo | ${pkgs.gawk}/bin/awk '{print $2}')
104− mem=$(((totalmem * ${toString cfg.memoryPercent} / 100 / ${toString cfg.numDevices}) * 1024))
148+ mem=$(${pkgs.gawk}/bin/awk '/MemTotal: / {
149+ print int($2*${toString cfg.memoryPercent}/100.0/${toString devicesCount}*1024)
150+ }' /proc/meminfo)
105151
106− echo $mem > /sys/class/block/${dev}/disksize
152+ ${pkgs.utillinux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev}
107153 ${pkgs.utillinux}/sbin/mkswap /dev/${dev}
108154 '';
109155 restartIfChanged = false;
@@ -111,6 +157,9 @@ in
111157 in listToAttrs ((map createZramInitService devices) ++ [(nameValuePair "zram-reloader"
112158 {
113159 description = "Reload zram kernel module when number of devices changes";
160+ wants = [ "systemd-udevd.service" ];
161+ after = [ "systemd-udevd.service" ];
162+ unitConfig.DefaultDependencies = false; # needed to prevent a cycle
114163 serviceConfig = {
115164 Type = "oneshot";
116165 RemainAfterExit = true;
@@ -118,7 +167,11 @@ in
118167 ExecStart = "${modprobe} zram";
119168 ExecStop = "${modprobe} -r zram";
120169 };
121− restartTriggers = [ cfg.numDevices ];
170+ restartTriggers = [
171+ cfg.numDevices
172+ cfg.algorithm
173+ cfg.memoryPercent
174+ ];
122175 restartIfChanged = true;
123176 })]);
124177
nixos/modules/hardware/all-firmware.nix+1−1
@@ -38,7 +38,7 @@ in {
3838 firmwareLinuxNonfree
3939 intel2200BGFirmware
4040 rtl8192su-firmware
41− ] ++ optional (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) raspberrypiWirelessFirmware
41+ ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware
4242 ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
4343 rtl8723bs-firmware
4444 ];
nixos/modules/hardware/bladeRF.nixnew file+28
@@ -0,0 +1,28 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.hardware.bladeRF;
7+
8+in
9+
10+{
11+ options.hardware.bladeRF = {
12+ enable = mkOption {
13+ type = types.bool;
14+ default = false;
15+ description = ''
16+ Enables udev rules for BladeRF devices. By default grants access
17+ to users in the "bladerf" group. You may want to install the
18+ libbladeRF package.
19+ '';
20+ };
21+
22+ };
23+
24+ config = mkIf cfg.enable {
25+ services.udev.packages = [ pkgs.libbladeRF ];
26+ users.groups.bladerf = {};
27+ };
28+}
nixos/modules/hardware/ckb-next.nixnew file+49
@@ -0,0 +1,49 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.hardware.ckb-next;
7+
8+in
9+ {
10+ options.hardware.ckb-next = {
11+ enable = mkEnableOption "the Corsair keyboard/mouse driver";
12+
13+ gid = mkOption {
14+ type = types.nullOr types.int;
15+ default = null;
16+ example = 100;
17+ description = ''
18+ Limit access to the ckb daemon to a particular group.
19+ '';
20+ };
21+
22+ package = mkOption {
23+ type = types.package;
24+ default = pkgs.ckb-next;
25+ defaultText = "pkgs.ckb-next";
26+ description = ''
27+ The package implementing the Corsair keyboard/mouse driver.
28+ '';
29+ };
30+ };
31+
32+ config = mkIf cfg.enable {
33+ environment.systemPackages = [ cfg.package ];
34+
35+ systemd.services.ckb-next = {
36+ description = "Corsair Keyboards and Mice Daemon";
37+ wantedBy = ["multi-user.target"];
38+ serviceConfig = {
39+ ExecStart = "${cfg.package}/bin/ckb-next-daemon ${optionalString (cfg.gid != null) "--gid=${builtins.toString cfg.gid}"}";
40+ Restart = "on-failure";
41+ StandardOutput = "syslog";
42+ };
43+ };
44+ };
45+
46+ meta = {
47+ maintainers = with lib.maintainers; [ kierdavis ];
48+ };
49+ }
nixos/modules/hardware/ckb.nixdeleted−40
@@ -1,40 +0,0 @@
1−{ config, lib, pkgs, ... }:
2−
3−with lib;
4−
5−let
6− cfg = config.hardware.ckb;
7−
8−in
9− {
10− options.hardware.ckb = {
11− enable = mkEnableOption "the Corsair keyboard/mouse driver";
12−
13− package = mkOption {
14− type = types.package;
15− default = pkgs.ckb;
16− defaultText = "pkgs.ckb";
17− description = ''
18− The package implementing the Corsair keyboard/mouse driver.
19− '';
20− };
21− };
22−
23− config = mkIf cfg.enable {
24− environment.systemPackages = [ cfg.package ];
25−
26− systemd.services.ckb = {
27− description = "Corsair Keyboard Daemon";
28− wantedBy = ["multi-user.target"];
29− script = "${cfg.package}/bin/ckb-daemon";
30− serviceConfig = {
31− Restart = "always";
32− StandardOutput = "syslog";
33− };
34− };
35− };
36−
37− meta = {
38− maintainers = with lib.maintainers; [ kierdavis ];
39− };
40− }
nixos/modules/hardware/opengl.nix+10−6
@@ -1,4 +1,4 @@
1−{ config, lib, pkgs, pkgs_i686, ... }:
1+{ config, lib, pkgs, ... }:
22
33with lib;
44
@@ -124,10 +124,14 @@ in
124124
125125 config = mkIf cfg.enable {
126126
127− assertions = lib.singleton {
128− assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64;
129− message = "Option driSupport32Bit only makes sense on a 64-bit system.";
130− };
127+ assertions = [
128+ { assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64;
129+ message = "Option driSupport32Bit only makes sense on a 64-bit system.";
130+ }
131+ { assertion = cfg.driSupport32Bit -> (config.boot.kernelPackages.kernel.features.ia32Emulation or false);
132+ message = "Option driSupport32Bit requires a kernel that supports 32bit emulation";
133+ }
134+ ];
131135
132136 systemd.tmpfiles.rules = [
133137 "L+ /run/opengl-driver - - - - ${package}"
@@ -148,7 +152,7 @@ in
148152 [ "/run/opengl-driver/share" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/share";
149153
150154 hardware.opengl.package = mkDefault (makePackage pkgs);
151− hardware.opengl.package32 = mkDefault (makePackage pkgs_i686);
155+ hardware.opengl.package32 = mkDefault (makePackage pkgs.pkgsi686Linux);
152156
153157 boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions;
154158 };
nixos/modules/hardware/raid/hpsa.nix+2−2
@@ -8,7 +8,7 @@ let
88 version = "2.40-13.0";
99
1010 src = pkgs.fetchurl {
11− url = "http://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${name}_amd64.deb";
11+ url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${name}_amd64.deb";
1212 sha256 = "11w7fwk93lmfw0yya4jpjwdmgjimqxx6412sqa166g1pz4jil4sw";
1313 };
1414
@@ -34,7 +34,7 @@ let
3434
3535 meta = with lib; {
3636 description = "HP Smart Array CLI";
37− homepage = http://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/;
37+ homepage = https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/;
3838 license = licenses.unfreeRedistributable;
3939 platforms = [ "x86_64-linux" ];
4040 maintainers = with maintainers; [ volth ];
nixos/modules/hardware/video/amdgpu-pro.nix+2−2
@@ -1,6 +1,6 @@
11# This module provides the proprietary AMDGPU-PRO drivers.
22
3−{ config, lib, pkgs, pkgs_i686, ... }:
3+{ config, lib, pkgs, ... }:
44
55with lib;
66
@@ -11,7 +11,7 @@ let
1111 enabled = elem "amdgpu-pro" drivers;
1212
1313 package = config.boot.kernelPackages.amdgpu-pro;
14− package32 = pkgs_i686.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; };
14+ package32 = pkgs.pkgsi686Linux.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; };
1515
1616 opengl = config.hardware.opengl;
1717
nixos/modules/hardware/video/ati.nix+2−2
@@ -1,6 +1,6 @@
11# This module provides the proprietary ATI X11 / OpenGL drivers.
22
3−{ config, lib, pkgs_i686, ... }:
3+{ config, lib, pkgs, ... }:
44
55with lib;
66
@@ -24,7 +24,7 @@ in
2424 { name = "fglrx"; modules = [ ati_x11 ]; libPath = [ "${ati_x11}/lib" ]; };
2525
2626 hardware.opengl.package = ati_x11;
27− hardware.opengl.package32 = pkgs_i686.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
27+ hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
2828
2929 environment.systemPackages = [ ati_x11 ];
3030
nixos/modules/hardware/video/nvidia.nix+11−5
@@ -1,6 +1,6 @@
11# This module provides the proprietary NVIDIA X11 / OpenGL drivers.
22
3−{ config, lib, pkgs, pkgs_i686, ... }:
3+{ stdenv, config, lib, pkgs, ... }:
44
55with lib;
66
@@ -20,10 +20,16 @@ let
2020 kernelPackages.nvidia_x11_legacy304
2121 else if elem "nvidiaLegacy340" drivers then
2222 kernelPackages.nvidia_x11_legacy340
23+ else if elem "nvidiaLegacy390" drivers then
24+ kernelPackages.nvidia_x11_legacy390
2325 else null;
2426
2527 nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;
26− nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; };
28+ nvidia_libs32 =
29+ if versionOlder nvidia_x11.version "391" then
30+ ((nvidiaForKernel pkgs.pkgsi686Linux.linuxPackages).override { libsOnly = true; kernel = null; }).out
31+ else
32+ (nvidiaForKernel config.boot.kernelPackages).lib32;
2733
2834 enabled = nvidia_x11 != null;
2935
@@ -97,8 +103,8 @@ in
97103 config = mkIf enabled {
98104 assertions = [
99105 {
100− assertion = config.services.xserver.displayManager.gdm.wayland;
101− message = "NVidia drivers don't support wayland";
106+ assertion = with config.services.xserver.displayManager; gdm.enable -> !gdm.wayland;
107+ message = "NVIDIA drivers don't support wayland, set services.xserver.displayManager.gdm.wayland=false";
102108 }
103109 {
104110 assertion = !optimusCfg.enable ||
@@ -161,7 +167,7 @@ in
161167 };
162168
163169 hardware.opengl.package = nvidia_x11.out;
164− hardware.opengl.package32 = nvidia_libs32.out;
170+ hardware.opengl.package32 = nvidia_libs32;
165171
166172 environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]
167173 ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ];
nixos/modules/installer/cd-dvd/channel.nix+1−1
@@ -16,7 +16,7 @@ let
1616 { }
1717 ''
1818 mkdir -p $out
19− cp -prd ${nixpkgs} $out/nixos
19+ cp -prd ${nixpkgs.outPath} $out/nixos
2020 chmod -R u+w $out/nixos
2121 if [ ! -e $out/nixos/nixpkgs ]; then
2222 ln -s . $out/nixos/nixpkgs
nixos/modules/installer/cd-dvd/installation-cd-minimal.nix+2
@@ -7,4 +7,6 @@
77 imports =
88 [ ./installation-cd-base.nix
99 ];
10+
11+ fonts.fontconfig.enable = false;
1012}
nixos/modules/installer/cd-dvd/iso-image.nix+55−27
@@ -50,7 +50,7 @@ let
5050 finalCfg = {
5151 name = "NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel}";
5252 params = "init=${config.system.build.toplevel}/init ${additional} ${toString config.boot.kernelParams}";
53− image = "/boot/bzImage";
53+ image = "/boot/${config.system.boot.loader.kernelFile}";
5454 initrd = "/boot/initrd";
5555 };
5656 in
@@ -163,7 +163,7 @@ let
163163 cp -v ${pkgs.refind}/share/refind/refind_x64.efi $out/EFI/boot/
164164 ''
165165 else
166− "# No refind for ia32"
166+ "# No refind for ${targetArch}"
167167 ;
168168
169169 grubMenuCfg = ''
@@ -222,18 +222,34 @@ let
222222 efiDir = pkgs.runCommand "efi-directory" {} ''
223223 mkdir -p $out/EFI/boot/
224224
225+ # ALWAYS required modules.
225226 MODULES="fat iso9660 part_gpt part_msdos \
226227 normal boot linux configfile loopback chain halt \
227− efifwsetup efi_gop efi_uga \
228+ efifwsetup efi_gop \
228229 ls search search_label search_fs_uuid search_fs_file \
229230 gfxmenu gfxterm gfxterm_background gfxterm_menu test all_video loadenv \
230231 exfat ext2 ntfs btrfs hfsplus udf \
231232 videoinfo png \
232233 echo serial \
233234 "
235+
236+ echo "Building GRUB with modules:"
237+ for mod in $MODULES; do
238+ echo " - $mod"
239+ done
240+
241+ # Modules that may or may not be available per-platform.
242+ echo "Adding additional modules:"
243+ for mod in efi_uga; do
244+ if [ -f ${pkgs.grub2_efi}/lib/grub/${pkgs.grub2_efi.grubTarget}/$mod.mod ]; then
245+ echo " - $mod"
246+ MODULES+=" $mod"
247+ fi
248+ done
249+
234250 # Make our own efi program, we can't rely on "grub-install" since it seems to
235251 # probe for devices, even with --skip-fs-probe.
236− ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootia32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \
252+ ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/boot${targetArch}.efi -p /EFI/boot -O ${pkgs.grub2_efi.grubTarget} \
237253 $MODULES
238254 cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/
239255
@@ -339,15 +355,24 @@ let
339355 echo "Image size: $image_size"
340356 truncate --size=$image_size "$out"
341357 ${pkgs.libfaketime}/bin/faketime "2000-01-01 00:00:00" ${pkgs.dosfstools}/sbin/mkfs.vfat -i 12345678 -n EFIBOOT "$out"
342− mcopy -bpsvm -i "$out" ./* ::
358+ mcopy -psvm -i "$out" ./* ::
359+ # Verify the FAT partition.
360+ ${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out"
343361 ''; # */
344362
345− targetArch = if pkgs.stdenv.isi686 then
346− "ia32"
347− else if pkgs.stdenv.isx86_64 then
348− "x64"
349− else
350− throw "Unsupported architecture";
363+ # Name used by UEFI for architectures.
364+ targetArch =
365+ if pkgs.stdenv.isi686 then
366+ "ia32"
367+ else if pkgs.stdenv.isx86_64 then
368+ "x64"
369+ else if pkgs.stdenv.isAarch64 then
370+ "aa64"
371+ else
372+ throw "Unsupported architecture";
373+
374+ # Syslinux (and isolinux) only supports x86-based architectures.
375+ canx86BiosBoot = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;
351376
352377in
353378
@@ -481,9 +506,9 @@ in
481506 # here and it causes a cyclic dependency.
482507 boot.loader.grub.enable = false;
483508
484− # !!! Hack - attributes expected by other modules.
485− system.boot.loader.kernelFile = "bzImage";
486− environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ];
509+ environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi ]
510+ ++ optional canx86BiosBoot pkgs.syslinux
511+ ;
487512
488513 # In stage 1 of the boot, mount the CD as the root FS by label so
489514 # that we don't need to know its device. We pass the label of the
@@ -554,13 +579,7 @@ in
554579 # Individual files to be included on the CD, outside of the Nix
555580 # store on the CD.
556581 isoImage.contents =
557− [ { source = pkgs.substituteAll {
558− name = "isolinux.cfg";
559− src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg;
560− bootRoot = "/boot";
561− };
562− target = "/isolinux/isolinux.cfg";
563− }
582+ [
564583 { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile;
565584 target = "/boot/" + config.system.boot.loader.kernelFile;
566585 }
@@ -570,9 +589,6 @@ in
570589 { source = config.system.build.squashfsStore;
571590 target = "/nix-store.squashfs";
572591 }
573− { source = "${pkgs.syslinux}/share/syslinux";
574− target = "/isolinux";
575− }
576592 { source = config.isoImage.efiSplashImage;
577593 target = "/EFI/boot/efi-background.png";
578594 }
@@ -582,6 +598,17 @@ in
582598 { source = pkgs.writeText "version" config.system.nixos.label;
583599 target = "/version.txt";
584600 }
601+ ] ++ optionals canx86BiosBoot [
602+ { source = pkgs.substituteAll {
603+ name = "isolinux.cfg";
604+ src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg;
605+ bootRoot = "/boot";
606+ };
607+ target = "/isolinux/isolinux.cfg";
608+ }
609+ { source = "${pkgs.syslinux}/share/syslinux";
610+ target = "/isolinux";
611+ }
585612 ] ++ optionals config.isoImage.makeEfiBootable [
586613 { source = efiImg;
587614 target = "/boot/efi.img";
@@ -589,7 +616,7 @@ in
589616 { source = "${efiDir}/EFI";
590617 target = "/EFI";
591618 }
592− ] ++ optionals config.boot.loader.grub.memtest86.enable [
619+ ] ++ optionals (config.boot.loader.grub.memtest86.enable && canx86BiosBoot) [
593620 { source = "${pkgs.memtest86plus}/memtest.bin";
594621 target = "/boot/memtest.bin";
595622 }
@@ -604,9 +631,10 @@ in
604631 # Create the ISO image.
605632 system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({
606633 inherit (config.isoImage) isoName compressImage volumeID contents;
607− bootable = true;
634+ bootable = canx86BiosBoot;
608635 bootImage = "/isolinux/isolinux.bin";
609− } // optionalAttrs config.isoImage.makeUsbBootable {
636+ syslinux = if canx86BiosBoot then pkgs.syslinux else null;
637+ } // optionalAttrs (config.isoImage.makeUsbBootable && canx86BiosBoot) {
610638 usbBootable = true;
611639 isohybridMbrImage = "${pkgs.syslinux}/share/syslinux/isohdpfx.bin";
612640 } // optionalAttrs config.isoImage.makeEfiBootable {
nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nixnew file+7
@@ -0,0 +1,7 @@
1+{ pkgs, ... }:
2+
3+{
4+ imports = [ ./sd-image-aarch64.nix ];
5+
6+ boot.kernelPackages = pkgs.linuxPackages_latest;
7+}
nixos/modules/installer/cd-dvd/sd-image-aarch64.nix+1−9
@@ -5,7 +5,7 @@
55let
66 extlinux-conf-builder =
77 import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {
8− inherit pkgs;
8+ pkgs = pkgs.buildPackages;
99 };
1010in
1111{
@@ -15,18 +15,10 @@ in
1515 ./sd-image.nix
1616 ];
1717
18− assertions = lib.singleton {
19− assertion = pkgs.stdenv.hostPlatform.system == "aarch64-linux"
20− && pkgs.stdenv.hostPlatform.system == pkgs.stdenv.buildPlatform.system;
21− message = "sd-image-aarch64.nix can be only built natively on Aarch64 / ARM64; " +
22− "it cannot be cross compiled";
23− };
24−
2518 boot.loader.grub.enable = false;
2619 boot.loader.generic-extlinux-compatible.enable = true;
2720
2821 boot.consoleLogLevel = lib.mkDefault 7;
29− boot.kernelPackages = pkgs.linuxPackages_latest;
3022
3123 # The serial ports listed here are:
3224 # - ttyS0: for Tegra (Jetson TX1)
nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix+1−8
@@ -5,7 +5,7 @@
55let
66 extlinux-conf-builder =
77 import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {
8− inherit pkgs;
8+ pkgs = pkgs.buildPackages;
99 };
1010in
1111{
@@ -15,13 +15,6 @@ in
1515 ./sd-image.nix
1616 ];
1717
18− assertions = lib.singleton {
19− assertion = pkgs.stdenv.hostPlatform.system == "armv7l-linux"
20− && pkgs.stdenv.hostPlatform.system == pkgs.stdenv.buildPlatform.system;
21− message = "sd-image-armv7l-multiplatform.nix can be only built natively on ARMv7; " +
22− "it cannot be cross compiled";
23− };
24−
2518 boot.loader.grub.enable = false;
2619 boot.loader.generic-extlinux-compatible.enable = true;
2720
nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix+1−8
@@ -5,7 +5,7 @@
55let
66 extlinux-conf-builder =
77 import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix {
8− inherit pkgs;
8+ pkgs = pkgs.buildPackages;
99 };
1010in
1111{
@@ -15,13 +15,6 @@ in
1515 ./sd-image.nix
1616 ];
1717
18− assertions = lib.singleton {
19− assertion = pkgs.stdenv.hostPlatform.system == "armv6l-linux"
20− && pkgs.stdenv.hostPlatform.system == pkgs.stdenv.buildPlatform.system;
21− message = "sd-image-raspberrypi.nix can be only built natively on ARMv6; " +
22− "it cannot be cross compiled";
23− };
24−
2518 boot.loader.grub.enable = false;
2619 boot.loader.generic-extlinux-compatible.enable = true;
2720
nixos/modules/installer/cd-dvd/sd-image.nix+3−1
@@ -134,7 +134,9 @@ in
134134 ${config.sdImage.populateBootCommands}
135135
136136 # Copy the populated /boot into the SD image
137− (cd boot; mcopy -bpsvm -i ../bootpart.img ./* ::)
137+ (cd boot; mcopy -psvm -i ../bootpart.img ./* ::)
138+ # Verify the FAT partition before copying it.
139+ fsck.vfat -vn bootpart.img
138140 dd conv=notrunc if=bootpart.img of=$img seek=$START count=$SECTORS
139141 '';
140142 }) {};
nixos/modules/installer/tools/nix-fallback-paths.nix+4−4
@@ -1,6 +1,6 @@
11{
2− x86_64-linux = "/nix/store/cdcia67siabmj6li7vyffgv2cry86fq8-nix-2.1.3";
3− i686-linux = "/nix/store/6q3xi6y5qnsv7d62b8n00hqfxi8rs2xs-nix-2.1.3";
4− aarch64-linux = "/nix/store/2v93d0vimlm28jg0ms6v1i6lc0fq13pn-nix-2.1.3";
5− x86_64-darwin = "/nix/store/dkjlfkrknmxbjmpfk3dg4q3nmb7m3zvk-nix-2.1.3";
2+ x86_64-linux = "/nix/store/pid1yakjasch4pwl63nzbj22z9zf0q26-nix-2.2";
3+ i686-linux = "/nix/store/qpkl0cxy0xh4h432lv2qsjrmhvx5x2vy-nix-2.2";
4+ aarch64-linux = "/nix/store/0jg7h94x986d8cskg6gcfza9x67spdbp-nix-2.2";
5+ x86_64-darwin = "/nix/store/a48whqkmxnsfhwbk6nay74iyc1cf0lr2-nix-2.2";
66}
nixos/modules/installer/tools/nixos-build-vms/build-vms.nix+5−1
@@ -1,9 +1,13 @@
11{ system ? builtins.currentSystem
2+, config ? {}
23, networkExpr
34}:
45
56let nodes = import networkExpr; in
67
7−with import ../../../../lib/testing.nix { inherit system; };
8+with import ../../../../lib/testing.nix {
9+ inherit system;
10+ pkgs = import ../../../../.. { inherit system config; };
11+};
812
913(makeTest { inherit nodes; testScript = ""; }).driver
nixos/modules/installer/tools/nixos-generate-config.pl+14−8
@@ -314,14 +314,16 @@ push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];" if $videoDr
314314
315315# Generate the swapDevices option from the currently activated swap
316316# devices.
317−my @swaps = read_file("/proc/swaps");
318−shift @swaps;
317+my @swaps = read_file("/proc/swaps", err_mode => 'carp');
319318my @swapDevices;
320−foreach my $swap (@swaps) {
321− $swap =~ /^(\S+)\s/;
322− next unless -e $1;
323− my $dev = findStableDevPath $1;
324− push @swapDevices, "{ device = \"$dev\"; }";
319+if (@swaps) {
320+ shift @swaps;
321+ foreach my $swap (@swaps) {
322+ $swap =~ /^(\S+)\s/;
323+ next unless -e $1;
324+ my $dev = findStableDevPath $1;
325+ push @swapDevices, "{ device = \"$dev\"; }";
326+ }
325327}
326328
327329
@@ -447,7 +449,11 @@ EOF
447449 if (-e $slave) {
448450 my $dmName = read_file("/sys/class/block/$deviceName/dm/name");
449451 chomp $dmName;
450− $fileSystems .= " boot.initrd.luks.devices.\"$dmName\".device = \"${\(findStableDevPath $slave)}\";\n\n";
452+ # Ensure to add an entry only once
453+ my $luksDevice = " boot.initrd.luks.devices.\"$dmName\".device";
454+ if ($fileSystems !~ /^\Q$luksDevice\E/m) {
455+ $fileSystems .= "$luksDevice = \"${\(findStableDevPath $slave)}\";\n\n";
456+ }
451457 }
452458 }
453459 }
nixos/modules/installer/tools/nixos-install.sh+1
@@ -13,6 +13,7 @@ extraBuildFlags=()
1313
1414mountPoint=/mnt
1515channelPath=
16+system=
1617
1718while [ "$#" -gt 0 ]; do
1819 i="$1"; shift 1
nixos/modules/installer/tools/nixos-option.sh+3−3
@@ -314,13 +314,13 @@ else
314314 # echo 1>&2 "Warning: This value is not an option."
315315
316316 result=$(evalCfg "")
317− if names=$(attrNames "$result" 2> /dev/null); then
317+ if [ ! -z "$result" ]; then
318+ names=$(attrNames "$result" 2> /dev/null)
318319 echo 1>&2 "This attribute set contains:"
319320 escapeQuotes () { eval echo "$1"; }
320321 nixMap escapeQuotes "$names"
321322 else
322− echo 1>&2 "An error occurred while looking for attribute names."
323− echo $result
323+ echo 1>&2 "An error occurred while looking for attribute names. Are you sure that '$option' exists?"
324324 fi
325325fi
326326
nixos/modules/installer/tools/nixos-rebuild.sh+2−2
@@ -53,11 +53,11 @@ while [ "$#" -gt 0 ]; do
5353 repair=1
5454 extraBuildFlags+=("$i")
5555 ;;
56− --max-jobs|-j|--cores|-I)
56+ --max-jobs|-j|--cores|-I|--builders)
5757 j="$1"; shift 1
5858 extraBuildFlags+=("$i" "$j")
5959 ;;
60− --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*)
60+ --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*)
6161 extraBuildFlags+=("$i")
6262 ;;
6363 --option)
nixos/modules/installer/tools/tools.nix+1−1
@@ -37,7 +37,7 @@ let
3737 name = "nixos-generate-config";
3838 src = ./nixos-generate-config.pl;
3939 path = [ pkgs.btrfs-progs ];
40− perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
40+ perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix}";
4141 inherit (config.system.nixos) release;
4242 };
4343
nixos/modules/installer/virtualbox-demo.nix+38
@@ -22,4 +22,42 @@ with lib;
2222
2323 powerManagement.enable = false;
2424 system.stateVersion = mkDefault "18.03";
25+
26+ installer.cloneConfigExtra = ''
27+ # Let demo build as a trusted user.
28+ # nix.trustedUsers = [ "demo" ];
29+
30+ # Mount a VirtualBox shared folder.
31+ # This is configurable in the VirtualBox menu at
32+ # Machine / Settings / Shared Folders.
33+ # fileSystems."/mnt" = {
34+ # fsType = "vboxsf";
35+ # device = "nameofdevicetomount";
36+ # options = [ "rw" ];
37+ # };
38+
39+ # By default, the NixOS VirtualBox demo image includes SDDM and Plasma.
40+ # If you prefer another desktop manager or display manager, you may want
41+ # to disable the default.
42+ # services.xserver.desktopManager.plasma5.enable = lib.mkForce false;
43+ # services.xserver.displayManager.sddm.enable = lib.mkForce false;
44+
45+ # Enable GDM/GNOME by uncommenting above two lines and two lines below.
46+ # services.xserver.displayManager.gdm.enable = true;
47+ # services.xserver.desktopManager.gnome3.enable = true;
48+
49+ # Set your time zone.
50+ # time.timeZone = "Europe/Amsterdam";
51+
52+ # List packages installed in system profile. To search, run:
53+ # \$ nix search wget
54+ # environment.systemPackages = with pkgs; [
55+ # wget vim
56+ # ];
57+
58+ # Enable the OpenSSH daemon.
59+ # services.openssh.enable = true;
60+
61+ system.stateVersion = mkDefault "18.03";
62+ '';
2563}
nixos/modules/misc/documentation.nix+1−1
@@ -166,7 +166,7 @@ in
166166 if [ -w $out/share/info ]; then
167167 shopt -s nullglob
168168 for i in $out/share/info/*.info $out/share/info/*.info.gz; do
169− ${pkgs.texinfo}/bin/install-info $i $out/share/info/dir
169+ ${pkgs.buildPackages.texinfo}/bin/install-info $i $out/share/info/dir
170170 done
171171 fi
172172 '';
nixos/modules/misc/ids.nix+23−7
@@ -101,7 +101,7 @@
101101 iodined = 66;
102102 #libvirtd = 67; # unused
103103 graphite = 68;
104− statsd = 69;
104+ #statsd = 69; # removed 2018-11-14
105105 transmission = 70;
106106 postgres = 71;
107107 #vboxusers = 72; # unused
@@ -175,7 +175,7 @@
175175 dnsmasq = 141;
176176 uhub = 142;
177177 yandexdisk = 143;
178− #collectd = 144; #unused
178+ mxisd = 144; # was once collectd
179179 consul = 145;
180180 mailpile = 146;
181181 redmine = 147;
@@ -306,7 +306,7 @@
306306 rslsync = 279;
307307 minio = 280;
308308 kanboard = 281;
309− pykms = 282;
309+ # pykms = 282; # DynamicUser = true
310310 kodi = 283;
311311 restya-board = 284;
312312 mighttpd2 = 285;
@@ -331,6 +331,14 @@
331331 zeronet = 304;
332332 lirc = 305;
333333 lidarr = 306;
334+ slurm = 307;
335+ kapacitor = 308;
336+ solr = 309;
337+ alerta = 310;
338+ minetest = 311;
339+ rss2email = 312;
340+ cockroachdb = 313;
341+ zoneminder = 314;
334342
335343 # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
336344
@@ -385,7 +393,7 @@
385393 virtuoso = 44;
386394 #rtkit = 45; # unused
387395 dovecot2 = 46;
388− #dovenull = 47; # unused
396+ dovenull2 = 47;
389397 prayer = 49;
390398 mpd = 50;
391399 clamav = 51;
@@ -406,7 +414,7 @@
406414 iodined = 66;
407415 libvirtd = 67;
408416 graphite = 68;
409− #statsd = 69; # unused
417+ #statsd = 69; # removed 2018-11-14
410418 transmission = 70;
411419 postgres = 71;
412420 vboxusers = 72;
@@ -478,7 +486,7 @@
478486 #dnsmasq = 141; # unused
479487 uhub = 142;
480488 #yandexdisk = 143; # unused
481− #collectd = 144; # unused
489+ mxisd = 144; # was once collectd
482490 #consul = 145; # unused
483491 mailpile = 146;
484492 redmine = 147;
@@ -597,7 +605,7 @@
597605 rslsync = 279;
598606 minio = 280;
599607 kanboard = 281;
600− pykms = 282;
608+ # pykms = 282; # DynamicUser = true
601609 kodi = 283;
602610 restya-board = 284;
603611 mighttpd2 = 285;
@@ -622,6 +630,14 @@
622630 zeronet = 304;
623631 lirc = 305;
624632 lidarr = 306;
633+ slurm = 307;
634+ kapacitor = 308;
635+ solr = 309;
636+ alerta = 310;
637+ minetest = 311;
638+ rss2email = 312;
639+ cockroachdb = 313;
640+ zoneminder = 314;
625641
626642 # When adding a gid, make sure it doesn't match an existing
627643 # uid. Users and groups with the same name should have equal
nixos/modules/misc/nixpkgs.nix+44−13
@@ -1,9 +1,10 @@
1−{ config, lib, pkgs, ... }:
1+{ config, options, lib, pkgs, ... }:
22
33with lib;
44
55let
66 cfg = config.nixpkgs;
7+ opt = options.nixpkgs;
78
89 isConfig = x:
910 builtins.isAttrs x || lib.isFunction x;
@@ -54,6 +55,12 @@ let
5455 check = builtins.isAttrs;
5556 };
5657
58+ defaultPkgs = import ../../.. {
59+ inherit (cfg) config overlays localSystem crossSystem;
60+ };
61+
62+ finalPkgs = if opt.pkgs.isDefined then cfg.pkgs.appendOverlays cfg.overlays else defaultPkgs;
63+
5764in
5865
5966{
@@ -65,17 +72,21 @@ in
6572 inherit (cfg) config overlays localSystem crossSystem;
6673 }
6774 '';
68− default = import ../../.. {
69− inherit (cfg) config overlays localSystem crossSystem;
70− };
7175 type = pkgsType;
7276 example = literalExample ''import <nixpkgs> {}'';
7377 description = ''
74− This is the evaluation of Nixpkgs that will be provided to
75− all NixOS modules. Defining this option has the effect of
76− ignoring the other options that would otherwise be used to
77− evaluate Nixpkgs, because those are arguments to the default
78− value. The default value imports the Nixpkgs source files
78+ If set, the pkgs argument to all NixOS modules is the value of
79+ this option, extended with <code>nixpkgs.overlays</code>, if
80+ that is also set. Either <code>nixpkgs.crossSystem</code> or
81+ <code>nixpkgs.localSystem</code> will be used in an assertion
82+ to check that the NixOS and Nixpkgs architectures match. Any
83+ other options in <code>nixpkgs.*</code>, notably <code>config</code>,
84+ will be ignored.
85+
86+ If unset, the pkgs argument to all NixOS modules is determined
87+ as shown in the default value for this option.
88+
89+ The default value imports the Nixpkgs source files
7990 relative to the location of this NixOS module, because
8091 NixOS and Nixpkgs are distributed together for consistency,
8192 so the <code>nixos</code> in the default value is in fact a
@@ -128,12 +139,14 @@ in
128139 description = ''
129140 List of overlays to use with the Nix Packages collection.
130141 (For details, see the Nixpkgs documentation.) It allows
131− you to override packages globally. This is a function that
142+ you to override packages globally. Each function in the list
132143 takes as an argument the <emphasis>original</emphasis> Nixpkgs.
133144 The first argument should be used for finding dependencies, and
134145 the second should be used for overriding recipes.
135146
136− Ignored when <code>nixpkgs.pkgs</code> is set.
147+ If <code>nixpkgs.pkgs</code> is set, overlays specified here
148+ will be applied after the overlays that were already present
149+ in <code>nixpkgs.pkgs</code>.
137150 '';
138151 };
139152
@@ -207,8 +220,26 @@ in
207220
208221 config = {
209222 _module.args = {
210− pkgs = cfg.pkgs;
211− pkgs_i686 = cfg.pkgs.pkgsi686Linux;
223+ pkgs = finalPkgs;
212224 };
225+
226+ assertions = [
227+ (
228+ let
229+ nixosExpectedSystem =
230+ if config.nixpkgs.crossSystem != null
231+ then config.nixpkgs.crossSystem.system
232+ else config.nixpkgs.localSystem.system;
233+ nixosOption =
234+ if config.nixpkgs.crossSystem != null
235+ then "nixpkgs.crossSystem"
236+ else "nixpkgs.localSystem";
237+ pkgsSystem = finalPkgs.stdenv.targetPlatform.system;
238+ in {
239+ assertion = nixosExpectedSystem == pkgsSystem;
240+ message = "The NixOS nixpkgs.pkgs option was set to a Nixpkgs invocation that compiles to target system ${pkgsSystem} but NixOS was configured for system ${nixosExpectedSystem} via NixOS option ${nixosOption}. The NixOS system settings must match the Nixpkgs target system.";
241+ }
242+ )
243+ ];
213244 };
214245}
nixos/modules/misc/version.nix+2−3
@@ -43,6 +43,7 @@ in
4343 nixos.codeName = mkOption {
4444 readOnly = true;
4545 type = types.str;
46+ default = lib.trivial.codeName;
4647 description = "The NixOS release code name (e.g. <literal>Emu</literal>).";
4748 };
4849
@@ -79,9 +80,6 @@ in
7980 version = mkDefault (cfg.release + cfg.versionSuffix);
8081 revision = mkIf (pathIsDirectory gitRepo) (mkDefault gitCommitId);
8182 versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
82−
83− # Note: the first letter is bumped on every release. It's an animal.
84− codeName = "Koi";
8583 };
8684
8785 # Generate /etc/os-release. See
@@ -95,6 +93,7 @@ in
9593 VERSION_CODENAME=${toLower cfg.codeName}
9694 VERSION_ID="${cfg.version}"
9795 PRETTY_NAME="NixOS ${cfg.version} (${cfg.codeName})"
96+ LOGO="nix-snowflake"
9897 HOME_URL="https://nixos.org/"
9998 SUPPORT_URL="https://nixos.org/nixos/support.html"
10099 BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues"
nixos/modules/module-list.nix+32−7
@@ -11,6 +11,9 @@
1111 ./config/xdg/icons.nix
1212 ./config/xdg/menus.nix
1313 ./config/xdg/mime.nix
14+ ./config/appstream.nix
15+ ./config/xdg/sounds.nix
16+ ./config/gtk/gtk-icon-cache.nix
1417 ./config/gnu.nix
1518 ./config/i18n.nix
1619 ./config/iproute2.nix
@@ -33,8 +36,9 @@
3336 ./config/vpnc.nix
3437 ./config/zram.nix
3538 ./hardware/all-firmware.nix
39+ ./hardware/bladeRF.nix
3640 ./hardware/brightnessctl.nix
37− ./hardware/ckb.nix
41+ ./hardware/ckb-next.nix
3842 ./hardware/cpu/amd-microcode.nix
3943 ./hardware/cpu/intel-microcode.nix
4044 ./hardware/digitalbitbox.nix
@@ -63,7 +67,6 @@
6367 ./i18n/input-method/ibus.nix
6468 ./i18n/input-method/nabi.nix
6569 ./i18n/input-method/uim.nix
66− ./installer/tools/auto-upgrade.nix
6770 ./installer/tools/tools.nix
6871 ./misc/assertions.nix
6972 ./misc/crashdump.nix
@@ -90,6 +93,7 @@
9093 ./programs/criu.nix
9194 ./programs/dconf.nix
9295 ./programs/digitalbitbox/default.nix
96+ ./programs/dmrconfig.nix
9397 ./programs/environment.nix
9498 ./programs/firejail.nix
9599 ./programs/fish.nix
@@ -102,13 +106,14 @@
102106 ./programs/less.nix
103107 ./programs/light.nix
104108 ./programs/mosh.nix
109+ ./programs/mininet.nix
105110 ./programs/mtr.nix
106111 ./programs/nano.nix
112+ ./programs/nm-applet.nix
107113 ./programs/npm.nix
108114 ./programs/oblogout.nix
109115 ./programs/plotinus.nix
110116 ./programs/qt5ct.nix
111− ./programs/rootston.nix
112117 ./programs/screen.nix
113118 ./programs/sedutil.nix
114119 ./programs/slock.nix
@@ -121,11 +126,13 @@
121126 ./programs/sysdig.nix
122127 ./programs/systemtap.nix
123128 ./programs/sway.nix
129+ ./programs/sway-beta.nix
124130 ./programs/thefuck.nix
125131 ./programs/tmux.nix
126132 ./programs/udevil.nix
127133 ./programs/venus.nix
128134 ./programs/vim.nix
135+ ./programs/wavemon.nix
129136 ./programs/way-cooler.nix
130137 ./programs/wireshark.nix
131138 ./programs/xfs_quota.nix
@@ -147,8 +154,10 @@
147154 ./security/chromium-suid-sandbox.nix
148155 ./security/dhparams.nix
149156 ./security/duosec.nix
157+ ./security/google_oslogin.nix
150158 ./security/hidepid.nix
151159 ./security/lock-kernel-modules.nix
160+ ./security/misc.nix
152161 ./security/oath.nix
153162 ./security/pam.nix
154163 ./security/pam_usb.nix
@@ -208,6 +217,7 @@
208217 ./services/databases/aerospike.nix
209218 ./services/databases/cassandra.nix
210219 ./services/databases/clickhouse.nix
220+ ./services/databases/cockroachdb.nix
211221 ./services/databases/couchdb.nix
212222 ./services/databases/firebird.nix
213223 ./services/databases/foundationdb.nix
@@ -233,14 +243,17 @@
233243 ./services/desktops/dleyna-server.nix
234244 ./services/desktops/flatpak.nix
235245 ./services/desktops/geoclue2.nix
246+ ./services/desktops/gsignond.nix
236247 ./services/desktops/pipewire.nix
237248 ./services/desktops/gnome3/at-spi2-core.nix
238249 ./services/desktops/gnome3/chrome-gnome-shell.nix
239250 ./services/desktops/gnome3/evolution-data-server.nix
251+ ./services/desktops/gnome3/file-roller.nix
240252 ./services/desktops/gnome3/gnome-disks.nix
241253 ./services/desktops/gnome3/gnome-documents.nix
242254 ./services/desktops/gnome3/gnome-keyring.nix
243255 ./services/desktops/gnome3/gnome-online-accounts.nix
256+ ./services/desktops/gnome3/gnome-remote-desktop.nix
244257 ./services/desktops/gnome3/gnome-online-miners.nix
245258 ./services/desktops/gnome3/gnome-terminal-server.nix
246259 ./services/desktops/gnome3/gnome-user-share.nix
@@ -292,12 +305,14 @@
292305 ./services/hardware/usbmuxd.nix
293306 ./services/hardware/thermald.nix
294307 ./services/hardware/undervolt.nix
308+ ./services/hardware/vdr.nix
295309 ./services/logging/SystemdJournal2Gelf.nix
296310 ./services/logging/awstats.nix
297311 ./services/logging/fluentd.nix
298312 ./services/logging/graylog.nix
299313 ./services/logging/heartbeat.nix
300314 ./services/logging/journalbeat.nix
315+ ./services/logging/journaldriver.nix
301316 ./services/logging/journalwatch.nix
302317 ./services/logging/klogd.nix
303318 ./services/logging/logcheck.nix
@@ -324,12 +339,15 @@
324339 ./services/mail/postgrey.nix
325340 ./services/mail/spamassassin.nix
326341 ./services/mail/rspamd.nix
342+ ./services/mail/rss2email.nix
327343 ./services/mail/rmilter.nix
344+ ./services/mail/roundcube.nix
328345 ./services/mail/nullmailer.nix
329346 ./services/misc/airsonic.nix
330347 ./services/misc/apache-kafka.nix
331348 ./services/misc/autofs.nix
332349 ./services/misc/autorandr.nix
350+ ./services/misc/bees.nix
333351 ./services/misc/bepasty.nix
334352 ./services/misc/canto-daemon.nix
335353 ./services/misc/calibre-server.nix
@@ -415,7 +433,9 @@
415433 ./services/misc/uhub.nix
416434 ./services/misc/weechat.nix
417435 ./services/misc/xmr-stak.nix
436+ ./services/misc/zoneminder.nix
418437 ./services/misc/zookeeper.nix
438+ ./services/monitoring/alerta.nix
419439 ./services/monitoring/apcupsd.nix
420440 ./services/monitoring/arbtt.nix
421441 ./services/monitoring/bosun.nix
@@ -426,10 +446,12 @@
426446 ./services/monitoring/dd-agent/dd-agent.nix
427447 ./services/monitoring/fusion-inventory.nix
428448 ./services/monitoring/grafana.nix
449+ ./services/monitoring/grafana-reporter.nix
429450 ./services/monitoring/graphite.nix
430451 ./services/monitoring/hdaps.nix
431452 ./services/monitoring/heapster.nix
432453 ./services/monitoring/incron.nix
454+ ./services/monitoring/kapacitor.nix
433455 ./services/monitoring/longview.nix
434456 ./services/monitoring/monit.nix
435457 ./services/monitoring/munin.nix
@@ -444,7 +466,6 @@
444466 ./services/monitoring/riemann-tools.nix
445467 ./services/monitoring/scollector.nix
446468 ./services/monitoring/smartd.nix
447− ./services/monitoring/statsd.nix
448469 ./services/monitoring/sysstat.nix
449470 ./services/monitoring/systemhealth.nix
450471 ./services/monitoring/teamviewer.nix
@@ -503,6 +524,7 @@
503524 ./services/networking/dnsmasq.nix
504525 ./services/networking/ejabberd.nix
505526 ./services/networking/epmd.nix
527+ ./services/networking/eternal-terminal.nix
506528 ./services/networking/fakeroute.nix
507529 ./services/networking/ferm.nix
508530 ./services/networking/firefox/sync-server.nix
@@ -550,6 +572,7 @@
550572 ./services/networking/miredo.nix
551573 ./services/networking/mstpd.nix
552574 ./services/networking/murmur.nix
575+ ./services/networking/mxisd.nix
553576 ./services/networking/namecoind.nix
554577 ./services/networking/nat.nix
555578 ./services/networking/ndppd.nix
@@ -612,6 +635,7 @@
612635 ./services/networking/supplicant.nix
613636 ./services/networking/supybot.nix
614637 ./services/networking/syncthing.nix
638+ ./services/networking/syncthing-relay.nix
615639 ./services/networking/tcpcrypt.nix
616640 ./services/networking/teamspeak3.nix
617641 ./services/networking/tinc.nix
@@ -634,7 +658,7 @@
634658 ./services/networking/zerobin.nix
635659 ./services/networking/zeronet.nix
636660 ./services/networking/zerotierone.nix
637− ./services/networking/znc.nix
661+ ./services/networking/znc/default.nix
638662 ./services/printing/cupsd.nix
639663 ./services/scheduling/atd.nix
640664 ./services/scheduling/chronos.nix
@@ -673,7 +697,7 @@
673697 ./services/system/dbus.nix
674698 ./services/system/earlyoom.nix
675699 ./services/system/localtime.nix
676− ./services/system/kerberos.nix
700+ ./services/system/kerberos/default.nix
677701 ./services/system/nscd.nix
678702 ./services/system/saslauthd.nix
679703 ./services/system/uptimed.nix
@@ -698,7 +722,6 @@
698722 ./services/web-apps/restya-board.nix
699723 ./services/web-apps/tt-rss.nix
700724 ./services/web-apps/selfoss.nix
701− ./services/web-apps/quassel-webserver.nix
702725 ./services/web-apps/virtlyst.nix
703726 ./services/web-apps/youtrack.nix
704727 ./services/web-servers/apache-httpd/default.nix
@@ -742,6 +765,7 @@
742765 ./services/x11/hardware/multitouch.nix
743766 ./services/x11/hardware/synaptics.nix
744767 ./services/x11/hardware/wacom.nix
768+ ./services/x11/gdk-pixbuf.nix
745769 ./services/x11/redshift.nix
746770 ./services/x11/urxvtd.nix
747771 ./services/x11/window-managers/awesome.nix
@@ -792,6 +816,7 @@
792816 ./system/boot/timesyncd.nix
793817 ./system/boot/tmp.nix
794818 ./system/etc/etc.nix
819+ ./tasks/auto-upgrade.nix
795820 ./tasks/bcache.nix
796821 ./tasks/cpu-freq.nix
797822 ./tasks/encrypted-devices.nix
nixos/modules/profiles/base.nix+5−2
@@ -7,7 +7,7 @@
77 # Include some utilities that are useful for installing or repairing
88 # the system.
99 environment.systemPackages = [
10− pkgs.w3m-nox # needed for the manual anyway
10+ pkgs.w3m-nographics # needed for the manual anyway
1111 pkgs.testdisk # useful for repairing boot problems
1212 pkgs.ms-sys # for writing Microsoft boot sectors / MBRs
1313 pkgs.efibootmgr
@@ -19,6 +19,9 @@
1919 pkgs.cryptsetup # needed for dm-crypt volumes
2020 pkgs.mkpasswd # for generating password files
2121
22+ # Some text editors.
23+ pkgs.vim
24+
2225 # Some networking tools.
2326 pkgs.fuse
2427 pkgs.fuse3
@@ -46,7 +49,7 @@
4649 ];
4750
4851 # Include support for various filesystems.
49− boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
52+ boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ];
5053
5154 # Configure host id for ZFS to work
5255 networking.hostId = lib.mkDefault "8425e349";
nixos/modules/profiles/clone-config.nix+9
@@ -48,6 +48,8 @@ let
4848
4949 {
5050 imports = [ ${toString config.installer.cloneConfigIncludes} ];
51+
52+ ${config.installer.cloneConfigExtra}
5153 }
5254 '';
5355
@@ -73,6 +75,13 @@ in
7375 '';
7476 };
7577
78+ installer.cloneConfigExtra = mkOption {
79+ default = "";
80+ description = ''
81+ Extra text to include in the cloned configuration.nix included in this
82+ installer.
83+ '';
84+ };
7685 };
7786
7887 config = {
nixos/modules/profiles/docker-container.nix+10−6
@@ -15,15 +15,19 @@ in {
1515
1616 # Create the tarball
1717 system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix {
18− contents = [];
18+ contents = [
19+ {
20+ source = "${config.system.build.toplevel}/.";
21+ target = "./";
22+ }
23+ ];
1924 extraArgs = "--owner=0";
2025
2126 # Add init script to image
22− storeContents = [
23− { object = config.system.build.toplevel + "/init";
24− symlink = "/init";
25− }
26− ] ++ (pkgs2storeContents [ pkgs.stdenv ]);
27+ storeContents = pkgs2storeContents [
28+ config.system.build.toplevel
29+ pkgs.stdenv
30+ ];
2731
2832 # Some container managers like lxc need these
2933 extraCommands = "mkdir -p proc sys dev";
nixos/modules/profiles/hardened.nix+22−17
@@ -6,23 +6,43 @@
66with lib;
77
88{
9+ meta = {
10+ maintainers = [ maintainers.joachifm ];
11+ };
12+
913 boot.kernelPackages = mkDefault pkgs.linuxPackages_hardened;
1014
15+ nix.allowedUsers = mkDefault [ "@users" ];
16+
1117 security.hideProcessInformation = mkDefault true;
1218
1319 security.lockKernelModules = mkDefault true;
1420
21+ security.allowUserNamespaces = mkDefault false;
22+
23+ security.protectKernelImage = mkDefault true;
24+
25+ security.allowSimultaneousMultithreading = mkDefault false;
26+
27+ security.virtualization.flushL1DataCache = mkDefault "always";
28+
1529 security.apparmor.enable = mkDefault true;
1630
1731 boot.kernelParams = [
32+ # Slab/slub sanity checks, redzoning, and poisoning
33+ "slub_debug=FZP"
34+
35+ # Disable slab merging to make certain heap overflow attacks harder
36+ "slab_nomerge"
37+
1838 # Overwrite free'd memory
1939 "page_poison=1"
2040
2141 # Disable legacy virtual syscalls
2242 "vsyscall=none"
2343
24− # Disable hibernation (allows replacing the running kernel)
25− "nohibernate"
44+ # Enable PTI even if CPU claims to be safe from meltdown
45+ "pti=on"
2646 ];
2747
2848 boot.blacklistedKernelModules = [
@@ -36,9 +56,6 @@ with lib;
3656 # (e.g., parent/child)
3757 boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkOverride 500 1;
3858
39− # Prevent replacing the running kernel image w/o reboot
40− boot.kernel.sysctl."kernel.kexec_load_disabled" = mkDefault true;
41−
4259 # Restrict access to kernel ring buffer (information leaks)
4360 boot.kernel.sysctl."kernel.dmesg_restrict" = mkDefault true;
4461
@@ -55,18 +72,6 @@ with lib;
5572 # ... or at least apply some hardening to it
5673 boot.kernel.sysctl."net.core.bpf_jit_harden" = mkDefault true;
5774
58− # A recurring problem with user namespaces is that there are
59− # still code paths where the kernel's permission checking logic
60− # fails to account for namespacing, instead permitting a
61− # namespaced process to act outside the namespace with the
62− # same privileges as it would have inside it. This is particularly
63− # bad in the common case of running as root within the namespace.
64− #
65− # Setting the number of allowed user namespaces to 0 effectively disables
66− # the feature at runtime. Attempting to create a user namespace
67− # with unshare will then fail with "no space left on device".
68− boot.kernel.sysctl."user.max_user_namespaces" = mkDefault 0;
69−
7075 # Raise ASLR entropy for 64bit & 32bit, respectively.
7176 #
7277 # Note: mmap_rnd_compat_bits may not exist on 64bit.
nixos/modules/profiles/headless.nix−1
@@ -6,7 +6,6 @@
66with lib;
77
88{
9− sound.enable = false;
109 boot.vesa = false;
1110
1211 # Don't start a tty on the serial consoles.
nixos/modules/profiles/installation-device.nix+1−4
@@ -63,7 +63,7 @@ with lib;
6363 # Tell the Nix evaluator to garbage collect more aggressively.
6464 # This is desirable in memory-constrained environments that don't
6565 # (yet) have swap set up.
66− environment.variables.GC_INITIAL_HEAP_SIZE = "100000";
66+ environment.variables.GC_INITIAL_HEAP_SIZE = "1M";
6767
6868 # Make the installer more likely to succeed in low memory
6969 # environments. The kernel's overcommit heustistics bite us
@@ -87,9 +87,6 @@ with lib;
8787 # console less cumbersome if the machine has a public IP.
8888 networking.firewall.logRefusedConnections = mkDefault false;
8989
90− environment.systemPackages = [ pkgs.vim ];
91−
92−
9390 # Allow the user to log in as root without a password.
9491 users.users.root.initialHashedPassword = "";
9592 };
nixos/modules/profiles/minimal.nix+1−1
@@ -13,5 +13,5 @@ with lib;
1313
1414 documentation.enable = mkDefault false;
1515
16− sound.enable = mkDefault false;
16+ services.nixosManual.enable = mkDefault false;
1717}
nixos/modules/programs/adb.nix+1−2
@@ -16,7 +16,6 @@ with lib;
1616 To grant access to a user, it must be part of adbusers group:
1717 <code>users.users.alice.extraGroups = ["adbusers"];</code>
1818 '';
19− relatedPackages = [ ["androidenv" "platformTools"] ];
2019 };
2120 };
2221 };
@@ -24,7 +23,7 @@ with lib;
2423 ###### implementation
2524 config = mkIf config.programs.adb.enable {
2625 services.udev.packages = [ pkgs.android-udev-rules ];
27− environment.systemPackages = [ pkgs.androidenv.platformTools ];
26+ environment.systemPackages = [ pkgs.androidenv.androidPkgs_9_0.platform-tools ];
2827 users.groups.adbusers = {};
2928 };
3029}
nixos/modules/programs/bash/bash.nix+15−7
@@ -16,7 +16,7 @@ let
1616 # programmable completion. If we do, enable all modules installed in
1717 # the system and user profile in obsolete /etc/bash_completion.d/
1818 # directories. Bash loads completions in all
19− # $XDG_DATA_DIRS/share/bash-completion/completions/
19+ # $XDG_DATA_DIRS/bash-completion/completions/
2020 # on demand, so they do not need to be sourced here.
2121 if shopt -q progcomp &>/dev/null; then
2222 . "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh"
@@ -33,7 +33,8 @@ let
3333 '';
3434
3535 bashAliases = concatStringsSep "\n" (
36− mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") cfg.shellAliases
36+ mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}")
37+ (filterAttrs (k: v: !isNull v) cfg.shellAliases)
3738 );
3839
3940in
@@ -59,12 +60,12 @@ in
5960 */
6061
6162 shellAliases = mkOption {
62− default = config.environment.shellAliases;
63+ default = {};
6364 description = ''
64− Set of aliases for bash shell. See <option>environment.shellAliases</option>
65− for an option format description.
65+ Set of aliases for bash shell, which overrides <option>environment.shellAliases</option>.
66+ See <option>environment.shellAliases</option> for an option format description.
6667 '';
67− type = types.attrs; # types.attrsOf types.stringOrPath;
68+ type = with types; attrsOf (nullOr (either str path));
6869 };
6970
7071 shellInit = mkOption {
@@ -97,7 +98,12 @@ in
9798 if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then
9899 PROMPT_COLOR="1;31m"
99100 let $UID && PROMPT_COLOR="1;32m"
100− PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
101+ if [ -n "$INSIDE_EMACS" ]; then
102+ # Emacs term mode doesn't support xterm title escape sequence (\e]0;)
103+ PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
104+ else
105+ PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] "
106+ fi
101107 if test "$TERM" = "xterm"; then
102108 PS1="\[\033]2;\h:\u:\w\007\]$PS1"
103109 fi
@@ -125,6 +131,8 @@ in
125131
126132 programs.bash = {
127133
134+ shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases;
135+
128136 shellInit = ''
129137 if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
130138 . ${config.system.build.setEnvironment}
nixos/modules/programs/command-not-found/command-not-found.nix+1−1
@@ -16,7 +16,7 @@ let
1616 isExecutable = true;
1717 inherit (pkgs) perl;
1818 inherit (cfg) dbPath;
19− perlFlags = concatStrings (map (path: "-I ${path}/lib/perl5/site_perl ")
19+ perlFlags = concatStrings (map (path: "-I ${path}/${pkgs.perl.libPrefix} ")
2020 [ pkgs.perlPackages.DBI pkgs.perlPackages.DBDSQLite pkgs.perlPackages.StringShellQuote ]);
2121 };
2222
nixos/modules/programs/dmrconfig.nixnew file+38
@@ -0,0 +1,38 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.programs.dmrconfig;
7+
8+in {
9+ meta.maintainers = [ maintainers.etu ];
10+
11+ ###### interface
12+ options = {
13+ programs.dmrconfig = {
14+ enable = mkOption {
15+ default = false;
16+ type = types.bool;
17+ description = ''
18+ Whether to configure system to enable use of dmrconfig. This
19+ enables the required udev rules and installs the program.
20+ '';
21+ relatedPackages = [ "dmrconfig" ];
22+ };
23+
24+ package = mkOption {
25+ default = pkgs.dmrconfig;
26+ type = types.package;
27+ defaultText = "pkgs.dmrconfig";
28+ description = "dmrconfig derivation to use";
29+ };
30+ };
31+ };
32+
33+ ###### implementation
34+ config = mkIf cfg.enable {
35+ environment.systemPackages = [ cfg.package ];
36+ services.udev.packages = [ cfg.package ];
37+ };
38+}
nixos/modules/programs/fish.nix+8−5
@@ -9,7 +9,8 @@ let
99 cfg = config.programs.fish;
1010
1111 fishAliases = concatStringsSep "\n" (
12− mapAttrsFlatten (k: v: "alias ${k} '${v}'") cfg.shellAliases
12+ mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}")
13+ (filterAttrs (k: v: !isNull v) cfg.shellAliases)
1314 );
1415
1516in
@@ -53,12 +54,12 @@ in
5354 };
5455
5556 shellAliases = mkOption {
56− default = config.environment.shellAliases;
57+ default = {};
5758 description = ''
58− Set of aliases for fish shell. See <option>environment.shellAliases</option>
59− for an option format description.
59+ Set of aliases for fish shell, which overrides <option>environment.shellAliases</option>.
60+ See <option>environment.shellAliases</option> for an option format description.
6061 '';
61− type = types.attrs;
62+ type = with types; attrsOf (nullOr (either str path));
6263 };
6364
6465 shellInit = mkOption {
@@ -99,6 +100,8 @@ in
99100
100101 config = mkIf cfg.enable {
101102
103+ programs.fish.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases;
104+
102105 environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit;
103106 environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit;
104107 environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit;
nixos/modules/programs/gnupg.nix+1−1
@@ -77,7 +77,7 @@ in
7777
7878 systemd.packages = [ pkgs.gnupg ];
7979
80− environment.extraInit = ''
80+ environment.interactiveShellInit = ''
8181 # Bind gpg-agent to this TTY if gpg commands are used.
8282 export GPG_TTY=$(tty)
8383
nixos/modules/programs/mininet.nixnew file+39
@@ -0,0 +1,39 @@
1+# Global configuration for mininet
2+# kernel must have NETNS/VETH/SCHED
3+{ config, lib, pkgs, ... }:
4+
5+with lib;
6+
7+let
8+ cfg = config.programs.mininet;
9+
10+ generatedPath = with pkgs; makeSearchPath "bin" [
11+ iperf ethtool iproute socat
12+ ];
13+
14+ pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]);
15+
16+ mnexecWrapped = pkgs.runCommand "mnexec-wrapper"
17+ { buildInputs = [ pkgs.makeWrapper pkgs.pythonPackages.wrapPython ]; }
18+ ''
19+ makeWrapper ${pkgs.mininet}/bin/mnexec \
20+ $out/bin/mnexec \
21+ --prefix PATH : "${generatedPath}"
22+
23+ ln -s ${pyEnv}/bin/mn $out/bin/mn
24+
25+ # mn errors out without a telnet binary
26+ # pkgs.telnet brings an undesired ifconfig into PATH see #43105
27+ ln -s ${pkgs.telnet}/bin/telnet $out/bin/telnet
28+ '';
29+in
30+{
31+ options.programs.mininet.enable = mkEnableOption "Mininet";
32+
33+ config = mkIf cfg.enable {
34+
35+ virtualisation.vswitch.enable = true;
36+
37+ environment.systemPackages = [ mnexecWrapped ];
38+ };
39+}
nixos/modules/programs/nano.nix+3−2
@@ -2,6 +2,7 @@
22
33let
44 cfg = config.programs.nano;
5+ LF = "\n";
56in
67
78{
@@ -33,9 +34,9 @@ in
3334
3435 ###### implementation
3536
36− config = lib.mkIf (cfg.nanorc != "") {
37+ config = lib.mkIf (cfg.nanorc != "" || cfg.syntaxHighlight) {
3738 environment.etc."nanorc".text = lib.concatStrings [ cfg.nanorc
38− (lib.optionalString cfg.syntaxHighlight ''include "${pkgs.nano}/share/nano/*.nanorc"'') ];
39+ (lib.optionalString cfg.syntaxHighlight ''${LF}include "${pkgs.nano}/share/nano/*.nanorc"'') ];
3940 };
4041
4142}
nixos/modules/programs/nm-applet.nixnew file+14
@@ -0,0 +1,14 @@
1+{ config, lib, pkgs, ... }:
2+
3+{
4+ options.programs.nm-applet.enable = lib.mkEnableOption "nm-applet";
5+
6+ config = lib.mkIf config.programs.nm-applet.enable {
7+ systemd.user.services.nm-applet = {
8+ description = "Network manager applet";
9+ wantedBy = [ "graphical-session.target" ];
10+ partOf = [ "graphical-session.target" ];
11+ serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet";
12+ };
13+ };
14+}
nixos/modules/programs/rootston.nixdeleted−103
@@ -1,103 +0,0 @@
1−{ config, pkgs, lib, ... }:
2−
3−with lib;
4−
5−let
6− cfg = config.programs.rootston;
7−
8− rootstonWrapped = pkgs.writeScriptBin "rootston" ''
9− #! ${pkgs.runtimeShell}
10− if [[ "$#" -ge 1 ]]; then
11− exec ${pkgs.rootston}/bin/rootston "$@"
12− else
13− ${cfg.extraSessionCommands}
14− exec ${pkgs.rootston}/bin/rootston -C ${cfg.configFile}
15− fi
16− '';
17−in {
18− options.programs.rootston = {
19− enable = mkEnableOption ''
20− rootston, the reference compositor for wlroots. The purpose of rootston
21− is to test and demonstrate the features of wlroots (if you want a real
22− Wayland compositor you should e.g. use Sway instead). You can manually
23− start the compositor by running "rootston" from a terminal'';
24−
25− extraSessionCommands = mkOption {
26− type = types.lines;
27− default = "";
28− example = ''
29− # Define a keymap (US QWERTY is the default)
30− export XKB_DEFAULT_LAYOUT=de,us
31− export XKB_DEFAULT_VARIANT=nodeadkeys
32− export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:escape
33− '';
34− description = ''
35− Shell commands executed just before rootston is started.
36− '';
37− };
38−
39− extraPackages = mkOption {
40− type = with types; listOf package;
41− default = with pkgs; [
42− westonLite xwayland rofi
43− ];
44− defaultText = literalExample ''
45− with pkgs; [
46− westonLite xwayland rofi
47− ]
48− '';
49− example = literalExample "[ ]";
50− description = ''
51− Extra packages to be installed system wide.
52− '';
53− };
54−
55− config = mkOption {
56− type = types.str;
57− default = ''
58− [keyboard]
59− meta-key = Logo
60−
61− # Sway/i3 like Keybindings
62− # Maps key combinations with commands to execute
63− # Commands include:
64− # - "exit" to stop the compositor
65− # - "exec" to execute a shell command
66− # - "close" to close the current view
67− # - "next_window" to cycle through windows
68− [bindings]
69− Logo+Shift+e = exit
70− Logo+q = close
71− Logo+m = maximize
72− Alt+Tab = next_window
73− Logo+Return = exec weston-terminal
74− Logo+d = exec rofi -show run
75− '';
76− description = ''
77− Default configuration for rootston (used when called without any
78− parameters).
79− '';
80− };
81−
82− configFile = mkOption {
83− type = types.path;
84− default = "/etc/rootston.ini";
85− example = literalExample "${pkgs.rootston}/etc/rootston.ini";
86− description = ''
87− Path to the default rootston configuration file (the "config" option
88− will have no effect if you change the path).
89− '';
90− };
91− };
92−
93− config = mkIf cfg.enable {
94− environment.etc."rootston.ini".text = cfg.config;
95− environment.systemPackages = [ rootstonWrapped ] ++ cfg.extraPackages;
96−
97− hardware.opengl.enable = mkDefault true;
98− fonts.enableDefaultFonts = mkDefault true;
99− programs.dconf.enable = mkDefault true;
100− };
101−
102− meta.maintainers = with lib.maintainers; [ primeos gnidorah ];
103−}
nixos/modules/programs/shell.nix+2−8
@@ -8,18 +8,12 @@ with lib;
88
99 config = {
1010
11− environment.shellAliases =
12− { ls = "ls --color=tty";
13− ll = "ls -l";
14− l = "ls -alh";
15− };
16−
1711 environment.shellInit =
1812 ''
1913 # Set up the per-user profile.
2014 mkdir -m 0755 -p "$NIX_USER_PROFILE_DIR"
2115 if [ "$(stat --printf '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)" ]; then
22− echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR, should be $(id -u)" >&2
16+ echo "WARNING: the per-user profile dir $NIX_USER_PROFILE_DIR should belong to user id $(id -u)" >&2
2317 fi
2418
2519 if [ -w "$HOME" ]; then
@@ -41,7 +35,7 @@ with lib;
4135 NIX_USER_GCROOTS_DIR="/nix/var/nix/gcroots/per-user/$USER"
4236 mkdir -m 0755 -p "$NIX_USER_GCROOTS_DIR"
4337 if [ "$(stat --printf '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)" ]; then
44− echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR, should be $(id -u)" >&2
38+ echo "WARNING: the per-user gcroots dir $NIX_USER_GCROOTS_DIR should belong to user id $(id -u)" >&2
4539 fi
4640
4741 # Set up a default Nix expression from which to install stuff.
nixos/modules/programs/ssh.nix+6−6
@@ -167,16 +167,16 @@ in
167167 The set of system-wide known SSH hosts.
168168 '';
169169 example = literalExample ''
170− [
171− {
170+ {
171+ myhost = {
172172 hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
173173 publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub;
174− }
175− {
174+ };
175+ myhost2 = {
176176 hostNames = [ "myhost2" ];
177177 publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub;
178− }
179− ]
178+ };
179+ }
180180 '';
181181 };
182182
nixos/modules/programs/sway-beta.nixnew file+90
@@ -0,0 +1,90 @@
1+{ config, pkgs, lib, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.programs.sway-beta;
7+ swayPackage = cfg.package;
8+
9+ swayWrapped = pkgs.writeShellScriptBin "sway" ''
10+ set -o errexit
11+
12+ if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
13+ export _SWAY_WRAPPER_ALREADY_EXECUTED=1
14+ ${cfg.extraSessionCommands}
15+ fi
16+
17+ if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
18+ export DBUS_SESSION_BUS_ADDRESS
19+ exec ${swayPackage}/bin/sway "$@"
20+ else
21+ exec ${pkgs.dbus}/bin/dbus-run-session ${swayPackage}/bin/sway "$@"
22+ fi
23+ '';
24+ swayJoined = pkgs.symlinkJoin {
25+ name = "sway-joined";
26+ paths = [ swayWrapped swayPackage ];
27+ };
28+in {
29+ options.programs.sway-beta = {
30+ enable = mkEnableOption ''
31+ Sway, the i3-compatible tiling Wayland compositor. This module will be removed after the final release of Sway 1.0
32+ '';
33+
34+ package = mkOption {
35+ type = types.package;
36+ default = pkgs.sway-beta;
37+ defaultText = "pkgs.sway-beta";
38+ description = ''
39+ The package to be used for `sway`.
40+ '';
41+ };
42+
43+ extraSessionCommands = mkOption {
44+ type = types.lines;
45+ default = "";
46+ example = ''
47+ export SDL_VIDEODRIVER=wayland
48+ # needs qt5.qtwayland in systemPackages
49+ export QT_QPA_PLATFORM=wayland
50+ export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
51+ # Fix for some Java AWT applications (e.g. Android Studio),
52+ # use this if they aren't displayed properly:
53+ export _JAVA_AWT_WM_NONREPARENTING=1
54+ '';
55+ description = ''
56+ Shell commands executed just before Sway is started.
57+ '';
58+ };
59+
60+ extraPackages = mkOption {
61+ type = with types; listOf package;
62+ default = with pkgs; [
63+ xwayland rxvt_unicode dmenu
64+ ];
65+ defaultText = literalExample ''
66+ with pkgs; [ xwayland rxvt_unicode dmenu ];
67+ '';
68+ example = literalExample ''
69+ with pkgs; [
70+ xwayland
71+ i3status i3status-rust
72+ termite rofi light
73+ ]
74+ '';
75+ description = ''
76+ Extra packages to be installed system wide.
77+ '';
78+ };
79+ };
80+
81+ config = mkIf cfg.enable {
82+ environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages;
83+ security.pam.services.swaylock = {};
84+ hardware.opengl.enable = mkDefault true;
85+ fonts.enableDefaultFonts = mkDefault true;
86+ programs.dconf.enable = mkDefault true;
87+ };
88+
89+ meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ];
90+}
nixos/modules/programs/sway.nix+10−3
@@ -7,11 +7,18 @@ let
77 swayPackage = pkgs.sway;
88
99 swayWrapped = pkgs.writeShellScriptBin "sway" ''
10− if [[ "$#" -ge 1 ]]; then
10+ set -o errexit
11+
12+ if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
13+ export _SWAY_WRAPPER_ALREADY_EXECUTED=1
14+ ${cfg.extraSessionCommands}
15+ fi
16+
17+ if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
18+ export DBUS_SESSION_BUS_ADDRESS
1119 exec sway-setcap "$@"
1220 else
13− ${cfg.extraSessionCommands}
14− exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
21+ exec ${pkgs.dbus}/bin/dbus-run-session sway-setcap "$@"
1522 fi
1623 '';
1724 swayJoined = pkgs.symlinkJoin {
nixos/modules/programs/thefuck.nix+1−1
@@ -29,8 +29,8 @@ in
2929
3030 config = mkIf cfg.enable {
3131 environment.systemPackages = with pkgs; [ thefuck ];
32− environment.shellInit = initScript;
3332
33+ programs.bash.interactiveShellInit = initScript;
3434 programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript;
3535 programs.fish.interactiveShellInit = mkIf prg.fish.enable ''
3636 ${pkgs.thefuck}/bin/thefuck --alias | source
nixos/modules/programs/wavemon.nixnew file+28
@@ -0,0 +1,28 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.programs.wavemon;
7+in {
8+ options = {
9+ programs.wavemon = {
10+ enable = mkOption {
11+ type = types.bool;
12+ default = false;
13+ description = ''
14+ Whether to add wavemon to the global environment and configure a
15+ setcap wrapper for it.
16+ '';
17+ };
18+ };
19+ };
20+
21+ config = mkIf cfg.enable {
22+ environment.systemPackages = with pkgs; [ wavemon ];
23+ security.wrappers.wavemon = {
24+ source = "${pkgs.wavemon}/bin/wavemon";
25+ capabilities = "cap_net_admin+ep";
26+ };
27+ };
28+}
nixos/modules/programs/way-cooler.nix+1−1
@@ -8,7 +8,7 @@ let
88
99 wcWrapped = pkgs.writeShellScriptBin "way-cooler" ''
1010 ${cfg.extraSessionCommands}
11− exec ${pkgs.dbus.dbus-launch} --exit-with-session ${way-cooler}/bin/way-cooler
11+ exec ${pkgs.dbus}/bin/dbus-run-session ${way-cooler}/bin/way-cooler
1212 '';
1313 wcJoined = pkgs.symlinkJoin {
1414 name = "way-cooler-wrapped";
nixos/modules/programs/xss-lock.nix+2−1
@@ -9,7 +9,8 @@ in
99 options.programs.xss-lock = {
1010 enable = mkEnableOption "xss-lock";
1111 lockerCommand = mkOption {
12− example = "xlock";
12+ default = "${pkgs.i3lock}/bin/i3lock";
13+ example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy'';
1314 type = types.string;
1415 description = "Locker to be used with xsslock";
1516 };
nixos/modules/programs/zsh/oh-my-zsh.xml+4−4
@@ -19,7 +19,7 @@
1919 configuration format of <literal>oh-my-zsh</literal>.
2020<programlisting>
2121{
22− programs.ohMyZsh = {
22+ programs.zsh.ohMyZsh = {
2323 enable = true;
2424 plugins = [ "git" "python" "man" ];
2525 theme = "agnoster";
@@ -51,7 +51,7 @@
5151 The module can do this as well:
5252<programlisting>
5353{
54− programs.ohMyZsh.custom = "~/path/to/custom/scripts";
54+ programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts";
5555}
5656</programlisting>
5757 </para>
@@ -73,7 +73,7 @@
7373<programlisting>
7474{ pkgs, ... }:
7575{
76− programs.ohMyZsh.customPkgs = with pkgs; [
76+ programs.zsh.ohMyZsh.customPkgs = with pkgs; [
7777 pkgs.nix-zsh-completions
7878 # and even more...
7979 ];
@@ -87,7 +87,7 @@
8787
8888 <para>
8989 <emphasis>Please keep in mind that this is not compatible with
90− <literal>programs.ohMyZsh.custom</literal> as it requires an immutable store
90+ <literal>programs.zsh.ohMyZsh.custom</literal> as it requires an immutable store
9191 path while <literal>custom</literal> shall remain mutable! An evaluation
9292 failure will be thrown if both <literal>custom</literal> and
9393 <literal>customPkgs</literal> are set.</emphasis>
nixos/modules/programs/zsh/zsh-autosuggestions.nix+4−4
@@ -18,13 +18,13 @@ in
1818 };
1919
2020 strategy = mkOption {
21− type = types.enum [ "default" "match_prev_cmd" ];
22− default = "default";
21+ type = types.enum [ "history" "match_prev_cmd" ];
22+ default = "history";
2323 description = ''
2424 Set ZSH_AUTOSUGGEST_STRATEGY to choose the strategy for generating suggestions.
2525 There are currently two to choose from:
2626
27− * default: Chooses the most recent match.
27+ * history: Chooses the most recent match.
2828 * match_prev_cmd: Chooses the most recent match whose preceding history item matches
2929 the most recently executed command (more info). Note that this strategy won't work as
3030 expected with ZSH options that don't preserve the history order such as
@@ -51,7 +51,7 @@ in
5151 source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
5252
5353 export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}"
54− export ZSH_AUTOSUGGEST_STRATEGY="${cfg.strategy}"
54+ export ZSH_AUTOSUGGEST_STRATEGY=("${cfg.strategy}")
5555
5656 ${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)}
5757 '';
nixos/modules/programs/zsh/zsh.nix+7−5
@@ -11,7 +11,8 @@ let
1111 cfg = config.programs.zsh;
1212
1313 zshAliases = concatStringsSep "\n" (
14− mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") cfg.shellAliases
14+ mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}")
15+ (filterAttrs (k: v: !isNull v) cfg.shellAliases)
1516 );
1617
1718in
@@ -34,13 +35,12 @@ in
3435 };
3536
3637 shellAliases = mkOption {
37− default = config.environment.shellAliases;
38+ default = {};
3839 description = ''
39− Set of aliases for zsh shell. Overrides the default value taken from
40− <option>environment.shellAliases</option>.
40+ Set of aliases for zsh shell, which overrides <option>environment.shellAliases</option>.
4141 See <option>environment.shellAliases</option> for an option format description.
4242 '';
43− type = types.attrs; # types.attrsOf types.stringOrPath;
43+ type = with types; attrsOf (nullOr (either str path));
4444 };
4545
4646 shellInit = mkOption {
@@ -106,6 +106,8 @@ in
106106
107107 config = mkIf cfg.enable {
108108
109+ programs.zsh.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases;
110+
109111 environment.etc."zshenv".text =
110112 ''
111113 # /etc/zshenv: DO NOT EDIT -- this file has been generated automatically.
nixos/modules/rename.nix+8−1
@@ -28,7 +28,10 @@ with lib;
2828 (config:
2929 let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config;
3030 in if enabled then [ pkgs.gutenprint ] else [ ]))
31− (mkRenamedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ])
31+ (mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]
32+ (config:
33+ let value = getAttrFromPath [ "services" "ddclient" "domain" ] config;
34+ in if value != "" then [ value ] else []))
3235 (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "")
3336 (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ])
3437 (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])
@@ -279,6 +282,10 @@ with lib;
279282 (mkRenamedOptionModule [ "programs" "man" "enable" ] [ "documentation" "man" "enable" ])
280283 (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ])
281284
285+ # ckb
286+ (mkRenamedOptionModule [ "hardware" "ckb" "enable" ] [ "hardware" "ckb-next" "enable" ])
287+ (mkRenamedOptionModule [ "hardware" "ckb" "package" ] [ "hardware" "ckb-next" "package" ])
288+
282289 ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
283290 "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
284291 "snmpExporter" "unifiExporter" "varnishExporter" ]
nixos/modules/security/apparmor-suid.nix+1−1
@@ -28,7 +28,7 @@ with lib;
2828 capability setuid,
2929 network inet raw,
3030
31− ${pkgs.glibc.out}/lib/*.so mr,
31+ ${pkgs.stdenv.cc.libc.out}/lib/*.so mr,
3232 ${pkgs.libcap.lib}/lib/libcap.so* mr,
3333 ${pkgs.attr.out}/lib/libattr.so* mr,
3434
nixos/modules/security/dhparams.nix+2
@@ -170,4 +170,6 @@ in {
170170 '';
171171 }) cfg.params;
172172 };
173+
174+ meta.maintainers = with lib.maintainers; [ ekleog ];
173175}
nixos/modules/security/google_oslogin.nixnew file+68
@@ -0,0 +1,68 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+
7+ cfg = config.security.googleOsLogin;
8+ package = pkgs.google-compute-engine-oslogin;
9+
10+in
11+
12+{
13+
14+ options = {
15+
16+ security.googleOsLogin.enable = mkOption {
17+ type = types.bool;
18+ default = false;
19+ description = ''
20+ Whether to enable Google OS Login
21+
22+ The OS Login package enables the following components:
23+ AuthorizedKeysCommand to query valid SSH keys from the user's OS Login
24+ profile during ssh authentication phase.
25+ NSS Module to provide user and group information
26+ PAM Module for the sshd service, providing authorization and
27+ authentication support, allowing the system to use data stored in
28+ Google Cloud IAM permissions to control both, the ability to log into
29+ an instance, and to perform operations as root (sudo).
30+ '';
31+ };
32+
33+ };
34+
35+ config = mkIf cfg.enable {
36+ security.pam.services.sshd = {
37+ makeHomeDir = true;
38+ googleOsLoginAccountVerification = true;
39+ # disabled for now: googleOsLoginAuthentication = true;
40+ };
41+
42+ security.sudo.extraConfig = ''
43+ #includedir /run/google-sudoers.d
44+ '';
45+ systemd.tmpfiles.rules = [
46+ "d /run/google-sudoers.d 750 root root -"
47+ "d /var/google-users.d 750 root root -"
48+ ];
49+
50+ # enable the nss module, so user lookups etc. work
51+ system.nssModules = [ package ];
52+
53+ # Ugly: sshd refuses to start if a store path is given because /nix/store is group-writable.
54+ # So indirect by a symlink.
55+ environment.etc."ssh/authorized_keys_command_google_oslogin" = {
56+ mode = "0755";
57+ text = ''
58+ #!/bin/sh
59+ exec ${package}/bin/google_authorized_keys "$@"
60+ '';
61+ };
62+ services.openssh.extraConfig = ''
63+ AuthorizedKeysCommand /etc/ssh/authorized_keys_command_google_oslogin %u
64+ AuthorizedKeysCommandUser nobody
65+ '';
66+ };
67+
68+}
nixos/modules/security/lock-kernel-modules.nix+4
@@ -3,6 +3,10 @@
33with lib;
44
55{
6+ meta = {
7+ maintainers = [ maintainers.joachifm ];
8+ };
9+
610 options = {
711 security.lockKernelModules = mkOption {
812 type = types.bool;
nixos/modules/security/misc.nixnew file+125
@@ -0,0 +1,125 @@
1+{ config, lib, ... }:
2+
3+with lib;
4+
5+{
6+ meta = {
7+ maintainers = [ maintainers.joachifm ];
8+ };
9+
10+ options = {
11+ security.allowUserNamespaces = mkOption {
12+ type = types.bool;
13+ default = true;
14+ description = ''
15+ Whether to allow creation of user namespaces. A recurring problem
16+ with user namespaces is the presence of code paths where the kernel's
17+ permission checking logic fails to account for namespacing, instead
18+ permitting a namespaced process to act outside the namespace with the
19+ same privileges as it would have inside it. This is particularly
20+ damaging in the common case of running as root within the namespace.
21+ When user namespace creation is disallowed, attempting to create
22+ a user namespace fails with "no space left on device" (ENOSPC).
23+ '';
24+ };
25+
26+ security.protectKernelImage = mkOption {
27+ type = types.bool;
28+ default = false;
29+ description = ''
30+ Whether to prevent replacing the running kernel image.
31+ '';
32+ };
33+
34+ security.allowSimultaneousMultithreading = mkOption {
35+ type = types.bool;
36+ default = true;
37+ description = ''
38+ Whether to allow SMT/hyperthreading. Disabling SMT means that only
39+ physical CPU cores will be usable at runtime, potentially at
40+ significant performance cost.
41+ </para>
42+
43+ <para>
44+ The primary motivation for disabling SMT is to mitigate the risk of
45+ leaking data between threads running on the same CPU core (due to
46+ e.g., shared caches). This attack vector is unproven.
47+ </para>
48+
49+ <para>
50+ Disabling SMT is a supplement to the L1 data cache flushing mitigation
51+ (see <xref linkend="opt-security.virtualization.flushL1DataCache"/>)
52+ versus malicious VM guests (SMT could "bring back" previously flushed
53+ data).
54+ </para>
55+ <para>
56+ '';
57+ };
58+
59+ security.virtualization.flushL1DataCache = mkOption {
60+ type = types.nullOr (types.enum [ "never" "cond" "always" ]);
61+ default = null;
62+ description = ''
63+ Whether the hypervisor should flush the L1 data cache before
64+ entering guests.
65+ See also <xref linkend="opt-security.allowSimultaneousMultithreading"/>.
66+ </para>
67+
68+ <para>
69+ <variablelist>
70+ <varlistentry>
71+ <term><literal>null</literal></term>
72+ <listitem><para>uses the kernel default</para></listitem>
73+ </varlistentry>
74+ <varlistentry>
75+ <term><literal>"never"</literal></term>
76+ <listitem><para>disables L1 data cache flushing entirely.
77+ May be appropriate if all guests are trusted.</para></listitem>
78+ </varlistentry>
79+ <varlistentry>
80+ <term><literal>"cond"</literal></term>
81+ <listitem><para>flushes L1 data cache only for pre-determined
82+ code paths. May leak information about the host address space
83+ layout.</para></listitem>
84+ </varlistentry>
85+ <varlistentry>
86+ <term><literal>"always"</literal></term>
87+ <listitem><para>flushes L1 data cache every time the hypervisor
88+ enters the guest. May incur significant performance cost.
89+ </para></listitem>
90+ </varlistentry>
91+ </variablelist>
92+ '';
93+ };
94+ };
95+
96+ config = mkMerge [
97+ (mkIf (!config.security.allowUserNamespaces) {
98+ # Setting the number of allowed user namespaces to 0 effectively disables
99+ # the feature at runtime. Note that root may raise the limit again
100+ # at any time.
101+ boot.kernel.sysctl."user.max_user_namespaces" = 0;
102+
103+ assertions = [
104+ { assertion = config.nix.useSandbox -> config.security.allowUserNamespaces;
105+ message = "`nix.useSandbox = true` conflicts with `!security.allowUserNamespaces`.";
106+ }
107+ ];
108+ })
109+
110+ (mkIf config.security.protectKernelImage {
111+ # Disable hibernation (allows replacing the running kernel)
112+ boot.kernelParams = [ "nohibernate" ];
113+ # Prevent replacing the running kernel image w/o reboot
114+ boot.kernel.sysctl."kernel.kexec_load_disabled" = mkDefault true;
115+ })
116+
117+ (mkIf (!config.security.allowSimultaneousMultithreading) {
118+ boot.kernelParams = [ "nosmt" ];
119+ })
120+
121+ (mkIf (config.security.virtualization.flushL1DataCache != null) {
122+ boot.kernelParams = [ "kvm-intel.vmentry_l1d_flush=${config.security.virtualization.flushL1DataCache}" ];
123+ })
124+ ];
125+}
nixos/modules/security/pam.nix+31−1
@@ -77,6 +77,30 @@ let
7777 '';
7878 };
7979
80+ googleOsLoginAccountVerification = mkOption {
81+ default = false;
82+ type = types.bool;
83+ description = ''
84+ If set, will use the Google OS Login PAM modules
85+ (<literal>pam_oslogin_login</literal>,
86+ <literal>pam_oslogin_admin</literal>) to verify possible OS Login
87+ users and set sudoers configuration accordingly.
88+ This only makes sense to enable for the <literal>sshd</literal> PAM
89+ service.
90+ '';
91+ };
92+
93+ googleOsLoginAuthentication = mkOption {
94+ default = false;
95+ type = types.bool;
96+ description = ''
97+ If set, will use the <literal>pam_oslogin_login</literal>'s user
98+ authentication methods to authenticate users using 2FA.
99+ This only makes sense to enable for the <literal>sshd</literal> PAM
100+ service.
101+ '';
102+ };
103+
80104 fprintAuth = mkOption {
81105 default = config.services.fprintd.enable;
82106 type = types.bool;
@@ -269,7 +293,7 @@ let
269293 text = mkDefault
270294 (''
271295 # Account management.
272− account ${if cfg.sssdStrictAccess then "required" else "sufficient"} pam_unix.so
296+ account required pam_unix.so
273297 ${optionalString use_ldap
274298 "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"}
275299 ${optionalString (config.services.sssd.enable && cfg.sssdStrictAccess==false)
@@ -278,8 +302,14 @@ let
278302 "account [default=bad success=ok user_unknown=ignore] ${pkgs.sssd}/lib/security/pam_sss.so"}
279303 ${optionalString config.krb5.enable
280304 "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"}
305+ ${optionalString cfg.googleOsLoginAccountVerification ''
306+ account [success=ok ignore=ignore default=die] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so
307+ account [success=ok default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_admin.so
308+ ''}
281309
282310 # Authentication management.
311+ ${optionalString cfg.googleOsLoginAuthentication
312+ "auth [success=done perm_denied=bad default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so"}
283313 ${optionalString cfg.rootOK
284314 "auth sufficient pam_rootok.so"}
285315 ${optionalString cfg.requireWheel
nixos/modules/security/rngd.nix+1−3
@@ -20,7 +20,6 @@ with lib;
2020 KERNEL=="random", TAG+="systemd"
2121 SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
2222 KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
23− ${if config.services.tcsd.enable then "" else ''KERNEL=="tpm0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"''}
2423 '';
2524
2625 systemd.services.rngd = {
@@ -30,8 +29,7 @@ with lib;
3029
3130 description = "Hardware RNG Entropy Gatherer Daemon";
3231
33− serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f -v" +
34− (if config.services.tcsd.enable then " --no-tpm=1" else "");
32+ serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f";
3533 };
3634 };
3735}
nixos/modules/security/wrappers/default.nix−29
@@ -180,35 +180,6 @@ in
180180 # programs to be wrapped.
181181 WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
182182
183− # Remove the old /var/setuid-wrappers path from the system...
184− #
185− # TODO: this is only necessary for upgrades 16.09 => 17.x;
186− # this conditional removal block needs to be removed after
187− # the release.
188− if [ -d /var/setuid-wrappers ]; then
189− rm -rf /var/setuid-wrappers
190− ln -s /run/wrappers/bin /var/setuid-wrappers
191− fi
192−
193− # Remove the old /run/setuid-wrappers-dir path from the
194− # system as well...
195− #
196− # TODO: this is only necessary for upgrades 16.09 => 17.x;
197− # this conditional removal block needs to be removed after
198− # the release.
199− if [ -d /run/setuid-wrapper-dirs ]; then
200− rm -rf /run/setuid-wrapper-dirs
201− ln -s /run/wrappers/bin /run/setuid-wrapper-dirs
202− fi
203−
204− # TODO: this is only necessary for upgrades 16.09 => 17.x;
205− # this conditional removal block needs to be removed after
206− # the release.
207− if readlink -f /run/booted-system | grep nixos-17 > /dev/null; then
208− rm -rf /run/setuid-wrapper-dirs
209− rm -rf /var/setuid-wrappers
210− fi
211−
212183 # We want to place the tmpdirs for the wrappers to the parent dir.
213184 wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
214185 chmod a+rx $wrapperDir
nixos/modules/services/admin/salt/master.nix+3
@@ -53,6 +53,9 @@ in
5353 Type = "notify";
5454 NotifyAccess = "all";
5555 };
56+ restartTriggers = [
57+ config.environment.etc."salt/master".source
58+ ];
5659 };
5760 };
5861
nixos/modules/services/admin/salt/minion.nix+16−5
@@ -15,7 +15,6 @@ let
1515 # Default is in /etc/salt/pki/minion
1616 pki_dir = "/var/lib/salt/pki/minion";
1717 } cfg.configuration;
18− configDir = pkgs.writeTextDir "minion" (builtins.toJSON fullConfig);
1918
2019in
2120
@@ -28,15 +27,24 @@ in
2827 default = {};
2928 description = ''
3029 Salt minion configuration as Nix attribute set.
31− See <link xlink:href="https://docs.saltstack.com/en/latest/ref/configuration/minion.html"/>
32− for details.
30+ See <link xlink:href="https://docs.saltstack.com/en/latest/ref/configuration/minion.html"/>
31+ for details.
3332 '';
3433 };
3534 };
3635 };
3736
3837 config = mkIf cfg.enable {
39− environment.systemPackages = with pkgs; [ salt ];
38+ environment = {
39+ # Set this up in /etc/salt/minion so `salt-call`, etc. work.
40+ # The alternatives are
41+ # - passing --config-dir to all salt commands, not just the minion unit,
42+ # - setting aglobal environment variable.
43+ etc."salt/minion".source = pkgs.writeText "minion" (
44+ builtins.toJSON fullConfig
45+ );
46+ systemPackages = with pkgs; [ salt ];
47+ };
4048 systemd.services.salt-minion = {
4149 description = "Salt Minion";
4250 wantedBy = [ "multi-user.target" ];
@@ -45,11 +53,14 @@ in
4553 utillinux
4654 ];
4755 serviceConfig = {
48− ExecStart = "${pkgs.salt}/bin/salt-minion --config-dir=${configDir}";
56+ ExecStart = "${pkgs.salt}/bin/salt-minion";
4957 LimitNOFILE = 8192;
5058 Type = "notify";
5159 NotifyAccess = "all";
5260 };
61+ restartTriggers = [
62+ config.environment.etc."salt/minion".source
63+ ];
5364 };
5465 };
5566}
nixos/modules/services/amqp/rabbitmq.nix+23−6
@@ -87,9 +87,19 @@ in {
8787 }
8888 '';
8989 description = ''
90− New style config options.
91−
92− See http://www.rabbitmq.com/configure.html
90+ Configuration options in RabbitMQ's new config file format,
91+ which is a simple key-value format that can not express nested
92+ data structures. This is known as the <literal>rabbitmq.conf</literal> file,
93+ although outside NixOS that filename may have Erlang syntax, particularly
94+ prior to RabbitMQ 3.7.0.
95+
96+ If you do need to express nested data structures, you can use
97+ <literal>config</literal> option. Configuration from <literal>config</literal>
98+ will be merged into these options by RabbitMQ at runtime to
99+ form the final configuration.
100+
101+ See http://www.rabbitmq.com/configure.html#config-items
102+ For the distinct formats, see http://www.rabbitmq.com/configure.html#config-file-formats
93103 '';
94104 };
95105
@@ -97,10 +107,17 @@ in {
97107 default = "";
98108 type = types.str;
99109 description = ''
100− Verbatim advanced configuration file contents.
101− Prefered way is to use configItems.
110+ Verbatim advanced configuration file contents using the Erlang syntax.
111+ This is also known as the <literal>advanced.config</literal> file or the old config format.
112+
113+ <literal>configItems</literal> is preferred whenever possible. However, nested
114+ data structures can only be expressed properly using the <literal>config</literal> option.
115+
116+ The contents of this option will be merged into the <literal>configItems</literal>
117+ by RabbitMQ at runtime to form the final configuration.
102118
103− See http://www.rabbitmq.com/configure.html
119+ See the second table on http://www.rabbitmq.com/configure.html#config-items
120+ For the distinct formats, see http://www.rabbitmq.com/configure.html#config-file-formats
104121 '';
105122 };
106123
nixos/modules/services/backup/bacula.nix+18−6
@@ -346,8 +346,12 @@ in {
346346 description = "Bacula File Daemon";
347347 wantedBy = [ "multi-user.target" ];
348348 path = [ pkgs.bacula ];
349− serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-fd -f -u root -g bacula -c ${fd_conf}";
350− serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
349+ serviceConfig = {
350+ ExecStart = "${pkgs.bacula}/sbin/bacula-fd -f -u root -g bacula -c ${fd_conf}";
351+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
352+ LogsDirectory = "bacula";
353+ StateDirectory = "bacula";
354+ };
351355 };
352356
353357 systemd.services.bacula-sd = mkIf sd_cfg.enable {
@@ -355,8 +359,12 @@ in {
355359 description = "Bacula Storage Daemon";
356360 wantedBy = [ "multi-user.target" ];
357361 path = [ pkgs.bacula ];
358− serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-sd -f -u bacula -g bacula -c ${sd_conf}";
359− serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
362+ serviceConfig = {
363+ ExecStart = "${pkgs.bacula}/sbin/bacula-sd -f -u bacula -g bacula -c ${sd_conf}";
364+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
365+ LogsDirectory = "bacula";
366+ StateDirectory = "bacula";
367+ };
360368 };
361369
362370 services.postgresql.enable = dir_cfg.enable == true;
@@ -366,8 +374,12 @@ in {
366374 description = "Bacula Director Daemon";
367375 wantedBy = [ "multi-user.target" ];
368376 path = [ pkgs.bacula ];
369− serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-dir -f -u bacula -g bacula -c ${dir_conf}";
370− serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
377+ serviceConfig = {
378+ ExecStart = "${pkgs.bacula}/sbin/bacula-dir -f -u bacula -g bacula -c ${dir_conf}";
379+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
380+ LogsDirectory = "bacula";
381+ StateDirectory = "bacula";
382+ };
371383 preStart = ''
372384 if ! test -e "${libDir}/db-created"; then
373385 ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole bacula
nixos/modules/services/backup/borgbackup.nix+1−2
@@ -191,10 +191,9 @@ in {
191191 options = {
192192
193193 paths = mkOption {
194− type = with types; either path (nonEmptyListOf path);
194+ type = with types; coercedTo str lib.singleton (listOf str);
195195 description = "Path(s) to back up.";
196196 example = "/home/user";
197− apply = x: if isList x then x else [ x ];
198197 };
199198
200199 repo = mkOption {
nixos/modules/services/backup/postgresql-backup.nix+42−11
@@ -6,11 +6,11 @@ let
66
77 cfg = config.services.postgresqlBackup;
88
9− postgresqlBackupService = db :
9+ postgresqlBackupService = db: dumpCmd:
1010 {
1111 enable = true;
1212
13− description = "Backup of database ${db}";
13+ description = "Backup of ${db} database(s)";
1414
1515 requires = [ "postgresql.service" ];
1616
@@ -20,11 +20,13 @@ let
2020 '';
2121
2222 script = ''
23+ umask 0077 # ensure backup is only readable by postgres user
24+
2325 if [ -e ${cfg.location}/${db}.sql.gz ]; then
2426 ${pkgs.coreutils}/bin/mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz
2527 fi
2628
27− ${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db} | \
29+ ${dumpCmd} | \
2830 ${pkgs.gzip}/bin/gzip -c > ${cfg.location}/${db}.sql.gz
2931 '';
3032
@@ -40,9 +42,7 @@ let
4042in {
4143
4244 options = {
43−
4445 services.postgresqlBackup = {
45−
4646 enable = mkOption {
4747 default = false;
4848 description = ''
@@ -59,6 +59,19 @@ in {
5959 '';
6060 };
6161
62+ backupAll = mkOption {
63+ default = cfg.databases == [];
64+ defaultText = "services.postgresqlBackup.databases == []";
65+ type = lib.types.bool;
66+ description = ''
67+ Backup all databases using pg_dumpall.
68+ This option is mutual exclusive to
69+ <literal>services.postgresqlBackup.databases</literal>.
70+ The resulting backup dump will have the name all.sql.gz.
71+ This option is the default if no databases are specified.
72+ '';
73+ };
74+
6275 databases = mkOption {
6376 default = [];
6477 description = ''
@@ -77,18 +90,36 @@ in {
7790 type = types.string;
7891 default = "-Cbo";
7992 description = ''
80− Command line options for pg_dump.
93+ Command line options for pg_dump. This options is not used
94+ if <literal>config.services.postgresqlBackup.backupAll</literal> is enabled.
95+ Note that config.services.postgresqlBackup.backupAll is also active,
96+ when no databases where specified.
8197 '';
8298 };
8399 };
84100
85101 };
86102
87− config = mkIf config.services.postgresqlBackup.enable {
88−
89− systemd.services = listToAttrs (map (db : {
103+ config = mkMerge [
104+ {
105+ assertions = [{
106+ assertion = cfg.backupAll -> cfg.databases == [];
107+ message = "config.services.postgresqlBackup.backupAll cannot be used together with config.services.postgresqlBackup.databases";
108+ }];
109+ }
110+ (mkIf (cfg.enable && cfg.backupAll) {
111+ systemd.services.postgresqlBackup =
112+ postgresqlBackupService "all" "${config.services.postgresql.package}/bin/pg_dumpall";
113+ })
114+ (mkIf (cfg.enable && !cfg.backupAll) {
115+ systemd.services = listToAttrs (map (db:
116+ let
117+ cmd = "${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db}";
118+ in {
90119 name = "postgresqlBackup-${db}";
91− value = postgresqlBackupService db; } ) cfg.databases);
92− };
120+ value = postgresqlBackupService db cmd;
121+ }) cfg.databases);
122+ })
123+ ];
93124
94125}
nixos/modules/services/backup/restic.nix+6−1
@@ -1,6 +1,11 @@
11{ config, lib, pkgs, ... }:
22
33with lib;
4+
5+let
6+ # Type for a valid systemd unit option. Needed for correctly passing "timerConfig" to "systemd.timers"
7+ unitOption = (import ../../system/boot/systemd-unit-options.nix { inherit config lib; }).unitOption;
8+in
49{
510 options.services.restic.backups = mkOption {
611 description = ''
@@ -47,7 +52,7 @@ with lib;
4752 };
4853
4954 timerConfig = mkOption {
50− type = types.attrsOf types.str;
55+ type = types.attrsOf unitOption;
5156 default = {
5257 OnCalendar = "daily";
5358 };
nixos/modules/services/cluster/kubernetes/default.nix+4−4
@@ -784,7 +784,7 @@ in {
784784 clusterCidr = mkOption {
785785 description = "Kubernetes controller manager and proxy CIDR Range for Pods in cluster.";
786786 default = "10.1.0.0/16";
787− type = types.str;
787+ type = types.nullOr types.str;
788788 };
789789
790790 flannel.enable = mkOption {
@@ -1018,9 +1018,9 @@ in {
10181018 ${if (cfg.controllerManager.rootCaFile!=null)
10191019 then "--root-ca-file=${cfg.controllerManager.rootCaFile}"
10201020 else "--root-ca-file=/var/run/kubernetes/apiserver.crt"} \
1021− ${optionalString (cfg.clusterCidr!=null)
1022− "--cluster-cidr=${cfg.clusterCidr}"} \
1023− --allocate-node-cidrs=true \
1021+ ${if (cfg.clusterCidr!=null)
1022+ then "--cluster-cidr=${cfg.clusterCidr} --allocate-node-cidrs=true"
1023+ else "--allocate-node-cidrs=false"} \
10241024 ${optionalString (cfg.controllerManager.featureGates != [])
10251025 "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.controllerManager.featureGates}"} \
10261026 ${optionalString cfg.verbose "--v=6"} \
nixos/modules/services/cluster/kubernetes/dns.nix+190−196
@@ -3,8 +3,13 @@
33with lib;
44
55let
6− version = "1.14.10";
6+ version = "1.2.5";
77 cfg = config.services.kubernetes.addons.dns;
8+ ports = {
9+ dns = 10053;
10+ health = 10054;
11+ metrics = 10055;
12+ };
813in {
914 options.services.kubernetes.addons.dns = {
1015 enable = mkEnableOption "kubernetes dns addon";
@@ -27,49 +32,130 @@ in {
2732 type = types.str;
2833 };
2934
30− kube-dns = mkOption {
31− description = "Docker image to seed for the kube-dns main container.";
32− type = types.attrs;
33− default = {
34− imageName = "k8s.gcr.io/k8s-dns-kube-dns-amd64";
35− imageDigest = "sha256:b99fc3eee2a9f052f7eb4cc00f15eb12fc405fa41019baa2d6b79847ae7284a8";
36− finalImageTag = version;
37− sha256 = "0x583znk9smqn0fix7ld8sm5jgaxhqhx3fq97b1wkqm7iwhvl3pj";
38− };
39− };
40−
41− dnsmasq-nanny = mkOption {
42− description = "Docker image to seed for the kube-dns dnsmasq container.";
43− type = types.attrs;
44− default = {
45− imageName = "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64";
46− imageDigest = "sha256:bbb2a290a568125b3b996028958eb773f33b5b87a6b37bf38a28f8b62dddb3c8";
47− finalImageTag = version;
48− sha256 = "1fihml7s2mfwgac51cbqpylkwbivc8nyhgi4vb820s83zvl8a6y1";
49− };
35+ replicas = mkOption {
36+ description = "Number of DNS pod replicas to deploy in the cluster.";
37+ default = 2;
38+ type = types.int;
5039 };
5140
52− sidecar = mkOption {
53− description = "Docker image to seed for the kube-dns sidecar container.";
41+ coredns = mkOption {
42+ description = "Docker image to seed for the CoreDNS container.";
5443 type = types.attrs;
5544 default = {
56− imageName = "k8s.gcr.io/k8s-dns-sidecar-amd64";
57− imageDigest = "sha256:4f1ab957f87b94a5ec1edc26fae50da2175461f00afecf68940c4aa079bd08a4";
45+ imageName = "coredns/coredns";
46+ imageDigest = "sha256:33c8da20b887ae12433ec5c40bfddefbbfa233d5ce11fb067122e68af30291d6";
5847 finalImageTag = version;
59− sha256 = "08l1bv5jgrhvjzpqpbinrkgvv52snc4fzyd8ya9v18ns2klyz7m0";
48+ sha256 = "13q19rgwapv27xcs664dw502254yw4zw63insf6g2danidv2mg6i";
6049 };
6150 };
6251 };
6352
6453 config = mkIf cfg.enable {
65− services.kubernetes.kubelet.seedDockerImages = with pkgs.dockerTools; [
66− (pullImage cfg.kube-dns)
67− (pullImage cfg.dnsmasq-nanny)
68− (pullImage cfg.sidecar)
69− ];
54+ services.kubernetes.kubelet.seedDockerImages =
55+ singleton (pkgs.dockerTools.pullImage cfg.coredns);
7056
7157 services.kubernetes.addonManager.addons = {
72− kubedns-deployment = {
58+ coredns-sa = {
59+ apiVersion = "v1";
60+ kind = "ServiceAccount";
61+ metadata = {
62+ labels = {
63+ "addonmanager.kubernetes.io/mode" = "Reconcile";
64+ "k8s-app" = "kube-dns";
65+ "kubernetes.io/cluster-service" = "true";
66+ };
67+ name = "coredns";
68+ namespace = "kube-system";
69+ };
70+ };
71+
72+ coredns-cr = {
73+ apiVersion = "rbac.authorization.k8s.io/v1beta1";
74+ kind = "ClusterRole";
75+ metadata = {
76+ labels = {
77+ "addonmanager.kubernetes.io/mode" = "Reconcile";
78+ "k8s-app" = "kube-dns";
79+ "kubernetes.io/cluster-service" = "true";
80+ "kubernetes.io/bootstrapping" = "rbac-defaults";
81+ };
82+ name = "system:coredns";
83+ };
84+ rules = [
85+ {
86+ apiGroups = [ "" ];
87+ resources = [ "endpoints" "services" "pods" "namespaces" ];
88+ verbs = [ "list" "watch" ];
89+ }
90+ {
91+ apiGroups = [ "" ];
92+ resources = [ "nodes" ];
93+ verbs = [ "get" ];
94+ }
95+ ];
96+ };
97+
98+ coredns-crb = {
99+ apiVersion = "rbac.authorization.k8s.io/v1beta1";
100+ kind = "ClusterRoleBinding";
101+ metadata = {
102+ annotations = {
103+ "rbac.authorization.kubernetes.io/autoupdate" = "true";
104+ };
105+ labels = {
106+ "addonmanager.kubernetes.io/mode" = "Reconcile";
107+ "k8s-app" = "kube-dns";
108+ "kubernetes.io/cluster-service" = "true";
109+ "kubernetes.io/bootstrapping" = "rbac-defaults";
110+ };
111+ name = "system:coredns";
112+ };
113+ roleRef = {
114+ apiGroup = "rbac.authorization.k8s.io";
115+ kind = "ClusterRole";
116+ name = "system:coredns";
117+ };
118+ subjects = [
119+ {
120+ kind = "ServiceAccount";
121+ name = "coredns";
122+ namespace = "kube-system";
123+ }
124+ ];
125+ };
126+
127+ coredns-cm = {
128+ apiVersion = "v1";
129+ kind = "ConfigMap";
130+ metadata = {
131+ labels = {
132+ "addonmanager.kubernetes.io/mode" = "Reconcile";
133+ "k8s-app" = "kube-dns";
134+ "kubernetes.io/cluster-service" = "true";
135+ };
136+ name = "coredns";
137+ namespace = "kube-system";
138+ };
139+ data = {
140+ Corefile = ".:${toString ports.dns} {
141+ errors
142+ health :${toString ports.health}
143+ kubernetes ${cfg.clusterDomain} in-addr.arpa ip6.arpa {
144+ pods insecure
145+ upstream
146+ fallthrough in-addr.arpa ip6.arpa
147+ }
148+ prometheus :${toString ports.metrics}
149+ proxy . /etc/resolv.conf
150+ cache 30
151+ loop
152+ reload
153+ loadbalance
154+ }";
155+ };
156+ };
157+
158+ coredns-deploy = {
73159 apiVersion = "extensions/v1beta1";
74160 kind = "Deployment";
75161 metadata = {
@@ -77,182 +163,96 @@ in {
77163 "addonmanager.kubernetes.io/mode" = "Reconcile";
78164 "k8s-app" = "kube-dns";
79165 "kubernetes.io/cluster-service" = "true";
166+ "kubernetes.io/name" = "CoreDNS";
80167 };
81− name = "kube-dns";
168+ name = "coredns";
82169 namespace = "kube-system";
83170 };
84171 spec = {
85− selector.matchLabels."k8s-app" = "kube-dns";
172+ replicas = cfg.replicas;
173+ selector = {
174+ matchLabels = { k8s-app = "kube-dns"; };
175+ };
86176 strategy = {
87− rollingUpdate = {
88− maxSurge = "10%";
89− maxUnavailable = 0;
90− };
177+ rollingUpdate = { maxUnavailable = 1; };
178+ type = "RollingUpdate";
91179 };
92180 template = {
93181 metadata = {
94− annotations."scheduler.alpha.kubernetes.io/critical-pod" = "";
95− labels.k8s-app = "kube-dns";
182+ labels = {
183+ k8s-app = "kube-dns";
184+ };
96185 };
97186 spec = {
98− priorityClassName = "system-cluster-critical";
99187 containers = [
100188 {
101− name = "kubedns";
102− image = with cfg.kube-dns; "${imageName}:${finalImageTag}";
103− resources = {
104− limits.memory = "170Mi";
105− requests = {
106− cpu = "100m";
107− memory = "70Mi";
108− };
109− };
189+ args = [ "-conf" "/etc/coredns/Corefile" ];
190+ image = with cfg.coredns; "${imageName}:${finalImageTag}";
191+ imagePullPolicy = "Never";
110192 livenessProbe = {
111193 failureThreshold = 5;
112194 httpGet = {
113− path = "/healthcheck/kubedns";
114− port = 10054;
195+ path = "/health";
196+ port = ports.health;
115197 scheme = "HTTP";
116198 };
117199 initialDelaySeconds = 60;
118200 successThreshold = 1;
119201 timeoutSeconds = 5;
120202 };
121− readinessProbe = {
122− httpGet = {
123− path = "/readiness";
124− port = 8081;
125− scheme = "HTTP";
126− };
127− initialDelaySeconds = 3;
128− timeoutSeconds = 5;
129− };
130− args = [
131− "--domain=${cfg.clusterDomain}"
132− "--dns-port=10053"
133− "--config-dir=/kube-dns-config"
134− "--v=2"
135− ];
136− env = [
137− {
138− name = "PROMETHEUS_PORT";
139− value = "10055";
140− }
141− ];
203+ name = "coredns";
142204 ports = [
143205 {
144− containerPort = 10053;
145− name = "dns-local";
206+ containerPort = ports.dns;
207+ name = "dns";
146208 protocol = "UDP";
147209 }
148210 {
149− containerPort = 10053;
150− name = "dns-tcp-local";
211+ containerPort = ports.dns;
212+ name = "dns-tcp";
151213 protocol = "TCP";
152214 }
153215 {
154− containerPort = 10055;
216+ containerPort = ports.metrics;
155217 name = "metrics";
156218 protocol = "TCP";
157219 }
158220 ];
159− volumeMounts = [
160− {
161− mountPath = "/kube-dns-config";
162− name = "kube-dns-config";
163− }
164− ];
165− }
166− {
167− name = "dnsmasq";
168− image = with cfg.dnsmasq-nanny; "${imageName}:${finalImageTag}";
169− livenessProbe = {
170− httpGet = {
171− path = "/healthcheck/dnsmasq";
172− port = 10054;
173− scheme = "HTTP";
174− };
175− initialDelaySeconds = 60;
176− timeoutSeconds = 5;
177− successThreshold = 1;
178− failureThreshold = 5;
179− };
180− args = [
181− "-v=2"
182− "-logtostderr"
183− "-configDir=/etc/k8s/dns/dnsmasq-nanny"
184− "-restartDnsmasq=true"
185− "--"
186− "-k"
187− "--cache-size=1000"
188− "--log-facility=-"
189− "--server=/${cfg.clusterDomain}/127.0.0.1#10053"
190− "--server=/in-addr.arpa/127.0.0.1#10053"
191− "--server=/ip6.arpa/127.0.0.1#10053"
192− ];
193− ports = [
194− {
195− containerPort = 53;
196− name = "dns";
197− protocol = "UDP";
198− }
199− {
200− containerPort = 53;
201− name = "dns-tcp";
202− protocol = "TCP";
203− }
204− ];
205221 resources = {
222+ limits = {
223+ memory = "170Mi";
224+ };
206225 requests = {
207− cpu = "150m";
208− memory = "20Mi";
226+ cpu = "100m";
227+ memory = "70Mi";
209228 };
210229 };
211− volumeMounts = [
212− {
213− mountPath = "/etc/k8s/dns/dnsmasq-nanny";
214− name = "kube-dns-config";
215− }
216− ];
217− }
218− {
219− name = "sidecar";
220− image = with cfg.sidecar; "${imageName}:${finalImageTag}";
221− livenessProbe = {
222− httpGet = {
223− path = "/metrics";
224− port = 10054;
225− scheme = "HTTP";
230+ securityContext = {
231+ allowPrivilegeEscalation = false;
232+ capabilities = {
233+ drop = [ "all" ];
226234 };
227− initialDelaySeconds = 60;
228− timeoutSeconds = 5;
229− successThreshold = 1;
230− failureThreshold = 5;
235+ readOnlyRootFilesystem = true;
231236 };
232− args = [
233− "--v=2"
234− "--logtostderr"
235− "--probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.${cfg.clusterDomain},5,A"
236− "--probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.${cfg.clusterDomain},5,A"
237− ];
238− ports = [
237+ volumeMounts = [
239238 {
240− containerPort = 10054;
241− name = "metrics";
242− protocol = "TCP";
239+ mountPath = "/etc/coredns";
240+ name = "config-volume";
241+ readOnly = true;
243242 }
244243 ];
245− resources = {
246− requests = {
247− cpu = "10m";
248− memory = "20Mi";
249− };
250− };
251244 }
252245 ];
253246 dnsPolicy = "Default";
254− serviceAccountName = "kube-dns";
247+ nodeSelector = {
248+ "beta.kubernetes.io/os" = "linux";
249+ };
250+ serviceAccountName = "coredns";
255251 tolerations = [
252+ {
253+ effect = "NoSchedule";
254+ key = "node-role.kubernetes.io/master";
255+ }
256256 {
257257 key = "CriticalAddonsOnly";
258258 operator = "Exists";
@@ -261,10 +261,15 @@ in {
261261 volumes = [
262262 {
263263 configMap = {
264− name = "kube-dns";
265− optional = true;
264+ items = [
265+ {
266+ key = "Corefile";
267+ path = "Corefile";
268+ }
269+ ];
270+ name = "coredns";
266271 };
267− name = "kube-dns-config";
272+ name = "config-volume";
268273 }
269274 ];
270275 };
@@ -272,51 +277,40 @@ in {
272277 };
273278 };
274279
275− kubedns-svc = {
280+ coredns-svc = {
276281 apiVersion = "v1";
277282 kind = "Service";
278283 metadata = {
284+ annotations = {
285+ "prometheus.io/port" = toString ports.metrics;
286+ "prometheus.io/scrape" = "true";
287+ };
279288 labels = {
280289 "addonmanager.kubernetes.io/mode" = "Reconcile";
281290 "k8s-app" = "kube-dns";
282291 "kubernetes.io/cluster-service" = "true";
283− "kubernetes.io/name" = "KubeDNS";
292+ "kubernetes.io/name" = "CoreDNS";
284293 };
285294 name = "kube-dns";
286− namespace = "kube-system";
295+ namespace = "kube-system";
287296 };
288297 spec = {
289298 clusterIP = cfg.clusterIp;
290299 ports = [
291− {name = "dns"; port = 53; protocol = "UDP";}
292− {name = "dns-tcp"; port = 53; protocol = "TCP";}
300+ {
301+ name = "dns";
302+ port = 53;
303+ targetPort = ports.dns;
304+ protocol = "UDP";
305+ }
306+ {
307+ name = "dns-tcp";
308+ port = 53;
309+ targetPort = ports.dns;
310+ protocol = "TCP";
311+ }
293312 ];
294− selector.k8s-app = "kube-dns";
295− };
296− };
297−
298− kubedns-sa = {
299− apiVersion = "v1";
300− kind = "ServiceAccount";
301− metadata = {
302− name = "kube-dns";
303− namespace = "kube-system";
304− labels = {
305− "kubernetes.io/cluster-service" = "true";
306− "addonmanager.kubernetes.io/mode" = "Reconcile";
307− };
308− };
309− };
310−
311− kubedns-cm = {
312− apiVersion = "v1";
313− kind = "ConfigMap";
314− metadata = {
315− name = "kube-dns";
316− namespace = "kube-system";
317− labels = {
318− "addonmanager.kubernetes.io/mode" = "EnsureExists";
319− };
313+ selector = { k8s-app = "kube-dns"; };
320314 };
321315 };
322316 };
nixos/modules/services/computing/slurm/slurm.nix+115−12
@@ -6,13 +6,18 @@ let
66
77 cfg = config.services.slurm;
88 # configuration file can be generated by http://slurm.schedmd.com/configurator.html
9+
10+ defaultUser = "slurm";
11+
912 configFile = pkgs.writeTextDir "slurm.conf"
1013 ''
1114 ClusterName=${cfg.clusterName}
15+ StateSaveLocation=${cfg.stateSaveLocation}
16+ SlurmUser=${cfg.user}
1217 ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''}
1318 ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''}
14− ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''}
15− ${optionalString (cfg.partitionName != null) ''partitionName=${cfg.partitionName}''}
19+ ${toString (map (x: "NodeName=${x}\n") cfg.nodeName)}
20+ ${toString (map (x: "PartitionName=${x}\n") cfg.partitionName)}
1621 PlugStackConfig=${plugStackConfig}
1722 ProctrackType=${cfg.procTrackType}
1823 ${cfg.extraConfig}
@@ -24,17 +29,24 @@ let
2429 ${cfg.extraPlugstackConfig}
2530 '';
2631
27−
2832 cgroupConfig = pkgs.writeTextDir "cgroup.conf"
2933 ''
3034 ${cfg.extraCgroupConfig}
3135 '';
3236
37+ slurmdbdConf = pkgs.writeTextDir "slurmdbd.conf"
38+ ''
39+ DbdHost=${cfg.dbdserver.dbdHost}
40+ SlurmUser=${cfg.user}
41+ StorageType=accounting_storage/mysql
42+ ${cfg.dbdserver.extraConfig}
43+ '';
44+
3345 # slurm expects some additional config files to be
3446 # in the same directory as slurm.conf
3547 etcSlurm = pkgs.symlinkJoin {
3648 name = "etc-slurm";
37− paths = [ configFile cgroupConfig plugStackConfig ];
49+ paths = [ configFile cgroupConfig plugStackConfig ] ++ cfg.extraConfigPaths;
3850 };
3951
4052in
@@ -43,6 +55,8 @@ in
4355
4456 ###### interface
4557
58+ meta.maintainers = [ maintainers.markuskowa ];
59+
4660 options = {
4761
4862 services.slurm = {
@@ -60,6 +74,27 @@ in
6074 };
6175 };
6276
77+ dbdserver = {
78+ enable = mkEnableOption "SlurmDBD service";
79+
80+ dbdHost = mkOption {
81+ type = types.str;
82+ default = config.networking.hostName;
83+ description = ''
84+ Hostname of the machine where <literal>slurmdbd</literal>
85+ is running (i.e. name returned by <literal>hostname -s</literal>).
86+ '';
87+ };
88+
89+ extraConfig = mkOption {
90+ type = types.lines;
91+ default = "";
92+ description = ''
93+ Extra configuration for <literal>slurmdbd.conf</literal>
94+ '';
95+ };
96+ };
97+
6398 client = {
6499 enable = mkEnableOption "slurm client daemon";
65100 };
@@ -116,9 +151,9 @@ in
116151 };
117152
118153 nodeName = mkOption {
119− type = types.nullOr types.str;
120− default = null;
121− example = "linux[1-32] CPUs=1 State=UNKNOWN";
154+ type = types.listOf types.str;
155+ default = [];
156+ example = literalExample ''[ "linux[1-32] CPUs=1 State=UNKNOWN" ];'';
122157 description = ''
123158 Name that SLURM uses to refer to a node (or base partition for BlueGene
124159 systems). Typically this would be the string that "/bin/hostname -s"
@@ -127,9 +162,9 @@ in
127162 };
128163
129164 partitionName = mkOption {
130− type = types.nullOr types.str;
131− default = null;
132− example = "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP";
165+ type = types.listOf types.str;
166+ default = [];
167+ example = literalExample ''[ "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP" ];'';
133168 description = ''
134169 Name by which the partition may be referenced. Note that now you have
135170 to write the partition's parameters after the name.
@@ -150,7 +185,7 @@ in
150185 };
151186
152187 procTrackType = mkOption {
153− type = types.string;
188+ type = types.str;
154189 default = "proctrack/linuxproc";
155190 description = ''
156191 Plugin to be used for process tracking on a job step basis.
@@ -159,6 +194,25 @@ in
159194 '';
160195 };
161196
197+ stateSaveLocation = mkOption {
198+ type = types.str;
199+ default = "/var/spool/slurmctld";
200+ description = ''
201+ Directory into which the Slurm controller, slurmctld, saves its state.
202+ '';
203+ };
204+
205+ user = mkOption {
206+ type = types.str;
207+ default = defaultUser;
208+ description = ''
209+ Set this option when you want to run the slurmctld daemon
210+ as something else than the default slurm user "slurm".
211+ Note that the UID of this user needs to be the same
212+ on all nodes.
213+ '';
214+ };
215+
162216 extraConfig = mkOption {
163217 default = "";
164218 type = types.lines;
@@ -184,6 +238,19 @@ in
184238 used when <literal>procTrackType=proctrack/cgroup</literal>.
185239 '';
186240 };
241+
242+ extraConfigPaths = mkOption {
243+ type = with types; listOf path;
244+ default = [];
245+ description = ''
246+ Slurm expects config files for plugins in the same path
247+ as <literal>slurm.conf</literal>. Add extra nix store
248+ paths that should be merged into same directory as
249+ <literal>slurm.conf</literal>.
250+ '';
251+ };
252+
253+
187254 };
188255
189256 };
@@ -220,12 +287,24 @@ in
220287 '';
221288 };
222289
223− in mkIf (cfg.enableStools || cfg.client.enable || cfg.server.enable) {
290+ in mkIf ( cfg.enableStools ||
291+ cfg.client.enable ||
292+ cfg.server.enable ||
293+ cfg.dbdserver.enable ) {
224294
225295 environment.systemPackages = [ wrappedSlurm ];
226296
227297 services.munge.enable = mkDefault true;
228298
299+ # use a static uid as default to ensure it is the same on all nodes
300+ users.users.slurm = mkIf (cfg.user == defaultUser) {
301+ name = defaultUser;
302+ group = "slurm";
303+ uid = config.ids.uids.slurm;
304+ };
305+
306+ users.groups.slurm.gid = config.ids.uids.slurm;
307+
229308 systemd.services.slurmd = mkIf (cfg.client.enable) {
230309 path = with pkgs; [ wrappedSlurm coreutils ]
231310 ++ lib.optional cfg.enableSrunX11 slurm-spank-x11;
@@ -235,6 +314,7 @@ in
235314
236315 serviceConfig = {
237316 Type = "forking";
317+ KillMode = "process";
238318 ExecStart = "${wrappedSlurm}/bin/slurmd";
239319 PIDFile = "/run/slurmd.pid";
240320 ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
@@ -261,6 +341,29 @@ in
261341 PIDFile = "/run/slurmctld.pid";
262342 ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
263343 };
344+
345+ preStart = ''
346+ mkdir -p ${cfg.stateSaveLocation}
347+ chown -R ${cfg.user}:slurm ${cfg.stateSaveLocation}
348+ '';
349+ };
350+
351+ systemd.services.slurmdbd = mkIf (cfg.dbdserver.enable) {
352+ path = with pkgs; [ wrappedSlurm munge coreutils ];
353+
354+ wantedBy = [ "multi-user.target" ];
355+ after = [ "network.target" "munged.service" "mysql.service" ];
356+ requires = [ "munged.service" "mysql.service" ];
357+
358+ # slurm strips the last component off the path
359+ environment.SLURM_CONF = "${slurmdbdConf}/slurm.conf";
360+
361+ serviceConfig = {
362+ Type = "forking";
363+ ExecStart = "${cfg.package}/bin/slurmdbd";
364+ PIDFile = "/run/slurmdbd.pid";
365+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
366+ };
264367 };
265368
266369 };
nixos/modules/services/continuous-integration/buildbot/master.nix+49−18
@@ -6,8 +6,12 @@ with lib;
66
77let
88 cfg = config.services.buildbot-master;
9+
10+ python = cfg.package.pythonModule;
11+
912 escapeStr = s: escape ["'"] s;
10− masterCfg = if cfg.masterCfg == null then pkgs.writeText "master.cfg" ''
13+
14+ defaultMasterCfg = pkgs.writeText "master.cfg" ''
1115 from buildbot.plugins import *
1216 factory = util.BuildFactory()
1317 c = BuildmasterConfig = dict(
@@ -27,8 +31,28 @@ let
2731 factory.addStep(step)
2832
2933 ${cfg.extraConfig}
30− ''
31− else cfg.masterCfg;
34+ '';
35+
36+ tacFile = pkgs.writeText "buildbot-master.tac" ''
37+ import os
38+
39+ from twisted.application import service
40+ from buildbot.master import BuildMaster
41+
42+ basedir = '${cfg.buildbotDir}'
43+
44+ configfile = '${cfg.masterCfg}'
45+
46+ # Default umask for server
47+ umask = None
48+
49+ # note: this line is matched against to check that this is a buildmaster
50+ # directory; do not edit it.
51+ application = service.Application('buildmaster')
52+
53+ m = BuildMaster(basedir, configfile, umask)
54+ m.setServiceParent(application)
55+ '';
3256
3357in {
3458 options = {
@@ -66,9 +90,9 @@ in {
6690 };
6791
6892 masterCfg = mkOption {
69− type = types.nullOr types.path;
93+ type = types.path;
7094 description = "Optionally pass master.cfg path. Other options in this configuration will be ignored.";
71− default = null;
95+ default = defaultMasterCfg;
7296 example = "/etc/nixos/buildbot/master.cfg";
7397 };
7498
@@ -175,18 +199,25 @@ in {
175199
176200 package = mkOption {
177201 type = types.package;
178− default = pkgs.buildbot-full;
179− defaultText = "pkgs.buildbot-full";
202+ default = pkgs.pythonPackages.buildbot-full;
203+ defaultText = "pkgs.pythonPackages.buildbot-full";
180204 description = "Package to use for buildbot.";
181− example = literalExample "pkgs.buildbot-full";
205+ example = literalExample "pkgs.python3Packages.buildbot-full";
182206 };
183207
184208 packages = mkOption {
185− default = with pkgs; [ python27Packages.twisted git ];
209+ default = [ pkgs.git ];
186210 example = literalExample "[ pkgs.git ]";
187211 type = types.listOf types.package;
188212 description = "Packages to add to PATH for the buildbot process.";
189213 };
214+
215+ pythonPackages = mkOption {
216+ default = pythonPackages: with pythonPackages; [ ];
217+ defaultText = "pythonPackages: with pythonPackages; [ ]";
218+ description = "Packages to add the to the PYTHONPATH of the buildbot process.";
219+ example = literalExample "pythonPackages: with pythonPackages; [ requests ]";
220+ };
190221 };
191222 };
192223
@@ -210,14 +241,15 @@ in {
210241 description = "Buildbot Continuous Integration Server.";
211242 after = [ "network-online.target" ];
212243 wantedBy = [ "multi-user.target" ];
213− path = cfg.packages;
244+ path = cfg.packages ++ cfg.pythonPackages python.pkgs;
245+ environment.PYTHONPATH = "${python.withPackages (self: cfg.pythonPackages self ++ [ cfg.package ])}/${python.sitePackages}";
214246
215247 preStart = ''
216− env > envvars
217− mkdir -vp ${cfg.buildbotDir}
218− ln -sfv ${masterCfg} ${cfg.buildbotDir}/master.cfg
219− rm -fv $cfg.buildbotDir}/buildbot.tac
220− ${cfg.package}/bin/buildbot create-master ${cfg.buildbotDir}
248+ mkdir -vp "${cfg.buildbotDir}"
249+ # Link the tac file so buildbot command line tools recognize the directory
250+ ln -sf "${tacFile}" "${cfg.buildbotDir}/buildbot.tac"
251+ ${cfg.package}/bin/buildbot create-master --db "${cfg.dbUrl}" "${cfg.buildbotDir}"
252+ rm -f buildbot.tac.new master.cfg.sample
221253 '';
222254
223255 serviceConfig = {
@@ -225,12 +257,11 @@ in {
225257 User = cfg.user;
226258 Group = cfg.group;
227259 WorkingDirectory = cfg.home;
228− ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}";
260+ # NOTE: call twistd directly with stdout logging for systemd
261+ ExecStart = "${python.pkgs.twisted}/bin/twistd -o --nodaemon --pidfile= --logfile - --python ${tacFile}";
229262 };
230−
231263 };
232264 };
233265
234266 meta.maintainers = with lib.maintainers; [ nand0p mic92 ];
235−
236267}
nixos/modules/services/continuous-integration/buildbot/worker.nix+66−11
@@ -7,6 +7,40 @@ with lib;
77let
88 cfg = config.services.buildbot-worker;
99
10+ python = cfg.package.pythonModule;
11+
12+ tacFile = pkgs.writeText "aur-buildbot-worker.tac" ''
13+ import os
14+ from io import open
15+
16+ from buildbot_worker.bot import Worker
17+ from twisted.application import service
18+
19+ basedir = '${cfg.buildbotDir}'
20+
21+ # note: this line is matched against to check that this is a worker
22+ # directory; do not edit it.
23+ application = service.Application('buildbot-worker')
24+
25+ master_url_split = '${cfg.masterUrl}'.split(':')
26+ buildmaster_host = master_url_split[0]
27+ port = int(master_url_split[1])
28+ workername = '${cfg.workerUser}'
29+
30+ with open('${cfg.workerPassFile}', 'r', encoding='utf-8') as passwd_file:
31+ passwd = passwd_file.read().strip('\r\n')
32+ keepalive = 600
33+ umask = None
34+ maxdelay = 300
35+ numcpus = None
36+ allow_shutdown = None
37+
38+ s = Worker(buildmaster_host, port, workername, passwd, basedir,
39+ keepalive, umask=umask, maxdelay=maxdelay,
40+ numcpus=numcpus, allow_shutdown=allow_shutdown)
41+ s.setServiceParent(application)
42+ '';
43+
1044in {
1145 options = {
1246 services.buildbot-worker = {
@@ -59,6 +93,23 @@ in {
5993 description = "Specifies the Buildbot Worker password.";
6094 };
6195
96+ workerPassFile = mkOption {
97+ type = types.path;
98+ description = "File used to store the Buildbot Worker password";
99+ };
100+
101+ hostMessage = mkOption {
102+ default = null;
103+ type = types.nullOr types.str;
104+ description = "Description of this worker";
105+ };
106+
107+ adminMessage = mkOption {
108+ default = null;
109+ type = types.nullOr types.str;
110+ description = "Name of the administrator of this worker";
111+ };
112+
62113 masterUrl = mkOption {
63114 default = "localhost:9989";
64115 type = types.str;
@@ -67,23 +118,24 @@ in {
67118
68119 package = mkOption {
69120 type = types.package;
70− default = pkgs.buildbot-worker;
71− defaultText = "pkgs.buildbot-worker";
121+ default = pkgs.pythonPackages.buildbot-worker;
122+ defaultText = "pkgs.pythonPackages.buildbot-worker";
72123 description = "Package to use for buildbot worker.";
73− example = literalExample "pkgs.buildbot-worker";
124+ example = literalExample "pkgs.python3Packages.buildbot-worker";
74125 };
75126
76127 packages = mkOption {
77− default = with pkgs; [ python27Packages.twisted git ];
128+ default = with pkgs; [ git ];
78129 example = literalExample "[ pkgs.git ]";
79130 type = types.listOf types.package;
80131 description = "Packages to add to PATH for the buildbot process.";
81132 };
82−
83133 };
84134 };
85135
86136 config = mkIf cfg.enable {
137+ services.buildbot-worker.workerPassFile = mkDefault (pkgs.writeText "buildbot-worker-password" cfg.workerPass);
138+
87139 users.groups = optional (cfg.group == "bbworker") {
88140 name = "bbworker";
89141 };
@@ -104,11 +156,16 @@ in {
104156 after = [ "network.target" "buildbot-master.service" ];
105157 wantedBy = [ "multi-user.target" ];
106158 path = cfg.packages;
159+ environment.PYTHONPATH = "${python.withPackages (p: [ cfg.package ])}/${python.sitePackages}";
107160
108161 preStart = ''
109− mkdir -vp ${cfg.buildbotDir}
110− rm -fv $cfg.buildbotDir}/buildbot.tac
111− ${cfg.package}/bin/buildbot-worker create-worker ${cfg.buildbotDir} ${cfg.masterUrl} ${cfg.workerUser} ${cfg.workerPass}
162+ mkdir -vp "${cfg.buildbotDir}/info"
163+ ${optionalString (cfg.hostMessage != null) ''
164+ ln -sf "${pkgs.writeText "buildbot-worker-host" cfg.hostMessage}" "${cfg.buildbotDir}/info/host"
165+ ''}
166+ ${optionalString (cfg.adminMessage != null) ''
167+ ln -sf "${pkgs.writeText "buildbot-worker-admin" cfg.adminMessage}" "${cfg.buildbotDir}/info/admin"
168+ ''}
112169 '';
113170
114171 serviceConfig = {
@@ -116,11 +173,9 @@ in {
116173 User = cfg.user;
117174 Group = cfg.group;
118175 WorkingDirectory = cfg.home;
119− Environment = "PYTHONPATH=${cfg.package}/lib/python2.7/site-packages:${pkgs.python27Packages.future}/lib/python2.7/site-packages";
120176
121177 # NOTE: call twistd directly with stdout logging for systemd
122− #ExecStart = "${cfg.package}/bin/buildbot-worker start --nodaemon ${cfg.buildbotDir}";
123− ExecStart = "${pkgs.python27Packages.twisted}/bin/twistd -n -l - -y ${cfg.buildbotDir}/buildbot.tac";
178+ ExecStart = "${python.pkgs.twisted}/bin/twistd --nodaemon --pidfile= --logfile - --python ${tacFile}";
124179 };
125180
126181 };
nixos/modules/services/continuous-integration/jenkins/job-builder.nix+34−2
@@ -42,6 +42,18 @@ in {
4242 type = types.str;
4343 description = ''
4444 User token in Jenkins used to reload config.
45+ WARNING: This token will be world readable in the Nix store. To keep
46+ it secret, use the <option>accessTokenFile</option> option instead.
47+ '';
48+ };
49+
50+ accessTokenFile = mkOption {
51+ default = "";
52+ type = types.str;
53+ example = "/run/keys/jenkins-job-builder-access-token";
54+ description = ''
55+ File containing the API token for the <option>accessUser</option>
56+ user.
4557 '';
4658 };
4759
@@ -103,6 +115,21 @@ in {
103115 };
104116
105117 config = mkIf (jenkinsCfg.enable && cfg.enable) {
118+ assertions = [
119+ { assertion =
120+ if cfg.accessUser != ""
121+ then (cfg.accessToken != "" && cfg.accessTokenFile == "") ||
122+ (cfg.accessToken == "" && cfg.accessTokenFile != "")
123+ else true;
124+ message = ''
125+ One of accessToken and accessTokenFile options must be non-empty
126+ strings, but not both. Current values:
127+ services.jenkins.jobBuilder.accessToken = "${cfg.accessToken}"
128+ services.jenkins.jobBuilder.accessTokenFile = "${cfg.accessTokenFile}"
129+ '';
130+ }
131+ ];
132+
106133 systemd.services.jenkins-job-builder = {
107134 description = "Jenkins Job Builder Service";
108135 # JJB can run either before or after jenkins. We chose after, so we can
@@ -128,8 +155,13 @@ in {
128155 ownerStamp = ".config-xml-managed-by-nixos-jenkins-job-builder";
129156 reloadScript = ''
130157 echo "Asking Jenkins to reload config"
131− CRUMB=$(curl -s 'http://${cfg.accessUser}:${cfg.accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)')
132− curl --silent -X POST -H "$CRUMB" http://${cfg.accessUser}:${cfg.accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/reload
158+ curl_opts="--silent --fail --show-error"
159+ access_token=${if cfg.accessTokenFile != ""
160+ then "$(cat '${cfg.accessTokenFile}')"
161+ else cfg.accessToken}
162+ jenkins_url="http://${cfg.accessUser}:$access_token@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}"
163+ crumb=$(curl $curl_opts "$jenkins_url"'/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)')
164+ curl $curl_opts -X POST -H "$crumb" "$jenkins_url"/reload
133165 '';
134166 in
135167 ''
nixos/modules/services/databases/aerospike.nix+1
@@ -43,6 +43,7 @@ in
4343
4444 package = mkOption {
4545 default = pkgs.aerospike;
46+ defaultText = "pkgs.aerospike";
4647 type = types.package;
4748 description = "Which Aerospike derivation to use";
4849 };
nixos/modules/services/databases/cassandra.nix+22
@@ -34,11 +34,13 @@ let
3434 { name = "cassandra-etc";
3535 cassandraYaml = builtins.toJSON cassandraConfigWithAddresses;
3636 cassandraEnvPkg = "${cfg.package}/conf/cassandra-env.sh";
37+ cassandraLogbackConfig = pkgs.writeText "logback.xml" cfg.logbackConfig;
3738 buildCommand = ''
3839 mkdir -p "$out"
3940
4041 echo "$cassandraYaml" > "$out/cassandra.yaml"
4142 ln -s "$cassandraEnvPkg" "$out/cassandra-env.sh"
43+ ln -s "$cassandraLogbackConfig" "$out/logback.xml"
4244 '';
4345 };
4446in {
@@ -139,7 +141,27 @@ in {
139141 correspond to a single address, IP aliasing is not supported.
140142 '';
141143 };
144+ logbackConfig = mkOption {
145+ type = types.lines;
146+ default = ''
147+ <configuration scan="false">
148+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
149+ <encoder>
150+ <pattern>%-5level %date{HH:mm:ss,SSS} %msg%n</pattern>
151+ </encoder>
152+ </appender>
142153
154+ <root level="INFO">
155+ <appender-ref ref="STDOUT" />
156+ </root>
157+
158+ <logger name="com.thinkaurelius.thrift" level="ERROR"/>
159+ </configuration>
160+ '';
161+ description = ''
162+ XML logback configuration for cassandra
163+ '';
164+ };
143165 extraConfig = mkOption {
144166 type = types.attrs;
145167 default = {};
nixos/modules/services/databases/clickhouse.nix+5
@@ -70,6 +70,11 @@ with lib;
7070 };
7171 };
7272
73+ environment.systemPackages = [ pkgs.clickhouse ];
74+
75+ # startup requires a `/etc/localtime` which only if exists if `time.timeZone != null`
76+ time.timeZone = mkDefault "UTC";
77+
7378 };
7479
7580}
nixos/modules/services/databases/cockroachdb.nixnew file+217
@@ -0,0 +1,217 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.cockroachdb;
7+ crdb = cfg.package;
8+
9+ escape = builtins.replaceStrings ["%"] ["%%"];
10+ ifNotNull = v: s: optionalString (!isNull v) s;
11+
12+ startupCommand = lib.concatStringsSep " "
13+ [ # Basic startup
14+ "${crdb}/bin/cockroach start"
15+ "--logtostderr"
16+ "--store=/var/lib/cockroachdb"
17+ (ifNotNull cfg.locality "--locality='${cfg.locality}'")
18+
19+ # WebUI settings
20+ "--http-addr='${cfg.http.address}:${toString cfg.http.port}'"
21+
22+ # Cluster listen address
23+ "--listen-addr='${cfg.listen.address}:${toString cfg.listen.port}'"
24+
25+ # Cluster configuration
26+ (ifNotNull cfg.join "--join=${cfg.join}")
27+
28+ # Cache and memory settings. Must be escaped.
29+ "--cache='${escape cfg.cache}'"
30+ "--max-sql-memory='${escape cfg.maxSqlMemory}'"
31+
32+ # Certificate/security settings.
33+ (if cfg.insecure then "--insecure" else "--certs-dir=${cfg.certsDir}")
34+ ];
35+
36+ addressOption = descr: defaultPort: {
37+ address = mkOption {
38+ type = types.str;
39+ default = "localhost";
40+ description = "Address to bind to for ${descr}";
41+ };
42+
43+ port = mkOption {
44+ type = types.port;
45+ default = defaultPort;
46+ description = "Port to bind to for ${descr}";
47+ };
48+ };
49+in
50+
51+{
52+ options = {
53+ services.cockroachdb = {
54+ enable = mkEnableOption "CockroachDB Server";
55+
56+ listen = addressOption "intra-cluster communication" 26257;
57+
58+ http = addressOption "http-based Admin UI" 8080;
59+
60+ locality = mkOption {
61+ type = types.nullOr types.str;
62+ default = null;
63+ description = ''
64+ An ordered, comma-separated list of key-value pairs that describe the
65+ topography of the machine. Topography might include country,
66+ datacenter or rack designations. Data is automatically replicated to
67+ maximize diversities of each tier. The order of tiers is used to
68+ determine the priority of the diversity, so the more inclusive
69+ localities like country should come before less inclusive localities
70+ like datacenter. The tiers and order must be the same on all nodes.
71+ Including more tiers is better than including fewer. For example:
72+
73+ <literal>
74+ country=us,region=us-west,datacenter=us-west-1b,rack=12
75+ country=ca,region=ca-east,datacenter=ca-east-2,rack=4
76+
77+ planet=earth,province=manitoba,colo=secondary,power=3
78+ </literal>
79+ '';
80+ };
81+
82+ join = mkOption {
83+ type = types.nullOr types.str;
84+ default = null;
85+ description = "The addresses for connecting the node to a cluster.";
86+ };
87+
88+ insecure = mkOption {
89+ type = types.bool;
90+ default = false;
91+ description = "Run in insecure mode.";
92+ };
93+
94+ certsDir = mkOption {
95+ type = types.nullOr types.path;
96+ default = null;
97+ description = "The path to the certificate directory.";
98+ };
99+
100+ user = mkOption {
101+ type = types.str;
102+ default = "cockroachdb";
103+ description = "User account under which CockroachDB runs";
104+ };
105+
106+ group = mkOption {
107+ type = types.str;
108+ default = "cockroachdb";
109+ description = "User account under which CockroachDB runs";
110+ };
111+
112+ openPorts = mkOption {
113+ type = types.bool;
114+ default = false;
115+ description = "Open firewall ports for cluster communication by default";
116+ };
117+
118+ cache = mkOption {
119+ type = types.str;
120+ default = "25%";
121+ description = ''
122+ The total size for caches.
123+
124+ This can be a percentage, expressed with a fraction sign or as a
125+ decimal-point number, or any bytes-based unit. For example,
126+ <literal>"25%"</literal>, <literal>"0.25"</literal> both represent
127+ 25% of the available system memory. The values
128+ <literal>"1000000000"</literal> and <literal>"1GB"</literal> both
129+ represent 1 gigabyte of memory.
130+
131+ '';
132+ };
133+
134+ maxSqlMemory = mkOption {
135+ type = types.str;
136+ default = "25%";
137+ description = ''
138+ The maximum in-memory storage capacity available to store temporary
139+ data for SQL queries.
140+
141+ This can be a percentage, expressed with a fraction sign or as a
142+ decimal-point number, or any bytes-based unit. For example,
143+ <literal>"25%"</literal>, <literal>"0.25"</literal> both represent
144+ 25% of the available system memory. The values
145+ <literal>"1000000000"</literal> and <literal>"1GB"</literal> both
146+ represent 1 gigabyte of memory.
147+ '';
148+ };
149+
150+ package = mkOption {
151+ type = types.package;
152+ default = pkgs.cockroachdb;
153+ defaultText = "pkgs.cockroachdb";
154+ description = ''
155+ The CockroachDB derivation to use for running the service.
156+
157+ This would primarily be useful to enable Enterprise Edition features
158+ in your own custom CockroachDB build (Nixpkgs CockroachDB binaries
159+ only contain open source features and open source code).
160+ '';
161+ };
162+ };
163+ };
164+
165+ config = mkIf config.services.cockroachdb.enable {
166+ assertions = [
167+ { assertion = !cfg.insecure -> !(isNull cfg.certsDir);
168+ message = "CockroachDB must have a set of SSL certificates (.certsDir), or run in Insecure Mode (.insecure = true)";
169+ }
170+ ];
171+
172+ environment.systemPackages = [ crdb ];
173+
174+ users.users = optionalAttrs (cfg.user == "cockroachdb") (singleton
175+ { name = "cockroachdb";
176+ description = "CockroachDB Server User";
177+ uid = config.ids.uids.cockroachdb;
178+ group = cfg.group;
179+ });
180+
181+ users.groups = optionalAttrs (cfg.group == "cockroachdb") (singleton
182+ { name = "cockroachdb";
183+ gid = config.ids.gids.cockroachdb;
184+ });
185+
186+ networking.firewall.allowedTCPPorts = lib.optionals cfg.openPorts
187+ [ cfg.http.port cfg.listen.port ];
188+
189+ systemd.services.cockroachdb =
190+ { description = "CockroachDB Server";
191+ documentation = [ "man:cockroach(1)" "https://www.cockroachlabs.com" ];
192+
193+ after = [ "network.target" "time-sync.target" ];
194+ requires = [ "time-sync.target" ];
195+ wantedBy = [ "multi-user.target" ];
196+
197+ unitConfig.RequiresMountsFor = "/var/lib/cockroachdb";
198+
199+ serviceConfig =
200+ { ExecStart = startupCommand;
201+ Type = "notify";
202+ User = cfg.user;
203+ StateDirectory = "cockroachdb";
204+ StateDirectoryMode = "0700";
205+
206+ Restart = "always";
207+
208+ # A conservative-ish timeout is alright here, because for Type=notify
209+ # cockroach will send systemd pings during startup to keep it alive
210+ TimeoutStopSec = 60;
211+ RestartSec = 10;
212+ };
213+ };
214+ };
215+
216+ meta.maintainers = with lib.maintainers; [ thoughtpolice ];
217+}
nixos/modules/services/databases/mysql.nix+33−21
@@ -12,26 +12,22 @@ let
1212 let
1313 pName = _p: (builtins.parseDrvName (_p.name)).name;
1414 in pName mysql == pName pkgs.mariadb;
15+ isMysqlAtLeast57 =
16+ let
17+ pName = _p: (builtins.parseDrvName (_p.name)).name;
18+ in (pName mysql == pName pkgs.mysql57)
19+ && ((builtins.compareVersions mysql.version "5.7") >= 0);
1520
1621 pidFile = "${cfg.pidDir}/mysqld.pid";
1722
23+ mysqldAndInstallOptions =
24+ "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${mysql}";
1825 mysqldOptions =
19− "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${mysql} " +
20− "--pid-file=${pidFile}";
21−
22− myCnf = pkgs.writeText "my.cnf"
23− ''
24− [mysqld]
25− port = ${toString cfg.port}
26− ${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" }
27− ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}
28− ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}
29− ${optionalString (cfg.ensureUsers != [])
30− ''
31− plugin-load-add = auth_socket.so
32− ''}
33− ${cfg.extraOptions}
34− '';
26+ "${mysqldAndInstallOptions} --pid-file=${pidFile}";
27+ # For MySQL 5.7+, --insecure creates the root user without password
28+ # (earlier versions and MariaDB do this by default).
29+ installOptions =
30+ "${mysqldAndInstallOptions} ${lib.optionalString isMysqlAtLeast57 "--insecure"}";
3531
3632in
3733
@@ -147,7 +143,7 @@ in
147143 option is changed. This means that users created and permissions assigned once through this option or
148144 otherwise have to be removed manually.
149145 '';
150− example = [
146+ example = literalExample ''[
151147 {
152148 name = "nextcloud";
153149 ensurePermissions = {
@@ -160,7 +156,7 @@ in
160156 "*.*" = "SELECT, LOCK TABLES";
161157 };
162158 }
163− ];
159+ ]'';
164160 };
165161
166162 # FIXME: remove this option; it's a really bad idea.
@@ -231,6 +227,21 @@ in
231227
232228 environment.systemPackages = [mysql];
233229
230+ environment.etc."my.cnf".text =
231+ ''
232+ [mysqld]
233+ port = ${toString cfg.port}
234+ datadir = ${cfg.dataDir}
235+ ${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" }
236+ ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}
237+ ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}
238+ ${optionalString (cfg.ensureUsers != [])
239+ ''
240+ plugin-load-add = auth_socket.so
241+ ''}
242+ ${cfg.extraOptions}
243+ '';
244+
234245 systemd.services.mysql = let
235246 hasNotify = (cfg.package == pkgs.mariadb);
236247 in {
@@ -252,7 +263,7 @@ in
252263 if ! test -e ${cfg.dataDir}/mysql; then
253264 mkdir -m 0700 -p ${cfg.dataDir}
254265 chown -R ${cfg.user} ${cfg.dataDir}
255− ${mysql}/bin/mysql_install_db ${mysqldOptions}
266+ ${mysql}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${installOptions}
256267 touch /tmp/mysql_init
257268 fi
258269
@@ -263,7 +274,8 @@ in
263274 serviceConfig = {
264275 Type = if hasNotify then "notify" else "simple";
265276 RuntimeDirectory = "mysqld";
266− ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
277+ # The last two environment variables are used for starting Galera clusters
278+ ExecStart = "${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION";
267279 };
268280
269281 postStart = ''
@@ -351,7 +363,7 @@ in
351363 ${optionalString (cfg.ensureDatabases != []) ''
352364 (
353365 ${concatMapStrings (database: ''
354− echo "CREATE DATABASE IF NOT EXISTS ${database};"
366+ echo "CREATE DATABASE IF NOT EXISTS \`${database}\`;"
355367 '') cfg.ensureDatabases}
356368 ) | ${mysql}/bin/mysql -u root -N
357369 ''}
nixos/modules/services/databases/openldap.nix+8−1
@@ -54,6 +54,13 @@ in
5454 description = "The database directory.";
5555 };
5656
57+ logLevel = mkOption {
58+ type = types.str;
59+ default = "0";
60+ example = "acl trace";
61+ description = "The log level selector of slapd.";
62+ };
63+
5764 configDir = mkOption {
5865 type = types.nullOr types.path;
5966 default = null;
@@ -139,7 +146,7 @@ in
139146 chown -R "${cfg.user}:${cfg.group}" "${cfg.dataDir}"
140147 '';
141148 serviceConfig.ExecStart =
142− "${openldap.out}/libexec/slapd -d 0 " +
149+ "${openldap.out}/libexec/slapd -d ${cfg.logLevel} " +
143150 "-u '${cfg.user}' -g '${cfg.group}' " +
144151 "-h '${concatStringsSep " " cfg.urlList}' " +
145152 "${configOpts}";
nixos/modules/services/databases/postgresql.nix+9−6
@@ -55,7 +55,7 @@ in
5555
5656 package = mkOption {
5757 type = types.package;
58− example = literalExample "pkgs.postgresql96";
58+ example = literalExample "pkgs.postgresql_9_6";
5959 description = ''
6060 PostgreSQL package to use.
6161 '';
@@ -118,7 +118,7 @@ in
118118 extraPlugins = mkOption {
119119 type = types.listOf types.path;
120120 default = [];
121− example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }) ]";
121+ example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_4; }) ]";
122122 description = ''
123123 When this list contains elements a new store path is created.
124124 PostgreSQL and the elements are symlinked into it. Then pg_config,
@@ -167,9 +167,9 @@ in
167167 # Note: when changing the default, make it conditional on
168168 # ‘system.stateVersion’ to maintain compatibility with existing
169169 # systems!
170− mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql96
171− else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95
172− else pkgs.postgresql94);
170+ mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
171+ else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5
172+ else pkgs.postgresql_9_4);
173173
174174 services.postgresql.dataDir =
175175 mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"
@@ -238,6 +238,9 @@ in
238238 User = "postgres";
239239 Group = "postgres";
240240 PermissionsStartOnly = true;
241+ Type = if lib.versionAtLeast cfg.package.version "9.6"
242+ then "notify"
243+ else "simple";
241244
242245 # Shut down Postgres using SIGINT ("Fast Shutdown mode"). See
243246 # http://www.postgresql.org/docs/current/static/server-shutdown.html
@@ -271,5 +274,5 @@ in
271274 };
272275
273276 meta.doc = ./postgresql.xml;
274−
277+ meta.maintainers = with lib.maintainers; [ thoughtpolice ];
275278}
nixos/modules/services/databases/postgresql.xml+4−4
@@ -27,12 +27,12 @@
2727 <filename>configuration.nix</filename>:
2828<programlisting>
2929<xref linkend="opt-services.postgresql.enable"/> = true;
30−<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql94;
30+<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_9_4;
3131</programlisting>
3232 Note that you are required to specify the desired version of PostgreSQL
33− (e.g. <literal>pkgs.postgresql94</literal>). Since upgrading your PostgreSQL
34− version requires a database dump and reload (see below), NixOS cannot
35− provide a default value for
33+ (e.g. <literal>pkgs.postgresql_9_4</literal>). Since upgrading your
34+ PostgreSQL version requires a database dump and reload (see below), NixOS
35+ cannot provide a default value for
3636 <xref linkend="opt-services.postgresql.package"/> such as the most recent
3737 release of PostgreSQL.
3838 </para>
nixos/modules/services/desktops/accountsservice.nix+2−2
@@ -39,14 +39,14 @@ with lib;
3939
4040 systemd.packages = [ pkgs.accountsservice ];
4141
42− systemd.services.accounts-daemon = {
42+ systemd.services.accounts-daemon = recursiveUpdate {
4343
4444 wantedBy = [ "graphical.target" ];
4545
4646 # Accounts daemon looks for dbus interfaces in $XDG_DATA_DIRS/accountsservice
4747 environment.XDG_DATA_DIRS = "${config.system.path}/share";
4848
49− } // (optionalAttrs (!config.users.mutableUsers) {
49+ } (optionalAttrs (!config.users.mutableUsers) {
5050 environment.NIXOS_USERS_PURE = "true";
5151 });
5252 };
nixos/modules/services/desktops/geoclue2.nix+2
@@ -61,6 +61,8 @@ in
6161 wantedBy = [ "default.target" ];
6262 };
6363 };
64+
65+ environment.etc."geoclue/geoclue.conf".source = "${package}/etc/geoclue/geoclue.conf";
6466 };
6567
6668}
nixos/modules/services/desktops/gnome3/file-roller.nixnew file+32
@@ -0,0 +1,32 @@
1+# File Roller.
2+
3+{ config, pkgs, lib, ... }:
4+
5+with lib;
6+
7+{
8+
9+ ###### interface
10+
11+ options = {
12+
13+ services.gnome3.file-roller = {
14+
15+ enable = mkEnableOption "File Roller, an archive manager for GNOME";
16+
17+ };
18+
19+ };
20+
21+
22+ ###### implementation
23+
24+ config = mkIf config.services.gnome3.file-roller.enable {
25+
26+ environment.systemPackages = [ pkgs.gnome3.file-roller ];
27+
28+ services.dbus.packages = [ pkgs.gnome3.file-roller ];
29+
30+ };
31+
32+}
nixos/modules/services/desktops/gnome3/gnome-keyring.nix+1−1
@@ -33,7 +33,7 @@ with lib;
3333
3434 environment.systemPackages = [ pkgs.gnome3.gnome-keyring ];
3535
36− services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gnome3.gcr ];
36+ services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gcr ];
3737
3838 };
3939
nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nixnew file+18
@@ -0,0 +1,18 @@
1+# Remote desktop daemon using Pipewire.
2+{ config, lib, pkgs, ... }:
3+
4+with lib;
5+
6+{
7+ ###### interface
8+ options = {
9+ services.gnome3.gnome-remote-desktop = {
10+ enable = mkEnableOption "Remote Desktop support using Pipewire";
11+ };
12+ };
13+
14+ ###### implementation
15+ config = mkIf config.services.gnome3.gnome-remote-desktop.enable {
16+ systemd.packages = [ pkgs.gnome3.gnome-remote-desktop ];
17+ };
18+}
nixos/modules/services/desktops/gnome3/seahorse.nix+1−1
@@ -29,7 +29,7 @@ with lib;
2929
3030 config = mkIf config.services.gnome3.seahorse.enable {
3131
32− environment.systemPackages = [ pkgs.gnome3.seahorse ];
32+ environment.systemPackages = [ pkgs.gnome3.seahorse pkgs.gnome3.dconf ];
3333
3434 services.dbus.packages = [ pkgs.gnome3.seahorse ];
3535
nixos/modules/services/desktops/gsignond.nixnew file+43
@@ -0,0 +1,43 @@
1+# Accounts-SSO gSignOn daemon
2+
3+{ config, lib, pkgs, ... }:
4+
5+with lib;
6+
7+let
8+ package = pkgs.gsignond.override { plugins = config.services.gsignond.plugins; };
9+in
10+{
11+
12+ ###### interface
13+
14+ options = {
15+
16+ services.gsignond = {
17+
18+ enable = mkOption {
19+ type = types.bool;
20+ default = false;
21+ description = ''
22+ Whether to enable gSignOn daemon, a DBus service
23+ which performs user authentication on behalf of its clients.
24+ '';
25+ };
26+
27+ plugins = mkOption {
28+ type = types.listOf types.package;
29+ default = [];
30+ description = ''
31+ What plugins to use with the gSignOn daemon.
32+ '';
33+ };
34+ };
35+ };
36+
37+ ###### implementation
38+ config = mkIf config.services.gsignond.enable {
39+ environment.etc."gsignond.conf".source = "${package}/etc/gsignond.conf";
40+ services.dbus.packages = [ package ];
41+ };
42+
43+}
nixos/modules/services/desktops/profile-sync-daemon.nix+2−2
@@ -36,7 +36,7 @@ in {
3636 description = "Profile Sync daemon";
3737 wants = [ "psd-resync.service" "local-fs.target" ];
3838 wantedBy = [ "default.target" ];
39− path = with pkgs; [ rsync kmod gawk nettools profile-sync-daemon ];
39+ path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
4040 unitConfig = {
4141 RequiresMountsFor = [ "/home/" ];
4242 };
@@ -55,7 +55,7 @@ in {
5555 wants = [ "psd-resync.timer" ];
5656 partOf = [ "psd.service" ];
5757 wantedBy = [ "default.target" ];
58− path = with pkgs; [ rsync kmod gawk nettools profile-sync-daemon ];
58+ path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
5959 serviceConfig = {
6060 Type = "oneshot";
6161 ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon resync";
nixos/modules/services/development/jupyter/default.nix+1
@@ -145,6 +145,7 @@ in {
145145 systemd.services.jupyter = {
146146 description = "Jupyter development server";
147147
148+ after = [ "network.target" ];
148149 wantedBy = [ "multi-user.target" ];
149150
150151 # TODO: Patch notebook so we can explicitly pass in a shell
nixos/modules/services/editors/emacs.xml+1−1
@@ -11,7 +11,7 @@
1111 Rodney Lorrimar @rvl
1212 -->
1313 <para>
14− <link xlink:href="http://www.gnu.org/software/emacs/">Emacs</link> is an
14+ <link xlink:href="https://www.gnu.org/software/emacs/">Emacs</link> is an
1515 extensible, customizable, self-documenting real-time display editor — and
1616 more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp
1717 programming language with extensions to support text editing.
nixos/modules/services/games/minetest-server.nix+3
@@ -84,7 +84,9 @@ in
8484 home = "/var/lib/minetest";
8585 createHome = true;
8686 uid = config.ids.uids.minetest;
87+ group = "minetest";
8788 };
89+ users.groups.minetest.gid = config.ids.gids.minetest;
8890
8991 systemd.services.minetest-server = {
9092 description = "Minetest Server Service";
@@ -93,6 +95,7 @@ in
9395
9496 serviceConfig.Restart = "always";
9597 serviceConfig.User = "minetest";
98+ serviceConfig.Group = "minetest";
9699
97100 script = ''
98101 cd /var/lib/minetest
nixos/modules/services/hardware/bluetooth.nix+6−1
@@ -25,9 +25,14 @@ in {
2525 type = types.package;
2626 default = pkgs.bluez;
2727 defaultText = "pkgs.bluez";
28− example = "pkgs.bluez.override { enableMidi = true; }";
28+ example = "pkgs.bluezFull";
2929 description = ''
3030 Which BlueZ package to use.
31+
32+ <note><para>
33+ Use the <literal>pkgs.bluezFull</literal> package to enable all
34+ bluez plugins.
35+ </para></note>
3136 '';
3237 };
3338
nixos/modules/services/hardware/lirc.nix+17−2
@@ -32,7 +32,6 @@ in {
3232 default = [];
3333 description = "Extra arguments to lircd.";
3434 };
35−
3635 };
3736 };
3837
@@ -43,13 +42,15 @@ in {
4342 # Note: LIRC executables raises a warning, if lirc_options.conf do not exists
4443 environment.etc."lirc/lirc_options.conf".text = cfg.options;
4544
45+ passthru.lirc.socket = "/run/lirc/lircd";
46+
4647 environment.systemPackages = [ pkgs.lirc ];
4748
4849 systemd.sockets.lircd = {
4950 description = "LIRC daemon socket";
5051 wantedBy = [ "sockets.target" ];
5152 socketConfig = {
52− ListenStream = "/run/lirc/lircd";
53+ ListenStream = config.passthru.lirc.socket;
5354 SocketUser = "lirc";
5455 SocketMode = "0660";
5556 };
@@ -65,6 +66,20 @@ in {
6566
6667 serviceConfig = {
6768 RuntimeDirectory = "lirc";
69+
70+ # Service runtime directory and socket share same folder.
71+ # Following hacks are necessary to get everything right:
72+
73+ # 1. prevent socket deletion during stop and restart
74+ RuntimeDirectoryPreserve = true;
75+
76+ # 2. fix runtime folder owner-ship, happens when socket activation
77+ # creates the folder
78+ PermissionsStartOnly = true;
79+ ExecStartPre = [
80+ "${pkgs.coreutils}/bin/chown lirc /run/lirc/"
81+ ];
82+
6883 ExecStart = ''
6984 ${pkgs.lirc}/bin/lircd --nodaemon \
7085 ${escapeShellArgs cfg.extraArguments} \
nixos/modules/services/hardware/tlp.nix+2
@@ -56,6 +56,8 @@ in
5656
5757 powerManagement.scsiLinkPolicy = null;
5858 powerManagement.cpuFreqGovernor = null;
59+ powerManagement.cpufreq.max = null;
60+ powerManagement.cpufreq.min = null;
5961
6062 systemd.sockets."systemd-rfkill".enable = false;
6163
nixos/modules/services/hardware/trezord.nix+5−5
@@ -27,13 +27,13 @@ in {
2727 destination = "/etc/udev/rules.d/51-trezor.rules";
2828 text = ''
2929 # TREZOR v1 (One)
30− SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
31− KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl"
30+ SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n"
31+ KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0660", GROUP="trezord", TAG+="uaccess"
3232
3333 # TREZOR v2 (T)
34− SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0661", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
35− SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
36− KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0666", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl"
34+ SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n"
35+ SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0660", GROUP="trezord", TAG+="uaccess", SYMLINK+="trezor%n"
36+ KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0660", GROUP="trezord", TAG+="uaccess"
3737 '';
3838 });
3939
nixos/modules/services/hardware/upower.nix+26
@@ -56,6 +56,32 @@ in
5656 { Type = "dbus";
5757 BusName = "org.freedesktop.UPower";
5858 ExecStart = "@${cfg.package}/libexec/upowerd upowerd";
59+ Restart = "on-failure";
60+ # Upstream lockdown:
61+ # Filesystem lockdown
62+ ProtectSystem = "strict";
63+ # Needed by keyboard backlight support
64+ ProtectKernelTunables = false;
65+ ProtectControlGroups = true;
66+ ReadWritePaths = "/var/lib/upower";
67+ ProtectHome = true;
68+ PrivateTmp = true;
69+
70+ # Network
71+ # PrivateNetwork=true would block udev's netlink socket
72+ RestrictAddressFamilies = "AF_UNIX AF_NETLINK";
73+
74+ # Execute Mappings
75+ MemoryDenyWriteExecute = true;
76+
77+ # Modules
78+ ProtectKernelModules = true;
79+
80+ # Real-time
81+ RestrictRealtime = true;
82+
83+ # Privilege escalation
84+ NoNewPrivileges = true;
5985 };
6086 };
6187
nixos/modules/services/hardware/vdr.nixnew file+81
@@ -0,0 +1,81 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.vdr;
7+ libDir = "/var/lib/vdr";
8+in {
9+
10+ ###### interface
11+
12+ options = {
13+
14+ services.vdr = {
15+ enable = mkEnableOption "enable VDR. Please put config into ${libDir}.";
16+
17+ package = mkOption {
18+ type = types.package;
19+ default = pkgs.vdr;
20+ defaultText = "pkgs.vdr";
21+ example = literalExample "pkgs.wrapVdr.override { plugins = with pkgs.vdrPlugins; [ hello ]; }";
22+ description = "Package to use.";
23+ };
24+
25+ videoDir = mkOption {
26+ type = types.path;
27+ default = "/srv/vdr/video";
28+ description = "Recording directory";
29+ };
30+
31+ extraArguments = mkOption {
32+ type = types.listOf types.str;
33+ default = [];
34+ description = "Additional command line arguments to pass to VDR.";
35+ };
36+
37+ enableLirc = mkEnableOption "enable LIRC";
38+ };
39+ };
40+
41+ ###### implementation
42+
43+ config = mkIf cfg.enable (mkMerge [{
44+ systemd.tmpfiles.rules = [
45+ "d ${cfg.videoDir} 0755 vdr vdr -"
46+ "Z ${cfg.videoDir} - vdr vdr -"
47+ ];
48+
49+ systemd.services.vdr = {
50+ description = "VDR";
51+ wantedBy = [ "multi-user.target" ];
52+ serviceConfig = {
53+ ExecStart = ''
54+ ${cfg.package}/bin/vdr \
55+ --video="${cfg.videoDir}" \
56+ --config="${libDir}" \
57+ ${escapeShellArgs cfg.extraArguments}
58+ '';
59+ User = "vdr";
60+ CacheDirectory = "vdr";
61+ StateDirectory = "vdr";
62+ Restart = "on-failure";
63+ };
64+ };
65+
66+ users.users.vdr = {
67+ group = "vdr";
68+ home = libDir;
69+ };
70+
71+ users.groups.vdr = {};
72+ }
73+
74+ (mkIf cfg.enableLirc {
75+ services.lirc.enable = true;
76+ users.users.vdr.extraGroups = [ "lirc" ];
77+ services.vdr.extraArguments = [
78+ "--lirc=${config.passthru.lirc.socket}"
79+ ];
80+ })]);
81+}
nixos/modules/services/mail/clamsmtp.nix+2
@@ -176,4 +176,6 @@ in
176176 }
177177 ) cfg.instances);
178178 };
179+
180+ meta.maintainers = with lib.maintainers; [ ekleog ];
179181}
nixos/modules/services/mail/dkimproxy-out.nix+2
@@ -115,4 +115,6 @@ in
115115 };
116116 };
117117 };
118+
119+ meta.maintainers = with lib.maintainers; [ ekleog ];
118120}
nixos/modules/services/mail/dovecot.nix+5−1
@@ -311,7 +311,7 @@ in
311311 { name = "dovenull";
312312 uid = config.ids.uids.dovenull2;
313313 description = "Dovecot user for untrusted logins";
314− group = cfg.group;
314+ group = "dovenull";
315315 }
316316 ] ++ optional (cfg.user == "dovecot2")
317317 { name = "dovecot2";
@@ -332,6 +332,10 @@ in
332332 }
333333 ++ optional (cfg.createMailUser && cfg.mailGroup != null)
334334 { name = cfg.mailGroup;
335+ }
336+ ++ singleton
337+ { name = "dovenull";
338+ gid = config.ids.gids.dovenull2;
335339 };
336340
337341 environment.etc."dovecot/modules".source = modulesDir;
nixos/modules/services/mail/postfix.nix+17−1
@@ -602,7 +602,7 @@ in
602602 target = "postfix";
603603 };
604604
605− # This makes comfortable for root to run 'postqueue' for example.
605+ # This makes it comfortable to run 'postqueue/postdrop' for example.
606606 systemPackages = [ pkgs.postfix ];
607607 };
608608
@@ -616,6 +616,22 @@ in
616616 setgid = true;
617617 };
618618
619+ security.wrappers.postqueue = {
620+ program = "postqueue";
621+ source = "${pkgs.postfix}/bin/postqueue";
622+ group = setgidGroup;
623+ setuid = false;
624+ setgid = true;
625+ };
626+
627+ security.wrappers.postdrop = {
628+ program = "postdrop";
629+ source = "${pkgs.postfix}/bin/postdrop";
630+ group = setgidGroup;
631+ setuid = false;
632+ setgid = true;
633+ };
634+
619635 users.users = optional (user == "postfix")
620636 { name = "postfix";
621637 description = "Postfix mail server user";
nixos/modules/services/mail/rmilter.nix+1−1
@@ -52,7 +52,7 @@ in
5252
5353 enable = mkOption {
5454 type = types.bool;
55− default = cfg.rspamd.enable;
55+ default = false;
5656 description = "Whether to run the rmilter daemon.";
5757 };
5858
nixos/modules/services/mail/roundcube.nixnew file+153
@@ -0,0 +1,153 @@
1+{ lib, config, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.roundcube;
7+in
8+{
9+ options.services.roundcube = {
10+ enable = mkOption {
11+ type = types.bool;
12+ default = false;
13+ description = ''
14+ Whether to enable roundcube.
15+
16+ Also enables nginx virtual host management.
17+ Further nginx configuration can be done by adapting <literal>services.nginx.virtualHosts.&lt;name&gt;</literal>.
18+ See <xref linkend="opt-services.nginx.virtualHosts"/> for further information.
19+ '';
20+ };
21+
22+ hostName = mkOption {
23+ type = types.str;
24+ example = "webmail.example.com";
25+ description = "Hostname to use for the nginx vhost";
26+ };
27+
28+ database = {
29+ username = mkOption {
30+ type = types.str;
31+ default = "roundcube";
32+ description = "Username for the postgresql connection";
33+ };
34+ host = mkOption {
35+ type = types.str;
36+ default = "localhost";
37+ description = ''
38+ Host of the postgresql server. If this is not set to
39+ <literal>localhost</literal>, you have to create the
40+ postgresql user and database yourself, with appropriate
41+ permissions.
42+ '';
43+ };
44+ password = mkOption {
45+ type = types.str;
46+ description = "Password for the postgresql connection";
47+ };
48+ dbname = mkOption {
49+ type = types.str;
50+ default = "roundcube";
51+ description = "Name of the postgresql database";
52+ };
53+ };
54+
55+ plugins = mkOption {
56+ type = types.listOf types.str;
57+ default = [];
58+ description = ''
59+ List of roundcube plugins to enable. Currently, only those directly shipped with Roundcube are supported.
60+ '';
61+ };
62+
63+ extraConfig = mkOption {
64+ type = types.lines;
65+ default = "";
66+ description = "Extra configuration for roundcube webmail instance";
67+ };
68+ };
69+
70+ config = mkIf cfg.enable {
71+ environment.etc."roundcube/config.inc.php".text = ''
72+ <?php
73+
74+ $config = array();
75+ $config['db_dsnw'] = 'pgsql://${cfg.database.username}:${cfg.database.password}@${cfg.database.host}/${cfg.database.dbname}';
76+ $config['log_driver'] = 'syslog';
77+ $config['max_message_size'] = '25M';
78+ $config['plugins'] = [${concatMapStringsSep "," (p: "'${p}'") cfg.plugins}];
79+ ${cfg.extraConfig}
80+ '';
81+
82+ services.nginx = {
83+ enable = true;
84+ virtualHosts = {
85+ ${cfg.hostName} = {
86+ forceSSL = mkDefault true;
87+ enableACME = mkDefault true;
88+ locations."/" = {
89+ root = pkgs.roundcube;
90+ index = "index.php";
91+ extraConfig = ''
92+ location ~* \.php$ {
93+ fastcgi_split_path_info ^(.+\.php)(/.+)$;
94+ fastcgi_pass unix:/run/phpfpm/roundcube;
95+ include ${pkgs.nginx}/conf/fastcgi_params;
96+ include ${pkgs.nginx}/conf/fastcgi.conf;
97+ }
98+ '';
99+ };
100+ };
101+ };
102+ };
103+
104+ services.postgresql = mkIf (cfg.database.host == "localhost") {
105+ enable = true;
106+ };
107+
108+ services.phpfpm.poolConfigs.roundcube = ''
109+ listen = /run/phpfpm/roundcube
110+ listen.owner = nginx
111+ listen.group = nginx
112+ listen.mode = 0660
113+ user = nginx
114+ pm = dynamic
115+ pm.max_children = 75
116+ pm.start_servers = 2
117+ pm.min_spare_servers = 1
118+ pm.max_spare_servers = 20
119+ pm.max_requests = 500
120+ php_admin_value[error_log] = 'stderr'
121+ php_admin_flag[log_errors] = on
122+ php_admin_value[post_max_size] = 25M
123+ php_admin_value[upload_max_filesize] = 25M
124+ catch_workers_output = yes
125+ '';
126+ systemd.services.phpfpm-roundcube.after = [ "roundcube-setup.service" ];
127+
128+ systemd.services.roundcube-setup = let
129+ pgSuperUser = config.services.postgresql.superUser;
130+ in {
131+ requires = [ "postgresql.service" ];
132+ after = [ "postgresql.service" ];
133+ wantedBy = [ "multi-user.target" ];
134+ path = [ config.services.postgresql.package ];
135+ script = ''
136+ mkdir -p /var/lib/roundcube
137+ if [ ! -f /var/lib/roundcube/db-created ]; then
138+ if [ "${cfg.database.host}" = "localhost" ]; then
139+ ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'";
140+ ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}";
141+ fi
142+ PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
143+ -f ${pkgs.roundcube}/SQL/postgres.initial.sql \
144+ -h ${cfg.database.host} ${cfg.database.dbname}
145+ touch /var/lib/roundcube/db-created
146+ fi
147+
148+ ${pkgs.php}/bin/php ${pkgs.roundcube}/bin/update.sh
149+ '';
150+ serviceConfig.Type = "oneshot";
151+ };
152+ };
153+}
nixos/modules/services/mail/rspamd.nix+171−24
@@ -6,6 +6,7 @@ let
66
77 cfg = config.services.rspamd;
88 opts = options.services.rspamd;
9+ postfixCfg = config.services.postfix;
910
1011 bindSocketOpts = {options, config, ... }: {
1112 options = {
@@ -44,7 +45,9 @@ let
4445 else "${config.socket}${maybeOption "mode"}${maybeOption "owner"}${maybeOption "group"}";
4546 };
4647
47− workerOpts = { name, ... }: {
48+ traceWarning = w: x: builtins.trace "warning: ${w}" x;
49+
50+ workerOpts = { name, options, ... }: {
4851 options = {
4952 enable = mkOption {
5053 type = types.nullOr types.bool;
@@ -58,9 +61,18 @@ let
5861 };
5962 type = mkOption {
6063 type = types.nullOr (types.enum [
61− "normal" "controller" "fuzzy_storage" "proxy" "lua"
64+ "normal" "controller" "fuzzy_storage" "rspamd_proxy" "lua" "proxy"
6265 ]);
63− description = "The type of this worker";
66+ description = ''
67+ The type of this worker. The type <literal>proxy</literal> is
68+ deprecated and only kept for backwards compatibility and should be
69+ replaced with <literal>rspamd_proxy</literal>.
70+ '';
71+ apply = let
72+ from = "services.rspamd.workers.\”${name}\".type";
73+ files = options.type.files;
74+ warning = "The option `${from}` defined in ${showFiles files} has enum value `proxy` which has been renamed to `rspamd_proxy`";
75+ in x: if x == "proxy" then traceWarning warning "rspamd_proxy" else x;
6476 };
6577 bindSockets = mkOption {
6678 type = types.listOf (types.either types.str (types.submodule bindSocketOpts));
@@ -99,19 +111,21 @@ let
99111 description = "Additional entries to put verbatim into worker section of rspamd config file.";
100112 };
101113 };
102− config = mkIf (name == "normal" || name == "controller" || name == "fuzzy") {
114+ config = mkIf (name == "normal" || name == "controller" || name == "fuzzy" || name == "rspamd_proxy") {
103115 type = mkDefault name;
104− includes = mkDefault [ "$CONFDIR/worker-${name}.inc" ];
105− bindSockets = mkDefault (if name == "normal"
106− then [{
107− socket = "/run/rspamd/rspamd.sock";
108− mode = "0660";
109− owner = cfg.user;
110− group = cfg.group;
111− }]
112− else if name == "controller"
113− then [ "localhost:11334" ]
114− else [] );
116+ includes = mkDefault [ "$CONFDIR/worker-${if name == "rspamd_proxy" then "proxy" else name}.inc" ];
117+ bindSockets =
118+ let
119+ unixSocket = name: {
120+ mode = "0660";
121+ socket = "/run/rspamd/${name}.sock";
122+ owner = cfg.user;
123+ group = cfg.group;
124+ };
125+ in mkDefault (if name == "normal" then [(unixSocket "rspamd")]
126+ else if name == "controller" then [ "localhost:11334" ]
127+ else if name == "rspamd_proxy" then [ (unixSocket "proxy") ]
128+ else [] );
115129 };
116130 };
117131
@@ -127,28 +141,83 @@ let
127141 options {
128142 pidfile = "$RUNDIR/rspamd.pid";
129143 .include "$CONFDIR/options.inc"
144+ .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/options.inc"
145+ .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/options.inc"
130146 }
131147
132148 logging {
133149 type = "syslog";
134150 .include "$CONFDIR/logging.inc"
151+ .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/logging.inc"
152+ .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/logging.inc"
135153 }
136154
137− ${concatStringsSep "\n" (mapAttrsToList (name: value: ''
138− worker ${optionalString (value.name != "normal" && value.name != "controller") "${value.name}"} {
155+ ${concatStringsSep "\n" (mapAttrsToList (name: value: let
156+ includeName = if name == "rspamd_proxy" then "proxy" else name;
157+ tryOverride = if value.extraConfig == "" then "true" else "false";
158+ in ''
159+ worker "${value.type}" {
139160 type = "${value.type}";
140161 ${optionalString (value.enable != null)
141162 "enabled = ${if value.enable != false then "yes" else "no"};"}
142163 ${mkBindSockets value.enable value.bindSockets}
143164 ${optionalString (value.count != null) "count = ${toString value.count};"}
144165 ${concatStringsSep "\n " (map (each: ".include \"${each}\"") value.includes)}
145− ${value.extraConfig}
166+ .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-${includeName}.inc"
167+ .include(try=${tryOverride}; priority=10) "$LOCAL_CONFDIR/override.d/worker-${includeName}.inc"
146168 }
147169 '') cfg.workers)}
148170
149− ${cfg.extraConfig}
171+ ${optionalString (cfg.extraConfig != "") ''
172+ .include(priority=10) "$LOCAL_CONFDIR/override.d/extra-config.inc"
173+ ''}
150174 '';
151175
176+ filterFiles = files: filterAttrs (n: v: v.enable) files;
177+ rspamdDir = pkgs.linkFarm "etc-rspamd-dir" (
178+ (mapAttrsToList (name: file: { name = "local.d/${name}"; path = file.source; }) (filterFiles cfg.locals)) ++
179+ (mapAttrsToList (name: file: { name = "override.d/${name}"; path = file.source; }) (filterFiles cfg.overrides)) ++
180+ (optional (cfg.localLuaRules != null) { name = "rspamd.local.lua"; path = cfg.localLuaRules; }) ++
181+ [ { name = "rspamd.conf"; path = rspamdConfFile; } ]
182+ );
183+
184+ configFileModule = prefix: { name, config, ... }: {
185+ options = {
186+ enable = mkOption {
187+ type = types.bool;
188+ default = true;
189+ description = ''
190+ Whether this file ${prefix} should be generated. This
191+ option allows specific ${prefix} files to be disabled.
192+ '';
193+ };
194+
195+ text = mkOption {
196+ default = null;
197+ type = types.nullOr types.lines;
198+ description = "Text of the file.";
199+ };
200+
201+ source = mkOption {
202+ type = types.path;
203+ description = "Path of the source file.";
204+ };
205+ };
206+ config = {
207+ source = mkIf (config.text != null) (
208+ let name' = "rspamd-${prefix}-" + baseNameOf name;
209+ in mkDefault (pkgs.writeText name' config.text));
210+ };
211+ };
212+
213+ configOverrides =
214+ (mapAttrs' (n: v: nameValuePair "worker-${if n == "rspamd_proxy" then "proxy" else n}.inc" {
215+ text = v.extraConfig;
216+ })
217+ (filterAttrs (n: v: v.extraConfig != "") cfg.workers))
218+ // (if cfg.extraConfig == "" then {} else {
219+ "extra-config.inc".text = cfg.extraConfig;
220+ });
152221in
153222
154223{
@@ -159,7 +228,7 @@ in
159228
160229 services.rspamd = {
161230
162− enable = mkEnableOption "Whether to run the rspamd daemon.";
231+ enable = mkEnableOption "rspamd, the Rapid spam filtering system";
163232
164233 debug = mkOption {
165234 type = types.bool;
@@ -167,6 +236,41 @@ in
167236 description = "Whether to run the rspamd daemon in debug mode.";
168237 };
169238
239+ locals = mkOption {
240+ type = with types; attrsOf (submodule (configFileModule "locals"));
241+ default = {};
242+ description = ''
243+ Local configuration files, written into <filename>/etc/rspamd/local.d/{name}</filename>.
244+ '';
245+ example = literalExample ''
246+ { "redis.conf".source = "/nix/store/.../etc/dir/redis.conf";
247+ "arc.conf".text = "allow_envfrom_empty = true;";
248+ }
249+ '';
250+ };
251+
252+ overrides = mkOption {
253+ type = with types; attrsOf (submodule (configFileModule "overrides"));
254+ default = {};
255+ description = ''
256+ Overridden configuration files, written into <filename>/etc/rspamd/override.d/{name}</filename>.
257+ '';
258+ example = literalExample ''
259+ { "redis.conf".source = "/nix/store/.../etc/dir/redis.conf";
260+ "arc.conf".text = "allow_envfrom_empty = true;";
261+ }
262+ '';
263+ };
264+
265+ localLuaRules = mkOption {
266+ default = null;
267+ type = types.nullOr types.path;
268+ description = ''
269+ Path of file to link to <filename>/etc/rspamd/rspamd.local.lua</filename> for local
270+ rules written in Lua
271+ '';
272+ };
273+
170274 workers = mkOption {
171275 type = with types; attrsOf (submodule workerOpts);
172276 description = ''
@@ -210,7 +314,7 @@ in
210314 description = ''
211315 User to use when no root privileges are required.
212316 '';
213− };
317+ };
214318
215319 group = mkOption {
216320 type = types.string;
@@ -218,7 +322,30 @@ in
218322 description = ''
219323 Group to use when no root privileges are required.
220324 '';
221− };
325+ };
326+
327+ postfix = {
328+ enable = mkOption {
329+ type = types.bool;
330+ default = false;
331+ description = "Add rspamd milter to postfix main.conf";
332+ };
333+
334+ config = mkOption {
335+ type = with types; attrsOf (either bool (either str (listOf str)));
336+ description = ''
337+ Addon to postfix configuration
338+ '';
339+ default = {
340+ smtpd_milters = ["unix:/run/rspamd/rspamd-milter.sock"];
341+ non_smtpd_milters = ["unix:/run/rspamd/rspamd-milter.sock"];
342+ };
343+ example = {
344+ smtpd_milters = ["unix:/run/rspamd/rspamd-milter.sock"];
345+ non_smtpd_milters = ["unix:/run/rspamd/rspamd-milter.sock"];
346+ };
347+ };
348+ };
222349 };
223350 };
224351
@@ -226,6 +353,25 @@ in
226353 ###### implementation
227354
228355 config = mkIf cfg.enable {
356+ services.rspamd.overrides = configOverrides;
357+ services.rspamd.workers = mkIf cfg.postfix.enable {
358+ controller = {};
359+ rspamd_proxy = {
360+ bindSockets = [ {
361+ mode = "0660";
362+ socket = "/run/rspamd/rspamd-milter.sock";
363+ owner = cfg.user;
364+ group = postfixCfg.group;
365+ } ];
366+ extraConfig = ''
367+ upstream "local" {
368+ default = yes; # Self-scan upstreams are always default
369+ self_scan = yes; # Enable self-scan
370+ }
371+ '';
372+ };
373+ };
374+ services.postfix.config = mkIf cfg.postfix.enable cfg.postfix.config;
229375
230376 # Allow users to run 'rspamc' and 'rspamadm'.
231377 environment.systemPackages = [ pkgs.rspamd ];
@@ -242,16 +388,17 @@ in
242388 gid = config.ids.gids.rspamd;
243389 };
244390
245− environment.etc."rspamd.conf".source = rspamdConfFile;
391+ environment.etc."rspamd".source = rspamdDir;
246392
247393 systemd.services.rspamd = {
248394 description = "Rspamd Service";
249395
250396 wantedBy = [ "multi-user.target" ];
251397 after = [ "network.target" ];
398+ restartTriggers = [ rspamdDir ];
252399
253400 serviceConfig = {
254− ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f";
401+ ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c /etc/rspamd/rspamd.conf -f";
255402 Restart = "always";
256403 RuntimeDirectory = "rspamd";
257404 PrivateTmp = true;
nixos/modules/services/mail/rss2email.nixnew file+136
@@ -0,0 +1,136 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.rss2email;
7+in {
8+
9+ ###### interface
10+
11+ options = {
12+
13+ services.rss2email = {
14+
15+ enable = mkOption {
16+ type = types.bool;
17+ default = false;
18+ description = "Whether to enable rss2email.";
19+ };
20+
21+ to = mkOption {
22+ type = types.str;
23+ description = "Mail address to which to send emails";
24+ };
25+
26+ interval = mkOption {
27+ type = types.str;
28+ default = "12h";
29+ description = "How often to check the feeds, in systemd interval format";
30+ };
31+
32+ config = mkOption {
33+ type = with types; attrsOf (either str (either int bool));
34+ default = {};
35+ description = ''
36+ The configuration to give rss2email.
37+
38+ Default will use system-wide <literal>sendmail</literal> to send the
39+ email. This is rss2email's default when running
40+ <literal>r2e new</literal>.
41+
42+ This set contains key-value associations that will be set in the
43+ <literal>[DEFAULT]</literal> block along with the
44+ <literal>to</literal> parameter.
45+
46+ See
47+ <literal>https://github.com/rss2email/rss2email/blob/master/r2e.1</literal>
48+ for more information on which parameters are accepted.
49+ '';
50+ };
51+
52+ feeds = mkOption {
53+ description = "The feeds to watch.";
54+ type = types.attrsOf (types.submodule {
55+ options = {
56+ url = mkOption {
57+ type = types.str;
58+ description = "The URL at which to fetch the feed.";
59+ };
60+
61+ to = mkOption {
62+ type = with types; nullOr str;
63+ default = null;
64+ description = ''
65+ Email address to which to send feed items.
66+
67+ If <literal>null</literal>, this will not be set in the
68+ configuration file, and rss2email will make it default to
69+ <literal>rss2email.to</literal>.
70+ '';
71+ };
72+ };
73+ });
74+ };
75+ };
76+
77+ };
78+
79+
80+ ###### implementation
81+
82+ config = mkIf cfg.enable {
83+ users.groups = {
84+ rss2email.gid = config.ids.gids.rss2email;
85+ };
86+
87+ users.users = {
88+ rss2email = {
89+ description = "rss2email user";
90+ uid = config.ids.uids.rss2email;
91+ group = "rss2email";
92+ };
93+ };
94+
95+ services.rss2email.config.to = cfg.to;
96+
97+ systemd.services.rss2email = let
98+ conf = pkgs.writeText "rss2email.cfg" (lib.generators.toINI {} ({
99+ DEFAULT = cfg.config;
100+ } // lib.mapAttrs' (name: feed: nameValuePair "feed.${name}" (
101+ { inherit (feed) url; } //
102+ lib.optionalAttrs (feed.to != null) { inherit (feed) to; }
103+ )) cfg.feeds
104+ ));
105+ in
106+ {
107+ preStart = ''
108+ mkdir -p /var/rss2email
109+ chmod 700 /var/rss2email
110+
111+ cp ${conf} /var/rss2email/conf.cfg
112+ if [ ! -f /var/rss2email/db.json ]; then
113+ echo '{"version":2,"feeds":[]}' > /var/rss2email/db.json
114+ fi
115+
116+ chown -R rss2email:rss2email /var/rss2email
117+ '';
118+ path = [ pkgs.system-sendmail ];
119+ serviceConfig = {
120+ ExecStart =
121+ "${pkgs.rss2email}/bin/r2e -c /var/rss2email/conf.cfg -d /var/rss2email/db.json run";
122+ User = "rss2email";
123+ PermissionsStartOnly = "true";
124+ };
125+ };
126+
127+ systemd.timers.rss2email = {
128+ partOf = [ "rss2email.service" ];
129+ wantedBy = [ "timers.target" ];
130+ timerConfig.OnBootSec = "0";
131+ timerConfig.OnUnitActiveSec = cfg.interval;
132+ };
133+ };
134+
135+ meta.maintainers = with lib.maintainers; [ ekleog ];
136+}
nixos/modules/services/misc/bees.nixnew file+123
@@ -0,0 +1,123 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+
7+ cfg = config.services.beesd;
8+
9+ logLevels = { emerg = 0; alert = 1; crit = 2; err = 3; warning = 4; notice = 5; info = 6; debug = 7; };
10+
11+ fsOptions = with types; {
12+ options.spec = mkOption {
13+ type = str;
14+ description = ''
15+ Description of how to identify the filesystem to be duplicated by this
16+ instance of bees. Note that deduplication crosses subvolumes; one must
17+ not configure multiple instances for subvolumes of the same filesystem
18+ (or block devices which are part of the same filesystem), but only for
19+ completely independent btrfs filesystems.
20+ </para>
21+ <para>
22+ This must be in a format usable by findmnt; that could be a key=value
23+ pair, or a bare path to a mount point.
24+ '';
25+ example = "LABEL=MyBulkDataDrive";
26+ };
27+ options.hashTableSizeMB = mkOption {
28+ type = types.addCheck types.int (n: mod n 16 == 0);
29+ default = 1024; # 1GB; default from upstream beesd script
30+ description = ''
31+ Hash table size in MB; must be a multiple of 16.
32+ </para>
33+ <para>
34+ A larger ratio of index size to storage size means smaller blocks of
35+ duplicate content are recognized.
36+ </para>
37+ <para>
38+ If you have 1TB of data, a 4GB hash table (which is to say, a value of
39+ 4096) will permit 4KB extents (the smallest possible size) to be
40+ recognized, whereas a value of 1024 -- creating a 1GB hash table --
41+ will recognize only aligned duplicate blocks of 16KB.
42+ '';
43+ };
44+ options.verbosity = mkOption {
45+ type = types.enum (attrNames logLevels ++ attrValues logLevels);
46+ apply = v: if isString v then logLevels.${v} else v;
47+ default = "info";
48+ description = "Log verbosity (syslog keyword/level).";
49+ };
50+ options.workDir = mkOption {
51+ type = str;
52+ default = ".beeshome";
53+ description = ''
54+ Name (relative to the root of the filesystem) of the subvolume where
55+ the hash table will be stored.
56+ '';
57+ };
58+ options.extraOptions = mkOption {
59+ type = listOf str;
60+ default = [];
61+ description = ''
62+ Extra command-line options passed to the daemon. See upstream bees documentation.
63+ '';
64+ example = literalExample ''
65+ [ "--thread-count" "4" ]
66+ '';
67+ };
68+ };
69+
70+in {
71+
72+ options.services.beesd = {
73+ filesystems = mkOption {
74+ type = with types; attrsOf (submodule fsOptions);
75+ description = "BTRFS filesystems to run block-level deduplication on.";
76+ default = { };
77+ example = literalExample ''
78+ {
79+ root = {
80+ spec = "LABEL=root";
81+ hashTableSizeMB = 2048;
82+ verbosity = "crit";
83+ extraOptions = [ "--loadavg-target" "5.0" ];
84+ };
85+ }
86+ '';
87+ };
88+ };
89+ config = {
90+ systemd.services = mapAttrs' (name: fs: nameValuePair "beesd@${name}" {
91+ description = "Block-level BTRFS deduplication for %i";
92+ after = [ "sysinit.target" ];
93+
94+ serviceConfig = let
95+ configOpts = [
96+ fs.spec
97+ "verbosity=${toString fs.verbosity}"
98+ "idxSizeMB=${toString fs.hashTableSizeMB}"
99+ "workDir=${fs.workDir}"
100+ ];
101+ configOptsStr = escapeShellArgs configOpts;
102+ in {
103+ # Values from https://github.com/Zygo/bees/blob/v0.6.1/scripts/beesd%40.service.in
104+ ExecStart = "${pkgs.bees}/bin/bees-service-wrapper run ${configOptsStr} -- --no-timestamps ${escapeShellArgs fs.extraOptions}";
105+ ExecStopPost = "${pkgs.bees}/bin/bees-service-wrapper cleanup ${configOptsStr}";
106+ CPUAccounting = true;
107+ CPUWeight = 12;
108+ IOSchedulingClass = "idle";
109+ IOSchedulingPriority = 7;
110+ IOWeight = 10;
111+ KillMode = "control-group";
112+ KillSignal = "SIGTERM";
113+ MemoryAccounting = true;
114+ Nice = 19;
115+ Restart = "on-abnormal";
116+ StartupCPUWeight = 25;
117+ StartupIOWeight = 25;
118+ SyslogIdentifier = "bees"; # would otherwise be "bees-service-wrapper"
119+ };
120+ wantedBy = ["multi-user.target"];
121+ }) cfg.filesystems;
122+ };
123+}
nixos/modules/services/misc/exhibitor.nix+3
@@ -405,6 +405,9 @@ in
405405 cp -Rf ${pkgs.zookeeper}/* ${cfg.baseDir}/zookeeper
406406 chown -R zookeeper ${cfg.baseDir}/zookeeper/conf
407407 chmod -R u+w ${cfg.baseDir}/zookeeper/conf
408+ replace_what=$(echo ${pkgs.zookeeper} | sed 's/[\/&]/\\&/g')
409+ replace_with=$(echo ${cfg.baseDir}/zookeeper | sed 's/[\/&]/\\&/g')
410+ sed -i 's/'"$replace_what"'/'"$replace_with"'/g' ${cfg.baseDir}/zookeeper/bin/zk*.sh
408411 '';
409412 };
410413 users.users = singleton {
nixos/modules/services/misc/gitea.nix+26−3
@@ -6,6 +6,7 @@ let
66 cfg = config.services.gitea;
77 gitea = cfg.package;
88 pg = config.services.postgresql;
9+ useMysql = cfg.database.type == "mysql";
910 usePostgresql = cfg.database.type == "postgres";
1011 configFile = pkgs.writeText "app.ini" ''
1112 APP_NAME = ${cfg.appName}
@@ -14,7 +15,7 @@ let
1415
1516 [database]
1617 DB_TYPE = ${cfg.database.type}
17− HOST = ${cfg.database.host}:${toString cfg.database.port}
18+ HOST = ${if cfg.database.socket != null then cfg.database.socket else cfg.database.host + ":" + toString cfg.database.port}
1819 NAME = ${cfg.database.name}
1920 USER = ${cfg.database.user}
2021 PASSWD = #dbpass#
@@ -45,6 +46,9 @@ let
4546 ROOT_PATH = ${cfg.log.rootPath}
4647 LEVEL = ${cfg.log.level}
4748
49+ [service]
50+ DISABLE_REGISTRATION = ${boolToString cfg.disableRegistration}
51+
4852 ${cfg.extraConfig}
4953 '';
5054in
@@ -148,6 +152,13 @@ in
148152 '';
149153 };
150154
155+ socket = mkOption {
156+ type = types.nullOr types.path;
157+ default = null;
158+ example = "/run/mysqld/mysqld.sock";
159+ description = "Path to the unix socket file to use for authentication.";
160+ };
161+
151162 path = mkOption {
152163 type = types.str;
153164 default = "${cfg.stateDir}/data/gitea.db";
@@ -240,6 +251,18 @@ in
240251 description = "Upper level of template and static files path.";
241252 };
242253
254+ disableRegistration = mkEnableOption "the registration lock" // {
255+ description = ''
256+ By default any user can create an account on this <literal>gitea</literal> instance.
257+ This can be disabled by using this option.
258+
259+ <emphasis>Note:</emphasis> please keep in mind that this should be added after the initial
260+ deploy unless <link linkend="opt-services.gitea.useWizard">services.gitea.useWizard</link>
261+ is <literal>true</literal> as the first registered user will be the administrator if
262+ no install wizard is used.
263+ '';
264+ };
265+
243266 extraConfig = mkOption {
244267 type = types.str;
245268 default = "";
@@ -253,9 +276,9 @@ in
253276
254277 systemd.services.gitea = {
255278 description = "gitea";
256− after = [ "network.target" "postgresql.service" ];
279+ after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";
257280 wantedBy = [ "multi-user.target" ];
258− path = [ gitea.bin ];
281+ path = [ gitea.bin pkgs.gitAndTools.git ];
259282
260283 preStart = let
261284 runConfig = "${cfg.stateDir}/custom/conf/app.ini";
nixos/modules/services/misc/gitlab.nix+97−122
@@ -14,15 +14,16 @@ let
1414 pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
1515 pgSuperUser = config.services.postgresql.superUser;
1616
17− databaseYml = ''
18− production:
19− adapter: postgresql
20− database: ${cfg.databaseName}
21− host: ${cfg.databaseHost}
22− password: ${cfg.databasePassword}
23− username: ${cfg.databaseUsername}
24− encoding: utf8
25− '';
17+ databaseConfig = {
18+ production = {
19+ adapter = "postgresql";
20+ database = cfg.databaseName;
21+ host = cfg.databaseHost;
22+ password = cfg.databasePassword;
23+ username = cfg.databaseUsername;
24+ encoding = "utf8";
25+ };
26+ };
2627
2728 gitalyToml = pkgs.writeText "gitaly.toml" ''
2829 socket_path = "${lib.escape ["\""] gitalySocket}"
@@ -45,34 +46,31 @@ let
4546 '') gitlabConfig.production.repositories.storages))}
4647 '';
4748
48− gitlabShellYml = ''
49− user: ${cfg.user}
50− gitlab_url: "http+unix://${pathUrlQuote gitlabSocket}"
51− http_settings:
52− self_signed_cert: false
53− repos_path: "${cfg.statePath}/repositories"
54− secret_file: "${cfg.statePath}/config/gitlab_shell_secret"
55− log_file: "${cfg.statePath}/log/gitlab-shell.log"
56− redis:
57− bin: ${pkgs.redis}/bin/redis-cli
58− host: 127.0.0.1
59− port: 6379
60− database: 0
61− namespace: resque:gitlab
62− '';
49+ gitlabShellConfig = {
50+ user = cfg.user;
51+ gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}";
52+ http_settings.self_signed_cert = false;
53+ repos_path = "${cfg.statePath}/repositories";
54+ secret_file = "${cfg.statePath}/config/gitlab_shell_secret";
55+ log_file = "${cfg.statePath}/log/gitlab-shell.log";
56+ custom_hooks_dir = "${cfg.statePath}/custom_hooks";
57+ redis = {
58+ bin = "${pkgs.redis}/bin/redis-cli";
59+ host = "127.0.0.1";
60+ port = 6379;
61+ database = 0;
62+ namespace = "resque:gitlab";
63+ };
64+ };
6365
64− redisYml = ''
65− production:
66− url: redis://localhost:6379/
67− '';
66+ redisConfig.production.url = "redis://localhost:6379/";
6867
69− secretsYml = ''
70− production:
71− secret_key_base: ${cfg.secrets.secret}
72− otp_key_base: ${cfg.secrets.otp}
73− db_key_base: ${cfg.secrets.db}
74− openid_connect_signing_key: ${builtins.toJSON cfg.secrets.jws}
75− '';
68+ secretsConfig.production = {
69+ secret_key_base = cfg.secrets.secret;
70+ otp_key_base = cfg.secrets.otp;
71+ db_key_base = cfg.secrets.db;
72+ openid_connect_signing_key = cfg.secrets.jws;
73+ };
7674
7775 gitlabConfig = {
7876 # These are the default settings from config/gitlab.example.yml
@@ -114,12 +112,8 @@ let
114112 upload_pack = true;
115113 receive_pack = true;
116114 };
117− workhorse = {
118− secret_file = "${cfg.statePath}/.gitlab_workhorse_secret";
119− };
120− git = {
121− bin_path = "git";
122− };
115+ workhorse.secret_file = "${cfg.statePath}/.gitlab_workhorse_secret";
116+ git.bin_path = "git";
123117 monitoring = {
124118 ip_whitelist = [ "127.0.0.0/8" "::1/128" ];
125119 sidekiq_exporter = {
@@ -137,7 +131,7 @@ let
137131 HOME = "${cfg.statePath}/home";
138132 UNICORN_PATH = "${cfg.statePath}/";
139133 GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/";
140− GITLAB_STATE_PATH = "${cfg.statePath}";
134+ GITLAB_STATE_PATH = cfg.statePath;
141135 GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads";
142136 SCHEMA = "${cfg.statePath}/db/schema.rb";
143137 GITLAB_LOG_PATH = "${cfg.statePath}/log";
@@ -145,13 +139,11 @@ let
145139 GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml";
146140 GITLAB_SHELL_SECRET_PATH = "${cfg.statePath}/config/gitlab_shell_secret";
147141 GITLAB_SHELL_HOOKS_PATH = "${cfg.statePath}/shell/hooks";
148− GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "gitlab-redis.yml" redisYml;
142+ GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "redis.yml" (builtins.toJSON redisConfig);
149143 prometheus_multiproc_dir = "/run/gitlab";
150144 RAILS_ENV = "production";
151145 };
152146
153− unicornConfig = builtins.readFile ./defaultUnicornConfig.rb;
154−
155147 gitlab-rake = pkgs.stdenv.mkDerivation rec {
156148 name = "gitlab-rake";
157149 buildInputs = [ pkgs.makeWrapper ];
@@ -161,7 +153,6 @@ let
161153 mkdir -p $out/bin
162154 makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \
163155 ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
164− --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \
165156 --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package pkgs.coreutils pkgs.procps ]}:$PATH' \
166157 --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \
167158 --run 'cd ${cfg.packages.gitlab}/share/gitlab'
@@ -305,7 +296,6 @@ in {
305296
306297 initialRootPassword = mkOption {
307298 type = types.str;
308− default = "UseNixOS!";
309299 description = ''
310300 Initial password of the root account if this is a new install.
311301 '';
@@ -460,10 +450,30 @@ in {
460450 }
461451 ];
462452
453+ systemd.tmpfiles.rules = [
454+ "d /run/gitlab 0755 ${cfg.user} ${cfg.group} -"
455+ "d ${gitlabEnv.HOME} 0750 ${cfg.user} ${cfg.group} -"
456+ "d ${cfg.backupPath} 0750 ${cfg.user} ${cfg.group} -"
457+ "d ${cfg.statePath}/builds 0750 ${cfg.user} ${cfg.group} -"
458+ "d ${cfg.statePath}/config 0750 ${cfg.user} ${cfg.group} -"
459+ "d ${cfg.statePath}/db 0750 ${cfg.user} ${cfg.group} -"
460+ "d ${cfg.statePath}/log 0750 ${cfg.user} ${cfg.group} -"
461+ "d ${cfg.statePath}/repositories 2770 ${cfg.user} ${cfg.group} -"
462+ "d ${cfg.statePath}/shell 0750 ${cfg.user} ${cfg.group} -"
463+ "d ${cfg.statePath}/tmp/pids 0750 ${cfg.user} ${cfg.group} -"
464+ "d ${cfg.statePath}/tmp/sockets 0750 ${cfg.user} ${cfg.group} -"
465+ "d ${cfg.statePath}/uploads 0700 ${cfg.user} ${cfg.group} -"
466+ "d ${cfg.statePath}/custom_hooks/pre-receive.d 0700 ${cfg.user} ${cfg.group} -"
467+ "d ${cfg.statePath}/custom_hooks/post-receive.d 0700 ${cfg.user} ${cfg.group} -"
468+ "d ${cfg.statePath}/custom_hooks/update.d 0700 ${cfg.user} ${cfg.group} -"
469+ "d ${gitlabConfig.production.shared.path}/artifacts 0750 ${cfg.user} ${cfg.group} -"
470+ "d ${gitlabConfig.production.shared.path}/lfs-objects 0750 ${cfg.user} ${cfg.group} -"
471+ "d ${gitlabConfig.production.shared.path}/pages 0750 ${cfg.user} ${cfg.group} -"
472+ ];
473+
463474 systemd.services.gitlab-sidekiq = {
464− after = [ "network.target" "redis.service" ];
475+ after = [ "network.target" "redis.service" "gitlab.service" ];
465476 wantedBy = [ "multi-user.target" ];
466− partOf = [ "gitlab.service" ];
467477 environment = gitlabEnv;
468478 path = with pkgs; [
469479 config.services.postgresql.package
@@ -485,10 +495,8 @@ in {
485495 };
486496
487497 systemd.services.gitaly = {
488− after = [ "network.target" "gitlab.service" ];
498+ after = [ "network.target" ];
489499 wantedBy = [ "multi-user.target" ];
490− environment.HOME = gitlabEnv.HOME;
491− environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH;
492500 path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv cfg.packages.gitaly.rubyEnv.wrappedRuby ];
493501 serviceConfig = {
494502 Type = "simple";
@@ -504,8 +512,6 @@ in {
504512 systemd.services.gitlab-workhorse = {
505513 after = [ "network.target" ];
506514 wantedBy = [ "multi-user.target" ];
507− environment.HOME = gitlabEnv.HOME;
508− environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH;
509515 path = with pkgs; [
510516 gitAndTools.git
511517 gnutar
@@ -513,10 +519,6 @@ in {
513519 openssh
514520 gitlab-workhorse
515521 ];
516− preStart = ''
517− mkdir -p /run/gitlab
518− chown ${cfg.user}:${cfg.group} /run/gitlab
519− '';
520522 serviceConfig = {
521523 PermissionsStartOnly = true; # preStart must be run as root
522524 Type = "simple";
@@ -537,7 +539,7 @@ in {
537539 };
538540
539541 systemd.services.gitlab = {
540− after = [ "network.target" "postgresql.service" "redis.service" ];
542+ after = [ "gitlab-workhorse.service" "gitaly.service" "network.target" "postgresql.service" "redis.service" ];
541543 requires = [ "gitlab-sidekiq.service" ];
542544 wantedBy = [ "multi-user.target" ];
543545 environment = gitlabEnv;
@@ -550,99 +552,72 @@ in {
550552 gnupg
551553 ];
552554 preStart = ''
553− mkdir -p ${cfg.backupPath}
554− mkdir -p ${cfg.statePath}/builds
555− mkdir -p ${cfg.statePath}/repositories
556− mkdir -p ${gitlabConfig.production.shared.path}/artifacts
557− mkdir -p ${gitlabConfig.production.shared.path}/lfs-objects
558− mkdir -p ${gitlabConfig.production.shared.path}/pages
559− mkdir -p ${cfg.statePath}/log
560− mkdir -p ${cfg.statePath}/tmp/pids
561− mkdir -p ${cfg.statePath}/tmp/sockets
562− mkdir -p ${cfg.statePath}/shell
563− mkdir -p ${cfg.statePath}/db
564− mkdir -p ${cfg.statePath}/uploads
565−
566− rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
567− mkdir -p ${cfg.statePath}/config
568−
569− ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret
570−
571− mkdir -p /run/gitlab
572− mkdir -p ${cfg.statePath}/log
573− [ -d /run/gitlab/log ] || ln -sf ${cfg.statePath}/log /run/gitlab/log
574− [ -d /run/gitlab/tmp ] || ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
575− [ -d /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
576− ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml
577− chown -R ${cfg.user}:${cfg.group} /run/gitlab
578−
579− # Prepare home directory
580− mkdir -p ${gitlabEnv.HOME}/.ssh
581− touch ${gitlabEnv.HOME}/.ssh/authorized_keys
582− chown -R ${cfg.user}:${cfg.group} ${gitlabEnv.HOME}/
583−
584555 cp -rf ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
585− cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
586− ${optionalString cfg.smtp.enable ''
587− ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
588− ''}
589− ln -sf ${cfg.statePath}/config /run/gitlab/config
556+ rm -rf ${cfg.statePath}/config
557+ mkdir ${cfg.statePath}/config
590558 if [ -e ${cfg.statePath}/lib ]; then
591559 rm ${cfg.statePath}/lib
592560 fi
593− ln -sf ${pkgs.gitlab}/share/gitlab/lib ${cfg.statePath}/lib
561+
562+ ln -sf ${cfg.packages.gitlab}/share/gitlab/lib ${cfg.statePath}/lib
563+ [ -L /run/gitlab/config ] || ln -sf ${cfg.statePath}/config /run/gitlab/config
564+ [ -L /run/gitlab/log ] || ln -sf ${cfg.statePath}/log /run/gitlab/log
565+ [ -L /run/gitlab/tmp ] || ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
566+ [ -L /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
594567 cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
568+ cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
569+ ${optionalString cfg.smtp.enable ''
570+ ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
571+ ''}
572+ ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret
595573
596574 # JSON is a subset of YAML
597− ln -fs ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)} ${cfg.statePath}/config/gitlab.yml
598− ln -fs ${pkgs.writeText "database.yml" databaseYml} ${cfg.statePath}/config/database.yml
599− ln -fs ${pkgs.writeText "secrets.yml" secretsYml} ${cfg.statePath}/config/secrets.yml
600− ln -fs ${pkgs.writeText "unicorn.rb" unicornConfig} ${cfg.statePath}/config/unicorn.rb
601−
602− chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}/
603− chmod -R ug+rwX,o-rwx+X ${cfg.statePath}/
575+ ln -sf ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)} ${cfg.statePath}/config/gitlab.yml
576+ ln -sf ${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} ${cfg.statePath}/config/database.yml
577+ ln -sf ${pkgs.writeText "secrets.yml" (builtins.toJSON secretsConfig)} ${cfg.statePath}/config/secrets.yml
578+ ln -sf ${./defaultUnicornConfig.rb} ${cfg.statePath}/config/unicorn.rb
604579
605580 # Install the shell required to push repositories
606− ln -fs ${pkgs.writeText "config.yml" gitlabShellYml} "$GITLAB_SHELL_CONFIG_PATH"
607− ln -fs ${cfg.packages.gitlab-shell}/hooks "$GITLAB_SHELL_HOOKS_PATH"
581+ ln -sf ${pkgs.writeText "config.yml" (builtins.toJSON gitlabShellConfig)} /run/gitlab/shell-config.yml
582+ [ -L ${cfg.statePath}/shell/hooks ] || ln -sf ${cfg.packages.gitlab-shell}/hooks ${cfg.statePath}/shell/hooks
608583 ${cfg.packages.gitlab-shell}/bin/install
609584
610− if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
611− if ! test -e "${cfg.statePath}/db-created"; then
585+ chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}/
586+ chmod -R ug+rwX,o-rwx+X ${cfg.statePath}/
587+ chown -R ${cfg.user}:${cfg.group} /run/gitlab
588+
589+ if ! test -e "${cfg.statePath}/db-created"; then
590+ if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
612591 ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.databasePassword}'"
613592 ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName}
614− touch "${cfg.statePath}/db-created"
593+
594+ # enable required pg_trgm extension for gitlab
595+ ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
615596 fi
616597
617− # enable required pg_trgm extension for gitlab
618− ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
598+ ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake db:schema:load
599+
600+ touch "${cfg.statePath}/db-created"
619601 fi
620602
621603 # Always do the db migrations just to be sure the database is up-to-date
622− ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production
604+ ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake db:migrate
623605
624− # The gitlab:setup task is horribly broken somehow, the db:migrate
625− # task above and the db:seed_fu below will do the same for setting
626− # up the initial database
627606 if ! test -e "${cfg.statePath}/db-seeded"; then
628− ${gitlab-rake}/bin/gitlab-rake db:seed_fu RAILS_ENV=production \
607+ ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${gitlab-rake}/bin/gitlab-rake db:seed_fu \
629608 GITLAB_ROOT_PASSWORD='${cfg.initialRootPassword}' GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}'
630609 touch "${cfg.statePath}/db-seeded"
631610 fi
632611
633− # The gitlab:shell:setup regenerates the authorized_keys file so that
634− # the store path to the gitlab-shell in it gets updated
635− ${pkgs.sudo}/bin/sudo -u ${cfg.user} force=yes ${gitlab-rake}/bin/gitlab-rake gitlab:shell:setup RAILS_ENV=production
636−
637612 # The gitlab:shell:create_hooks task seems broken for fixing links
638613 # so we instead delete all the hooks and create them anew
639614 rm -f ${cfg.statePath}/repositories/**/*.git/hooks
640− ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks RAILS_ENV=production
615+ ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks
616+
617+ ${pkgs.sudo}/bin/sudo -u ${cfg.user} -H ${pkgs.git}/bin/git config --global core.autocrlf "input"
641618
642619 # Change permissions in the last step because some of the
643620 # intermediary scripts like to create directories as root.
644− chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}
645− chmod -R ug+rwX,o-rwx+X ${cfg.statePath}
646621 chmod -R u+rwX,go-rwx+X ${gitlabEnv.HOME}
647622 chmod -R ug+rwX,o-rwx ${cfg.statePath}/repositories
648623 chmod -R ug-s ${cfg.statePath}/repositories
nixos/modules/services/misc/home-assistant.nix+1
@@ -157,6 +157,7 @@ in {
157157 Restart = "on-failure";
158158 ProtectSystem = "strict";
159159 ReadWritePaths = "${cfg.configDir}";
160+ KillSignal = "SIGINT";
160161 PrivateTmp = true;
161162 RemoveIPC = true;
162163 };
nixos/modules/services/misc/nix-daemon.nix+13−9
@@ -62,11 +62,15 @@ let
6262 ''}
6363 $extraOptions
6464 END
65− '' + optionalString cfg.checkConfig ''
66− echo "Checking that Nix can read nix.conf..."
67− ln -s $out ./nix.conf
68− NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null
69− '');
65+ '' + optionalString cfg.checkConfig (
66+ if pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform then ''
67+ echo "Ignore nix.checkConfig when cross-compiling"
68+ '' else ''
69+ echo "Checking that Nix can read nix.conf..."
70+ ln -s $out ./nix.conf
71+ NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null
72+ '')
73+ );
7074
7175in
7276
@@ -113,11 +117,11 @@ in
113117
114118 buildCores = mkOption {
115119 type = types.int;
116− default = 1;
120+ default = 0;
117121 example = 64;
118122 description = ''
119123 This option defines the maximum number of concurrent tasks during
120− one build. It affects, e.g., -j option for make. The default is 1.
124+ one build. It affects, e.g., -j option for make.
121125 The special value 0 means that the builder should use all
122126 available CPU cores in the system. Some builds may become
123127 non-deterministic with this option; use with care! Packages will
@@ -399,8 +403,8 @@ in
399403 systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];
400404
401405 systemd.services.nix-daemon =
402− { path = [ nix pkgs.utillinux ]
403− ++ optionals cfg.distributedBuilds [ config.programs.ssh.package pkgs.gzip ]
406+ { path = [ nix pkgs.utillinux config.programs.ssh.package ]
407+ ++ optionals cfg.distributedBuilds [ pkgs.gzip ]
404408 ++ optionals (!isNix20) [ pkgs.openssl.bin ];
405409
406410 environment = cfg.envVars
nixos/modules/services/misc/nscd-sssd.confdeleted−36
@@ -1,36 +0,0 @@
1−server-user nscd
2−threads 1
3−paranoia no
4−debug-level 0
5−
6−enable-cache passwd yes
7−positive-time-to-live passwd 0
8−negative-time-to-live passwd 0
9−suggested-size passwd 211
10−check-files passwd yes
11−persistent passwd no
12−shared passwd yes
13−
14−enable-cache group yes
15−positive-time-to-live group 0
16−negative-time-to-live group 0
17−suggested-size group 211
18−check-files group yes
19−persistent group no
20−shared group yes
21−
22−enable-cache hosts yes
23−positive-time-to-live hosts 600
24−negative-time-to-live hosts 5
25−suggested-size hosts 211
26−check-files hosts yes
27−persistent hosts no
28−shared hosts yes
29−
30−enable-cache services yes
31−positive-time-to-live services 0
32−negative-time-to-live services 0
33−suggested-size services 211
34−check-files services yes
35−persistent services no
36−shared services yes
nixos/modules/services/misc/nzbget.nix+21−2
@@ -16,6 +16,20 @@ in {
1616 description = "The NZBGet package to use";
1717 };
1818
19+ dataDir = mkOption {
20+ type = types.str;
21+ default = "/var/lib/nzbget";
22+ description = "The directory where NZBGet stores its configuration files.";
23+ };
24+
25+ openFirewall = mkOption {
26+ type = types.bool;
27+ default = false;
28+ description = ''
29+ Open ports in the firewall for the NZBGet web interface
30+ '';
31+ };
32+
1933 user = mkOption {
2034 type = types.str;
2135 default = "nzbget";
@@ -40,7 +54,8 @@ in {
4054 p7zip
4155 ];
4256 preStart = ''
43− datadir=/var/lib/nzbget
57+ datadir=${cfg.dataDir}
58+ configfile=${cfg.dataDir}/nzbget.conf
4459 cfgtemplate=${cfg.package}/share/nzbget/nzbget.conf
4560 test -d $datadir || {
4661 echo "Creating nzbget data directory in $datadir"
@@ -60,7 +75,7 @@ in {
6075 '';
6176
6277 script = ''
63− configfile=/var/lib/nzbget/nzbget.conf
78+ configfile=${cfg.dataDir}/nzbget.conf
6479 args="--daemon --configfile $configfile"
6580 # The script in preStart (above) copies nzbget's config template to datadir on first run, containing paths that point to the nzbget derivation installed at the time.
6681 # These paths break when nzbget is upgraded & the original derivation is garbage collected. If such broken paths are found in the config file, override them to point to
@@ -86,6 +101,10 @@ in {
86101 };
87102 };
88103
104+ networking.firewall = mkIf cfg.openFirewall {
105+ allowedTCPPorts = [ 8989 ];
106+ };
107+
89108 users.users = mkIf (cfg.user == "nzbget") {
90109 nzbget = {
91110 group = cfg.group;
nixos/modules/services/misc/packagekit.nix−3
@@ -6,11 +6,8 @@ let
66
77 cfg = config.services.packagekit;
88
9− backend = "nix";
10−
119 packagekitConf = ''
1210[Daemon]
13−DefaultBackend=${backend}
1411KeepCache=false
1512 '';
1613
nixos/modules/services/misc/plex.nix+1−1
@@ -145,7 +145,7 @@ in
145145 PLEX_MEDIA_SERVER_HOME="${cfg.package}/usr/lib/plexmediaserver";
146146 PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6";
147147 PLEX_MEDIA_SERVER_TMPDIR="/tmp";
148− LD_LIBRARY_PATH="${cfg.package}/usr/lib/plexmediaserver";
148+ LD_LIBRARY_PATH="/run/opengl-driver/lib:${cfg.package}/usr/lib/plexmediaserver";
149149 LC_ALL="en_US.UTF-8";
150150 LANG="en_US.UTF-8";
151151 };
nixos/modules/services/misc/pykms.nix+27−40
@@ -5,20 +5,8 @@ with lib;
55let
66 cfg = config.services.pykms;
77
8− home = "/var/lib/pykms";
9−
10− services = {
11− serviceConfig = {
12− Restart = "on-failure";
13− RestartSec = "10s";
14− StartLimitInterval = "1min";
15− PrivateTmp = true;
16− ProtectSystem = "full";
17− ProtectHome = true;
18− };
19− };
20−
218in {
9+ meta.maintainers = with lib.maintainers; [ peterhoeg ];
2210
2311 options = {
2412 services.pykms = rec {
@@ -51,39 +39,38 @@ in {
5139 default = false;
5240 description = "Whether the listening port should be opened automatically.";
5341 };
42+
43+ memoryLimit = mkOption {
44+ type = types.str;
45+ default = "64M";
46+ description = "How much memory to use at most.";
47+ };
5448 };
5549 };
5650
5751 config = mkIf cfg.enable {
5852 networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewallPort [ cfg.port ];
5953
60− systemd.services = {
61− pykms = services // {
62− description = "Python KMS";
63− wantedBy = [ "multi-user.target" ];
64− serviceConfig = with pkgs; {
65− User = "pykms";
66− Group = "pykms";
67− ExecStartPre = "${getBin pykms}/bin/create_pykms_db.sh ${home}/clients.db";
68− ExecStart = "${getBin pykms}/bin/server.py ${optionalString cfg.verbose "--verbose"} ${cfg.listenAddress} ${toString cfg.port}";
69− WorkingDirectory = home;
70− MemoryLimit = "64M";
71− };
72− };
73− };
74−
75− users = {
76− users.pykms = {
77− name = "pykms";
78− group = "pykms";
79− home = home;
80− createHome = true;
81− uid = config.ids.uids.pykms;
82− description = "PyKMS daemon user";
83− };
84−
85− groups.pykms = {
86− gid = config.ids.gids.pykms;
54+ systemd.services.pykms = let
55+ home = "/var/lib/pykms";
56+ in {
57+ description = "Python KMS";
58+ after = [ "network.target" ];
59+ wantedBy = [ "multi-user.target" ];
60+ # python programs with DynamicUser = true require HOME to be set
61+ environment.HOME = home;
62+ serviceConfig = with pkgs; {
63+ DynamicUser = true;
64+ StateDirectory = baseNameOf home;
65+ ExecStartPre = "${getBin pykms}/bin/create_pykms_db.sh ${home}/clients.db";
66+ ExecStart = lib.concatStringsSep " " ([
67+ "${getBin pykms}/bin/server.py"
68+ cfg.listenAddress
69+ (toString cfg.port)
70+ ] ++ lib.optional cfg.verbose "--verbose");
71+ WorkingDirectory = home;
72+ Restart = "on-failure";
73+ MemoryLimit = cfg.memoryLimit;
8774 };
8875 };
8976 };
nixos/modules/services/misc/sonarr.nix+47−13
@@ -9,6 +9,32 @@ in
99 options = {
1010 services.sonarr = {
1111 enable = mkEnableOption "Sonarr";
12+
13+ dataDir = mkOption {
14+ type = types.str;
15+ default = "/var/lib/sonarr/.config/NzbDrone";
16+ description = "The directory where Sonarr stores its data files.";
17+ };
18+
19+ openFirewall = mkOption {
20+ type = types.bool;
21+ default = false;
22+ description = ''
23+ Open ports in the firewall for the Sonarr web interface
24+ '';
25+ };
26+
27+ user = mkOption {
28+ type = types.str;
29+ default = "sonarr";
30+ description = "User account under which Sonaar runs.";
31+ };
32+
33+ group = mkOption {
34+ type = types.str;
35+ default = "sonarr";
36+ description = "Group under which Sonaar runs.";
37+ };
1238 };
1339 };
1440
@@ -18,30 +44,38 @@ in
1844 after = [ "network.target" ];
1945 wantedBy = [ "multi-user.target" ];
2046 preStart = ''
21− test -d /var/lib/sonarr/ || {
22− echo "Creating sonarr data directory in /var/lib/sonarr/"
23− mkdir -p /var/lib/sonarr/
47+ test -d ${cfg.dataDir} || {
48+ echo "Creating sonarr data directory in ${cfg.dataDir}"
49+ mkdir -p ${cfg.dataDir}
2450 }
25− chown -R sonarr:sonarr /var/lib/sonarr/
26− chmod 0700 /var/lib/sonarr/
51+ chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
52+ chmod 0700 ${cfg.dataDir}
2753 '';
2854
2955 serviceConfig = {
3056 Type = "simple";
31− User = "sonarr";
32− Group = "sonarr";
57+ User = cfg.user;
58+ Group = cfg.group;
3359 PermissionsStartOnly = "true";
34− ExecStart = "${pkgs.sonarr}/bin/NzbDrone --no-browser";
60+ ExecStart = "${pkgs.sonarr}/bin/NzbDrone -nobrowser -data='${cfg.dataDir}'";
3561 Restart = "on-failure";
3662 };
3763 };
3864
39− users.users.sonarr = {
40− uid = config.ids.uids.sonarr;
41− home = "/var/lib/sonarr";
42− group = "sonarr";
65+ networking.firewall = mkIf cfg.openFirewall {
66+ allowedTCPPorts = [ 8989 ];
67+ };
68+
69+ users.users = mkIf (cfg.user == "sonarr") {
70+ sonarr = {
71+ group = cfg.group;
72+ home = cfg.dataDir;
73+ uid = config.ids.uids.sonarr;
74+ };
4375 };
44− users.groups.sonarr.gid = config.ids.gids.sonarr;
4576
77+ users.groups = mkIf (cfg.group == "sonarr") {
78+ sonarr.gid = config.ids.gids.sonarr;
79+ };
4680 };
4781}
nixos/modules/services/misc/sssd.nix−1
@@ -75,7 +75,6 @@ in {
7575 };
7676
7777 system.nssModules = optional cfg.enable pkgs.sssd;
78− services.nscd.config = builtins.readFile ./nscd-sssd.conf;
7978 services.dbus.packages = [ pkgs.sssd ];
8079 })
8180
nixos/modules/services/misc/weechat.nix+3−1
@@ -46,10 +46,12 @@ in
4646 Group = "weechat";
4747 RemainAfterExit = "yes";
4848 };
49− script = "exec ${pkgs.screen}/bin/screen -Dm -S ${cfg.sessionName} ${cfg.binary}";
49+ script = "exec ${config.security.wrapperDir}/screen -Dm -S ${cfg.sessionName} ${cfg.binary}";
5050 wantedBy = [ "multi-user.target" ];
5151 wants = [ "network.target" ];
5252 };
53+
54+ security.wrappers.screen.source = "${pkgs.screen}/bin/screen";
5355 };
5456
5557 meta.doc = ./weechat.xml;
nixos/modules/services/misc/weechat.xml+1−1
@@ -54,7 +54,7 @@
5454</programlisting>
5555 Now, the session can be re-attached like this:
5656<programlisting>
57−screen -r weechat-screen
57+screen -x weechat/weechat-screen
5858</programlisting>
5959 </para>
6060
nixos/modules/services/misc/zoneminder.nixnew file+362
@@ -0,0 +1,362 @@
1+{ config, lib, pkgs, ... }:
2+
3+let
4+ cfg = config.services.zoneminder;
5+ pkg = pkgs.zoneminder;
6+
7+ dirName = pkg.dirName;
8+
9+ user = "zoneminder";
10+ group = {
11+ nginx = config.services.nginx.group;
12+ none = user;
13+ }."${cfg.webserver}";
14+
15+ useNginx = cfg.webserver == "nginx";
16+
17+ defaultDir = "/var/lib/${user}";
18+ home = if useCustomDir then cfg.storageDir else defaultDir;
19+
20+ useCustomDir = !(builtins.isNull cfg.storageDir);
21+
22+ socket = "/run/phpfpm/${dirName}.sock";
23+
24+ zms = "/cgi-bin/zms";
25+
26+ dirs = dirList: [ dirName ] ++ map (e: "${dirName}/${e}") dirList;
27+
28+ cacheDirs = [ "swap" ];
29+ libDirs = [ "events" "exports" "images" "sounds" ];
30+
31+ dirStanzas = baseDir:
32+ lib.concatStringsSep "\n" (map (e:
33+ "ZM_DIR_${lib.toUpper e}=${baseDir}/${e}"
34+ ) libDirs);
35+
36+ defaultsFile = pkgs.writeText "60-defaults.conf" ''
37+ # 01-system-paths.conf
38+ ${dirStanzas home}
39+ ZM_PATH_ARP=${lib.getBin pkgs.nettools}/bin/arp
40+ ZM_PATH_LOGS=/var/log/${dirName}
41+ ZM_PATH_MAP=/dev/shm
42+ ZM_PATH_SOCKS=/run/${dirName}
43+ ZM_PATH_SWAP=/var/cache/${dirName}/swap
44+ ZM_PATH_ZMS=${zms}
45+
46+ # 02-multiserver.conf
47+ ZM_SERVER_HOST=
48+
49+ # Database
50+ ZM_DB_TYPE=mysql
51+ ZM_DB_HOST=${cfg.database.host}
52+ ZM_DB_NAME=${cfg.database.name}
53+ ZM_DB_USER=${cfg.database.username}
54+ ZM_DB_PASS=${cfg.database.password}
55+
56+ # Web
57+ ZM_WEB_USER=${user}
58+ ZM_WEB_GROUP=${group}
59+ '';
60+
61+ configFile = pkgs.writeText "80-nixos.conf" ''
62+ # You can override defaults here
63+
64+ ${cfg.extraConfig}
65+ '';
66+
67+ phpExtensions = with pkgs.phpPackages; [
68+ { pkg = apcu; name = "apcu"; }
69+ ];
70+
71+in {
72+ options = {
73+ services.zoneminder = with lib; {
74+ enable = lib.mkEnableOption ''
75+ ZoneMinder
76+ </para><para>
77+ If you intend to run the database locally, you should set
78+ `config.services.zoneminder.database.createLocally` to true. Otherwise,
79+ when set to `false` (the default), you will have to create the database
80+ and database user as well as populate the database yourself.
81+ '';
82+
83+ webserver = mkOption {
84+ type = types.enum [ "nginx" "none" ];
85+ default = "nginx";
86+ description = ''
87+ The webserver to configure for the PHP frontend.
88+ </para>
89+ <para>
90+
91+ Set it to `none` if you want to configure it yourself. PRs are welcome
92+ for support for other web servers.
93+ '';
94+ };
95+
96+ hostname = mkOption {
97+ type = types.str;
98+ default = "localhost";
99+ description = ''
100+ The hostname on which to listen.
101+ '';
102+ };
103+
104+ port = mkOption {
105+ type = types.int;
106+ default = 8095;
107+ description = ''
108+ The port on which to listen.
109+ '';
110+ };
111+
112+ openFirewall = mkOption {
113+ type = types.bool;
114+ default = false;
115+ description = ''
116+ Open the firewall port(s).
117+ '';
118+ };
119+
120+ database = {
121+ createLocally = mkOption {
122+ type = types.bool;
123+ default = false;
124+ description = ''
125+ Create the database and database user locally.
126+ '';
127+ };
128+
129+ host = mkOption {
130+ type = types.str;
131+ default = "localhost";
132+ description = ''
133+ Hostname hosting the database.
134+ '';
135+ };
136+
137+ name = mkOption {
138+ type = types.str;
139+ default = "zm";
140+ description = ''
141+ Name of database.
142+ '';
143+ };
144+
145+ username = mkOption {
146+ type = types.str;
147+ default = "zmuser";
148+ description = ''
149+ Username for accessing the database.
150+ '';
151+ };
152+
153+ password = mkOption {
154+ type = types.str;
155+ default = "zmpass";
156+ description = ''
157+ Username for accessing the database.
158+ '';
159+ };
160+ };
161+
162+ cameras = mkOption {
163+ type = types.int;
164+ default = 1;
165+ description = ''
166+ Set this to the number of cameras you expect to support.
167+ '';
168+ };
169+
170+ storageDir = mkOption {
171+ type = types.nullOr types.str;
172+ default = null;
173+ example = "/storage/tank";
174+ description = ''
175+ ZoneMinder can generate quite a lot of data, so in case you don't want
176+ to use the default ${home}, you can override the path here.
177+ '';
178+ };
179+
180+ extraConfig = mkOption {
181+ type = types.lines;
182+ default = "";
183+ description = ''
184+ Additional configuration added verbatim to the configuration file.
185+ '';
186+ };
187+ };
188+ };
189+
190+ config = lib.mkIf cfg.enable {
191+
192+ environment.etc = {
193+ "zoneminder/60-defaults.conf".source = defaultsFile;
194+ "zoneminder/80-nixos.conf".source = configFile;
195+ };
196+
197+ networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ];
198+
199+ services = {
200+ fcgiwrap = lib.mkIf useNginx {
201+ enable = true;
202+ preforkProcesses = cfg.cameras;
203+ inherit user group;
204+ };
205+
206+ mysql = lib.mkIf cfg.database.createLocally {
207+ ensureDatabases = [ cfg.database.name ];
208+ ensureUsers = {
209+ name = cfg.database.username;
210+ ensurePermissions = [
211+ { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }
212+ ];
213+ initialDatabases = [
214+ { inherit (cfg.database) name; schema = "${pkg}/share/zoneminder/db/zm_create.sql"; }
215+ ];
216+ };
217+ };
218+
219+ nginx = lib.mkIf useNginx {
220+ enable = true;
221+ virtualHosts = {
222+ "${cfg.hostname}" = {
223+ default = true;
224+ root = "${pkg}/share/zoneminder/www";
225+ listen = [ { addr = "0.0.0.0"; inherit (cfg) port; } ];
226+ extraConfig = let
227+ fcgi = config.services.fcgiwrap;
228+ in ''
229+ index index.php;
230+
231+ location / {
232+ try_files $uri $uri/ /index.php?$args =404;
233+
234+ location ~ /api/(css|img|ico) {
235+ rewrite ^/api(.+)$ /api/app/webroot/$1 break;
236+ try_files $uri $uri/ =404;
237+ }
238+
239+ location ~ \.(gif|ico|jpg|jpeg|png)$ {
240+ access_log off;
241+ expires 30d;
242+ }
243+
244+ location /api {
245+ rewrite ^/api(.+)$ /api/app/webroot/index.php?p=$1 last;
246+ }
247+
248+ location /cgi-bin {
249+ gzip off;
250+
251+ include ${pkgs.nginx}/conf/fastcgi_params;
252+ fastcgi_param SCRIPT_FILENAME ${pkg}/libexec/zoneminder/${zms};
253+ fastcgi_param HTTP_PROXY "";
254+ fastcgi_intercept_errors on;
255+
256+ fastcgi_pass ${fcgi.socketType}:${fcgi.socketAddress};
257+ }
258+
259+ location /cache {
260+ alias /var/cache/${dirName};
261+ }
262+
263+ location ~ \.php$ {
264+ try_files $uri =404;
265+ fastcgi_index index.php;
266+
267+ include ${pkgs.nginx}/conf/fastcgi_params;
268+ fastcgi_param SCRIPT_FILENAME $request_filename;
269+ fastcgi_param HTTP_PROXY "";
270+
271+ fastcgi_pass unix:${socket};
272+ }
273+ }
274+ '';
275+ };
276+ };
277+ };
278+
279+ phpfpm = lib.mkIf useNginx {
280+ phpOptions = ''
281+ date.timezone = "${config.time.timeZone}"
282+
283+ ${lib.concatStringsSep "\n" (map (e:
284+ "extension=${e.pkg}/lib/php/extensions/${e.name}.so") phpExtensions)}
285+ '';
286+ pools.zoneminder = {
287+ listen = socket;
288+ extraConfig = ''
289+ user = ${user}
290+ group = ${group}
291+
292+ listen.owner = ${user}
293+ listen.group = ${group}
294+ listen.mode = 0660
295+
296+ pm = dynamic
297+ pm.start_servers = 1
298+ pm.min_spare_servers = 1
299+ pm.max_spare_servers = 2
300+ pm.max_requests = 500
301+ pm.max_children = 5
302+ pm.status_path = /$pool-status
303+ ping.path = /$pool-ping
304+ '';
305+ };
306+ };
307+ };
308+
309+ systemd.services = {
310+ zoneminder = with pkgs; rec {
311+ inherit (zoneminder.meta) description;
312+ documentation = [ "https://zoneminder.readthedocs.org/en/latest/" ];
313+ path = [
314+ coreutils
315+ procps
316+ psmisc
317+ ];
318+ after = [ "mysql.service" "nginx.service" ];
319+ wantedBy = [ "multi-user.target" ];
320+ restartTriggers = [ defaultsFile configFile ];
321+ preStart = lib.mkIf useCustomDir ''
322+ install -dm775 -o ${user} -g ${group} ${cfg.storageDir}/{${lib.concatStringsSep "," libDirs}}
323+ '';
324+ serviceConfig = {
325+ User = user;
326+ Group = group;
327+ SupplementaryGroups = [ "video" ];
328+ ExecStart = "${zoneminder}/bin/zmpkg.pl start";
329+ ExecStop = "${zoneminder}/bin/zmpkg.pl stop";
330+ ExecReload = "${zoneminder}/bin/zmpkg.pl restart";
331+ PIDFile = "/run/${dirName}/zm.pid";
332+ Type = "forking";
333+ Restart = "on-failure";
334+ RestartSec = "10s";
335+ CacheDirectory = dirs cacheDirs;
336+ RuntimeDirectory = dirName;
337+ ReadWriteDirectories = lib.mkIf useCustomDir [ cfg.storageDir ];
338+ StateDirectory = dirs (if useCustomDir then [] else libDirs);
339+ LogsDirectory = dirName;
340+ PrivateTmp = true;
341+ ProtectSystem = "strict";
342+ ProtectKernelTunables = true;
343+ SystemCallArchitectures = "native";
344+ NoNewPrivileges = true;
345+ };
346+ };
347+ };
348+
349+ users.groups."${user}" = {
350+ gid = config.ids.gids.zoneminder;
351+ };
352+
353+ users.users."${user}" = {
354+ uid = config.ids.uids.zoneminder;
355+ group = user;
356+ inherit home;
357+ inherit (pkgs.zoneminder.meta) description;
358+ };
359+ };
360+
361+ meta.maintainers = with lib.maintainers; [ peterhoeg ];
362+}
nixos/modules/services/monitoring/alerta.nixnew file+116
@@ -0,0 +1,116 @@
1+{ options, config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.alerta;
7+
8+ alertaConf = pkgs.writeTextFile {
9+ name = "alertad.conf";
10+ text = ''
11+ DATABASE_URL = '${cfg.databaseUrl}'
12+ DATABASE_NAME = '${cfg.databaseName}'
13+ LOG_FILE = '${cfg.logDir}/alertad.log'
14+ LOG_FORMAT = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
15+ CORS_ORIGINS = [ ${concatMapStringsSep ", " (s: "\"" + s + "\"") cfg.corsOrigins} ];
16+ AUTH_REQUIRED = ${if cfg.authenticationRequired then "True" else "False"}
17+ SIGNUP_ENABLED = ${if cfg.signupEnabled then "True" else "False"}
18+ ${cfg.extraConfig}
19+ '';
20+ };
21+in
22+{
23+ options.services.alerta = {
24+ enable = mkEnableOption "alerta";
25+
26+ port = mkOption {
27+ type = types.int;
28+ default = 5000;
29+ description = "Port of Alerta";
30+ };
31+
32+ bind = mkOption {
33+ type = types.str;
34+ default = "0.0.0.0";
35+ example = literalExample "0.0.0.0";
36+ description = "Address to bind to. The default is to bind to all addresses";
37+ };
38+
39+ logDir = mkOption {
40+ type = types.path;
41+ description = "Location where the logfiles are stored";
42+ default = "/var/log/alerta";
43+ };
44+
45+ databaseUrl = mkOption {
46+ type = types.str;
47+ description = "URL of the MongoDB or PostgreSQL database to connect to";
48+ default = "mongodb://localhost";
49+ example = "mongodb://localhost";
50+ };
51+
52+ databaseName = mkOption {
53+ type = types.str;
54+ description = "Name of the database instance to connect to";
55+ default = "monitoring";
56+ example = "monitoring";
57+ };
58+
59+ corsOrigins = mkOption {
60+ type = types.listOf types.str;
61+ description = "List of URLs that can access the API for Cross-Origin Resource Sharing (CORS)";
62+ example = [ "http://localhost" "http://localhost:5000" ];
63+ default = [ "http://localhost" "http://localhost:5000" ];
64+ };
65+
66+ authenticationRequired = mkOption {
67+ type = types.bool;
68+ description = "Whether users must authenticate when using the web UI or command-line tool";
69+ default = false;
70+ };
71+
72+ signupEnabled = mkOption {
73+ type = types.bool;
74+ description = "Whether to prevent sign-up of new users via the web UI";
75+ default = true;
76+ };
77+
78+ extraConfig = mkOption {
79+ description = "These lines go into alertad.conf verbatim.";
80+ default = "";
81+ type = types.lines;
82+ };
83+ };
84+
85+ config = mkIf cfg.enable {
86+ systemd.services.alerta = {
87+ description = "Alerta Monitoring System";
88+ wantedBy = [ "multi-user.target" ];
89+ after = [ "networking.target" ];
90+ environment = {
91+ ALERTA_SVR_CONF_FILE = alertaConf;
92+ };
93+ serviceConfig = {
94+ ExecStart = "${pkgs.python36Packages.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}";
95+ User = "alerta";
96+ Group = "alerta";
97+ PermissionsStartOnly = true;
98+ };
99+ preStart = ''
100+ mkdir -p ${cfg.logDir}
101+ chown alerta:alerta ${cfg.logDir}
102+ '';
103+ };
104+
105+ environment.systemPackages = [ pkgs.python36Packages.alerta ];
106+
107+ users.users.alerta = {
108+ uid = config.ids.uids.alerta;
109+ description = "Alerta user";
110+ };
111+
112+ users.groups.alerta = {
113+ gid = config.ids.gids.alerta;
114+ };
115+ };
116+}
nixos/modules/services/monitoring/apcupsd.nix+1−1
@@ -180,7 +180,7 @@ in
180180 serviceConfig = {
181181 Type = "oneshot";
182182 ExecStart = "${pkgs.apcupsd}/bin/apcupsd --killpower -f ${configFile}";
183− TimeoutSec = 0;
183+ TimeoutSec = "infinity";
184184 StandardOutput = "tty";
185185 RemainAfterExit = "yes";
186186 };
nixos/modules/services/monitoring/datadog-agent.nix+22−2
@@ -7,7 +7,7 @@ let
77
88 ddConf = {
99 dd_url = "https://app.datadoghq.com";
10− skip_ssl_validation = "no";
10+ skip_ssl_validation = false;
1111 confd_path = "/etc/datadog-agent/conf.d";
1212 additional_checksd = "/etc/datadog-agent/checks.d";
1313 use_dogstatsd = true;
@@ -16,6 +16,7 @@ let
1616 // optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; }
1717 // optionalAttrs (cfg.tags != null ) { tags = concatStringsSep ", " cfg.tags; }
1818 // optionalAttrs (cfg.enableLiveProcessCollection) { process_config = { enabled = "true"; }; }
19+ // optionalAttrs (cfg.enableTraceAgent) { apm_config = { enabled = true; }; }
1920 // cfg.extraConfig;
2021
2122 # Generate Datadog configuration files for each configured checks.
@@ -132,6 +133,15 @@ in {
132133 default = false;
133134 type = types.bool;
134135 };
136+
137+ enableTraceAgent = mkOption {
138+ description = ''
139+ Whether to enable the trace agent.
140+ '';
141+ default = false;
142+ type = types.bool;
143+ };
144+
135145 checks = mkOption {
136146 description = ''
137147 Configuration for all Datadog checks. Keys of this attribute
@@ -176,7 +186,7 @@ in {
176186 type = types.attrs;
177187 default = {
178188 init_config = {};
179− instances = [ { use-mount = "no"; } ];
189+ instances = [ { use_mount = "false"; } ];
180190 };
181191 };
182192
@@ -244,6 +254,16 @@ in {
244254 ${pkgs.datadog-process-agent}/bin/agent --config /etc/datadog-agent/datadog.yaml
245255 '';
246256 });
257+
258+ datadog-trace-agent = lib.mkIf cfg.enableTraceAgent (makeService {
259+ description = "Datadog Trace Agent";
260+ path = [ ];
261+ script = ''
262+ export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile})
263+ ${pkgs.datadog-trace-agent}/bin/trace-agent -config /etc/datadog-agent/datadog.yaml
264+ '';
265+ });
266+
247267 };
248268
249269 environment.etc = etcfiles;
nixos/modules/services/monitoring/grafana-reporter.nixnew file+66
@@ -0,0 +1,66 @@
1+{ options, config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.grafana_reporter;
7+
8+in {
9+ options.services.grafana_reporter = {
10+ enable = mkEnableOption "grafana_reporter";
11+
12+ grafana = {
13+ protocol = mkOption {
14+ description = "Grafana protocol.";
15+ default = "http";
16+ type = types.enum ["http" "https"];
17+ };
18+ addr = mkOption {
19+ description = "Grafana address.";
20+ default = "127.0.0.1";
21+ type = types.str;
22+ };
23+ port = mkOption {
24+ description = "Grafana port.";
25+ default = 3000;
26+ type = types.int;
27+ };
28+
29+ };
30+ addr = mkOption {
31+ description = "Listening address.";
32+ default = "127.0.0.1";
33+ type = types.str;
34+ };
35+
36+ port = mkOption {
37+ description = "Listening port.";
38+ default = 8686;
39+ type = types.int;
40+ };
41+
42+ templateDir = mkOption {
43+ description = "Optional template directory to use custom tex templates";
44+ default = "${pkgs.grafana_reporter}";
45+ type = types.str;
46+ };
47+ };
48+
49+ config = mkIf cfg.enable {
50+ systemd.services.grafana_reporter = {
51+ description = "Grafana Reporter Service Daemon";
52+ wantedBy = ["multi-user.target"];
53+ after = ["network.target"];
54+ serviceConfig = let
55+ args = lib.concatSepString " " [
56+ "-proto ${cfg.grafana.protocol}://"
57+ "-ip ${cfg.grafana.addr}:${toString cfg.grafana.port}"
58+ "-port :${toString cfg.port}"
59+ "-templates ${cfg.templateDir}"
60+ ];
61+ in {
62+ ExecStart = "${pkgs.grafana_reporter.bin}/bin/grafana-reporter ${args}";
63+ };
64+ };
65+ };
66+}
nixos/modules/services/monitoring/grafana.nix+113−7
@@ -4,6 +4,7 @@ with lib;
44
55let
66 cfg = config.services.grafana;
7+ opt = options.services.grafana;
78
89 envOptions = {
910 PATHS_DATA = cfg.dataDir;
@@ -41,6 +42,12 @@ let
4142 AUTH_ANONYMOUS_ORG_ROLE = cfg.auth.anonymous.org_role;
4243
4344 ANALYTICS_REPORTING_ENABLED = boolToString cfg.analytics.reporting.enable;
45+
46+ SMTP_ENABLE = boolToString cfg.smtp.enable;
47+ SMTP_HOST = cfg.smtp.host;
48+ SMTP_USER = cfg.smtp.user;
49+ SMTP_PASSWORD = cfg.smtp.password;
50+ SMTP_FROM_ADDRESS = cfg.smtp.fromAddress;
4451 } // cfg.extraOptions;
4552
4653in {
@@ -134,11 +141,23 @@ in {
134141 };
135142
136143 password = mkOption {
137− description = "Database password.";
144+ description = ''
145+ Database password.
146+ This option is mutual exclusive with the passwordFile option.
147+ '';
138148 default = "";
139149 type = types.str;
140150 };
141151
152+ passwordFile = mkOption {
153+ description = ''
154+ File that containts the database password.
155+ This option is mutual exclusive with the password option.
156+ '';
157+ default = null;
158+ type = types.nullOr types.path;
159+ };
160+
142161 path = mkOption {
143162 description = "Database path.";
144163 default = "${cfg.dataDir}/data/grafana.db";
@@ -150,8 +169,9 @@ in {
150169 Sets the maximum amount of time (in seconds) a connection may be reused.
151170 For MySQL this setting should be shorter than the `wait_timeout' variable.
152171 '';
153− default = 14400;
154− type = types.int;
172+ default = "unlimited";
173+ example = 14400;
174+ type = types.either types.int (types.enum [ "unlimited" ]);
155175 };
156176 };
157177
@@ -163,16 +183,69 @@ in {
163183 };
164184
165185 adminPassword = mkOption {
166− description = "Default admin password.";
186+ description = ''
187+ Default admin password.
188+ This option is mutual exclusive with the adminPasswordFile option.
189+ '';
167190 default = "admin";
168191 type = types.str;
169192 };
170193
194+ adminPasswordFile = mkOption {
195+ description = ''
196+ Default admin password.
197+ This option is mutual exclusive with the <literal>adminPassword</literal> option.
198+ '';
199+ default = null;
200+ type = types.nullOr types.path;
201+ };
202+
171203 secretKey = mkOption {
172204 description = "Secret key used for signing.";
173205 default = "SW2YcwTIb9zpOOhoPsMm";
174206 type = types.str;
175207 };
208+
209+ secretKeyFile = mkOption {
210+ description = "Secret key used for signing.";
211+ default = null;
212+ type = types.nullOr types.path;
213+ };
214+ };
215+
216+ smtp = {
217+ enable = mkEnableOption "smtp";
218+ host = mkOption {
219+ description = "Host to connect to";
220+ default = "localhost:25";
221+ type = types.str;
222+ };
223+ user = mkOption {
224+ description = "User used for authentication";
225+ default = "";
226+ type = types.str;
227+ };
228+ password = mkOption {
229+ description = ''
230+ Password used for authentication.
231+ This option is mutual exclusive with the passwordFile option.
232+ '';
233+ default = "";
234+ type = types.str;
235+ };
236+ passwordFile = mkOption {
237+ description = ''
238+ Password used for authentication.
239+ This option is mutual exclusive with the password option.
240+ '';
241+ default = null;
242+ type = types.nullOr types.path;
243+ };
244+ fromAddress = mkOption {
245+ description = "Email address used for sending";
246+ default = "admin@grafana.localhost";
247+ type = types.str;
248+ };
176249 };
177250
178251 users = {
@@ -241,12 +314,31 @@ in {
241314
242315 config = mkIf cfg.enable {
243316 warnings = optional (
244− cfg.database.password != options.services.grafana.database.password.default ||
245− cfg.security.adminPassword != options.services.grafana.security.adminPassword.default
317+ cfg.database.password != opt.database.password.default ||
318+ cfg.security.adminPassword != opt.security.adminPassword.default
246319 ) "Grafana passwords will be stored as plaintext in the Nix store!";
247320
248321 environment.systemPackages = [ cfg.package ];
249322
323+ assertions = [
324+ {
325+ assertion = cfg.database.password != opt.database.password.default -> cfg.database.passwordFile == null;
326+ message = "Cannot set both password and passwordFile";
327+ }
328+ {
329+ assertion = cfg.security.adminPassword != opt.security.adminPassword.default -> cfg.security.adminPasswordFile == null;
330+ message = "Cannot set both adminPassword and adminPasswordFile";
331+ }
332+ {
333+ assertion = cfg.security.secretKeyFile != opt.security.secretKeyFile.default -> cfg.security.secretKeyFile == null;
334+ message = "Cannot set both secretKey and secretKeyFile";
335+ }
336+ {
337+ assertion = cfg.smtp.password != opt.smtp.password.default -> cfg.smtp.passwordFile == null;
338+ message = "Cannot set both password and secretKeyFile";
339+ }
340+ ];
341+
250342 systemd.services.grafana = {
251343 description = "Grafana Service Daemon";
252344 wantedBy = ["multi-user.target"];
@@ -254,8 +346,22 @@ in {
254346 environment = {
255347 QT_QPA_PLATFORM = "offscreen";
256348 } // mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions;
349+ script = ''
350+ ${optionalString (cfg.database.passwordFile != null) ''
351+ export GF_DATABASE_PASSWORD="$(cat ${escapeShellArg cfg.database.passwordFile})"
352+ ''}
353+ ${optionalString (cfg.security.adminPasswordFile != null) ''
354+ export GF_SECURITY_ADMIN_PASSWORD="$(cat ${escapeShellArg cfg.security.adminPasswordFile})"
355+ ''}
356+ ${optionalString (cfg.security.secretKeyFile != null) ''
357+ export GF_SECURITY_SECRET_KEY="$(cat ${escapeShellArg cfg.security.secretKeyFile})"
358+ ''}
359+ ${optionalString (cfg.smtp.passwordFile != null) ''
360+ export GF_SMTP_PASSWORD="$(cat ${escapeShellArg cfg.smtp.passwordFile})"
361+ ''}
362+ exec ${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}
363+ '';
257364 serviceConfig = {
258− ExecStart = "${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir}";
259365 WorkingDirectory = cfg.dataDir;
260366 User = "grafana";
261367 };
nixos/modules/services/monitoring/kapacitor.nixnew file+192
@@ -0,0 +1,192 @@
1+{ options, config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.kapacitor;
7+
8+ kapacitorConf = pkgs.writeTextFile {
9+ name = "kapacitord.conf";
10+ text = ''
11+ hostname="${config.networking.hostName}"
12+ data_dir="${cfg.dataDir}"
13+
14+ [http]
15+ bind-address = "${cfg.bind}:${toString cfg.port}"
16+ log-enabled = false
17+ auth-enabled = false
18+
19+ [task]
20+ dir = "${cfg.dataDir}/tasks"
21+ snapshot-interval = "${cfg.taskSnapshotInterval}"
22+
23+ [replay]
24+ dir = "${cfg.dataDir}/replay"
25+
26+ [storage]
27+ boltdb = "${cfg.dataDir}/kapacitor.db"
28+
29+ ${optionalString (cfg.loadDirectory != null) ''
30+ [load]
31+ enabled = true
32+ dir = "${cfg.loadDirectory}"
33+ ''}
34+
35+ ${optionalString (cfg.defaultDatabase.enable) ''
36+ [[influxdb]]
37+ name = "default"
38+ enabled = true
39+ default = true
40+ urls = [ "${cfg.defaultDatabase.url}" ]
41+ username = "${cfg.defaultDatabase.username}"
42+ password = "${cfg.defaultDatabase.password}"
43+ ''}
44+
45+ ${optionalString (cfg.alerta.enable) ''
46+ [alerta]
47+ enabled = true
48+ url = "${cfg.alerta.url}"
49+ token = "${cfg.alerta.token}"
50+ environment = "${cfg.alerta.environment}"
51+ origin = "${cfg.alerta.origin}"
52+ ''}
53+
54+ ${cfg.extraConfig}
55+ '';
56+ };
57+in
58+{
59+ options.services.kapacitor = {
60+ enable = mkEnableOption "kapacitor";
61+
62+ dataDir = mkOption {
63+ type = types.path;
64+ example = "/var/lib/kapacitor";
65+ default = "/var/lib/kapacitor";
66+ description = "Location where Kapacitor stores its state";
67+ };
68+
69+ port = mkOption {
70+ type = types.int;
71+ default = 9092;
72+ description = "Port of Kapacitor";
73+ };
74+
75+ bind = mkOption {
76+ type = types.str;
77+ default = "";
78+ example = literalExample "0.0.0.0";
79+ description = "Address to bind to. The default is to bind to all addresses";
80+ };
81+
82+ extraConfig = mkOption {
83+ description = "These lines go into kapacitord.conf verbatim.";
84+ default = "";
85+ type = types.lines;
86+ };
87+
88+ user = mkOption {
89+ type = types.str;
90+ default = "kapacitor";
91+ description = "User account under which Kapacitor runs";
92+ };
93+
94+ group = mkOption {
95+ type = types.str;
96+ default = "kapacitor";
97+ description = "Group under which Kapacitor runs";
98+ };
99+
100+ taskSnapshotInterval = mkOption {
101+ type = types.str;
102+ description = "Specifies how often to snapshot the task state (in InfluxDB time units)";
103+ default = "1m0s";
104+ example = "1m0s";
105+ };
106+
107+ loadDirectory = mkOption {
108+ type = types.nullOr types.path;
109+ description = "Directory where to load services from, such as tasks, templates and handlers (or null to disable service loading on startup)";
110+ default = null;
111+ };
112+
113+ defaultDatabase = {
114+ enable = mkEnableOption "kapacitor.defaultDatabase";
115+
116+ url = mkOption {
117+ description = "The URL to an InfluxDB server that serves as the default database";
118+ example = "http://localhost:8086";
119+ type = types.string;
120+ };
121+
122+ username = mkOption {
123+ description = "The username to connect to the remote InfluxDB server";
124+ type = types.string;
125+ };
126+
127+ password = mkOption {
128+ description = "The password to connect to the remote InfluxDB server";
129+ type = types.string;
130+ };
131+ };
132+
133+ alerta = {
134+ enable = mkEnableOption "kapacitor alerta integration";
135+
136+ url = mkOption {
137+ description = "The URL to the Alerta REST API";
138+ default = "http://localhost:5000";
139+ example = "http://localhost:5000";
140+ type = types.string;
141+ };
142+
143+ token = mkOption {
144+ description = "Default Alerta authentication token";
145+ type = types.str;
146+ default = "";
147+ };
148+
149+ environment = mkOption {
150+ description = "Default Alerta environment";
151+ type = types.str;
152+ default = "Production";
153+ };
154+
155+ origin = mkOption {
156+ description = "Default origin of alert";
157+ type = types.str;
158+ default = "kapacitor";
159+ };
160+ };
161+ };
162+
163+ config = mkIf cfg.enable {
164+ environment.systemPackages = [ pkgs.kapacitor ];
165+
166+ systemd.services.kapacitor = {
167+ description = "Kapacitor Real-Time Stream Processing Engine";
168+ wantedBy = [ "multi-user.target" ];
169+ after = [ "networking.target" ];
170+ serviceConfig = {
171+ ExecStart = "${pkgs.kapacitor}/bin/kapacitord -config ${kapacitorConf}";
172+ User = "kapacitor";
173+ Group = "kapacitor";
174+ PermissionsStartOnly = true;
175+ };
176+ preStart = ''
177+ mkdir -p ${cfg.dataDir}
178+ chown ${cfg.user}:${cfg.group} ${cfg.dataDir}
179+ '';
180+ };
181+
182+ users.users.kapacitor = {
183+ uid = config.ids.uids.kapacitor;
184+ description = "Kapacitor user";
185+ home = cfg.dataDir;
186+ };
187+
188+ users.groups.kapacitor = {
189+ gid = config.ids.gids.kapacitor;
190+ };
191+ };
192+}
nixos/modules/services/monitoring/monit.nix+15−18
@@ -1,33 +1,30 @@
1−# Monit system watcher
2−# http://mmonit.org/monit/
3−
41{config, pkgs, lib, ...}:
52
6−let inherit (lib) mkOption mkIf;
3+with lib;
4+
5+let
6+ cfg = config.services.monit;
77in
88
99{
10− options = {
11− services.monit = {
12− enable = mkOption {
13− default = false;
14− description = ''
15− Whether to run Monit system watcher.
16− '';
17− };
18− config = mkOption {
19− default = "";
20− description = "monitrc content";
21− };
10+ options.services.monit = {
11+
12+ enable = mkEnableOption "Monit";
13+
14+ config = mkOption {
15+ type = types.lines;
16+ default = "";
17+ description = "monitrc content";
2218 };
19+
2320 };
2421
25− config = mkIf config.services.monit.enable {
22+ config = mkIf cfg.enable {
2623
2724 environment.systemPackages = [ pkgs.monit ];
2825
2926 environment.etc."monitrc" = {
30− text = config.services.monit.config;
27+ text = cfg.config;
3128 mode = "0400";
3229 };
3330
nixos/modules/services/monitoring/munin.nix+6−6
@@ -5,8 +5,8 @@
55
66# TODO: support fastcgi
77# http://munin-monitoring.org/wiki/CgiHowto2
8−# spawn-fcgi -s /var/run/munin/fastcgi-graph.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-graph
9−# spawn-fcgi -s /var/run/munin/fastcgi-html.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-html
8+# spawn-fcgi -s /run/munin/fastcgi-graph.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-graph
9+# spawn-fcgi -s /run/munin/fastcgi-html.sock -U www-data -u munin -g munin /usr/lib/munin/cgi/munin-cgi-html
1010# https://paste.sh/vofcctHP#-KbDSXVeWoifYncZmLfZzgum
1111# nginx http://munin.readthedocs.org/en/latest/example/webserver/nginx.html
1212
@@ -22,7 +22,7 @@ let
2222 dbdir /var/lib/munin
2323 htmldir /var/www/munin
2424 logdir /var/log/munin
25− rundir /var/run/munin
25+ rundir /run/munin
2626
2727 ${cronCfg.extraGlobalConfig}
2828
@@ -170,7 +170,7 @@ in
170170 wantedBy = [ "multi-user.target" ];
171171 path = with pkgs; [ munin smartmontools "/run/current-system/sw" "/run/wrappers" ];
172172 environment.MUNIN_LIBDIR = "${pkgs.munin}/lib";
173− environment.MUNIN_PLUGSTATE = "/var/run/munin";
173+ environment.MUNIN_PLUGSTATE = "/run/munin";
174174 environment.MUNIN_LOGDIR = "/var/log/munin";
175175 preStart = ''
176176 echo "updating munin plugins..."
@@ -188,7 +188,7 @@ in
188188 };
189189
190190 # munin_stats plugin breaks as of 2.0.33 when this doesn't exist
191− systemd.tmpfiles.rules = [ "d /var/run/munin 0755 munin munin -" ];
191+ systemd.tmpfiles.rules = [ "d /run/munin 0755 munin munin -" ];
192192
193193 }) (mkIf cronCfg.enable {
194194
@@ -210,7 +210,7 @@ in
210210 };
211211
212212 systemd.tmpfiles.rules = [
213− "d /var/run/munin 0755 munin munin -"
213+ "d /run/munin 0755 munin munin -"
214214 "d /var/log/munin 0755 munin munin -"
215215 "d /var/www/munin 0755 munin munin -"
216216 "d /var/lib/munin 0755 munin munin -"
nixos/modules/services/monitoring/netdata.nix+41−10
@@ -12,7 +12,7 @@ let
1212
1313 localConfig = {
1414 global = {
15− "plugins directory" = "${wrappedPlugins}/libexec/netdata/plugins.d ${pkgs.netdata}/libexec/netdata/plugins.d";
15+ "plugins directory" = "${pkgs.netdata}/libexec/netdata/plugins.d ${wrappedPlugins}/libexec/netdata/plugins.d";
1616 };
1717 web = {
1818 "web files owner" = "root";
@@ -53,6 +53,31 @@ in {
5353 '';
5454 };
5555
56+ python = {
57+ enable = mkOption {
58+ type = types.bool;
59+ default = true;
60+ description = ''
61+ Whether to enable python-based plugins
62+ '';
63+ };
64+ extraPackages = mkOption {
65+ default = ps: [];
66+ defaultText = "ps: []";
67+ example = literalExample ''
68+ ps: [
69+ ps.psycopg2
70+ ps.docker
71+ ps.dnspython
72+ ]
73+ '';
74+ description = ''
75+ Extra python packages available at runtime
76+ to enable additional python plugins.
77+ '';
78+ };
79+ };
80+
5681 config = mkOption {
5782 type = types.attrsOf types.attrs;
5883 default = {};
@@ -74,21 +99,27 @@ in {
7499 message = "Cannot specify both config and configText";
75100 }
76101 ];
102+
103+ systemd.tmpfiles.rules = [
104+ "d /var/cache/netdata 0755 ${cfg.user} ${cfg.group} -"
105+ "Z /var/cache/netdata - ${cfg.user} ${cfg.group} -"
106+ "d /var/log/netdata 0755 ${cfg.user} ${cfg.group} -"
107+ "Z /var/log/netdata - ${cfg.user} ${cfg.group} -"
108+ "d /var/lib/netdata 0755 ${cfg.user} ${cfg.group} -"
109+ "Z /var/lib/netdata - ${cfg.user} ${cfg.group} -"
110+ "d /etc/netdata 0755 ${cfg.user} ${cfg.group} -"
111+ "Z /etc/netdata - ${cfg.user} ${cfg.group} -"
112+ ];
77113 systemd.services.netdata = {
78− path = with pkgs; [ gawk curl ];
79114 description = "Real time performance monitoring";
80115 after = [ "network.target" ];
81116 wantedBy = [ "multi-user.target" ];
82− preStart = concatStringsSep "\n" (map (dir: ''
83− mkdir -vp ${dir}
84− chmod 750 ${dir}
85− chown -R ${cfg.user}:${cfg.group} ${dir}
86− '') [ "/var/cache/netdata"
87− "/var/log/netdata"
88− "/var/lib/netdata" ]);
117+ path = (with pkgs; [ gawk curl ]) ++ lib.optional cfg.python.enable
118+ (pkgs.python3.withPackages cfg.python.extraPackages);
89119 serviceConfig = {
90120 User = cfg.user;
91121 Group = cfg.group;
122+ Environment="PYTHONPATH=${pkgs.netdata}/libexec/netdata/python.d/python_modules";
92123 PermissionsStartOnly = true;
93124 ExecStart = "${pkgs.netdata}/bin/netdata -D -c ${configFile}";
94125 TimeoutStopSec = 60;
@@ -96,7 +127,7 @@ in {
96127 };
97128
98129 security.wrappers."apps.plugin" = {
99− source = "${pkgs.netdata}/libexec/netdata/plugins.d/apps.plugin";
130+ source = "${pkgs.netdata}/libexec/netdata/plugins.d/apps.plugin.org";
100131 capabilities = "cap_dac_read_search,cap_sys_ptrace+ep";
101132 owner = cfg.user;
102133 group = cfg.group;
nixos/modules/services/monitoring/osquery.nix+1−1
@@ -78,7 +78,7 @@ in
7878 mkdir -p "$(dirname ${escapeShellArg cfg.databasePath})"
7979 '';
8080 serviceConfig = {
81− TimeoutStartSec = 0;
81+ TimeoutStartSec = "infinity";
8282 ExecStart = "${pkgs.osquery}/bin/osqueryd --logger_path ${escapeShellArg cfg.loggerPath} --pidfile ${escapeShellArg cfg.pidfile} --database_path ${escapeShellArg cfg.databasePath}";
8383 KillMode = "process";
8484 KillSignal = "SIGTERM";
nixos/modules/services/monitoring/prometheus/alertmanager.nix+51−26
@@ -5,10 +5,18 @@ with lib;
55let
66 cfg = config.services.prometheus.alertmanager;
77 mkConfigFile = pkgs.writeText "alertmanager.yml" (builtins.toJSON cfg.configuration);
8− alertmanagerYml =
9− if cfg.configText != null then
10− pkgs.writeText "alertmanager.yml" cfg.configText
11− else mkConfigFile;
8+
9+ checkedConfig = file: pkgs.runCommand "checked-config" { buildInputs = [ cfg.package ]; } ''
10+ ln -s ${file} $out
11+ amtool check-config $out
12+ '';
13+
14+ alertmanagerYml = let
15+ yml = if cfg.configText != null then
16+ pkgs.writeText "alertmanager.yml" cfg.configText
17+ else mkConfigFile;
18+ in checkedConfig yml;
19+
1220 cmdlineArgs = cfg.extraFlags ++ [
1321 "--config.file ${alertmanagerYml}"
1422 "--web.listen-address ${cfg.listenAddress}:${toString cfg.port}"
@@ -23,6 +31,15 @@ in {
2331 services.prometheus.alertmanager = {
2432 enable = mkEnableOption "Prometheus Alertmanager";
2533
34+ package = mkOption {
35+ type = types.package;
36+ default = pkgs.prometheus-alertmanager;
37+ defaultText = "pkgs.alertmanager";
38+ description = ''
39+ Package that should be used for alertmanager.
40+ '';
41+ };
42+
2643 user = mkOption {
2744 type = types.str;
2845 default = "nobody";
@@ -40,8 +57,8 @@ in {
4057 };
4158
4259 configuration = mkOption {
43− type = types.attrs;
44− default = {};
60+ type = types.nullOr types.attrs;
61+ default = null;
4562 description = ''
4663 Alertmanager configuration as nix attribute set.
4764 '';
@@ -119,26 +136,34 @@ in {
119136 };
120137 };
121138
139+ config = mkMerge [
140+ (mkIf cfg.enable {
141+ assertions = singleton {
142+ assertion = cfg.configuration != null || cfg.configText != null;
143+ message = "Can not enable alertmanager without a configuration. "
144+ + "Set either the `configuration` or `configText` attribute.";
145+ };
146+ })
147+ (mkIf cfg.enable {
148+ networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
149+
150+ systemd.services.alertmanager = {
151+ wantedBy = [ "multi-user.target" ];
152+ after = [ "network.target" ];
153+ script = ''
154+ ${cfg.package}/bin/alertmanager \
155+ ${concatStringsSep " \\\n " cmdlineArgs}
156+ '';
122157
123− config = mkIf cfg.enable {
124− networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
125−
126− systemd.services.alertmanager = {
127− wantedBy = [ "multi-user.target" ];
128− after = [ "network.target" ];
129− script = ''
130− ${pkgs.prometheus-alertmanager.bin}/bin/alertmanager \
131− ${concatStringsSep " \\\n " cmdlineArgs}
132− '';
133−
134− serviceConfig = {
135− User = cfg.user;
136− Group = cfg.group;
137− Restart = "always";
138− PrivateTmp = true;
139− WorkingDirectory = "/tmp";
140− ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
158+ serviceConfig = {
159+ User = cfg.user;
160+ Group = cfg.group;
161+ Restart = "always";
162+ PrivateTmp = true;
163+ WorkingDirectory = "/tmp";
164+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
165+ };
141166 };
142− };
143− };
167+ })
168+ ];
144169}
nixos/modules/services/monitoring/prometheus/default.nix+36−7
@@ -10,6 +10,13 @@ let
1010 # Get a submodule without any embedded metadata:
1111 _filter = x: filterAttrs (k: v: k != "_module") x;
1212
13+ # a wrapper that verifies that the configuration is valid
14+ promtoolCheck = what: name: file: pkgs.runCommand "${name}-${what}-checked"
15+ { buildInputs = [ cfg.package ]; } ''
16+ ln -s ${file} $out
17+ promtool ${what} $out
18+ '';
19+
1320 # Pretty-print JSON to a file
1421 writePrettyJSON = name: x:
1522 pkgs.runCommand name { } ''
@@ -19,18 +26,19 @@ let
1926 # This becomes the main config file
2027 promConfig = {
2128 global = cfg.globalConfig;
22− rule_files = cfg.ruleFiles ++ [
29+ rule_files = map (promtoolCheck "check-rules" "rules") (cfg.ruleFiles ++ [
2330 (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules))
24− ];
31+ ]);
2532 scrape_configs = cfg.scrapeConfigs;
2633 };
2734
2835 generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig;
2936
30− prometheusYml =
31− if cfg.configText != null then
37+ prometheusYml = let
38+ yml = if cfg.configText != null then
3239 pkgs.writeText "prometheus.yml" cfg.configText
33− else generatedPrometheusYml;
40+ else generatedPrometheusYml;
41+ in promtoolCheck "check-config" "prometheus.yml" yml;
3442
3543 cmdlineArgs = cfg.extraFlags ++ [
3644 "-storage.local.path=${cfg.dataDir}/metrics"
@@ -39,6 +47,7 @@ let
3947 "-alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}"
4048 "-alertmanager.timeout=${toString cfg.alertmanagerTimeout}s"
4149 (optionalString (cfg.alertmanagerURL != []) "-alertmanager.url=${concatStringsSep "," cfg.alertmanagerURL}")
50+ (optionalString (cfg.webExternalUrl != null) "-web.external-url=${cfg.webExternalUrl}")
4251 ];
4352
4453 promTypes.globalConfig = types.submodule {
@@ -316,7 +325,8 @@ let
316325 promTypes.relabel_config = types.submodule {
317326 options = {
318327 source_labels = mkOption {
319− type = types.listOf types.str;
328+ type = with types; nullOr (listOf str);
329+ default = null;
320330 description = ''
321331 The source labels select values from existing labels. Their content
322332 is concatenated using the configured separator and matched against
@@ -375,6 +385,15 @@ in {
375385 '';
376386 };
377387
388+ package = mkOption {
389+ type = types.package;
390+ default = pkgs.prometheus;
391+ defaultText = "pkgs.prometheus";
392+ description = ''
393+ The prometheus package that should be used.
394+ '';
395+ };
396+
378397 listenAddress = mkOption {
379398 type = types.str;
380399 default = "0.0.0.0:9090";
@@ -467,6 +486,16 @@ in {
467486 Alert manager HTTP API timeout (in seconds).
468487 '';
469488 };
489+
490+ webExternalUrl = mkOption {
491+ type = types.nullOr types.str;
492+ default = null;
493+ example = "https://example.com/";
494+ description = ''
495+ The URL under which Prometheus is externally reachable (for example,
496+ if Prometheus is served via a reverse proxy).
497+ '';
498+ };
470499 };
471500 };
472501
@@ -484,7 +513,7 @@ in {
484513 after = [ "network.target" ];
485514 script = ''
486515 #!/bin/sh
487− exec ${pkgs.prometheus}/bin/prometheus \
516+ exec ${cfg.package}/bin/prometheus \
488517 ${concatStringsSep " \\\n " cmdlineArgs}
489518 '';
490519 serviceConfig = {
nixos/modules/services/monitoring/prometheus/exporters.nix+13−10
@@ -30,8 +30,10 @@ let
3030 postfix = import ./exporters/postfix.nix { inherit config lib pkgs; };
3131 snmp = import ./exporters/snmp.nix { inherit config lib pkgs; };
3232 surfboard = import ./exporters/surfboard.nix { inherit config lib pkgs; };
33+ tor = import ./exporters/tor.nix { inherit config lib pkgs; };
3334 unifi = import ./exporters/unifi.nix { inherit config lib pkgs; };
3435 varnish = import ./exporters/varnish.nix { inherit config lib pkgs; };
36+ bind = import ./exporters/bind.nix { inherit config lib pkgs; };
3537 };
3638
3739 mkExporterOpts = ({ name, port }: {
@@ -123,15 +125,13 @@ let
123125 systemd.services."prometheus-${name}-exporter" = mkMerge ([{
124126 wantedBy = [ "multi-user.target" ];
125127 after = [ "network.target" ];
126− serviceConfig = {
127− Restart = mkDefault "always";
128− PrivateTmp = mkDefault true;
129− WorkingDirectory = mkDefault /tmp;
130− } // mkIf (!(serviceOpts.serviceConfig.DynamicUser or false)) {
131− User = conf.user;
132− Group = conf.group;
133− };
134− } serviceOpts ]);
128+ serviceConfig.Restart = mkDefault "always";
129+ serviceConfig.PrivateTmp = mkDefault true;
130+ serviceConfig.WorkingDirectory = mkDefault /tmp;
131+ } serviceOpts ] ++ optional (!(serviceOpts.serviceConfig.DynamicUser or false)) {
132+ serviceConfig.User = conf.user;
133+ serviceConfig.Group = conf.group;
134+ });
135135 };
136136in
137137{
@@ -172,5 +172,8 @@ in
172172 }) exporterOpts)
173173 );
174174
175− meta.doc = ./exporters.xml;
175+ meta = {
176+ doc = ./exporters.xml;
177+ maintainers = [ maintainers.willibutz ];
178+ };
176179}
nixos/modules/services/monitoring/prometheus/exporters/bind.nixnew file+55
@@ -0,0 +1,55 @@
1+{ config, lib, pkgs }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.prometheus.exporters.bind;
7+in
8+{
9+ port = 9119;
10+ extraOpts = {
11+ bindURI = mkOption {
12+ type = types.str;
13+ default = "http://localhost:8053/";
14+ description = ''
15+ HTTP XML API address of an Bind server.
16+ '';
17+ };
18+ bindTimeout = mkOption {
19+ type = types.str;
20+ default = "10s";
21+ description = ''
22+ Timeout for trying to get stats from Bind.
23+ '';
24+ };
25+ bindVersion = mkOption {
26+ type = types.enum [ "xml.v2" "xml.v3" "auto" ];
27+ default = "auto";
28+ description = ''
29+ BIND statistics version. Can be detected automatically.
30+ '';
31+ };
32+ bindGroups = mkOption {
33+ type = types.listOf (types.enum [ "server" "view" "tasks" ]);
34+ default = [ "server" "view" ];
35+ description = ''
36+ List of statistics to collect. Available: [server, view, tasks]
37+ '';
38+ };
39+ };
40+ serviceOpts = {
41+ serviceConfig = {
42+ DynamicUser = true;
43+ ExecStart = ''
44+ ${pkgs.prometheus-bind-exporter}/bin/bind_exporter \
45+ -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
46+ -bind.pid-file /var/run/named/named.pid \
47+ -bind.timeout ${toString cfg.bindTimeout} \
48+ -bind.stats-url ${cfg.bindURI} \
49+ -bind.stats-version ${cfg.bindVersion} \
50+ -bind.stats-groups ${concatStringsSep "," cfg.bindGroups} \
51+ ${concatStringsSep " \\\n " cfg.extraFlags}
52+ '';
53+ };
54+ };
55+}
nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix+23−1
@@ -18,12 +18,34 @@ in
1818 socketPath = mkOption {
1919 type = types.path;
2020 default = "/var/run/dovecot/stats";
21− example = "/var/run/dovecot2/stats";
21+ example = "/var/run/dovecot2/old-stats";
2222 description = ''
2323 Path under which the stats socket is placed.
2424 The user/group under which the exporter runs,
2525 should be able to access the socket in order
2626 to scrape the metrics successfully.
27+
28+ Please keep in mind that the stats module has changed in
29+ <link xlink:href="https://wiki2.dovecot.org/Upgrading/2.3">Dovecot 2.3+</link> which
30+ is not <link xlink:href="https://github.com/kumina/dovecot_exporter/issues/8">compatible with this exporter</link>.
31+
32+ The following extra config has to be passed to Dovecot to ensure that recent versions
33+ work with this exporter:
34+ <programlisting>
35+ {
36+ <xref linkend="opt-services.prometheus.exporters.dovecot.enable" /> = true;
37+ <xref linkend="opt-services.prometheus.exporters.dovecot.socketPath" /> = "/var/run/dovecot2/old-stats";
38+ <xref linkend="opt-services.dovecot2.extraConfig" /> = '''
39+ mail_plugins = $mail_plugins old_stats
40+ service old-stats {
41+ unix_listener old-stats {
42+ user = nobody
43+ group = nobody
44+ }
45+ }
46+ ''';
47+ }
48+ </programlisting>
2749 '';
2850 };
2951 scopes = mkOption {
nixos/modules/services/monitoring/prometheus/exporters/tor.nixnew file+45
@@ -0,0 +1,45 @@
1+{ config, lib, pkgs }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.prometheus.exporters.tor;
7+in
8+{
9+ port = 9130;
10+ extraOpts = {
11+ torControlAddress = mkOption {
12+ type = types.str;
13+ default = "127.0.0.1";
14+ description = ''
15+ Tor control IP address or hostname.
16+ '';
17+ };
18+
19+ torControlPort = mkOption {
20+ type = types.int;
21+ default = 9051;
22+ description = ''
23+ Tor control port.
24+ '';
25+ };
26+ };
27+ serviceOpts = {
28+ serviceConfig = {
29+ DynamicUser = true;
30+ ExecStart = ''
31+ ${pkgs.prometheus-tor-exporter}/bin/prometheus-tor-exporter \
32+ -b ${cfg.listenAddress} \
33+ -p ${toString cfg.port} \
34+ -a ${cfg.torControlAddress} \
35+ -c ${toString cfg.torControlPort} \
36+ ${concatStringsSep " \\\n " cfg.extraFlags}
37+ '';
38+ };
39+
40+ # CPython requires a process to either have $HOME defined or run as a UID
41+ # defined in /etc/passwd. The latter is false with DynamicUser, so define a
42+ # dummy $HOME. https://bugs.python.org/issue10496
43+ environment = { HOME = "/var/empty"; };
44+ };
45+}
nixos/modules/services/monitoring/prometheus/exporters/varnish.nix+1
@@ -69,6 +69,7 @@ in
6969 path = [ pkgs.varnish ];
7070 serviceConfig = {
7171 DynamicUser = true;
72+ RestartSec = mkDefault 1;
7273 ExecStart = ''
7374 ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \
7475 --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
nixos/modules/services/monitoring/systemhealth.nix+1−1
@@ -8,7 +8,7 @@ let
88 systemhealth = with pkgs; stdenv.mkDerivation {
99 name = "systemhealth-1.0";
1010 src = fetchurl {
11− url = "http://www.brianlane.com/static/downloads/systemhealth/systemhealth-1.0.tar.bz2";
11+ url = "https://www.brianlane.com/downloads/systemhealth/systemhealth-1.0.tar.bz2";
1212 sha256 = "1q69lz7hmpbdpbz36zb06nzfkj651413n9icx0njmyr3xzq1j9qy";
1313 };
1414 buildInputs = [ python ];
nixos/modules/services/network-filesystems/glusterfs.nix+4−4
@@ -176,10 +176,8 @@ in
176176 '';
177177
178178 serviceConfig = {
179− Type="forking";
180− PIDFile="/run/glusterd.pid";
181179 LimitNOFILE=65536;
182− ExecStart="${glusterfs}/sbin/glusterd -p /run/glusterd.pid --log-level=${cfg.logLevel} ${toString cfg.extraFlags}";
180+ ExecStart="${glusterfs}/sbin/glusterd --no-daemon --log-level=${cfg.logLevel} ${toString cfg.extraFlags}";
183181 KillMode=cfg.killMode;
184182 TimeoutStopSec=cfg.stopKillTimeout;
185183 };
@@ -198,9 +196,11 @@ in
198196 install -m 0755 -d /var/log/glusterfs
199197 '';
200198
199+ # glustereventsd uses the `gluster` executable
200+ path = [ glusterfs ];
201+
201202 serviceConfig = {
202203 Type="simple";
203− Environment="PYTHONPATH=${glusterfs}/usr/lib/python2.7/site-packages";
204204 PIDFile="/run/glustereventsd.pid";
205205 ExecStart="${glusterfs}/sbin/glustereventsd --pid-file /run/glustereventsd.pid";
206206 ExecReload="/bin/kill -SIGUSR2 $MAINPID";
nixos/modules/services/network-filesystems/ipfs.nix+1−1
@@ -74,7 +74,7 @@ in {
7474
7575 services.ipfs = {
7676
77− enable = mkEnableOption "Interplanetary File System";
77+ enable = mkEnableOption "Interplanetary File System (WARNING: may cause severe network degredation)";
7878
7979 user = mkOption {
8080 type = types.str;
nixos/modules/services/network-filesystems/openafs/client.nix+2
@@ -149,11 +149,13 @@ in
149149 packages = {
150150 module = mkOption {
151151 default = config.boot.kernelPackages.openafs;
152+ defaultText = "config.boot.kernelPackages.openafs";
152153 type = types.package;
153154 description = "OpenAFS kernel module package. MUST match the userland package!";
154155 };
155156 programs = mkOption {
156157 default = getBin pkgs.openafs;
158+ defaultText = "config.boot.kernelPackages.openafs";
157159 type = types.package;
158160 description = "OpenAFS programs package. MUST match the kernel module package!";
159161 };
nixos/modules/services/network-filesystems/openafs/server.nix+1
@@ -80,6 +80,7 @@ in {
8080
8181 package = mkOption {
8282 default = pkgs.openafs.server or pkgs.openafs;
83+ defaultText = "pkgs.openafs.server or pkgs.openafs";
8384 type = types.package;
8485 description = "OpenAFS package for the server binaries";
8586 };
nixos/modules/services/networking/bitlbee.nix+1−1
@@ -33,7 +33,7 @@ let
3333
3434 purple_plugin_path =
3535 lib.concatMapStringsSep ":"
36− (plugin: "${plugin}/lib/pidgin/")
36+ (plugin: "${plugin}/lib/pidgin/:${plugin}/lib/purple-2/")
3737 cfg.libpurple_plugins
3838 ;
3939
nixos/modules/services/networking/chrony.nix+5−2
@@ -12,7 +12,7 @@ let
1212 ${concatMapStringsSep "\n" (server: "server " + server) cfg.servers}
1313
1414 ${optionalString
15− cfg.initstepslew.enabled
15+ (cfg.initstepslew.enabled && (cfg.servers != []))
1616 "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.initstepslew.servers}"
1717 }
1818
@@ -93,6 +93,8 @@ in
9393
9494 services.timesyncd.enable = mkForce false;
9595
96+ systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "chronyd.service"; };
97+
9698 systemd.services.chronyd =
9799 { description = "chrony NTP daemon";
98100
@@ -111,6 +113,7 @@ in
111113 chown chrony:chrony ${stateDir} ${keyFile}
112114 '';
113115
116+ unitConfig.ConditionCapability = "CAP_SYS_TIME";
114117 serviceConfig =
115118 { Type = "forking";
116119 ExecStart = "${pkgs.chrony}/bin/chronyd ${chronyFlags}";
@@ -119,8 +122,8 @@ in
119122 ProtectSystem = "full";
120123 PrivateTmp = "yes";
121124
122− ConditionCapability = "CAP_SYS_TIME";
123125 };
126+
124127 };
125128 };
126129}
nixos/modules/services/networking/consul.nix+5−4
@@ -6,9 +6,10 @@ let
66 dataDir = "/var/lib/consul";
77 cfg = config.services.consul;
88
9− configOptions = { data_dir = dataDir; } //
10− (if cfg.webUi then { ui_dir = "${cfg.package.ui}"; } else { }) //
11− cfg.extraConfig;
9+ configOptions = {
10+ data_dir = dataDir;
11+ ui = cfg.webUi;
12+ } // cfg.extraConfig;
1213
1314 configFiles = [ "/etc/consul.json" "/etc/consul-addrs.json" ]
1415 ++ cfg.extraConfigFiles;
@@ -184,7 +185,7 @@ in
184185 PermissionsStartOnly = true;
185186 User = if cfg.dropPrivileges then "consul" else null;
186187 Restart = "on-failure";
187− TimeoutStartSec = "0";
188+ TimeoutStartSec = "infinity";
188189 } // (optionalAttrs (cfg.leaveOnStop) {
189190 ExecStop = "${cfg.package.bin}/bin/consul leave";
190191 });
nixos/modules/services/networking/dhcpcd.nix+1−1
@@ -71,7 +71,7 @@ let
7171 # anything ever again ("couldn't resolve ..., giving up on
7272 # it"), so we silently lose time synchronisation. This also
7373 # applies to openntpd.
74− ${config.systemd.package}/bin/systemctl try-reload-or-restart ntpd.service openntpd.service || true
74+ ${config.systemd.package}/bin/systemctl try-reload-or-restart ntpd.service openntpd.service chronyd.service || true
7575 fi
7676
7777 ${cfg.runHook}
nixos/modules/services/networking/eternal-terminal.nixnew file+89
@@ -0,0 +1,89 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+
7+ cfg = config.services.eternal-terminal;
8+
9+in
10+
11+{
12+
13+ ###### interface
14+
15+ options = {
16+
17+ services.eternal-terminal = {
18+
19+ enable = mkEnableOption "Eternal Terminal server";
20+
21+ port = mkOption {
22+ default = 2022;
23+ type = types.int;
24+ description = ''
25+ The port the server should listen on. Will use the server's default (2022) if not specified.
26+ '';
27+ };
28+
29+ verbosity = mkOption {
30+ default = 0;
31+ type = types.enum (lib.range 0 9);
32+ description = ''
33+ The verbosity level (0-9).
34+ '';
35+ };
36+
37+ silent = mkOption {
38+ default = false;
39+ type = types.bool;
40+ description = ''
41+ If enabled, disables all logging.
42+ '';
43+ };
44+
45+ logSize = mkOption {
46+ default = 20971520;
47+ type = types.int;
48+ description = ''
49+ The maximum log size.
50+ '';
51+ };
52+ };
53+ };
54+
55+ ###### implementation
56+
57+ config = mkIf cfg.enable {
58+
59+ # We need to ensure the et package is fully installed because
60+ # the (remote) et client runs the `etterminal` binary when it
61+ # connects.
62+ environment.systemPackages = [ pkgs.eternal-terminal ];
63+
64+ systemd.services = {
65+ eternal-terminal = {
66+ description = "Eternal Terminal server.";
67+ wantedBy = [ "multi-user.target" ];
68+ after = [ "syslog.target" "network.target" ];
69+ serviceConfig = {
70+ Type = "forking";
71+ ExecStart = "${pkgs.eternal-terminal}/bin/etserver --daemon --cfgfile=${pkgs.writeText "et.cfg" ''
72+ ; et.cfg : Config file for Eternal Terminal
73+ ;
74+
75+ [Networking]
76+ port = ${toString cfg.port}
77+
78+ [Debug]
79+ verbose = ${toString cfg.verbosity}
80+ silent = ${if cfg.silent then "1" else "0"}
81+ logsize = ${toString cfg.logSize}
82+ ''}";
83+ Restart = "on-failure";
84+ KillMode = "process";
85+ };
86+ };
87+ };
88+ };
89+}
nixos/modules/services/networking/firewall.nix+9−10
@@ -58,6 +58,9 @@ let
5858 ${text}
5959 ''; in "${dir}/bin/${name}";
6060
61+ defaultInterface = { default = mapAttrs (name: value: cfg."${name}") commonOptions; };
62+ allInterfaces = defaultInterface // cfg.interfaces;
63+
6164 startScript = writeShScript "firewall-start" ''
6265 ${helpers}
6366
@@ -154,7 +157,7 @@ let
154157 ip46tables -A nixos-fw -p tcp --dport ${toString port} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"}
155158 ''
156159 ) cfg.allowedTCPPorts
157− ) cfg.interfaces)}
160+ ) allInterfaces)}
158161
159162 # Accept connections to the allowed TCP port ranges.
160163 ${concatStrings (mapAttrsToList (iface: cfg:
@@ -164,7 +167,7 @@ let
164167 ip46tables -A nixos-fw -p tcp --dport ${range} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"}
165168 ''
166169 ) cfg.allowedTCPPortRanges
167− ) cfg.interfaces)}
170+ ) allInterfaces)}
168171
169172 # Accept packets on the allowed UDP ports.
170173 ${concatStrings (mapAttrsToList (iface: cfg:
@@ -173,7 +176,7 @@ let
173176 ip46tables -A nixos-fw -p udp --dport ${toString port} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"}
174177 ''
175178 ) cfg.allowedUDPPorts
176− ) cfg.interfaces)}
179+ ) allInterfaces)}
177180
178181 # Accept packets on the allowed UDP port ranges.
179182 ${concatStrings (mapAttrsToList (iface: cfg:
@@ -183,7 +186,7 @@ let
183186 ip46tables -A nixos-fw -p udp --dport ${range} -j nixos-fw-accept ${optionalString (iface != "default") "-i ${iface}"}
184187 ''
185188 ) cfg.allowedUDPPortRanges
186− ) cfg.interfaces)}
189+ ) allInterfaces)}
187190
188191 # Accept IPv4 multicast. Not a big security risk since
189192 # probably nobody is listening anyway.
@@ -508,15 +511,11 @@ in
508511 };
509512
510513 interfaces = mkOption {
511− default = {
512− default = mapAttrs (name: value: cfg."${name}") commonOptions;
513− };
514+ default = { };
514515 type = with types; attrsOf (submodule [ { options = commonOptions; } ]);
515516 description =
516517 ''
517− Interface-specific open ports. Setting this value will override
518− all values of the <literal>networking.firewall.allowed*</literal>
519− options.
518+ Interface-specific open ports.
520519 '';
521520 };
522521 } // commonOptions;
nixos/modules/services/networking/flashpolicyd.nix+5−5
@@ -11,7 +11,7 @@ let
1111
1212 src = pkgs.fetchurl {
1313 name = "flashpolicyd_v0.6.zip";
14− url = "http://www.adobe.com/content/dotcom/en/devnet/flashplayer/articles/socket_policy_files/_jcr_content/articlePrerequistes/multiplefiles/node_1277808777771/file.res/flashpolicyd_v0.6%5B1%5D.zip";
14+ url = "https://download.adobe.com/pub/adobe/devnet/flashplayer/articles/socket_policy_files/flashpolicyd_v0.6.zip";
1515 sha256 = "16zk237233npwfq1m4ksy4g5lzy1z9fp95w7pz0cdlpmv0fv9sm3";
1616 };
1717
@@ -35,9 +35,9 @@ in
3535 ###### interface
3636
3737 options = {
38−
38+
3939 services.flashpolicyd = {
40−
40+
4141 enable = mkOption {
4242 default = false;
4343 description =
@@ -47,13 +47,13 @@ in
4747 connections to your server.
4848 '';
4949 };
50−
50+
5151 policy = mkOption {
5252 default =
5353 ''
5454 <?xml version="1.0"?>
5555 <!DOCTYPE cross-domain-policy SYSTEM "/xml/dtds/cross-domain-policy.dtd">
56− <cross-domain-policy>
56+ <cross-domain-policy>
5757 <site-control permitted-cross-domain-policies="master-only"/>
5858 <allow-access-from domain="*" to-ports="*" />
5959 </cross-domain-policy>
nixos/modules/services/networking/hostapd.nix+3−3
@@ -157,9 +157,9 @@ in
157157 { description = "hostapd wireless AP";
158158
159159 path = [ pkgs.hostapd ];
160− wantedBy = [ "network.target" ];
161−
162− after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service" "sys-subsystem-net-devices-${cfg.interface}.device" ];
160+ after = [ "sys-subsystem-net-devices-${cfg.interface}.device" ];
161+ bindsTo = [ "sys-subsystem-net-devices-${cfg.interface}.device" ];
162+ requiredBy = [ "network-link-${cfg.interface}.service" ];
163163
164164 serviceConfig =
165165 { ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}";
nixos/modules/services/networking/mxisd.nixnew file+125
@@ -0,0 +1,125 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.mxisd;
7+
8+ server = optionalAttrs (cfg.server.name != null) { inherit (cfg.server) name; }
9+ // optionalAttrs (cfg.server.port != null) { inherit (cfg.server) port; };
10+
11+ baseConfig = {
12+ matrix.domain = cfg.matrix.domain;
13+ key.path = "${cfg.dataDir}/signing.key";
14+ storage = {
15+ provider.sqlite.database = "${cfg.dataDir}/mxisd.db";
16+ };
17+ } // optionalAttrs (server != {}) { inherit server; };
18+
19+ # merges baseConfig and extraConfig into a single file
20+ fullConfig = recursiveUpdate baseConfig cfg.extraConfig;
21+
22+ configFile = pkgs.writeText "mxisd-config.yaml" (builtins.toJSON fullConfig);
23+
24+in {
25+ options = {
26+ services.mxisd = {
27+ enable = mkEnableOption "mxisd matrix federated identity server";
28+
29+ package = mkOption {
30+ type = types.package;
31+ default = pkgs.mxisd;
32+ defaultText = "pkgs.mxisd";
33+ description = "The mxisd package to use";
34+ };
35+
36+ dataDir = mkOption {
37+ type = types.str;
38+ default = "/var/lib/mxisd";
39+ description = "Where data mxisd uses resides";
40+ };
41+
42+ extraConfig = mkOption {
43+ type = types.attrs;
44+ default = {};
45+ description = "Extra options merged into the mxisd configuration";
46+ };
47+
48+ matrix = {
49+
50+ domain = mkOption {
51+ type = types.str;
52+ description = ''
53+ the domain of the matrix homeserver
54+ '';
55+ };
56+
57+ };
58+
59+ server = {
60+
61+ name = mkOption {
62+ type = types.nullOr types.str;
63+ default = null;
64+ description = ''
65+ Public hostname of mxisd, if different from the Matrix domain.
66+ '';
67+ };
68+
69+ port = mkOption {
70+ type = types.nullOr types.int;
71+ default = null;
72+ description = ''
73+ HTTP port to listen on (unencrypted)
74+ '';
75+ };
76+
77+ };
78+
79+ };
80+ };
81+
82+ config = mkIf cfg.enable {
83+ users.users = [
84+ {
85+ name = "mxisd";
86+ group = "mxisd";
87+ home = cfg.dataDir;
88+ createHome = true;
89+ shell = "${pkgs.bash}/bin/bash";
90+ uid = config.ids.uids.mxisd;
91+ }
92+ ];
93+
94+ users.groups = [
95+ {
96+ name = "mxisd";
97+ gid = config.ids.gids.mxisd;
98+ }
99+ ];
100+
101+ systemd.services.mxisd = {
102+ description = "a federated identity server for the matrix ecosystem";
103+ after = [ "network.target" ];
104+ wantedBy = [ "multi-user.target" ];
105+
106+ # mxisd / spring.boot needs the configuration to be named "application.yaml"
107+ preStart = ''
108+ config=${cfg.dataDir}/application.yaml
109+ cp ${configFile} $config
110+ chmod 444 $config
111+ '';
112+
113+ serviceConfig = {
114+ Type = "simple";
115+ User = "mxisd";
116+ Group = "mxisd";
117+ ExecStart = "${cfg.package}/bin/mxisd --spring.config.location=${cfg.dataDir}/ --spring.profiles.active=systemd --java.security.egd=file:/dev/./urandom";
118+ WorkingDirectory = cfg.dataDir;
119+ PermissionsStartOnly = true;
120+ SuccessExitStatus = 143;
121+ Restart = "on-failure";
122+ };
123+ };
124+ };
125+}
nixos/modules/services/networking/networkmanager.nix+1−1
@@ -488,7 +488,7 @@ in {
488488 '') cfg.dynamicHosts.hostsDirs);
489489 serviceConfig = {
490490 Type = "oneshot";
491− RemainAfterExist = true;
491+ RemainAfterExit = true;
492492 };
493493 };
494494
nixos/modules/services/networking/nsd.nix+5−7
@@ -435,7 +435,9 @@ let
435435
436436 dnssecZones = (filterAttrs (n: v: if v ? dnssec then v.dnssec else false) zoneConfigs);
437437
438− dnssec = length (attrNames dnssecZones) != 0;
438+ dnssec = dnssecZones != {};
439+
440+ dnssecTools = pkgs.bind.override { enablePython = true; };
439441
440442 signZones = optionalString dnssec ''
441443 mkdir -p ${stateDir}/dnssec
@@ -445,8 +447,8 @@ let
445447 ${concatStrings (mapAttrsToList signZone dnssecZones)}
446448 '';
447449 signZone = name: zone: ''
448− ${pkgs.bind}/bin/dnssec-keymgr -g ${pkgs.bind}/bin/dnssec-keygen -s ${pkgs.bind}/bin/dnssec-settime -K ${stateDir}/dnssec -c ${policyFile name zone.dnssecPolicy} ${name}
449− ${pkgs.bind}/bin/dnssec-signzone -S -K ${stateDir}/dnssec -o ${name} -O full -N date ${stateDir}/zones/${name}
450+ ${dnssecTools}/bin/dnssec-keymgr -g ${dnssecTools}/bin/dnssec-keygen -s ${dnssecTools}/bin/dnssec-settime -K ${stateDir}/dnssec -c ${policyFile name zone.dnssecPolicy} ${name}
451+ ${dnssecTools}/bin/dnssec-signzone -S -K ${stateDir}/dnssec -o ${name} -O full -N date ${stateDir}/zones/${name}
450452 ${nsdPkg}/sbin/nsd-checkzone ${name} ${stateDir}/zones/${name}.signed && mv -v ${stateDir}/zones/${name}.signed ${stateDir}/zones/${name}
451453 '';
452454 policyFile = name: policy: pkgs.writeText "${name}.policy" ''
@@ -953,10 +955,6 @@ in
953955 '';
954956 };
955957
956− nixpkgs.config = mkIf dnssec {
957− bind.enablePython = true;
958− };
959−
960958 systemd.timers."nsd-dnssec" = mkIf dnssec {
961959 description = "Automatic DNSSEC key rollover";
962960
nixos/modules/services/networking/ntpd.nix+38−2
@@ -15,6 +15,10 @@ let
1515 configFile = pkgs.writeText "ntp.conf" ''
1616 driftfile ${stateDir}/ntp.drift
1717
18+ restrict default ${toString cfg.restrictDefault}
19+ restrict -6 default ${toString cfg.restrictDefault}
20+ restrict source ${toString cfg.restrictSource}
21+
1822 restrict 127.0.0.1
1923 restrict -6 ::1
2024
@@ -36,9 +40,38 @@ in
3640 enable = mkOption {
3741 default = false;
3842 description = ''
39− Whether to synchronise your machine's time using the NTP
40− protocol.
43+ Whether to synchronise your machine's time using ntpd, as a peer in
44+ the NTP network.
45+ </para>
46+ <para>
47+ Disables <literal>systemd.timesyncd</literal> if enabled.
48+ '';
49+ };
50+
51+ restrictDefault = mkOption {
52+ type = types.listOf types.str;
53+ description = ''
54+ The restriction flags to be set by default.
55+ </para>
56+ <para>
57+ The default flags prevent external hosts from using ntpd as a DDoS
58+ reflector, setting system time, and querying OS/ntpd version. As
59+ recommended in section 6.5.1.1.3, answer "No" of
60+ http://support.ntp.org/bin/view/Support/AccessRestrictions
4161 '';
62+ default = [ "limited" "kod" "nomodify" "notrap" "noquery" "nopeer" ];
63+ };
64+
65+ restrictSource = mkOption {
66+ type = types.listOf types.str;
67+ description = ''
68+ The restriction flags to be set on source.
69+ </para>
70+ <para>
71+ The default flags allow peers to be added by ntpd from configured
72+ pool(s), but not by other means.
73+ '';
74+ default = [ "limited" "kod" "nomodify" "notrap" "noquery" ];
4275 };
4376
4477 servers = mkOption {
@@ -51,6 +84,7 @@ in
5184 extraFlags = mkOption {
5285 type = types.listOf types.str;
5386 description = "Extra flags passed to the ntpd command.";
87+ example = literalExample ''[ "--interface=eth0" ]'';
5488 default = [];
5589 };
5690
@@ -67,6 +101,8 @@ in
67101 environment.systemPackages = [ pkgs.ntp ];
68102 services.timesyncd.enable = mkForce false;
69103
104+ systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "ntpd.service"; };
105+
70106 users.users = singleton
71107 { name = ntpUser;
72108 uid = config.ids.uids.ntp;
nixos/modules/services/networking/oidentd.nix+1−2
@@ -28,8 +28,7 @@ with lib;
2828 after = [ "network.target" ];
2929 wantedBy = [ "multi-user.target" ];
3030 serviceConfig.Type = "forking";
31− script = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup" +
32− optionalString config.networking.enableIPv6 " -a ::";
31+ script = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup";
3332 };
3433
3534 users.users.oidentd = {
nixos/modules/services/networking/pptpd.nix+1−1
@@ -5,7 +5,7 @@ with lib;
55{
66 options = {
77 services.pptpd = {
8− enable = mkEnableOption "Whether pptpd should be run on startup.";
8+ enable = mkEnableOption "pptpd, the Point-to-Point Tunneling Protocol daemon";
99
1010 serverIp = mkOption {
1111 type = types.string;
nixos/modules/services/networking/prosody.nix+1
@@ -228,6 +228,7 @@ let
228228
229229 createSSLOptsStr = o: ''
230230 ssl = {
231+ cafile = "/etc/ssl/certs/ca-bundle.crt";
231232 key = "${o.key}";
232233 certificate = "${o.cert}";
233234 ${concatStringsSep "\n" (mapAttrsToList (name: value: "${name} = ${toLua value};") o.extraOptions)}
nixos/modules/services/networking/redsocks.nix+2
@@ -267,4 +267,6 @@ in
267267 "ip46tables -t nat -D OUTPUT -p tcp ${redCond block} -j ${chain} 2>/dev/null || true"
268268 ) cfg.redsocks;
269269 };
270+
271+ meta.maintainers = with lib.maintainers; [ ekleog ];
270272}
nixos/modules/services/networking/shairport-sync.nix+1−1
@@ -27,7 +27,7 @@ in
2727 };
2828
2929 arguments = mkOption {
30− default = "-v -d pulse";
30+ default = "-v -o pa";
3131 description = ''
3232 Arguments to pass to the daemon. Defaults to a local pulseaudio
3333 server.
nixos/modules/services/networking/ssh/sshd.nix+6−1
@@ -130,7 +130,7 @@ in
130130 };
131131
132132 ports = mkOption {
133− type = types.listOf types.int;
133+ type = types.listOf types.port;
134134 default = [22];
135135 description = ''
136136 Specifies on which ports the SSH daemon listens.
@@ -352,6 +352,10 @@ in
352352 path = [ cfgc.package pkgs.gawk ];
353353 environment.LD_LIBRARY_PATH = nssModulesPath;
354354
355+ restartTriggers = optionals (!cfg.startWhenNeeded) [
356+ config.environment.etc."ssh/sshd_config".source
357+ ];
358+
355359 preStart =
356360 ''
357361 # Make sure we don't write to stdout, since in case of
@@ -387,6 +391,7 @@ in
387391 Restart = "always";
388392 Type = "simple";
389393 });
394+
390395 };
391396 in
392397
nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix+83
@@ -248,6 +248,14 @@ in {
248248 </itemizedlist>
249249 '';
250250
251+ ppk_id = mkOptionalStrParam ''
252+ String identifying the Postquantum Preshared Key (PPK) to be used.
253+ '';
254+
255+ ppk_required = mkYesNoParam no ''
256+ Whether a Postquantum Preshared Key (PPK) is required for this connection.
257+ '';
258+
251259 keyingtries = mkIntParam 1 ''
252260 Number of retransmission sequences to perform during initial
253261 connect. Instead of giving up initiation after the first retransmission
@@ -922,6 +930,36 @@ in {
922930 <literal>0xffffffff</literal>.
923931 '';
924932
933+ set_mark_in = mkStrParam "0/0x00000000" ''
934+ Netfilter mark applied to packets after the inbound IPsec SA processed
935+ them. This way it's not necessary to mark packets via Netfilter before
936+ decryption or right afterwards to match policies or process them
937+ differently (e.g. via policy routing).
938+
939+ An additional mask may be appended to the mark, separated by
940+ <literal>/</literal>. The default mask if omitted is 0xffffffff. The
941+ special value <literal>%same</literal> uses the value (but not the mask)
942+ from <option>mark_in</option> as mark value, which can be fixed,
943+ <literal>%unique</literal> or <literal>%unique-dir</literal>.
944+
945+ Setting marks in XFRM input requires Linux 4.19 or higher.
946+ '';
947+
948+ set_mark_out = mkStrParam "0/0x00000000" ''
949+ Netfilter mark applied to packets after the outbound IPsec SA processed
950+ them. This allows processing ESP packets differently than the original
951+ traffic (e.g. via policy routing).
952+
953+ An additional mask may be appended to the mark, separated by
954+ <literal>/</literal>. The default mask if omitted is 0xffffffff. The
955+ special value <literal>%same</literal> uses the value (but not the mask)
956+ from <option>mark_out</option> as mark value, which can be fixed,
957+ <literal>%unique_</literal> or <literal>%unique-dir</literal>.
958+
959+ Setting marks in XFRM output is supported since Linux 4.14. Setting a
960+ mask requires at least Linux 4.19.
961+ '';
962+
925963 tfc_padding = mkParamOfType (with lib.types; either int (enum ["mtu"])) 0 ''
926964 Pads ESP packets with additional data to have a consistent ESP packet
927965 size for improved Traffic Flow Confidentiality. The padding defines the
@@ -946,6 +984,33 @@ in {
946984 supported, but the installation does not fail otherwise.
947985 '';
948986
987+ copy_df = mkYesNoParam yes ''
988+ Whether to copy the DF bit to the outer IPv4 header in tunnel mode. This
989+ effectively disables Path MTU discovery (PMTUD). Controlling this
990+ behavior is not supported by all kernel interfaces.
991+ '';
992+
993+ copy_ecn = mkYesNoParam yes ''
994+ Whether to copy the ECN (Explicit Congestion Notification) header field
995+ to/from the outer IP header in tunnel mode. Controlling this behavior is
996+ not supported by all kernel interfaces.
997+ '';
998+
999+ copy_dscp = mkEnumParam [ "out" "in" "yes" "no" ] "out" ''
1000+ Whether to copy the DSCP (Differentiated Services Field Codepoint)
1001+ header field to/from the outer IP header in tunnel mode. The value
1002+ <literal>out</literal> only copies the field from the inner to the outer
1003+ header, the value <literal>in</literal> does the opposite and only
1004+ copies the field from the outer to the inner header when decapsulating,
1005+ the value <literal>yes</literal> copies the field in both directions,
1006+ and the value <literal>no</literal> disables copying the field
1007+ altogether. Setting this to <literal>yes</literal> or
1008+ <literal>in</literal> could allow an attacker to adversely affect other
1009+ traffic at the receiver, which is why the default is
1010+ <literal>out</literal>. Controlling this behavior is not supported by
1011+ all kernel interfaces.
1012+ '';
1013+
9491014 start_action = mkEnumParam ["none" "trap" "start"] "none" ''
9501015 Action to perform after loading the configuration.
9511016 <itemizedlist>
@@ -1060,6 +1125,24 @@ in {
10601125 defined in a unique section having the <literal>ike</literal> prefix.
10611126 '';
10621127
1128+ ppk = mkPrefixedAttrsOfParams {
1129+ secret = mkOptionalStrParam ''
1130+ Value of the PPK. It may either be an ASCII string, a hex encoded string
1131+ if it has a <literal>0x</literal> prefix or a Base64 encoded string if
1132+ it has a <literal>0s</literal> prefix in its value. Should have at least
1133+ 256 bits of entropy for 128-bit security.
1134+ '';
1135+
1136+ id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") ''
1137+ PPK identity the PPK belongs to. Multiple unique identities may be
1138+ specified, each having an <literal>id</literal> prefix, if a secret is
1139+ shared between multiple peers.
1140+ '';
1141+ } ''
1142+ Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is
1143+ defined in a unique section having the <literal>ppk</literal> prefix.
1144+ '';
1145+
10631146 private = mkPrefixedAttrsOfParams {
10641147 file = mkOptionalStrParam ''
10651148 File name in the private folder for which this passphrase should be used.
nixos/modules/services/networking/syncthing-relay.nixnew file+121
@@ -0,0 +1,121 @@
1+{ config, lib, pkgs, ... }:
2+
3+with lib;
4+
5+let
6+ cfg = config.services.syncthing.relay;
7+
8+ dataDirectory = "/var/lib/syncthing-relay";
9+
10+ relayOptions =
11+ [
12+ "--keys=${dataDirectory}"
13+ "--listen=${cfg.listenAddress}:${toString cfg.port}"
14+ "--status-srv=${cfg.statusListenAddress}:${toString cfg.statusPort}"
15+ "--provided-by=${escapeShellArg cfg.providedBy}"
16+ ]
17+ ++ optional (cfg.pools != null) "--pools=${escapeShellArg (concatStringsSep "," cfg.pools)}"
18+ ++ optional (cfg.globalRateBps != null) "--global-rate=${toString cfg.globalRateBps}"
19+ ++ optional (cfg.perSessionRateBps != null) "--per-session-rate=${toString cfg.perSessionRateBps}"
20+ ++ cfg.extraOptions;
21+in {
22+ ###### interface
23+
24+ options.services.syncthing.relay = {
25+ enable = mkEnableOption "Syncthing relay service";
26+
27+ listenAddress = mkOption {
28+ type = types.str;
29+ default = "";
30+ example = "1.2.3.4";
31+ description = ''
32+ Address to listen on for relay traffic.
33+ '';
34+ };
35+
36+ port = mkOption {
37+ type = types.port;
38+ default = 22067;
39+ description = ''
40+ Port to listen on for relay traffic. This port should be added to
41+ <literal>networking.firewall.allowedTCPPorts</literal>.
42+ '';
43+ };
44+
45+ statusListenAddress = mkOption {
46+ type = types.str;
47+ default = "";
48+ example = "1.2.3.4";
49+ description = ''
50+ Address to listen on for serving the relay status API.
51+ '';
52+ };
53+
54+ statusPort = mkOption {
55+ type = types.port;
56+ default = 22070;
57+ description = ''
58+ Port to listen on for serving the relay status API. This port should be
59+ added to <literal>networking.firewall.allowedTCPPorts</literal>.
60+ '';
61+ };
62+
63+ pools = mkOption {
64+ type = types.nullOr (types.listOf types.str);
65+ default = null;
66+ description = ''
67+ Relay pools to join. If null, uses the default global pool.
68+ '';
69+ };
70+
71+ providedBy = mkOption {
72+ type = types.str;
73+ default = "";
74+ description = ''
75+ Human-readable description of the provider of the relay (you).
76+ '';
77+ };
78+
79+ globalRateBps = mkOption {
80+ type = types.nullOr types.ints.positive;
81+ default = null;
82+ description = ''
83+ Global bandwidth rate limit in bytes per second.
84+ '';
85+ };
86+
87+ perSessionRateBps = mkOption {
88+ type = types.nullOr types.ints.positive;
89+ default = null;
90+ description = ''
91+ Per session bandwidth rate limit in bytes per second.
92+ '';
93+ };
94+
95+ extraOptions = mkOption {
96+ type = types.listOf types.str;
97+ default = [];
98+ description = ''
99+ Extra command line arguments to pass to strelaysrv.
100+ '';
101+ };
102+ };
103+
104+ ###### implementation
105+
106+ config = mkIf cfg.enable {
107+ systemd.services.syncthing-relay = {
108+ description = "Syncthing relay service";
109+ wantedBy = [ "multi-user.target" ];
110+ after = [ "network.target" ];
111+
112+ serviceConfig = {
113+ DynamicUser = true;
114+ StateDirectory = baseNameOf dataDirectory;
115+
116+ Restart = "on-failure";
117+ ExecStart = "${pkgs.syncthing-relay}/bin/strelaysrv ${concatStringsSep " " relayOptions}";
118+ };
119+ };
120+ };
121+}
nixos/modules/services/networking/syncthing.nix+29−4
@@ -16,6 +16,14 @@ in {
1616 available on http://127.0.0.1:8384/.
1717 '';
1818
19+ guiAddress = mkOption {
20+ type = types.str;
21+ default = "127.0.0.1:8384";
22+ description = ''
23+ Address to serve the GUI.
24+ '';
25+ };
26+
1927 systemService = mkOption {
2028 type = types.bool;
2129 default = true;
@@ -23,7 +31,7 @@ in {
2331 };
2432
2533 user = mkOption {
26− type = types.string;
34+ type = types.str;
2735 default = defaultUser;
2836 description = ''
2937 Syncthing will be run under this user (user will be created if it doesn't exist.
@@ -32,7 +40,7 @@ in {
3240 };
3341
3442 group = mkOption {
35− type = types.string;
43+ type = types.str;
3644 default = "nogroup";
3745 description = ''
3846 Syncthing will be run under this group (group will not be created if it doesn't exist.
@@ -41,7 +49,7 @@ in {
4149 };
4250
4351 all_proxy = mkOption {
44− type = types.nullOr types.string;
52+ type = with types; nullOr str;
4553 default = null;
4654 example = "socks5://address.com:1234";
4755 description = ''
@@ -54,9 +62,21 @@ in {
5462 dataDir = mkOption {
5563 type = types.path;
5664 default = "/var/lib/syncthing";
65+ description = ''
66+ Path where synced directories will exist.
67+ '';
68+ };
69+
70+ configDir = mkOption {
71+ type = types.path;
5772 description = ''
5873 Path where the settings and keys will exist.
5974 '';
75+ default =
76+ let
77+ nixos = config.system.stateVersion;
78+ cond = versionAtLeast nixos "19.03";
79+ in cfg.dataDir + (optionalString cond "/.config/syncthing");
6080 };
6181
6282 openDefaultPorts = mkOption {
@@ -132,7 +152,12 @@ in {
132152 User = cfg.user;
133153 Group = cfg.group;
134154 PermissionsStartOnly = true;
135− ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}";
155+ ExecStart = ''
156+ ${cfg.package}/bin/syncthing \
157+ -no-browser \
158+ -gui-address=${cfg.guiAddress} \
159+ -home=${cfg.configDir}
160+ '';
136161 };
137162 };
138163
nixos/modules/services/networking/tinc.nix−8
@@ -148,14 +148,6 @@ in
148148 }
149149 ));
150150
151− networking.interfaces = flip mapAttrs' cfg.networks (network: data: nameValuePair
152− ("tinc.${network}")
153− ({
154− virtual = true;
155− virtualType = "${data.interfaceType}";
156− })
157− );
158−
159151 systemd.services = flip mapAttrs' cfg.networks (network: data: nameValuePair
160152 ("tinc.${network}")
161153 ({
nixos/modules/services/networking/wireguard.nix+1−1
@@ -202,7 +202,7 @@ let
202202 };
203203
204204 script = ''
205− modprobe wireguard
205+ ${optionalString (!config.boot.isContainer) "modprobe wireguard"}
206206
207207 ${values.preSetup}
208208
nixos/modules/services/networking/xl2tpd.nix+1−1
@@ -5,7 +5,7 @@ with lib;
55{
66 options = {
77 services.xl2tpd = {
8− enable = mkEnableOption "Whether xl2tpd should be run on startup.";
8+ enable = mkEnableOption "xl2tpd, the Layer 2 Tunnelling Protocol Daemon";
99
1010 serverIp = mkOption {
1111 type = types.string;
nixos/modules/services/networking/xrdp.nix+7−1
@@ -26,6 +26,12 @@ let
2626 substituteInPlace $out/sesman.ini \
2727 --replace LogFile=xrdp-sesman.log LogFile=/dev/null \
2828 --replace EnableSyslog=1 EnableSyslog=0
29+
30+ # Ensure that clipboard works for non-ASCII characters
31+ sed -i -e '/.*SessionVariables.*/ a\
32+ LANG=${config.i18n.defaultLocale}\
33+ LOCALE_ARCHIVE=${config.i18n.glibcLocales}/lib/locale/locale-archive
34+ ' $out/sesman.ini
2935 '';
3036in
3137{
@@ -36,7 +42,7 @@ in
3642
3743 services.xrdp = {
3844
39− enable = mkEnableOption "Whether xrdp should be run on startup.";
45+ enable = mkEnableOption "xrdp, the Remote Desktop Protocol server";
4046
4147 package = mkOption {
4248 type = types.package;
nixos/modules/services/networking/zerotierone.nix+2−1
@@ -39,7 +39,8 @@ in
3939 systemd.services.zerotierone = {
4040 description = "ZeroTierOne";
4141 path = [ cfg.package ];
42− after = [ "network.target" ];
42+ bindsTo = [ "network-online.target" ];
43+ after = [ "network-online.target" ];
4344 wantedBy = [ "multi-user.target" ];
4445 preStart = ''
4546 mkdir -p /var/lib/zerotier-one/networks.d
nixos/modules/services/networking/znc.nixdeleted−431
@@ -1,431 +0,0 @@
1−{ config, lib, pkgs, ...}:
2−
3−with lib;
4−
5−let
6− cfg = config.services.znc;
7−
8− defaultUser = "znc"; # Default user to own process.
9−
10− # Default user and pass:
11− # un=znc
12− # pw=nixospass
13−
14− defaultUserName = "znc";
15− defaultPassBlock = "
16− <Pass password>
17− Method = sha256
18− Hash = e2ce303c7ea75c571d80d8540a8699b46535be6a085be3414947d638e48d9e93
19− Salt = l5Xryew4g*!oa(ECfX2o
20− </Pass>
21− ";
22−
23− modules = pkgs.buildEnv {
24− name = "znc-modules";
25− paths = cfg.modulePackages;
26− };
27−
28− # Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`.
29− mkZncConf = confOpts: ''
30− Version = 1.6.3
31− ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.modules}
32−
33− <Listener l>
34− Port = ${toString confOpts.port}
35− IPv4 = true
36− IPv6 = true
37− SSL = ${boolToString confOpts.useSSL}
38− ${lib.optionalString (confOpts.uriPrefix != null) "URIPrefix = ${confOpts.uriPrefix}"}
39− </Listener>
40−
41− <User ${confOpts.userName}>
42− ${confOpts.passBlock}
43− Admin = true
44− Nick = ${confOpts.nick}
45− AltNick = ${confOpts.nick}_
46− Ident = ${confOpts.nick}
47− RealName = ${confOpts.nick}
48− ${concatMapStrings (n: "LoadModule = ${n}\n") confOpts.userModules}
49−
50− ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (name: net: ''
51− <Network ${name}>
52− ${concatMapStrings (m: "LoadModule = ${m}\n") net.modules}
53− Server = ${net.server} ${lib.optionalString net.useSSL "+"}${toString net.port} ${net.password}
54− ${concatMapStrings (c: "<Chan #${c}>\n</Chan>\n") net.channels}
55− ${lib.optionalString net.hasBitlbeeControlChannel ''
56− <Chan &bitlbee>
57− </Chan>
58− ''}
59− ${net.extraConf}
60− </Network>
61− '') confOpts.networks) }
62− </User>
63− ${confOpts.extraZncConf}
64− '';
65−
66− zncConfFile = pkgs.writeTextFile {
67− name = "znc.conf";
68− text = if cfg.zncConf != ""
69− then cfg.zncConf
70− else mkZncConf cfg.confOptions;
71− };
72−
73− networkOpts = { ... }: {
74− options = {
75− server = mkOption {
76− type = types.str;
77− example = "chat.freenode.net";
78− description = ''
79− IRC server address.
80− '';
81− };
82−
83− port = mkOption {
84− type = types.int;
85− default = 6697;
86− example = 6697;
87− description = ''
88− IRC server port.
89− '';
90− };
91−
92− userName = mkOption {
93− default = "";
94− example = "johntron";
95− type = types.string;
96− description = ''
97− A nick identity specific to the IRC server.
98− '';
99− };
100−
101− password = mkOption {
102− type = types.str;
103− default = "";
104− description = ''
105− IRC server password, such as for a Slack gateway.
106− '';
107− };
108−
109− useSSL = mkOption {
110− type = types.bool;
111− default = true;
112− description = ''
113− Whether to use SSL to connect to the IRC server.
114− '';
115− };
116−
117− modulePackages = mkOption {
118− type = types.listOf types.package;
119− default = [];
120− example = [ "pkgs.zncModules.push" "pkgs.zncModules.fish" ];
121− description = ''
122− External ZNC modules to build.
123− '';
124− };
125−
126− modules = mkOption {
127− type = types.listOf types.str;
128− default = [ "simple_away" ];
129− example = literalExample "[ simple_away sasl ]";
130− description = ''
131− ZNC modules to load.
132− '';
133− };
134−
135− channels = mkOption {
136− type = types.listOf types.str;
137− default = [];
138− example = [ "nixos" ];
139− description = ''
140− IRC channels to join.
141− '';
142− };
143−
144− hasBitlbeeControlChannel = mkOption {
145− type = types.bool;
146− default = false;
147− description = ''
148− Whether to add the special Bitlbee operations channel.
149− '';
150− };
151−
152− extraConf = mkOption {
153− default = "";
154− type = types.lines;
155− example = ''
156− Encoding = ^UTF-8
157− FloodBurst = 4
158− FloodRate = 1.00
159− IRCConnectEnabled = true
160− Ident = johntron
161− JoinDelay = 0
162− Nick = johntron
163− '';
164− description = ''
165− Extra config for the network.
166− '';
167− };
168− };
169− };
170−
171−in
172−
173−{
174−
175− ###### Interface
176−
177− options = {
178− services.znc = {
179− enable = mkOption {
180− default = false;
181− type = types.bool;
182− description = ''
183− Enable a ZNC service for a user.
184− '';
185− };
186−
187− user = mkOption {
188− default = "znc";
189− example = "john";
190− type = types.string;
191− description = ''
192− The name of an existing user account to use to own the ZNC server process.
193− If not specified, a default user will be created to own the process.
194− '';
195− };
196−
197− group = mkOption {
198− default = "";
199− example = "users";
200− type = types.string;
201− description = ''
202− Group to own the ZNCserver process.
203− '';
204− };
205−
206− dataDir = mkOption {
207− default = "/var/lib/znc/";
208− example = "/home/john/.znc/";
209− type = types.path;
210− description = ''
211− The data directory. Used for configuration files and modules.
212− '';
213− };
214−
215− openFirewall = mkOption {
216− type = types.bool;
217− default = false;
218− description = ''
219− Whether to open ports in the firewall for ZNC.
220− '';
221− };
222−
223− zncConf = mkOption {
224− default = "";
225− example = "See: http://wiki.znc.in/Configuration";
226− type = types.lines;
227− description = ''
228− Config file as generated with `znc --makeconf` to use for the whole ZNC configuration.
229− If specified, `confOptions` will be ignored, and this value, as-is, will be used.
230− If left empty, a conf file with default values will be used.
231− '';
232− };
233−
234− confOptions = {
235− modules = mkOption {
236− type = types.listOf types.str;
237− default = [ "webadmin" "adminlog" ];
238− example = [ "partyline" "webadmin" "adminlog" "log" ];
239− description = ''
240− A list of modules to include in the `znc.conf` file.
241− '';
242− };
243−
244− userModules = mkOption {
245− type = types.listOf types.str;
246− default = [ "chansaver" "controlpanel" ];
247− example = [ "chansaver" "controlpanel" "fish" "push" ];
248− description = ''
249− A list of user modules to include in the `znc.conf` file.
250− '';
251− };
252−
253− userName = mkOption {
254− default = defaultUserName;
255− example = "johntron";
256− type = types.string;
257− description = ''
258− The user name used to log in to the ZNC web admin interface.
259− '';
260− };
261−
262− networks = mkOption {
263− default = { };
264− type = with types; attrsOf (submodule networkOpts);
265− description = ''
266− IRC networks to connect the user to.
267− '';
268− example = {
269− "freenode" = {
270− server = "chat.freenode.net";
271− port = 6697;
272− useSSL = true;
273− modules = [ "simple_away" ];
274− };
275− };
276− };
277−
278− nick = mkOption {
279− default = "znc-user";
280− example = "john";
281− type = types.string;
282− description = ''
283− The IRC nick.
284− '';
285− };
286−
287− passBlock = mkOption {
288− example = defaultPassBlock;
289− type = types.string;
290− description = ''
291− Generate with `nix-shell -p znc --command "znc --makepass"`.
292− This is the password used to log in to the ZNC web admin interface.
293− '';
294− };
295−
296− port = mkOption {
297− default = 5000;
298− example = 5000;
299− type = types.int;
300− description = ''
301− Specifies the port on which to listen.
302− '';
303− };
304−
305− useSSL = mkOption {
306− default = true;
307− type = types.bool;
308− description = ''
309− Indicates whether the ZNC server should use SSL when listening on the specified port. A self-signed certificate will be generated.
310− '';
311− };
312−
313− uriPrefix = mkOption {
314− type = types.nullOr types.str;
315− default = null;
316− example = "/znc/";
317− description = ''
318− An optional URI prefix for the ZNC web interface. Can be
319− used to make ZNC available behind a reverse proxy.
320− '';
321− };
322−
323− extraZncConf = mkOption {
324− default = "";
325− type = types.lines;
326− description = ''
327− Extra config to `znc.conf` file.
328− '';
329− };
330− };
331−
332− modulePackages = mkOption {
333− type = types.listOf types.package;
334− default = [ ];
335− example = literalExample "[ pkgs.zncModules.fish pkgs.zncModules.push ]";
336− description = ''
337− A list of global znc module packages to add to znc.
338− '';
339− };
340−
341− mutable = mkOption {
342− default = true;
343− type = types.bool;
344− description = ''
345− Indicates whether to allow the contents of the `dataDir` directory to be changed
346− by the user at run-time.
347− If true, modifications to the ZNC configuration after its initial creation are not
348− overwritten by a NixOS system rebuild.
349− If false, the ZNC configuration is rebuilt by every system rebuild.
350− If the user wants to manage the ZNC service using the web admin interface, this value
351− should be set to true.
352− '';
353− };
354−
355− extraFlags = mkOption {
356− default = [ ];
357− example = [ "--debug" ];
358− type = types.listOf types.str;
359− description = ''
360− Extra flags to use when executing znc command.
361− '';
362− };
363− };
364− };
365−
366−
367− ###### Implementation
368−
369− config = mkIf cfg.enable {
370−
371− networking.firewall = mkIf cfg.openFirewall {
372− allowedTCPPorts = [ cfg.confOptions.port ];
373− };
374−
375− systemd.services.znc = {
376− description = "ZNC Server";
377− wantedBy = [ "multi-user.target" ];
378− after = [ "network.service" ];
379− serviceConfig = {
380− User = cfg.user;
381− Group = cfg.group;
382− Restart = "always";
383− ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
384− ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
385− };
386− preStart = ''
387− ${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}/configs
388−
389− # If mutable, regenerate conf file every time.
390− ${optionalString (!cfg.mutable) ''
391− ${pkgs.coreutils}/bin/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated."
392− ${pkgs.coreutils}/bin/rm -f ${cfg.dataDir}/configs/znc.conf
393− ''}
394−
395− # Ensure essential files exist.
396− if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then
397− ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now."
398− ${pkgs.coreutils}/bin/cp --no-clobber ${zncConfFile} ${cfg.dataDir}/configs/znc.conf
399− ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf
400− ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf
401− fi
402−
403− if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then
404− ${pkgs.coreutils}/bin/echo "No znc.pem file found in ${cfg.dataDir}. Creating one now."
405− ${pkgs.znc}/bin/znc --makepem --datadir ${cfg.dataDir}
406− fi
407−
408− # Symlink modules
409− rm ${cfg.dataDir}/modules || true
410− ln -fs ${modules}/lib/znc ${cfg.dataDir}/modules
411− '';
412− script = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${toString cfg.extraFlags}";
413− };
414−
415− users.users = optional (cfg.user == defaultUser)
416− { name = defaultUser;
417− description = "ZNC server daemon owner";
418− group = defaultUser;
419− uid = config.ids.uids.znc;
420− home = cfg.dataDir;
421− createHome = true;
422− };
423−
424− users.groups = optional (cfg.user == defaultUser)
425− { name = defaultUser;
426− gid = config.ids.gids.znc;
427− members = [ defaultUser ];
428− };
429−
430− };
431−}
nixos/modules/services/networking/znc/default.nixnew file+306
@@ -0,0 +1,306 @@
1+{ config, lib, pkgs, ...}:
2+
3+with lib;
4+
5+let
6+
7+ cfg = config.services.znc;
8+
9+ defaultUser = "znc";
10+
11+ modules = pkgs.buildEnv {
12+ name = "znc-modules";
13+ paths = cfg.modulePackages;
14+ };
15+
16+ listenerPorts = concatMap (l: optional (l ? Port) l.Port)
17+ (attrValues (cfg.config.Listener or {}));
18+
19+ # Converts the config option to a string
20+ semanticString = let
21+
22+ sortedAttrs = set: sort (l: r:
23+ if l == "extraConfig" then false # Always put extraConfig last
24+ else if isAttrs set.${l} == isAttrs set.${r} then l < r
25+ else isAttrs set.${r} # Attrsets should be last, makes for a nice config
26+ # This last case occurs when any side (but not both) is an attrset
27+ # The order of these is correct when the attrset is on the right
28+ # which we're just returning
29+ ) (attrNames set);
30+
31+ # Specifies an attrset that encodes the value according to its type
32+ encode = name: value: {
33+ null = [];
34+ bool = [ "${name} = ${boolToString value}" ];
35+ int = [ "${name} = ${toString value}" ];
36+
37+ # extraConfig should be inserted verbatim
38+ string = [ (if name == "extraConfig" then value else "${name} = ${value}") ];
39+
40+ # Values like `Foo = [ "bar" "baz" ];` should be transformed into
41+ # Foo=bar
42+ # Foo=baz
43+ list = concatMap (encode name) value;
44+
45+ # Values like `Foo = { bar = { Baz = "baz"; Qux = "qux"; Florps = null; }; };` should be transmed into
46+ # <Foo bar>
47+ # Baz=baz
48+ # Qux=qux
49+ # </Foo>
50+ set = concatMap (subname: [
51+ "<${name} ${subname}>"
52+ ] ++ map (line: "\t${line}") (toLines value.${subname}) ++ [
53+ "</${name}>"
54+ ]) (filter (v: v != null) (attrNames value));
55+
56+ }.${builtins.typeOf value};
57+
58+ # One level "above" encode, acts upon a set and uses encode on each name,value pair
59+ toLines = set: concatMap (name: encode name set.${name}) (sortedAttrs set);
60+
61+ in
62+ concatStringsSep "\n" (toLines cfg.config);
63+
64+ semanticTypes = with types; rec {
65+ zncAtom = nullOr (either (either int bool) str);
66+ zncAttr = attrsOf (nullOr zncConf);
67+ zncAll = either (either zncAtom (listOf zncAtom)) zncAttr;
68+ zncConf = attrsOf (zncAll // {
69+ # Since this is a recursive type and the description by default contains
70+ # the description of its subtypes, infinite recursion would occur without
71+ # explicitly breaking this cycle
72+ description = "znc values (null, atoms (str, int, bool), list of atoms, or attrsets of znc values)";
73+ });
74+ };
75+
76+in
77+
78+{
79+
80+ imports = [ ./options.nix ];
81+
82+ options = {
83+ services.znc = {
84+ enable = mkEnableOption "ZNC";
85+
86+ user = mkOption {
87+ default = "znc";
88+ example = "john";
89+ type = types.str;
90+ description = ''
91+ The name of an existing user account to use to own the ZNC server
92+ process. If not specified, a default user will be created.
93+ '';
94+ };
95+
96+ group = mkOption {
97+ default = defaultUser;
98+ example = "users";
99+ type = types.str;
100+ description = ''
101+ Group to own the ZNC process.
102+ '';
103+ };
104+
105+ dataDir = mkOption {
106+ default = "/var/lib/znc/";
107+ example = "/home/john/.znc/";
108+ type = types.path;
109+ description = ''
110+ The state directory for ZNC. The config and the modules will be linked
111+ to from this directory as well.
112+ '';
113+ };
114+
115+ openFirewall = mkOption {
116+ type = types.bool;
117+ default = false;
118+ description = ''
119+ Whether to open ports in the firewall for ZNC. Does work with
120+ ports for listeners specified in
121+ <option>services.znc.config.Listener</option>.
122+ '';
123+ };
124+
125+ config = mkOption {
126+ type = semanticTypes.zncConf;
127+ default = {};
128+ example = literalExample ''
129+ {
130+ LoadModule = [ "webadmin" "adminlog" ];
131+ User.paul = {
132+ Admin = true;
133+ Nick = "paul";
134+ AltNick = "paul1";
135+ LoadModule = [ "chansaver" "controlpanel" ];
136+ Network.freenode = {
137+ Server = "chat.freenode.net +6697";
138+ LoadModule = [ "simple_away" ];
139+ Chan = {
140+ "#nixos" = { Detached = false; };
141+ "##linux" = { Disabled = true; };
142+ };
143+ };
144+ Pass.password = {
145+ Method = "sha256";
146+ Hash = "e2ce303c7ea75c571d80d8540a8699b46535be6a085be3414947d638e48d9e93";
147+ Salt = "l5Xryew4g*!oa(ECfX2o";
148+ };
149+ };
150+ }
151+ '';
152+ description = ''
153+ Configuration for ZNC, see
154+ <literal>https://wiki.znc.in/Configuration</literal> for details. The
155+ Nix value declared here will be translated directly to the xml-like
156+ format ZNC expects. This is much more flexible than the legacy options
157+ under <option>services.znc.confOptions.*</option>, but also can't do
158+ any type checking.
159+ </para>
160+ <para>
161+ You can use <command>nix-instantiate --eval --strict '&lt;nixpkgs/nixos&gt;' -A config.services.znc.config</command>
162+ to view the current value. By default it contains a listener for port
163+ 5000 with SSL enabled.
164+ </para>
165+ <para>
166+ Nix attributes called <literal>extraConfig</literal> will be inserted
167+ verbatim into the resulting config file.
168+ </para>
169+ <para>
170+ If <option>services.znc.useLegacyConfig</option> is turned on, the
171+ option values in <option>services.znc.confOptions.*</option> will be
172+ gracefully be applied to this option.
173+ </para>
174+ <para>
175+ If you intend to update the configuration through this option, be sure
176+ to enable <option>services.znc.mutable</option>, otherwise none of the
177+ changes here will be applied after the initial deploy.
178+ '';
179+ };
180+
181+ configFile = mkOption {
182+ type = types.path;
183+ example = "~/.znc/configs/znc.conf";
184+ description = ''
185+ Configuration file for ZNC. It is recommended to use the
186+ <option>config</option> option instead.
187+ </para>
188+ <para>
189+ Setting this option will override any auto-generated config file
190+ through the <option>confOptions</option> or <option>config</option>
191+ options.
192+ '';
193+ };
194+
195+ modulePackages = mkOption {
196+ type = types.listOf types.package;
197+ default = [ ];
198+ example = literalExample "[ pkgs.zncModules.fish pkgs.zncModules.push ]";
199+ description = ''
200+ A list of global znc module packages to add to znc.
201+ '';
202+ };
203+
204+ mutable = mkOption {
205+ default = true; # TODO: Default to true when config is set, make sure to not delete the old config if present
206+ type = types.bool;
207+ description = ''
208+ Indicates whether to allow the contents of the
209+ <literal>dataDir</literal> directory to be changed by the user at
210+ run-time.
211+ </para>
212+ <para>
213+ If enabled, modifications to the ZNC configuration after its initial
214+ creation are not overwritten by a NixOS rebuild. If disabled, the
215+ ZNC configuration is rebuilt on every NixOS rebuild.
216+ </para>
217+ <para>
218+ If the user wants to manage the ZNC service using the web admin
219+ interface, this option should be enabled.
220+ '';
221+ };
222+
223+ extraFlags = mkOption {
224+ default = [ ];
225+ example = [ "--debug" ];
226+ type = types.listOf types.str;
227+ description = ''
228+ Extra arguments to use for executing znc.
229+ '';
230+ };
231+ };
232+ };
233+
234+
235+ ###### Implementation
236+
237+ config = mkIf cfg.enable {
238+
239+ services.znc = {
240+ configFile = mkDefault (pkgs.writeText "znc-generated.conf" semanticString);
241+ config = {
242+ Version = (builtins.parseDrvName pkgs.znc.name).version;
243+ Listener.l.Port = mkDefault 5000;
244+ Listener.l.SSL = mkDefault true;
245+ };
246+ };
247+
248+ networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall listenerPorts;
249+
250+ systemd.services.znc = {
251+ description = "ZNC Server";
252+ wantedBy = [ "multi-user.target" ];
253+ after = [ "network-online.target" ];
254+ serviceConfig = {
255+ User = cfg.user;
256+ Group = cfg.group;
257+ Restart = "always";
258+ ExecStart = "${pkgs.znc}/bin/znc --foreground --datadir ${cfg.dataDir} ${escapeShellArgs cfg.extraFlags}";
259+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
260+ ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
261+ };
262+ preStart = ''
263+ mkdir -p ${cfg.dataDir}/configs
264+
265+ # If mutable, regenerate conf file every time.
266+ ${optionalString (!cfg.mutable) ''
267+ echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated."
268+ rm -f ${cfg.dataDir}/configs/znc.conf
269+ ''}
270+
271+ # Ensure essential files exist.
272+ if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then
273+ echo "No znc.conf file found in ${cfg.dataDir}. Creating one now."
274+ cp --no-clobber ${cfg.configFile} ${cfg.dataDir}/configs/znc.conf
275+ chmod u+rw ${cfg.dataDir}/configs/znc.conf
276+ chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf
277+ fi
278+
279+ if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then
280+ echo "No znc.pem file found in ${cfg.dataDir}. Creating one now."
281+ ${pkgs.znc}/bin/znc --makepem --datadir ${cfg.dataDir}
282+ fi
283+
284+ # Symlink modules
285+ rm ${cfg.dataDir}/modules || true
286+ ln -fs ${modules}/lib/znc ${cfg.dataDir}/modules
287+ '';
288+ };
289+
290+ users.users = optional (cfg.user == defaultUser)
291+ { name = defaultUser;
292+ description = "ZNC server daemon owner";
293+ group = defaultUser;
294+ uid = config.ids.uids.znc;
295+ home = cfg.dataDir;
296+ createHome = true;
297+ };
298+
299+ users.groups = optional (cfg.user == defaultUser)
300+ { name = defaultUser;
301+ gid = config.ids.gids.znc;
302+ members = [ defaultUser ];
303+ };
304+
305+ };
306+}
nixos/modules/services/networking/znc/options.nixnew file+270

This diff is too big to show here.

nixos/modules/services/printing/cupsd.nix+1−1

This diff is too big to show here.

nixos/modules/services/search/elasticsearch-curator.nix+3−2

This diff is too big to show here.

nixos/modules/services/search/kibana.nix+4−1

This diff is too big to show here.

nixos/modules/services/search/solr.nix+72−109

This diff is too big to show here.

nixos/modules/services/security/munge.nix−2

This diff is too big to show here.

nixos/modules/services/security/tor.nix+12

This diff is too big to show here.

nixos/modules/services/system/cloud-init.nix+30−7

This diff is too big to show here.

nixos/modules/services/system/kerberos.nixdeleted−64

This diff is too big to show here.

nixos/modules/services/system/kerberos/default.nixnew file+80

This diff is too big to show here.

nixos/modules/services/system/kerberos/heimdal.nixnew file+68

This diff is too big to show here.

nixos/modules/services/system/kerberos/mit.nixnew file+68

This diff is too big to show here.

nixos/modules/services/system/nscd.conf+29−5

This diff is too big to show here.

nixos/modules/services/system/saslauthd.nix+1−1

This diff is too big to show here.

nixos/modules/services/ttys/kmscon.nix+12−1

This diff is too big to show here.

nixos/modules/services/web-apps/atlassian/confluence.nix+1−1

This diff is too big to show here.

nixos/modules/services/web-apps/atlassian/crowd.nix+3−2

This diff is too big to show here.

nixos/modules/services/web-apps/atlassian/jira.nix+1−1

This diff is too big to show here.

nixos/modules/services/web-apps/matomo.nix+11−4

This diff is too big to show here.

nixos/modules/services/web-apps/nextcloud.nix+34−8

This diff is too big to show here.

nixos/modules/services/web-apps/nextcloud.xmlnew file+99

This diff is too big to show here.

nixos/modules/services/web-apps/quassel-webserver.nixdeleted−101

This diff is too big to show here.

nixos/modules/services/web-apps/selfoss.nix+2−2

This diff is too big to show here.

nixos/modules/services/web-servers/apache-httpd/default.nix+15−2

This diff is too big to show here.

nixos/modules/services/web-servers/apache-httpd/limesurvey.nix+1−1

This diff is too big to show here.

nixos/modules/services/web-servers/apache-httpd/mediawiki.nix+5−5

This diff is too big to show here.

nixos/modules/services/web-servers/apache-httpd/owncloud.nixdeleted−608

This diff is too big to show here.

nixos/modules/services/web-servers/apache-httpd/wordpress.nix+4−4

This diff is too big to show here.

nixos/modules/services/web-servers/lighttpd/collectd.nix+1−1

This diff is too big to show here.

nixos/modules/services/web-servers/nginx/default.nix+31−4

This diff is too big to show here.

nixos/modules/services/web-servers/nginx/vhost-options.nix+1−1

This diff is too big to show here.

nixos/modules/services/web-servers/phpfpm/default.nix+21−10

This diff is too big to show here.

nixos/modules/services/web-servers/phpfpm/pool-options.nix+14−1

This diff is too big to show here.

nixos/modules/services/web-servers/tomcat.nix+53−5

This diff is too big to show here.

nixos/modules/services/x11/compton.nix+6

This diff is too big to show here.

nixos/modules/services/x11/desktop-managers/gnome3.nix+66−26

This diff is too big to show here.

nixos/modules/services/x11/desktop-managers/lxqt.nix+1−10

This diff is too big to show here.

nixos/modules/services/x11/desktop-managers/mate.nix+1−9

This diff is too big to show here.

nixos/modules/services/x11/desktop-managers/plasma5.nix+2−4

This diff is too big to show here.

nixos/modules/services/x11/desktop-managers/xfce.nix+2−1

This diff is too big to show here.

nixos/modules/services/x11/display-managers/default.nix+16−4

This diff is too big to show here.

nixos/modules/services/x11/display-managers/gdm.nix+1−1

This diff is too big to show here.

nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix+1−1

This diff is too big to show here.

nixos/modules/services/x11/display-managers/lightdm.nix+6−10

This diff is too big to show here.

nixos/modules/services/x11/display-managers/sddm.nix+2−3

This diff is too big to show here.

nixos/modules/services/x11/display-managers/xpra.nix+20−24

This diff is too big to show here.

nixos/modules/services/x11/gdk-pixbuf.nixnew file+45

This diff is too big to show here.

nixos/modules/services/x11/urxvtd.nix+28−28

This diff is too big to show here.

nixos/modules/services/x11/xserver.nix+4−3

This diff is too big to show here.

nixos/modules/system/activation/activation-script.nix+2−1

This diff is too big to show here.

nixos/modules/system/boot/initrd-network.nix+2−1

This diff is too big to show here.

nixos/modules/system/boot/initrd-ssh.nix+1

This diff is too big to show here.

nixos/modules/system/boot/loader/generations-dir/generations-dir.nix+2−2

This diff is too big to show here.

nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix+1−1

This diff is too big to show here.

nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix+2−2

This diff is too big to show here.

nixos/modules/system/boot/loader/grub/grub.nix+1−1

This diff is too big to show here.

nixos/modules/system/boot/loader/init-script/init-script.nix+2−2

This diff is too big to show here.

nixos/modules/system/boot/loader/raspberrypi/builder_uboot.shdeleted−29

This diff is too big to show here.

nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nixnew file+10

This diff is too big to show here.

nixos/modules/system/boot/loader/raspberrypi/builder.sh → nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.shrenamed+40−34

This diff is too big to show here.

nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix+11−17

This diff is too big to show here.

nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix → nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nixrenamed+11−11

This diff is too big to show here.

nixos/modules/system/boot/loader/raspberrypi/uboot-builder.shnew file+38

This diff is too big to show here.

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix+1−1

This diff is too big to show here.

nixos/modules/system/boot/luksroot.nix+35−35

This diff is too big to show here.

nixos/modules/system/boot/stage-1-init.sh+5−4

This diff is too big to show here.

nixos/modules/system/boot/stage-1.nix+5−5

This diff is too big to show here.

nixos/modules/system/boot/systemd-nspawn.nix+10−7

This diff is too big to show here.

nixos/modules/system/boot/systemd.nix+36−4

This diff is too big to show here.

nixos/modules/system/etc/etc.nix+1−1

This diff is too big to show here.

nixos/modules/installer/tools/auto-upgrade.nix → nixos/modules/tasks/auto-upgrade.nixrenamed

The content is the same.

nixos/modules/tasks/cpu-freq.nix+56−18

This diff is too big to show here.

nixos/modules/tasks/filesystems.nix+5−3

This diff is too big to show here.

nixos/modules/tasks/filesystems/bcachefs.nix+50−11

This diff is too big to show here.

nixos/modules/tasks/filesystems/f2fs.nix+6

This diff is too big to show here.

nixos/modules/tasks/filesystems/zfs.nix+2−1

This diff is too big to show here.

nixos/modules/tasks/network-interfaces-scripted.nix+2−1

This diff is too big to show here.

nixos/modules/testing/service-runner.nix+1−1

This diff is too big to show here.

nixos/modules/testing/test-instrumentation.nix+1−2

This diff is too big to show here.

nixos/modules/virtualisation/amazon-image.nix+6−2

This diff is too big to show here.

nixos/modules/virtualisation/container-config.nix+2−7

This diff is too big to show here.

nixos/modules/virtualisation/containers.nix+29−7

This diff is too big to show here.

nixos/modules/virtualisation/docker-image.nix+38

This diff is too big to show here.

nixos/modules/virtualisation/docker-preloader.nixnew file+135

This diff is too big to show here.

nixos/modules/virtualisation/ec2-amis.nix+18−1

This diff is too big to show here.

nixos/modules/virtualisation/gce-images.nix+2−2

This diff is too big to show here.

nixos/modules/virtualisation/google-compute-config.nix+233−3

This diff is too big to show here.

nixos/modules/virtualisation/google-compute-image.nix+43−318

This diff is too big to show here.

nixos/modules/virtualisation/kvmgt.nix+7−1

This diff is too big to show here.

nixos/modules/virtualisation/libvirtd.nix+2

This diff is too big to show here.

nixos/modules/virtualisation/parallels-guest.nix+2−2

This diff is too big to show here.

nixos/modules/virtualisation/qemu-guest-agent.nix+1−1

This diff is too big to show here.

nixos/modules/virtualisation/qemu-vm.nix+4−1

This diff is too big to show here.

nixos/modules/virtualisation/virtualbox-image.nix+5−5

This diff is too big to show here.

nixos/modules/virtualisation/xe-guest-utilities.nix+1−1

This diff is too big to show here.

nixos/release-combined.nix+27−22

This diff is too big to show here.

nixos/release.nix+32−217

This diff is too big to show here.

nixos/tests/all-tests.nixnew file+224

This diff is too big to show here.

nixos/tests/bees.nixnew file+55

This diff is too big to show here.

nixos/tests/boot.nix+5−2

This diff is too big to show here.

nixos/tests/borgbackup.nix+3

This diff is too big to show here.

nixos/tests/buildbot.nix+114−105

This diff is too big to show here.

nixos/tests/ceph.nix+3−4

This diff is too big to show here.

nixos/tests/certmgr.nix+5−2

This diff is too big to show here.

nixos/tests/chromium.nix+9−6

This diff is too big to show here.

nixos/tests/cjdns.nix−3

This diff is too big to show here.

nixos/tests/clickhouse.nixnew file+25

This diff is too big to show here.

nixos/tests/cloud-init.nix+5−2

This diff is too big to show here.

nixos/tests/cockroachdb.nixnew file+126

This diff is too big to show here.

nixos/tests/common/webroot/news-rss.xmlnew file+15

This diff is too big to show here.

nixos/tests/containers-bridge.nix−1

This diff is too big to show here.

nixos/tests/containers-extra_veth.nix+1−1

This diff is too big to show here.

nixos/tests/containers-ipv4.nix−1

This diff is too big to show here.

nixos/tests/containers-ipv6.nix−1

This diff is too big to show here.

nixos/tests/containers-portforward.nix−1

This diff is too big to show here.

nixos/tests/containers-restart_networking.nix−1

This diff is too big to show here.

nixos/tests/docker-preloader.nixnew file+27

This diff is too big to show here.

nixos/tests/docker-tools.nix+5

This diff is too big to show here.

nixos/tests/ec2.nix+5−2

This diff is too big to show here.

nixos/tests/elk.nix+8−2

This diff is too big to show here.

nixos/tests/gitea.nixnew file+79

This diff is too big to show here.

nixos/tests/gitlab.nix+16−5

This diff is too big to show here.

nixos/tests/gnome3-gdm.nix+24−8

This diff is too big to show here.

nixos/tests/gnome3.nix+2−2

This diff is too big to show here.

nixos/tests/google-oslogin/default.nixnew file+52

This diff is too big to show here.

nixos/tests/google-oslogin/server.nixnew file+29

This diff is too big to show here.

nixos/tests/google-oslogin/server.pynew file+96

This diff is too big to show here.

nixos/tests/handbrake.nixnew file+25

This diff is too big to show here.

nixos/tests/hardened.nix+21−1

This diff is too big to show here.

nixos/tests/home-assistant.nix+11−3

This diff is too big to show here.

nixos/tests/hydra/create-trivial-project.sh+2−1

This diff is too big to show here.

nixos/tests/i3wm.nix+1−1

This diff is too big to show here.

nixos/tests/incron.nixnew file+52

This diff is too big to show here.

nixos/tests/installer.nix+6−3

This diff is too big to show here.

nixos/tests/jackett.nixnew file+18

This diff is too big to show here.

nixos/tests/kafka.nix+9−3

This diff is too big to show here.

nixos/tests/kerberos/default.nixnew file+7

This diff is too big to show here.

nixos/tests/kerberos/heimdal.nixnew file+53

This diff is too big to show here.

nixos/tests/kerberos/mit.nixnew file+45

This diff is too big to show here.

nixos/tests/keymap.nix+6−3

This diff is too big to show here.

nixos/tests/kubernetes/base.nix+5−2

This diff is too big to show here.

nixos/tests/kubernetes/dns.nix+2−2

This diff is too big to show here.

nixos/tests/kubernetes/kubernetes-common.nix−1

This diff is too big to show here.

nixos/tests/lidarr.nixnew file+18

This diff is too big to show here.

nixos/tests/make-test.nix+6−2

This diff is too big to show here.

nixos/tests/mxisd.nixnew file+21

This diff is too big to show here.

nixos/tests/nat.nix−2

This diff is too big to show here.

nixos/tests/networking.nix+3−10

This diff is too big to show here.

nixos/tests/nextcloud/default.nix+7−4

This diff is too big to show here.

nixos/tests/nexus.nix+1−1

This diff is too big to show here.

nixos/tests/opensmtpd.nix+6−2

This diff is too big to show here.

nixos/tests/owncloud.nixdeleted−39

This diff is too big to show here.

nixos/tests/plasma5.nix+5−16

This diff is too big to show here.

nixos/tests/postgis.nix+1−1

This diff is too big to show here.

nixos/tests/postgresql.nix+26−9

This diff is too big to show here.

nixos/tests/predictable-interface-names.nix+5−2

This diff is too big to show here.

nixos/tests/prometheus-exporters.nixnew file+335

This diff is too big to show here.

nixos/tests/prometheus.nix+22

This diff is too big to show here.

nixos/tests/quagga.nix−1

This diff is too big to show here.

nixos/tests/radarr.nixnew file+18

This diff is too big to show here.

nixos/tests/roundcube.nixnew file+28

This diff is too big to show here.

nixos/tests/rspamd.nix+166−5

This diff is too big to show here.

nixos/tests/rss2email.nixnew file+66

This diff is too big to show here.

nixos/tests/rsyslogd.nixnew file+42

This diff is too big to show here.

nixos/tests/run-in-machine.nix+16−10

This diff is too big to show here.

nixos/tests/sddm.nix+5−2

This diff is too big to show here.

nixos/tests/slurm.nix+57−10

This diff is too big to show here.

nixos/tests/solr.nixnew file+47

This diff is too big to show here.

nixos/tests/sonarr.nixnew file+18

This diff is too big to show here.

nixos/tests/statsd.nixdeleted−51

This diff is too big to show here.

nixos/tests/syncthing-relay.nixnew file+22

This diff is too big to show here.

nixos/tests/systemd.nix+5

This diff is too big to show here.

nixos/tests/telegraf.nixnew file+30

This diff is too big to show here.

nixos/tests/virtualbox.nix+8−3

This diff is too big to show here.

nixos/tests/xmonad.nix+1−1

This diff is too big to show here.

nixos/tests/xss-lock.nix+1−2

This diff is too big to show here.

nixos/tests/zfs.nix+5−2

This diff is too big to show here.

pkgs/applications/altcoins/aeon/default.nix+5−5

This diff is too big to show here.

pkgs/applications/altcoins/bitcoin-abc.nix+4−4

This diff is too big to show here.

pkgs/applications/altcoins/bitcoin.nix+2−2

This diff is too big to show here.

pkgs/applications/altcoins/clightning.nix+17−11

This diff is too big to show here.

pkgs/applications/altcoins/default.nix+10−5

This diff is too big to show here.

pkgs/applications/altcoins/go-ethereum.nix+3−3

This diff is too big to show here.

pkgs/applications/altcoins/litecoin.nix+2−2

This diff is too big to show here.

pkgs/applications/altcoins/mist.nix+2−2

This diff is too big to show here.

pkgs/applications/altcoins/monero-gui/default.nix+8−7

This diff is too big to show here.

pkgs/applications/altcoins/monero/default.nix+4−3

This diff is too big to show here.

pkgs/applications/altcoins/namecoin.nix+2−2

This diff is too big to show here.

pkgs/applications/altcoins/nano-wallet/default.nix+2−2

This diff is too big to show here.

pkgs/applications/altcoins/parity-ui/default.nix−2

This diff is too big to show here.

pkgs/applications/altcoins/parity/beta.nix+4−5

This diff is too big to show here.

pkgs/applications/altcoins/parity/default.nix+4−5

This diff is too big to show here.

pkgs/applications/altcoins/parity/parity.nix+2−3

This diff is too big to show here.

pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patchdeleted−113

This diff is too big to show here.

pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patchdeleted−98

This diff is too big to show here.

pkgs/applications/altcoins/particl/particl-core.nix+15−6

This diff is too big to show here.

pkgs/applications/altcoins/polkadot/default.nixnew file+30

This diff is too big to show here.

pkgs/applications/altcoins/wownero.nixnew file+51

This diff is too big to show here.

pkgs/applications/audio/a2jmidid/default.nix+16−9

This diff is too big to show here.

pkgs/applications/audio/abcde/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/aeolus/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/ams-lv2/default.nix+5−8

This diff is too big to show here.

pkgs/applications/audio/ardour/default.nix+9−7

This diff is too big to show here.

pkgs/applications/audio/ario/default.nix+7−10

This diff is too big to show here.

pkgs/applications/audio/ario/glib-single-include.patchdeleted−40

This diff is too big to show here.

pkgs/applications/audio/artyFX/default.nix+2

This diff is too big to show here.

pkgs/applications/audio/audacity/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/avldrums-lv2/default.nixnew file+30

This diff is too big to show here.

pkgs/applications/audio/axoloti/default.nix+14−14

This diff is too big to show here.

pkgs/applications/audio/bitmeter/default.nix+9−2

This diff is too big to show here.

pkgs/applications/audio/bristol/default.nix+1−1

This diff is too big to show here.

pkgs/applications/audio/bs1770gain/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/cadence/default.nix+50−34

This diff is too big to show here.

pkgs/applications/audio/cantata/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/caps/default.nix+2−13

This diff is too big to show here.

pkgs/applications/audio/clementine/default.nix+3−2

This diff is too big to show here.

pkgs/applications/audio/cmusfm/default.nixnew file+36

This diff is too big to show here.

pkgs/applications/audio/cozy-audiobooks/default.nixnew file+79

This diff is too big to show here.

pkgs/applications/audio/crip/default.nix+2−3

This diff is too big to show here.

pkgs/applications/audio/csound/csound-qt/default.nixnew file+49

This diff is too big to show here.

pkgs/applications/audio/csound/csound-qt/rtmidipath.patchnew file+17

This diff is too big to show here.

pkgs/applications/audio/csound/default.nix+5−2

This diff is too big to show here.

pkgs/applications/audio/distrho/default.nix+21−16

This diff is too big to show here.

pkgs/applications/audio/dragonfly-reverb/default.nix+7−5

This diff is too big to show here.

pkgs/applications/audio/drumkv1/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/espeak-ng/default.nix+1−1

This diff is too big to show here.

pkgs/applications/audio/faust/faust1.nix+1−1

This diff is too big to show here.

pkgs/applications/audio/faust/faust2.nix+1−1

This diff is too big to show here.

pkgs/applications/audio/faust/faustlive.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/flacon/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/fluidsynth/default.nix+20−4

This diff is too big to show here.

pkgs/applications/audio/fomp/default.nix+2−8

This diff is too big to show here.

pkgs/applications/audio/gnome-podcasts/default.nixnew file+44

This diff is too big to show here.

pkgs/applications/audio/gpodder/default.nix+4−4

This diff is too big to show here.

pkgs/applications/audio/gradio/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/gtkpod/default.nix+4−4

This diff is too big to show here.

pkgs/applications/audio/guitarix/default.nix+2−8

This diff is too big to show here.

pkgs/applications/audio/gxplugins-lv2/default.nixnew file+29

This diff is too big to show here.

pkgs/applications/audio/hybridreverb2/default.nixnew file+49

This diff is too big to show here.

pkgs/applications/audio/ingen/default.nix+5−9

This diff is too big to show here.

pkgs/applications/audio/jack-rack/default.nix+5

This diff is too big to show here.

pkgs/applications/audio/jackmix/default.nix+1−5

This diff is too big to show here.

pkgs/applications/audio/jalv/default.nix+2−8

This diff is too big to show here.

pkgs/applications/audio/jamin/default.nix+4−6

This diff is too big to show here.

pkgs/applications/audio/kid3/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/klick/default.nix+4−11

This diff is too big to show here.

pkgs/applications/audio/lash/default.nix+6−1

This diff is too big to show here.

pkgs/applications/audio/lingot/default.nix+1−1

This diff is too big to show here.

pkgs/applications/audio/lmms/default.nix+4−4

This diff is too big to show here.

pkgs/applications/audio/lollypop/default.nix+13−13

This diff is too big to show here.

pkgs/applications/audio/ltc-tools/default.nixnew file+25

This diff is too big to show here.

pkgs/applications/audio/luppp/build-install.patchnew file+16

This diff is too big to show here.

pkgs/applications/audio/luppp/default.nixnew file+40

This diff is too big to show here.

pkgs/applications/audio/mda-lv2/default.nix+2−8

This diff is too big to show here.

pkgs/applications/audio/mi2ly/default.nix+1−1

This diff is too big to show here.

pkgs/applications/audio/mi2ly/default.upstream+1−1

This diff is too big to show here.

pkgs/applications/audio/mid2key/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/mimms/default.nix+1−1

This diff is too big to show here.

pkgs/applications/audio/mixxx/default.nix+6−19

This diff is too big to show here.

pkgs/applications/audio/mopidy/default.nix+5−5

This diff is too big to show here.

pkgs/applications/audio/mopidy/gmusic.nix+1−1

This diff is too big to show here.

pkgs/applications/audio/mopidy/iris.nix+3−3

This diff is too big to show here.

pkgs/applications/audio/mopidy/local-images.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/musescore/default.nix+8−4

This diff is too big to show here.

pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patchnew file+25

This diff is too big to show here.

pkgs/applications/audio/ncmpc/default.nix+4−4

This diff is too big to show here.

pkgs/applications/audio/non/default.nix+2−5

This diff is too big to show here.

pkgs/applications/audio/normalize/default.nix+1−1

This diff is too big to show here.

pkgs/applications/audio/nova-filters/default.nix+3−11

This diff is too big to show here.

pkgs/applications/audio/openmpt123/default.nix+16−10

This diff is too big to show here.

pkgs/applications/audio/opus-tools/default.nix+4−4

This diff is too big to show here.

pkgs/applications/audio/padthv1/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/patchage/default.nix+2−6

This diff is too big to show here.

pkgs/applications/audio/pianobooster/default.nix+1

This diff is too big to show here.

pkgs/applications/audio/picard/default.nix+11−5

This diff is too big to show here.

pkgs/applications/audio/pithos/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/pulseaudio-modules-bt/default.nix+30−11

This diff is too big to show here.

pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patchnew file+20

This diff is too big to show here.

pkgs/applications/audio/pulseeffects/default.nix+5−5

This diff is too big to show here.

pkgs/applications/audio/qjackctl/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/qmmp/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/qsampler/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/quodlibet/default.nix+8−14

This diff is too big to show here.

pkgs/applications/audio/radiotray-ng/default.nix+2−3

This diff is too big to show here.

pkgs/applications/audio/reaper/default.nix+15−36

This diff is too big to show here.

pkgs/applications/audio/renoise/default.nix+10−4

This diff is too big to show here.

pkgs/applications/audio/rhvoice/default.nix+2−10

This diff is too big to show here.

pkgs/applications/audio/rhythmbox/default.nix+2−1

This diff is too big to show here.

pkgs/applications/audio/rosegarden/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/samplv1/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/seq24/default.nix+1−1

This diff is too big to show here.

pkgs/applications/audio/sfxr-qt/default.nixnew file+36

This diff is too big to show here.

pkgs/applications/audio/snapcast/default.nix+34−22

This diff is too big to show here.

pkgs/applications/audio/snd/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/sonata/default.nix+3−3

This diff is too big to show here.

pkgs/applications/audio/sonic-pi/default.nix+5−5

This diff is too big to show here.

pkgs/applications/audio/sound-juicer/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/spectmorph/default.nixnew file+22

This diff is too big to show here.

pkgs/applications/audio/spotify/default.nix+10−4

This diff is too big to show here.

pkgs/applications/audio/spotify/update.sh+61−14

This diff is too big to show here.

pkgs/applications/audio/spotifywm/default.nixnew file+31

This diff is too big to show here.

pkgs/applications/audio/synthv1/default.nix+3−3

This diff is too big to show here.

pkgs/applications/audio/tetraproc/default.nix+2−2

This diff is too big to show here.

pkgs/applications/audio/timemachine/default.nix+4

This diff is too big to show here.

pkgs/applications/audio/transcribe/default.nix+20−17

This diff is too big to show here.

pkgs/applications/audio/traverso/default.nixnew file+31

This diff is too big to show here.

pkgs/applications/audio/vcv-rack/default.nix+3−2

This diff is too big to show here.

pkgs/applications/audio/vocal/default.nix+7−6

This diff is too big to show here.

pkgs/applications/audio/whipper/default.nix+10−7

This diff is too big to show here.

pkgs/applications/audio/whipper/paths.patch−73

This diff is too big to show here.

pkgs/applications/audio/wolf-shaper/default.nixnew file+47

This diff is too big to show here.

pkgs/applications/audio/x42-plugins/default.nix+3−3

This diff is too big to show here.

pkgs/applications/audio/yoshimi/default.nix+2−2

This diff is too big to show here.

pkgs/applications/backup/crashplan/crashplan-small-business.nix+1−1

This diff is too big to show here.

pkgs/applications/backup/deja-dup/default.nix+13−10

This diff is too big to show here.

pkgs/applications/backup/vdmfec/default.nixnew file+19

This diff is too big to show here.

pkgs/applications/display-managers/lightdm-mini-greeter/default.nix+3−3

This diff is too big to show here.

pkgs/applications/display-managers/lightdm/default.nix+2−2

This diff is too big to show here.

pkgs/applications/display-managers/ly/default.nixnew file+29

This diff is too big to show here.

pkgs/applications/display-managers/sddm/default.nix+2−3

This diff is too big to show here.

pkgs/applications/display-managers/sddm/qt511.patchdeleted−28

This diff is too big to show here.

pkgs/applications/editors/android-studio/common.nix+1−1

This diff is too big to show here.

pkgs/applications/editors/android-studio/default.nix+21−10

This diff is too big to show here.

pkgs/applications/editors/atom/default.nix+16−18

This diff is too big to show here.

pkgs/applications/editors/eclipse/default.nix+21

This diff is too big to show here.

pkgs/applications/editors/eclipse/plugins.nix+2−2

This diff is too big to show here.

pkgs/applications/editors/ed/default.nix+3−3

This diff is too big to show here.

pkgs/applications/editors/edbrowse/default.nix+10−2

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/bbdb/3.nix+2−2

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/cedille/default.nixnew file+30

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/color-theme/default.nix+1−1

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/elpa-generated.nix+264−104

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix+4−4

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/emms/default.nix+2−2

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix+3−7

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/let-alist/default.nix+2−2

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/melpa-generated.nix+5771−2668

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/melpa-packages.nix+12

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix+2608−1526

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix+6−12

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/org-generated.nix+6−6

This diff is too big to show here.

pkgs/applications/editors/emacs-modes/remember/default.nixdeleted−45

This diff is too big to show here.

pkgs/applications/editors/emacs/25.nix+8−5

This diff is too big to show here.

pkgs/applications/editors/emacs/builder.shdeleted−40

This diff is too big to show here.

pkgs/applications/editors/emacs/default.nix+8−5

This diff is too big to show here.

pkgs/applications/editors/emacs/macport.nix+6−6

This diff is too big to show here.

pkgs/applications/editors/emacs/site-start.el+1−1

This diff is too big to show here.

pkgs/applications/editors/featherpad/default.nixnew file+23

This diff is too big to show here.

pkgs/applications/editors/focuswriter/default.nix+2−2

This diff is too big to show here.

pkgs/applications/editors/geany/default.nix+3−3

This diff is too big to show here.

pkgs/applications/editors/ghostwriter/default.nix+4−4

This diff is too big to show here.

pkgs/applications/editors/gnome-builder/default.nix+10−27

This diff is too big to show here.

pkgs/applications/editors/gnome-latex/default.nix+2−2

This diff is too big to show here.

pkgs/applications/editors/jetbrains/default.nix+23−23

This diff is too big to show here.

pkgs/applications/editors/kakoune/default.nix+6−2

This diff is too big to show here.

pkgs/applications/editors/kile/default.nix+5−7

This diff is too big to show here.

pkgs/applications/editors/leafpad/default.nix+1−1

This diff is too big to show here.

pkgs/applications/editors/manuskript/default.nix+2−2

This diff is too big to show here.

pkgs/applications/editors/mindforger/build.patchnew file+91

This diff is too big to show here.

pkgs/applications/editors/mindforger/default.nixnew file+45

This diff is too big to show here.

pkgs/applications/editors/moe/default.nix+3−3

This diff is too big to show here.

pkgs/applications/editors/monodevelop/default.nix+1−1

This diff is too big to show here.

pkgs/applications/editors/nano/default.nix+2−2

This diff is too big to show here.

pkgs/applications/editors/ne/default.nix+2−2

This diff is too big to show here.

pkgs/applications/editors/neovim/default.nix+19−2

This diff is too big to show here.

pkgs/applications/editors/neovim/neovim-remote.nix+3−3

This diff is too big to show here.

pkgs/applications/editors/neovim/qt.nix+73−57

This diff is too big to show here.

pkgs/applications/editors/neovim/system_rplugin_manifest.patchnew file+29

This diff is too big to show here.

pkgs/applications/editors/neovim/wrapper.nix+42−20

This diff is too big to show here.

pkgs/applications/editors/notepadqq/default.nix+10−7

This diff is too big to show here.

pkgs/applications/editors/okteta/default.nix+2−2

This diff is too big to show here.

pkgs/applications/editors/quilter/default.nix+11−32

This diff is too big to show here.

pkgs/applications/editors/rednotebook/default.nix+5−5

This diff is too big to show here.

pkgs/applications/editors/rstudio/clang-location.patchnew file+25

This diff is too big to show here.

pkgs/applications/editors/rstudio/default.nix+6−5

This diff is too big to show here.

pkgs/applications/editors/rstudio/fix-cmake.patchnew file+15

This diff is too big to show here.

pkgs/applications/editors/rstudio/preview.nixnew file+119

This diff is too big to show here.

pkgs/applications/editors/standardnotes/default.nixnew file+48

This diff is too big to show here.

pkgs/applications/editors/sublime/2/default.nix+8−2

This diff is too big to show here.

pkgs/applications/editors/sublime/3/common.nix+24−5

This diff is too big to show here.

pkgs/applications/editors/sublime/3/packages.nix+3−3

This diff is too big to show here.

pkgs/applications/editors/tecoc/default.nix+29−22

This diff is too big to show here.

pkgs/applications/editors/texmacs/default.nix+1−6

This diff is too big to show here.

pkgs/applications/editors/texmaker/default.nix+2−2

This diff is too big to show here.

pkgs/applications/editors/texstudio/default.nix+2−2

This diff is too big to show here.

pkgs/applications/editors/textadept/default.nix+1−1

This diff is too big to show here.

pkgs/applications/editors/thonny/default.nix+12−4

This diff is too big to show here.

pkgs/applications/editors/tiled/default.nix+2−2

This diff is too big to show here.

pkgs/applications/editors/vim/common.nix+2−2

This diff is too big to show here.

pkgs/applications/editors/vim/default.nix+6−2

This diff is too big to show here.

pkgs/applications/editors/vscode/default.nix+22−16

This diff is too big to show here.

pkgs/applications/editors/vscode/with-extensions.nix+7−20

This diff is too big to show here.

pkgs/applications/editors/xmlcopyeditor/default.nixnew file+28

This diff is too big to show here.

pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patchnew file+36

This diff is too big to show here.

pkgs/applications/editors/zile/default.nix+1−1

This diff is too big to show here.

pkgs/applications/gis/openorienteering-mapper/default.nix+2−2

This diff is too big to show here.

pkgs/applications/gis/qgis/default.nix+5−2

This diff is too big to show here.

pkgs/applications/gis/saga/clang_patch.patchnew file+19

This diff is too big to show here.

pkgs/applications/gis/saga/default.nix+16−6

This diff is too big to show here.

pkgs/applications/gis/saga/finite-6.3.0.patchnew file+55

This diff is too big to show here.

pkgs/applications/gis/saga/finite.patchnew file+13

This diff is too big to show here.

pkgs/applications/gis/saga/lts.nixnew file+36

This diff is too big to show here.

pkgs/applications/graphics/ImageMagick/7.0.nix+2−2

This diff is too big to show here.

pkgs/applications/graphics/ahoviewer/default.nix+5−6

This diff is too big to show here.

pkgs/applications/graphics/antimony/default.nix+1−1

This diff is too big to show here.

pkgs/applications/graphics/ao/default.nixdeleted−41

This diff is too big to show here.

pkgs/applications/graphics/autopanosiftc/default.nix+7

This diff is too big to show here.

pkgs/applications/graphics/avocode/default.nix+13−8

This diff is too big to show here.

pkgs/applications/graphics/batik/default.nix+6

This diff is too big to show here.

pkgs/applications/graphics/cinepaint/default.nix+7−7

This diff is too big to show here.

pkgs/applications/graphics/darktable/default.nix+4−4

This diff is too big to show here.

pkgs/applications/graphics/deskew/default.nixnew file+37

This diff is too big to show here.

pkgs/applications/graphics/dia/default.nix+5−4

This diff is too big to show here.

pkgs/applications/graphics/digikam/default.nix+3−2

This diff is too big to show here.

pkgs/applications/graphics/feh/default.nix+4−4

This diff is too big to show here.

pkgs/applications/graphics/gcolor2/default.nix+3−2

This diff is too big to show here.

pkgs/applications/graphics/gimp/default.nix+21−7

This diff is too big to show here.

pkgs/applications/graphics/gimp/remove-cc-reference.patchnew file+13

This diff is too big to show here.

pkgs/applications/graphics/giv/default.nix+2−6

This diff is too big to show here.

pkgs/applications/graphics/glabels/default.nix+8−8

This diff is too big to show here.

pkgs/applications/graphics/gocr/default.nix+2−2

This diff is too big to show here.

pkgs/applications/graphics/goxel/default.nix+6−3

This diff is too big to show here.

pkgs/applications/graphics/gqview/default.nix+4

This diff is too big to show here.

pkgs/applications/graphics/graphicsmagick/default.nix+2−2

This diff is too big to show here.

pkgs/applications/graphics/gthumb/default.nix+2−2

This diff is too big to show here.

pkgs/applications/graphics/inkscape/default.nix+7−3

This diff is too big to show here.

pkgs/applications/graphics/ipe/default.nix+2−4

This diff is too big to show here.

pkgs/applications/graphics/ipe/xlocale.patchdeleted−10

This diff is too big to show here.

pkgs/applications/graphics/jpeginfo/default.nixnew file+21

This diff is too big to show here.

pkgs/applications/graphics/k3d/default.nix+4

This diff is too big to show here.

pkgs/applications/graphics/krita/default.nix+11−3

This diff is too big to show here.

pkgs/applications/graphics/krop/default.nix+2−2

This diff is too big to show here.

pkgs/applications/graphics/mypaint/default.nix+3−6

This diff is too big to show here.

pkgs/applications/graphics/ocrad/default.nix+6−4

This diff is too big to show here.

pkgs/applications/graphics/openimageio/default.nix+2−2

This diff is too big to show here.

pkgs/applications/graphics/photoflow/default.nix+2−2

This diff is too big to show here.

pkgs/applications/graphics/phototonic/default.nix+3−5

This diff is too big to show here.

pkgs/applications/graphics/pqiv/default.nix+2−2

This diff is too big to show here.

pkgs/applications/graphics/processing3/default.nix+1−1

This diff is too big to show here.

pkgs/applications/graphics/rapid-photo-downloader/default.nix+4−4

This diff is too big to show here.

pkgs/applications/graphics/rawtherapee/default.nix+2−2

This diff is too big to show here.

pkgs/applications/graphics/renderdoc/default.nix+4−4

This diff is too big to show here.

pkgs/applications/graphics/shotwell/default.nix+9−8

This diff is too big to show here.

pkgs/applications/graphics/shutter/default.nix+10−9

This diff is too big to show here.

pkgs/applications/graphics/tesseract/4.x.nixdeleted−61

This diff is too big to show here.

pkgs/applications/graphics/tesseract/default.nix+13−62

This diff is too big to show here.

pkgs/applications/graphics/tesseract/fetch-language-hashesnew file+35

This diff is too big to show here.

pkgs/applications/graphics/tesseract/languages.nixnew file+289

This diff is too big to show here.

pkgs/applications/graphics/tesseract/tesseract3.nixnew file+29

This diff is too big to show here.

pkgs/applications/graphics/tesseract/tesseract4.nixnew file+27

This diff is too big to show here.

pkgs/applications/graphics/tesseract/wrapper.nixnew file+58

This diff is too big to show here.

pkgs/applications/graphics/vimiv/default.nix+1−1

This diff is too big to show here.

pkgs/applications/graphics/wings/default.nix+15−14

This diff is too big to show here.

pkgs/applications/graphics/write_stylus/default.nix+4−3

This diff is too big to show here.

pkgs/applications/graphics/xaos/default.nix+3−3

This diff is too big to show here.

pkgs/applications/graphics/xournal/default.nix+2−2

This diff is too big to show here.

pkgs/applications/graphics/yacreader/default.nixnew file+25

This diff is too big to show here.

pkgs/applications/graphics/yed/default.nix+6−7

This diff is too big to show here.

pkgs/applications/inferno/default.nixdeleted−58

This diff is too big to show here.

pkgs/applications/inferno/infernodeleted−31

This diff is too big to show here.

pkgs/applications/kde/akonadi/akonadi-paths.patch+10−9

This diff is too big to show here.

pkgs/applications/kde/default.nix+2−1

This diff is too big to show here.

pkgs/applications/kde/dolphin.nix+3−1

This diff is too big to show here.

pkgs/applications/kde/fetch.sh+1−1

This diff is too big to show here.

pkgs/applications/kde/kcharselect.nixnew file+19

This diff is too big to show here.

pkgs/applications/kde/kdepim-runtime.nix+2−2

This diff is too big to show here.

pkgs/applications/kde/kmbox.nix+2−2

This diff is too big to show here.

pkgs/applications/kde/konqueror.nixnew file+20

This diff is too big to show here.

pkgs/applications/kde/konsole.nix+7−1

This diff is too big to show here.

pkgs/applications/kde/kpimtextedit.nix+3−2

This diff is too big to show here.

pkgs/applications/kde/marble.nix+3

This diff is too big to show here.

pkgs/applications/kde/srcs.nix+868−860

This diff is too big to show here.

pkgs/applications/kde/syndication.nixdeleted−16

This diff is too big to show here.

pkgs/applications/misc/1password/default.nix+5−5

This diff is too big to show here.

pkgs/applications/misc/acbuild/default.nixdeleted−37

This diff is too big to show here.

pkgs/applications/misc/airspy/default.nix+1−1

This diff is too big to show here.

pkgs/applications/misc/airtame/default.nix+22−42

This diff is too big to show here.

pkgs/applications/misc/alacritty/default.nix+17−23

This diff is too big to show here.

pkgs/applications/misc/albert/default.nix+7−9

This diff is too big to show here.

pkgs/applications/misc/aminal/default.nixnew file+75

This diff is too big to show here.

pkgs/applications/misc/apvlv/default.nix+3

This diff is too big to show here.

pkgs/applications/misc/archiver/default.nixnew file+28

This diff is too big to show here.

pkgs/applications/misc/archiver/deps.nixnew file+56

This diff is too big to show here.

pkgs/applications/misc/artha/default.nix+6−2

This diff is too big to show here.

pkgs/applications/misc/artha/gio-underlink.patchnew file+13

This diff is too big to show here.

pkgs/applications/misc/autospotting/default.nixnew file+30

This diff is too big to show here.

pkgs/applications/misc/autospotting/deps.nixnew file+75

This diff is too big to show here.

pkgs/applications/misc/avrdudess/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/bb/default.nix+8−4

This diff is too big to show here.

pkgs/applications/misc/blender/default.nix+5−5

This diff is too big to show here.

pkgs/applications/misc/calibre/default.nix+18−9

This diff is too big to show here.

pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch+2−2

This diff is too big to show here.

pkgs/applications/misc/cheat/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/cherrytree/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/chirp/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/clipmenu/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/cool-retro-term/default.nix+8−6

This diff is too big to show here.

pkgs/applications/misc/copyq/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/coursera-dl/default.nix+5

This diff is too big to show here.

pkgs/applications/misc/cura/default.nix+8−6

This diff is too big to show here.

pkgs/applications/misc/curaengine/default.nix+2−10

This diff is too big to show here.

pkgs/applications/misc/dbeaver/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/devilspie2/default.nix+1−1

This diff is too big to show here.

pkgs/applications/misc/digitalbitbox/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/dmrconfig/default.nixnew file+42

This diff is too big to show here.

pkgs/applications/misc/dunst/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/eaglemode/default.nix+13−13

This diff is too big to show here.

pkgs/applications/misc/electron-cash/default.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/electrum/dash.nix+1−1

This diff is too big to show here.

pkgs/applications/misc/electrum/default.nix+16−11

This diff is too big to show here.

pkgs/applications/misc/evilvte/default.nix+1−1

This diff is too big to show here.

pkgs/applications/misc/extract_url/default.nix+8−9

This diff is too big to show here.

pkgs/applications/misc/far2l/default.nix+2

This diff is too big to show here.

pkgs/applications/misc/fbreader/default.nix+9−2

This diff is too big to show here.

pkgs/applications/misc/fff/default.nixnew file+31

This diff is too big to show here.

pkgs/applications/misc/flrig/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/font-manager/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/fsv/default.nixnew file+47

This diff is too big to show here.

pkgs/applications/misc/gImageReader/default.nixnew file+70

This diff is too big to show here.

pkgs/applications/misc/get_iplayer/default.nix+4−4

This diff is too big to show here.

pkgs/applications/misc/girara/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/gksu/default.nix+1−1

This diff is too big to show here.

pkgs/applications/misc/glava/default.nix+8−22

This diff is too big to show here.

pkgs/applications/misc/glom/default.nixnew file+132

This diff is too big to show here.

pkgs/applications/misc/gnome-recipes/default.nixnew file+79

This diff is too big to show here.

pkgs/applications/misc/gnome-usage/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/gnss-sdr/default.nix+1

This diff is too big to show here.

pkgs/applications/misc/gnuradio/default.nix+4

This diff is too big to show here.

pkgs/applications/misc/gnuradio/gsm.nix+1−1

This diff is too big to show here.

pkgs/applications/misc/gnuradio/limesdr.nix+1−1

This diff is too big to show here.

pkgs/applications/misc/gnuradio/osmosdr.nix+16−7

This diff is too big to show here.

pkgs/applications/misc/gnuradio/rds.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/golden-cheetah/default.nix+3

This diff is too big to show here.

pkgs/applications/misc/gollum/Gemfile.lock+2−2

This diff is too big to show here.

pkgs/applications/misc/gollum/gemset.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/googleearth/default.nix+9

This diff is too big to show here.

pkgs/applications/misc/googler/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/gpa/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/gpsprune/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/gpx-viewer/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/gpxsee/default.nix+5−5

This diff is too big to show here.

pkgs/applications/misc/gramps/default.nix+4−4

This diff is too big to show here.

pkgs/applications/misc/gremlin-console/default.nixnew file+29

This diff is too big to show here.

pkgs/applications/misc/gtk2fontsel/default.nix+1−1

This diff is too big to show here.

pkgs/applications/misc/guake/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/gv/default.nix+1−1

This diff is too big to show here.

pkgs/applications/misc/gxneur/default.nix+2

This diff is too big to show here.

pkgs/applications/misc/hackrf/default.nix+7−6

This diff is too big to show here.

pkgs/applications/misc/hamster-time-tracker/default.nix+2−12

This diff is too big to show here.

pkgs/applications/misc/hello/default.nix+1−1

This diff is too big to show here.

pkgs/applications/misc/hivemind/default.nixnew file+21

This diff is too big to show here.

pkgs/applications/misc/houdini/runtime.nix+4−4

This diff is too big to show here.

pkgs/applications/misc/hovercraft/default.nixnew file+35

This diff is too big to show here.

pkgs/applications/misc/hugo/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/hugo/deps.nix+325−92

This diff is too big to show here.

pkgs/applications/misc/hyper/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/ikiwiki/default.nix+11−14

This diff is too big to show here.

pkgs/applications/misc/img2pdf/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/ipmicfg/default.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/jekyll/basic/Gemfile.lock+9−9

This diff is too big to show here.

pkgs/applications/misc/jekyll/basic/gemset.nix+16−16

This diff is too big to show here.

pkgs/applications/misc/jekyll/full/Gemfile.lock+10−10

This diff is too big to show here.

pkgs/applications/misc/jekyll/full/gemset.nix+18−18

This diff is too big to show here.

pkgs/applications/misc/josm/default.nix+5−5

This diff is too big to show here.

pkgs/applications/misc/jrnl/default.nix+1−1

This diff is too big to show here.

pkgs/applications/misc/k2pdfopt/default.nix+20−13

This diff is too big to show here.

pkgs/applications/misc/kdeconnect/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/keepassx/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/khal/default.nix+7−20

This diff is too big to show here.

pkgs/applications/misc/khard/default.nix+2−3

This diff is too big to show here.

pkgs/applications/misc/kitty/default.nix+10−12

This diff is too big to show here.

pkgs/applications/misc/kitty/fix-paths.patchnew file+27

This diff is too big to show here.

pkgs/applications/misc/kiwix/default.nix+3

This diff is too big to show here.

pkgs/applications/misc/kupfer/default.nix+4−20

This diff is too big to show here.

pkgs/applications/misc/latte-dock/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/libosmocore/default.nix+6−6

This diff is too big to show here.

pkgs/applications/misc/llpp/default.nix+19−16

This diff is too big to show here.

pkgs/applications/misc/llpp/fix-build-bash.patchnew file+88

This diff is too big to show here.

pkgs/applications/misc/lxterminal/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/mako/default.nixnew file+25

This diff is too big to show here.

pkgs/applications/misc/masterpdfeditor/default.nix+9−4

This diff is too big to show here.

pkgs/applications/misc/mdp/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/mediainfo-gui/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/mediainfo/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/mlterm/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/moonlight-embedded/default.nix+8−7

This diff is too big to show here.

pkgs/applications/misc/mrxvt/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/multimon-ng/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/mupdf/darwin.patch+27−44

This diff is too big to show here.

pkgs/applications/misc/mupdf/default.nix+12−11

This diff is too big to show here.

pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patchdeleted−45

This diff is too big to show here.

pkgs/applications/misc/mupdf/mupdf-1.14-shared_libs.patchnew file+39

This diff is too big to show here.

pkgs/applications/misc/mwic/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/mysql-workbench/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/nixnote2/default.nix+2−1

This diff is too big to show here.

pkgs/applications/misc/nnn/default.nix+12−5

This diff is too big to show here.

pkgs/applications/misc/notejot/default.nix+10−9

This diff is too big to show here.

pkgs/applications/misc/octoprint/default.nix+51−98

This diff is too big to show here.

pkgs/applications/misc/octoprint/plugins.nix+34−12

This diff is too big to show here.

pkgs/applications/misc/ola/default.nix+6−3

This diff is too big to show here.

pkgs/applications/misc/omegat.nixnew file+40

This diff is too big to show here.

pkgs/applications/misc/onboard/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/oneko/default.nix+9−12

This diff is too big to show here.

pkgs/applications/misc/opencpn/default.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/opentx/default.nix+9−5

This diff is too big to show here.

pkgs/applications/misc/orca/default.nix+8−5

This diff is too big to show here.

pkgs/applications/misc/orca/fix-paths.patch+49

This diff is too big to show here.

pkgs/applications/misc/osmium-tool/default.nixnew file+23

This diff is too big to show here.

pkgs/applications/misc/pbpst/default.nixnew file+49

This diff is too big to show here.

pkgs/applications/misc/pcmanfm/default.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/pdf-quench/default.nix+1−1

This diff is too big to show here.

pkgs/applications/misc/pdfpc/default.nix+4−4

This diff is too big to show here.

pkgs/applications/misc/pdfshuffler/default.nixdeleted−41

This diff is too big to show here.

pkgs/applications/misc/pgmanage/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/pinfo/default.nix+1−1

This diff is too big to show here.

pkgs/applications/misc/plank/default.nix+7−4

This diff is too big to show here.

pkgs/applications/misc/plank/hide-in-pantheon.patchnew file+9

This diff is too big to show here.

pkgs/applications/misc/playonlinux/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/pmenu/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/polar-bookshelf/default.nixnew file+91

This diff is too big to show here.

pkgs/applications/misc/polybar/default.nix+17−10

This diff is too big to show here.

pkgs/applications/misc/pwsafe/default.nix+23−41

This diff is too big to show here.

pkgs/applications/misc/qMasterPassword/default.nixnew file+48

This diff is too big to show here.

pkgs/applications/misc/qdirstat/default.nix+10−16

This diff is too big to show here.

pkgs/applications/misc/qlcplus/default.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/qmapshack/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/qtbitcointrader/default.nix+11−11

This diff is too big to show here.

pkgs/applications/misc/redshift/default.nix+7−4

This diff is too big to show here.

pkgs/applications/misc/regextester/default.nix+20−16

This diff is too big to show here.

pkgs/applications/misc/rescuetime/default.nix+5−5

This diff is too big to show here.

pkgs/applications/misc/rofi/config.patchdeleted−54

This diff is too big to show here.

pkgs/applications/misc/rofi/default.nix+3−11

This diff is too big to show here.

pkgs/applications/misc/rtl-sdr/default.nix+1−7

This diff is too big to show here.

pkgs/applications/misc/rtl_433/default.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/rxvt_unicode/default.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/safeeyes/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/sakura/default.nix+1−1

This diff is too big to show here.

pkgs/applications/misc/sequeler/default.nix+8−8

This diff is too big to show here.

pkgs/applications/misc/sigal/default.nix+7−8

This diff is too big to show here.

pkgs/applications/misc/slic3r/default.nix+17−11

This diff is too big to show here.

pkgs/applications/misc/slic3r/gcc6.patchdeleted−40

This diff is too big to show here.

pkgs/applications/misc/slic3r/prusa3d.nix+7−4

This diff is too big to show here.

pkgs/applications/misc/soapyairspy/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/soapybladerf/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/soapyremote/default.nix+5−5

This diff is too big to show here.

pkgs/applications/misc/soapyrtlsdr/default.nixnew file+30

This diff is too big to show here.

pkgs/applications/misc/soapysdr/default.nix+10−9

This diff is too big to show here.

pkgs/applications/misc/solaar/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/sweethome3d/default.nix+6−7

This diff is too big to show here.

pkgs/applications/misc/synapse/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/synergy/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/tabula/default.nixnew file+39

This diff is too big to show here.

pkgs/applications/misc/tangogps/default.nix+1

This diff is too big to show here.

pkgs/applications/misc/taskell/default.nixnew file+59

This diff is too big to show here.

pkgs/applications/misc/tdrop/default.nixnew file+33

This diff is too big to show here.

pkgs/applications/misc/termdown/default.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/terminator/default.nix+4−4

This diff is too big to show here.

pkgs/applications/misc/termite/default.nix+4−4

This diff is too big to show here.

pkgs/applications/misc/termonad/default.nixnew file+19

This diff is too big to show here.

pkgs/applications/misc/tilda/default.nix+6−6

This diff is too big to show here.

pkgs/applications/misc/tilix/default.nix+9−12

This diff is too big to show here.

pkgs/applications/misc/todolist/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/toggldesktop/default.nix+5−5

This diff is too big to show here.

pkgs/applications/misc/toot/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/tootle/default.nix+14−6

This diff is too big to show here.

pkgs/applications/misc/translate-shell/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/truecrypt/default.nixdeleted−98

This diff is too big to show here.

pkgs/applications/misc/truecrypt/gcc6.patchdeleted−61

This diff is too big to show here.

pkgs/applications/misc/tzupdate/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/udiskie/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/urh/default.nix+5−4

This diff is too big to show here.

pkgs/applications/misc/urlscan/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/valauncher/default.nixdeleted−28

This diff is too big to show here.

pkgs/applications/misc/valentina/default.nix+3−4

This diff is too big to show here.

pkgs/applications/misc/veracrypt/default.nix+23−28

This diff is too big to show here.

pkgs/applications/misc/vifm/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/visidata/default.nixnew file+29

This diff is too big to show here.

pkgs/applications/misc/wego/default.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/wego/deps.nix+15−6

This diff is too big to show here.

pkgs/applications/misc/welle-io/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/workrave/default.nix+4−4

This diff is too big to show here.

pkgs/applications/misc/wsjtx/default.nix+8−5

This diff is too big to show here.

pkgs/applications/misc/wsjtx/super.patchnew file+12

This diff is too big to show here.

pkgs/applications/misc/wsjtx/wsjtx.patch+6−6

This diff is too big to show here.

pkgs/applications/misc/wtf/default.nixnew file+28

This diff is too big to show here.

pkgs/applications/misc/xautoclick/default.nix+1

This diff is too big to show here.

pkgs/applications/misc/xca/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/xcruiser/default.nix+7−7

This diff is too big to show here.

pkgs/applications/misc/xdgmenumaker/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/xiphos/default.nix+4−13

This diff is too big to show here.

pkgs/applications/misc/xkbd/default.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/xkbmon/default.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/xlog/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/xmove/default.nixdeleted−19

This diff is too big to show here.

pkgs/applications/misc/xmr-stak/default.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/xmrig/default.nix+4−4

This diff is too big to show here.

pkgs/applications/misc/xpad/default.nix+4−8

This diff is too big to show here.

pkgs/applications/misc/xterm/default.nix+3−3

This diff is too big to show here.

pkgs/applications/misc/xtermcontrol/default.nix+2−2

This diff is too big to show here.

pkgs/applications/misc/xxkb/default.nix+10−9

This diff is too big to show here.

pkgs/applications/misc/yarssr/default.nix+4−8

This diff is too big to show here.

pkgs/applications/misc/yubioath-desktop/default.nix+43−28

This diff is too big to show here.

pkgs/applications/misc/zathura/core/default.nix+4−7

This diff is too big to show here.

pkgs/applications/misc/zathura/pdf-mupdf/default.nix+13−6

This diff is too big to show here.

pkgs/applications/misc/zathura/wrapper.nix+5−3

This diff is too big to show here.

pkgs/applications/misc/gutenberg/default.nix → pkgs/applications/misc/zola/default.nixrenamed+11−11

This diff is too big to show here.

pkgs/applications/networking/browsers/brave/default.nixnew file+150

This diff is too big to show here.

pkgs/applications/networking/browsers/chromium/common.nix+41−27

This diff is too big to show here.

pkgs/applications/networking/browsers/chromium/default.nix+4−1

This diff is too big to show here.

pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patchdeleted−15

This diff is too big to show here.

pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch−9

This diff is too big to show here.

pkgs/applications/networking/browsers/chromium/plugins.nix+9−5

This diff is too big to show here.

pkgs/applications/networking/browsers/chromium/update.sh+1−1

This diff is too big to show here.

pkgs/applications/networking/browsers/chromium/upstream-info.nix+9−9

This diff is too big to show here.

pkgs/applications/networking/browsers/eolie/default.nix+14−9

This diff is too big to show here.

pkgs/applications/networking/browsers/falkon/default.nix+8−4

This diff is too big to show here.

pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix+397−397

This diff is too big to show here.

pkgs/applications/networking/browsers/firefox-bin/default.nix+1−1

This diff is too big to show here.

pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix+397−397

This diff is too big to show here.

pkgs/applications/networking/browsers/firefox-bin/release_sources.nix+397−397

This diff is too big to show here.

pkgs/applications/networking/browsers/firefox-bin/update.nix+3−1

This diff is too big to show here.

pkgs/applications/networking/browsers/firefox/common.nix+53−54

This diff is too big to show here.

pkgs/applications/networking/browsers/firefox/packages.nix+48−52

This diff is too big to show here.

pkgs/applications/networking/browsers/firefox/update.nix+4−1

This diff is too big to show here.

pkgs/applications/networking/browsers/google-chrome/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/browsers/luakit/default.nix+3−2

This diff is too big to show here.

pkgs/applications/networking/browsers/lynx/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/browsers/midori/default.nix+17−40

This diff is too big to show here.

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix+9−8

This diff is too big to show here.

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix+11−7

This diff is too big to show here.

pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/browsers/opera/default.nix+4−2

This diff is too big to show here.

pkgs/applications/networking/browsers/otter/default.nix+3−2

This diff is too big to show here.

pkgs/applications/networking/browsers/palemoon/default.nix+1−1

This diff is too big to show here.

pkgs/applications/networking/browsers/qutebrowser/default.nix+10−21

This diff is too big to show here.

pkgs/applications/networking/browsers/surf/default.nix+1−1

This diff is too big to show here.

pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix+5−23

This diff is too big to show here.

pkgs/applications/networking/browsers/tor-browser-bundle/default.nix+4−26

This diff is too big to show here.

pkgs/applications/networking/browsers/vimb/default.nix+11−15

This diff is too big to show here.

pkgs/applications/networking/browsers/vivaldi/default.nix+4−4

This diff is too big to show here.

pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix+4−4

This diff is too big to show here.

pkgs/applications/networking/browsers/w3m/default.nix+25−7

This diff is too big to show here.

pkgs/applications/networking/cloudflared/default.nixnew file+25

This diff is too big to show here.

pkgs/applications/networking/cloudflared/deps.nixnew file+444

This diff is too big to show here.

pkgs/applications/networking/cluster/cni/default.nix+6−6

This diff is too big to show here.

pkgs/applications/networking/cluster/cni/plugins.nix+10−4

This diff is too big to show here.

pkgs/applications/networking/cluster/docker-machine/default.nix+7−7

This diff is too big to show here.

pkgs/applications/networking/cluster/docker-machine/kvm.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/cluster/docker-machine/kvm2.nix+3−8

This diff is too big to show here.

pkgs/applications/networking/cluster/flink/default.nix+4−4

This diff is too big to show here.

pkgs/applications/networking/cluster/helm/default.nix+1−1

This diff is too big to show here.

pkgs/applications/networking/cluster/helmfile/default.nix+7−2

This diff is too big to show here.

pkgs/applications/networking/cluster/kops/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/cluster/kube-router/default.nixnew file+32

This diff is too big to show here.

pkgs/applications/networking/cluster/kubectl/default.nixnew file+33

This diff is too big to show here.

pkgs/applications/networking/cluster/kubernetes/default.nix+5−5

This diff is too big to show here.

pkgs/applications/networking/cluster/kubetail/default.nix+6−3

This diff is too big to show here.

pkgs/applications/networking/cluster/luigi/default.nixnew file+35

This diff is too big to show here.

pkgs/applications/networking/cluster/minikube/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/cluster/minishift/default.nixnew file+70

This diff is too big to show here.

pkgs/applications/networking/cluster/nomad/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/cluster/openshift/default.nix+17−20

This diff is too big to show here.

pkgs/applications/networking/cluster/pig/default.nix+4−4

This diff is too big to show here.

pkgs/applications/networking/cluster/stern/default.nix+21−10

This diff is too big to show here.

pkgs/applications/networking/cluster/stern/deps.nix+8−17

This diff is too big to show here.

pkgs/applications/networking/cluster/terraform-docs/default.nixnew file+26

This diff is too big to show here.

pkgs/applications/networking/cluster/terraform-providers/data.nix+158−81

This diff is too big to show here.

pkgs/applications/networking/cluster/terraform-providers/default.nix+3

This diff is too big to show here.

pkgs/applications/networking/cluster/terraform-providers/gandi/default.nixnew file+26

This diff is too big to show here.

pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nixnew file+21

This diff is too big to show here.

pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix+5−1

This diff is too big to show here.

pkgs/applications/networking/cluster/terraform-providers/providers.txt+4−1

This diff is too big to show here.

pkgs/applications/networking/cluster/terraform/default.nix+8−26

This diff is too big to show here.

pkgs/applications/networking/cluster/terragrunt/0.11.1.nixdeleted−35

This diff is too big to show here.

pkgs/applications/networking/cluster/terragrunt/0.9.8.nixdeleted−35

This diff is too big to show here.

pkgs/applications/networking/cluster/terragrunt/default.nix+4−4

This diff is too big to show here.

pkgs/applications/networking/cluster/terragrunt/deps_0_11.nixdeleted−111

This diff is too big to show here.

pkgs/applications/networking/corebird/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/davmail/default.nix+1−1

This diff is too big to show here.

pkgs/applications/networking/dropbox/cli.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/dropbox/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/enhanced-ctorrent/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/esniper/default.nix+1−1

This diff is too big to show here.

pkgs/applications/networking/feedreaders/canto-curses/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/feedreaders/canto-daemon/default.nix+4−5

This diff is too big to show here.

pkgs/applications/networking/feedreaders/feedreader/default.nix+4−4

This diff is too big to show here.

pkgs/applications/networking/feedreaders/newsboat/default.nix+19−10

This diff is too big to show here.

pkgs/applications/networking/feedreaders/rawdog/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/feedreaders/rss2email/default.nix+7−2

This diff is too big to show here.

pkgs/applications/networking/flent/http-getter.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/flexget/default.nix+18−31

This diff is too big to show here.

pkgs/applications/networking/ftp/taxi/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/gmailieer/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/gns3/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/gns3/server.nix+31−40

This diff is too big to show here.

pkgs/applications/networking/google-drive-ocamlfuse/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/baresip/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/blink/default.nix+1−1

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/dino/default.nix+9−5

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/discord/default.nix+15−11

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/ekiga/default.nix+10−9

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/fractal/default.nixnew file+43

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/franz/default.nix+16−33

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/freetalk/default.nix+1−1

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/gajim/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/nheko/default.nix+1

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix+4−3

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix+7−4

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix+9−11

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix+5−10

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix+2−6

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix+5−9

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix+2−3

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/pidgin/default.nix+3−4

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/poezio/default.nixnew file+28

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/profanity/default.nix+1−1

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/psi-plus/default.nix+4−4

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/psi/default.nix+4−4

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/quaternion/default.nix+5−19

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/rambox/bare.nix+5−5

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/rambox/default.nix+16−5

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/riot/riot-web.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix+2−3

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/scudcloud/default.nix+1−1

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix+5−4

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix+1

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/slack-term/default.nixnew file+23

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/slack/default.nix+20−4

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/swift-im/default.nix+5−9

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/teamspeak/server.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix+4−4

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/telegram/tdesktop/fix-internal-compiler-error.patchdeleted−68

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix+7−7

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/toxic/default.nix+4−4

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/utox/default.nix−5

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/vacuum/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/vk-messenger/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/wavebox/default.nix+9−8

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/wire-desktop/default.nix+16−11

This diff is too big to show here.

pkgs/applications/networking/instant-messengers/zoom-us/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/insync/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/ipfs-cluster/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/ipfs/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/irc/irssi/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/irc/quassel/default.nix+10−7

This diff is too big to show here.

pkgs/applications/networking/irc/quassel/qt5_11.patchdeleted−72

This diff is too big to show here.

pkgs/applications/networking/irc/quassel/source.nixdeleted−9

This diff is too big to show here.

pkgs/applications/networking/irc/weechat/aggregate-commands.patchdeleted−110

This diff is too big to show here.

pkgs/applications/networking/irc/weechat/default.nix+6−78

This diff is too big to show here.

pkgs/applications/networking/irc/weechat/scripts/default.nix+5−1

This diff is too big to show here.

pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix+13−3

This diff is too big to show here.

pkgs/applications/networking/irc/weechat/scripts/wee-slack/libpath.patchnew file+13

This diff is too big to show here.

pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nixnew file+25

This diff is too big to show here.

pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/irc/weechat/wrapper.nixnew file+80

This diff is too big to show here.

pkgs/applications/networking/jnetmap/default.nixnew file+33

This diff is too big to show here.

pkgs/applications/networking/mailreaders/astroid/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/mailreaders/balsa/default.nix+5−4

This diff is too big to show here.

pkgs/applications/networking/mailreaders/claws-mail/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/mailreaders/claws-mail/mime.patch+21−8

This diff is too big to show here.

pkgs/applications/networking/mailreaders/imapfilter.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/mailreaders/inboxer/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/mailreaders/mutt/default.nix+4−4

This diff is too big to show here.

pkgs/applications/networking/mailreaders/neomutt/default.nix+5−3

This diff is too big to show here.

pkgs/applications/networking/mailreaders/notmuch-bower/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/mailreaders/notmuch/default.nix+19−46

This diff is too big to show here.

pkgs/applications/networking/mailreaders/realpine/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix+1−1

This diff is too big to show here.

pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix+233−233

This diff is too big to show here.

pkgs/applications/networking/mailreaders/thunderbird/default.nix+6−23

This diff is too big to show here.

pkgs/applications/networking/mailreaders/trojita/default.nix+6−5

This diff is too big to show here.

pkgs/applications/networking/modem-manager-gui/default.nixnew file+50

This diff is too big to show here.

pkgs/applications/networking/mpop/default.nix+6−7

This diff is too big to show here.

pkgs/applications/networking/msmtp/default.nix+7−15

This diff is too big to show here.

pkgs/applications/networking/mumble/default.nix+15−6

This diff is too big to show here.

pkgs/applications/networking/newsreaders/liferea/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/newsreaders/pan/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/nextcloud-client/default.nix+24−20

This diff is too big to show here.

pkgs/applications/networking/nextcloud-client/find-sql.patchdeleted−12

This diff is too big to show here.

pkgs/applications/networking/nload/default.nix+14−1

This diff is too big to show here.

pkgs/applications/networking/offrss/default.nix+4−1

This diff is too big to show here.

pkgs/applications/networking/omping/default.nixnew file+35

This diff is too big to show here.

pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/p2p/qbittorrent/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/p2p/soulseekqt/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/p2p/synapse-bt/default.nix+4−4

This diff is too big to show here.

pkgs/applications/networking/p2p/tixati/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/p2p/tribler/default.nix+7−5

This diff is too big to show here.

pkgs/applications/networking/p2p/zeronet/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/pjsip/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/protonmail-bridge/default.nix+4−4

This diff is too big to show here.

pkgs/applications/networking/remote/anydesk/default.nix+7−6

This diff is too big to show here.

pkgs/applications/networking/remote/freerdp/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/remote/remmina/default.nix+21−34

This diff is too big to show here.

pkgs/applications/networking/remote/ssvnc/default.nix+3−1

This diff is too big to show here.

pkgs/applications/networking/remote/teamviewer/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/remote/x2goclient/default.nix+9−10

This diff is too big to show here.

pkgs/applications/networking/remote/x2goclient/qt511.patchdeleted−15

This diff is too big to show here.

pkgs/applications/networking/remote/xrdp/default.nix+5−5

This diff is too big to show here.

pkgs/applications/networking/resilio-sync/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/seafile-client/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/sieve-connect/default.nix+8−6

This diff is too big to show here.

pkgs/applications/networking/sniffers/wireshark/default.nix+13−2

This diff is too big to show here.

pkgs/applications/networking/sniproxy/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/sync/desync/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/sync/desync/deps.nix+208−25

This diff is too big to show here.

pkgs/applications/networking/sync/rclone/browser.nixnew file+25

This diff is too big to show here.

pkgs/applications/networking/sync/rclone/default.nix+3−2

This diff is too big to show here.

pkgs/applications/networking/syncplay/default.nix+6−6

This diff is too big to show here.

pkgs/applications/networking/syncthing-gtk/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/syncthing/default.nix+20−18

This diff is too big to show here.

pkgs/applications/networking/transporter/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/tsung/default.nix+3−3

This diff is too big to show here.

pkgs/applications/networking/vnstat/default.nix+4−4

This diff is too big to show here.

pkgs/applications/networking/weather/meteo/default.nix+2−2

This diff is too big to show here.

pkgs/applications/networking/websocketd/default.nixnew file+24

This diff is too big to show here.

pkgs/applications/networking/websocketd/deps.nixnew file+12

This diff is too big to show here.

pkgs/applications/networking/znc/default.nix+9−2

This diff is too big to show here.

pkgs/applications/networking/znc/modules.nix+2

This diff is too big to show here.

pkgs/applications/office/aesop/default.nix+9−16

This diff is too big to show here.

pkgs/applications/office/autokey/default.nix+2−2

This diff is too big to show here.

pkgs/applications/office/bookworm/default.nix+25−11

This diff is too big to show here.

pkgs/applications/office/fava/default.nix+14−4

This diff is too big to show here.

pkgs/applications/office/gnucash/2.4.nixdeleted−90

This diff is too big to show here.

pkgs/applications/office/gnucash/2.6.nixdeleted−116

This diff is too big to show here.

pkgs/applications/office/gnucash/default.nix+6−2

This diff is too big to show here.

pkgs/applications/office/gnumeric/default.nix+15−19

This diff is too big to show here.

pkgs/applications/office/homebank/default.nix+2−2

This diff is too big to show here.

pkgs/applications/office/jameica/default.nix+7−17

This diff is too big to show here.

pkgs/applications/office/kmymoney/default.nix+3−2

This diff is too big to show here.

pkgs/applications/office/ledger-web/Gemfile.lock+3−3

This diff is too big to show here.

pkgs/applications/office/ledger-web/gemset.nix+10−2

This diff is too big to show here.

pkgs/applications/office/ledger/default.nix+9−1

This diff is too big to show here.

pkgs/applications/office/libreoffice/default-primary-src.nix+3−3

This diff is too big to show here.

pkgs/applications/office/libreoffice/default.nix+6−3

This diff is too big to show here.

pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix+8−8

This diff is too big to show here.

pkgs/applications/office/libreoffice/poppler.patchnew file+289

This diff is too big to show here.

pkgs/applications/office/libreoffice/still-primary-src.nix+3−3

This diff is too big to show here.

pkgs/applications/office/libreoffice/still.nix+2−2

This diff is too big to show here.

pkgs/applications/office/libreoffice/wrapper.nix+4−1

This diff is too big to show here.

pkgs/applications/office/marp/default.nix+13−8

This diff is too big to show here.

pkgs/applications/office/mendeley/default.nix+1−2

This diff is too big to show here.

pkgs/applications/office/mendeley/update.nix+2−1

This diff is too big to show here.

pkgs/applications/office/mytetra/default.nix+11−6

This diff is too big to show here.

pkgs/applications/office/planner/default.nix+15−10

This diff is too big to show here.

pkgs/applications/office/scribus/default.nix+14−1

This diff is too big to show here.

pkgs/applications/office/scribus/unstable.nixnew file+39

This diff is too big to show here.

pkgs/applications/office/skrooge/default.nix+4−4

This diff is too big to show here.

pkgs/applications/office/spice-up/default.nix+13−9

This diff is too big to show here.

pkgs/applications/office/todoman/default.nix+4−3

This diff is too big to show here.

pkgs/applications/office/trilium/default.nixnew file+58

This diff is too big to show here.

pkgs/applications/office/tryton/default.nix+2−2

This diff is too big to show here.

pkgs/applications/office/zim/default.nix+3−2

This diff is too big to show here.

pkgs/applications/office/zotero/default.nix+3−3

This diff is too big to show here.

pkgs/applications/science/astronomy/gildas/default.nix+3−3

This diff is too big to show here.

pkgs/applications/science/astronomy/stellarium/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/astronomy/xearth/default.nix+6−7

This diff is too big to show here.

pkgs/applications/science/biology/EZminc/default.nix−2

This diff is too big to show here.

pkgs/applications/science/biology/N3/default.nix+2−5

This diff is too big to show here.

pkgs/applications/science/biology/ants/default.nix−2

This diff is too big to show here.

pkgs/applications/science/biology/bftools/default.nixnew file+41

This diff is too big to show here.

pkgs/applications/science/biology/bowtie2/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/biology/conglomerate/default.nix+3−3

This diff is too big to show here.

pkgs/applications/science/biology/hmmer/default.nix+8−11

This diff is too big to show here.

pkgs/applications/science/biology/igv/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/biology/inormalize/default.nix+2−4

This diff is too big to show here.

pkgs/applications/science/biology/minc-tools/default.nix+2−4

This diff is too big to show here.

pkgs/applications/science/biology/minc-widgets/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/biology/minimap2/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/biology/mni_autoreg/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/biology/mosdepth/default.nix+6−3

This diff is too big to show here.

pkgs/applications/science/biology/niftyreg/default.nixnew file+24

This diff is too big to show here.

pkgs/applications/science/biology/niftyseg/default.nixnew file+24

This diff is too big to show here.

pkgs/applications/science/biology/picard-tools/default.nix+5−4

This diff is too big to show here.

pkgs/applications/science/biology/star/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/chemistry/avogadro/default.nix+7

This diff is too big to show here.

pkgs/applications/science/chemistry/gwyddion/default.nix+1−1

This diff is too big to show here.

pkgs/applications/science/chemistry/jmol/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/chemistry/marvin/LicenseManager.desktopnew file+9

This diff is too big to show here.

pkgs/applications/science/chemistry/marvin/MarvinSketch.desktopnew file+10

This diff is too big to show here.

pkgs/applications/science/chemistry/marvin/MarvinView.desktopnew file+10

This diff is too big to show here.

pkgs/applications/science/chemistry/marvin/default.nixnew file+49

This diff is too big to show here.

pkgs/applications/science/chemistry/octopus/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/electronics/alliance/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/electronics/archimedes/default.nix+1−1

This diff is too big to show here.

pkgs/applications/science/electronics/dsview/default.nixnew file+47

This diff is too big to show here.

pkgs/applications/science/electronics/dsview/install.patchnew file+15

This diff is too big to show here.

pkgs/applications/science/electronics/dsview/libsigrok4dsl.nixnew file+28

This diff is too big to show here.

pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nixnew file+27

This diff is too big to show here.

pkgs/applications/science/electronics/gtkwave/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/electronics/kicad/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/electronics/librepcb/default.nix+3−3

This diff is too big to show here.

pkgs/applications/science/electronics/ngspice/default.nix+5−4

This diff is too big to show here.

pkgs/applications/science/electronics/tkgate/1.x.nix+4−2

This diff is too big to show here.

pkgs/applications/science/electronics/verilator/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/electronics/verilog/default.nix+3−3

This diff is too big to show here.

pkgs/applications/science/logic/abella/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/logic/acgtk/default.nix+10−40

This diff is too big to show here.

pkgs/applications/science/logic/acgtk/install-emacs-to-site-lisp.patchdeleted−23

This diff is too big to show here.

pkgs/applications/science/logic/acgtk/use-nix-ocaml-byteflags.patchdeleted−11

This diff is too big to show here.

pkgs/applications/science/logic/alt-ergo/default.nix+4−4

This diff is too big to show here.

pkgs/applications/science/logic/aspino/default.nix+2

This diff is too big to show here.

pkgs/applications/science/logic/avy/default.nix+3

This diff is too big to show here.

pkgs/applications/science/logic/cedille/default.nixnew file+50

This diff is too big to show here.

pkgs/applications/science/logic/coq/8.4.nixdeleted−97

This diff is too big to show here.

pkgs/applications/science/logic/coq/configure.patchdeleted−11

This diff is too big to show here.

pkgs/applications/science/logic/coq/default.nix+3

This diff is too big to show here.

pkgs/applications/science/logic/coq2html/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/logic/cryptominisat/default.nix+5−11

This diff is too big to show here.

pkgs/applications/science/logic/cubicle/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/logic/elan/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/logic/eprover/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/logic/glucose/default.nix+2

This diff is too big to show here.

pkgs/applications/science/logic/iprover/default.nix+3−3

This diff is too big to show here.

pkgs/applications/science/logic/lean/default.nix+3−3

This diff is too big to show here.

pkgs/applications/science/logic/ltl2ba/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/logic/prooftree/default.nix+5−4

This diff is too big to show here.

pkgs/applications/science/logic/sapic/default.nixdeleted−28

This diff is too big to show here.

pkgs/applications/science/logic/sapic/native.patchdeleted−38

This diff is too big to show here.

pkgs/applications/science/logic/symbiyosys/default.nix+3−3

This diff is too big to show here.

pkgs/applications/science/logic/tamarin-prover/default.nix+14−9

This diff is too big to show here.

pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-term.patchdeleted−109

This diff is too big to show here.

pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-theory.patchdeleted−130

This diff is too big to show here.

pkgs/applications/science/logic/tamarin-prover/ghc-8.4-support-utils.patchdeleted−140

This diff is too big to show here.

pkgs/applications/science/logic/tamarin-prover/sapic-native.patchnew file+77

This diff is too big to show here.

pkgs/applications/science/logic/tptp/default.nix+3−3

This diff is too big to show here.

pkgs/applications/science/logic/vampire/default.nix+1−1

This diff is too big to show here.

pkgs/applications/science/logic/why3/default.nix+5−5

This diff is too big to show here.

pkgs/applications/science/logic/yices/default.nix+8−7

This diff is too big to show here.

pkgs/applications/science/logic/z3/default.nix+4−4

This diff is too big to show here.

pkgs/applications/science/logic/z3/tptp.nixnew file+31

This diff is too big to show here.

pkgs/applications/science/machine-learning/shogun/default.nix+4−4

This diff is too big to show here.

pkgs/applications/science/math/R/default.nix+9−5

This diff is too big to show here.

pkgs/applications/science/math/calc/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/math/colpack/default.nix+1

This diff is too big to show here.

pkgs/applications/science/math/fricas/default.nix+1−1

This diff is too big to show here.

pkgs/applications/science/math/gap/default.nix+127−36

This diff is too big to show here.

pkgs/applications/science/math/giac/default.nix+27−12

This diff is too big to show here.

pkgs/applications/science/math/gmsh/CMakeLists.txt.patchdeleted−37

This diff is too big to show here.

pkgs/applications/science/math/gmsh/default.nix+5−9

This diff is too big to show here.

pkgs/applications/science/math/gurobi/default.nix+8−2

This diff is too big to show here.

pkgs/applications/science/math/mathematica/l10ns.nix+2−2

This diff is too big to show here.

pkgs/applications/science/math/maxima/default.nix+1−1

This diff is too big to show here.

pkgs/applications/science/math/nasc/default.nix+16−23

This diff is too big to show here.

pkgs/applications/science/math/nauty/default.nix+9−2

This diff is too big to show here.

pkgs/applications/science/math/pari/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/math/pari/gp2c.nix+2−2

This diff is too big to show here.

pkgs/applications/science/math/polymake/default.nixnew file+48

This diff is too big to show here.

pkgs/applications/science/math/pspp/default.nix+1−1

This diff is too big to show here.

pkgs/applications/science/math/pynac/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/math/qalculate-gtk/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/math/sage/README.md+1−40

This diff is too big to show here.

pkgs/applications/science/math/sage/default.nix+87−64

This diff is too big to show here.

pkgs/applications/science/math/sage/env-locations.nix+6−3

This diff is too big to show here.

pkgs/applications/science/math/sage/openblas-pc.nixdeleted−17

This diff is too big to show here.

pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patchnew file+35

This diff is too big to show here.

pkgs/applications/science/math/sage/patches/dochtml-optional.patchdeleted−127

This diff is too big to show here.

pkgs/applications/science/math/sage/patches/eclib-20180710.patchdeleted−40

This diff is too big to show here.

pkgs/applications/science/math/sage/patches/eclib-regulator-precision.patchdeleted−98

This diff is too big to show here.

pkgs/applications/science/math/sage/patches/fix-ecl-race.patchnew file+19

This diff is too big to show here.

pkgs/applications/science/math/sage/patches/giac-1.5.0.patchnew file+14

This diff is too big to show here.

pkgs/applications/science/math/sage/patches/known-padics-bug.patchdeleted−15

This diff is too big to show here.

pkgs/applications/science/math/sage/patches/matplotlib-normed-deprecated.patchdeleted−12

This diff is too big to show here.

pkgs/applications/science/math/sage/patches/numpy-1.15.1.patchdeleted−911

This diff is too big to show here.

pkgs/applications/science/math/sage/patches/pari-no-threads.patchdeleted−18

This diff is too big to show here.

pkgs/applications/science/math/sage/patches/revert-sphinx-always-fork.patchnew file+71

This diff is too big to show here.

pkgs/applications/science/math/sage/patches/singular-4.1.1p2.patchdeleted−274

This diff is too big to show here.

pkgs/applications/science/math/sage/patches/spkg-scripts.patchdeleted−46

This diff is too big to show here.

pkgs/applications/science/math/sage/patches/test-in-tmpdir.patchdeleted−31

This diff is too big to show here.

pkgs/applications/science/math/sage/sage-env.nix+25−18

This diff is too big to show here.

pkgs/applications/science/math/sage/sage-src.nix+52−117

This diff is too big to show here.

pkgs/applications/science/math/sage/sage-tests.nixnew file+57

This diff is too big to show here.

pkgs/applications/science/math/sage/sage-with-env.nix+15−15

This diff is too big to show here.

pkgs/applications/science/math/sage/sage-wrapper.nixdeleted−41

This diff is too big to show here.

pkgs/applications/science/math/sage/sage.nix+44−8

This diff is too big to show here.

pkgs/applications/science/math/sage/sagedoc.nix+14−28

This diff is too big to show here.

pkgs/applications/science/math/sage/sagelib.nix+13−11

This diff is too big to show here.

pkgs/applications/science/math/sage/sagenb.nix+6−2

This diff is too big to show here.

pkgs/applications/science/math/scilab-bin/default.nix+33−2

This diff is too big to show here.

pkgs/applications/science/misc/boinc/default.nix+5−5

This diff is too big to show here.

pkgs/applications/science/misc/golly/beta.nix+3−3

This diff is too big to show here.

pkgs/applications/science/misc/golly/default.nix+3−4

This diff is too big to show here.

pkgs/applications/science/misc/golly/default.upstream+1−1

This diff is too big to show here.

pkgs/applications/science/misc/motu-client/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/misc/netlogo/default.nixnew file+58

This diff is too big to show here.

pkgs/applications/science/misc/root/5.nix+5−2

This diff is too big to show here.

pkgs/applications/science/misc/root/default.nix+2−2

This diff is too big to show here.

pkgs/applications/science/misc/sasview/default.nix+3−3

This diff is too big to show here.

pkgs/applications/science/misc/sasview/xhtml2pdf.nix+1

This diff is too big to show here.

pkgs/applications/science/misc/simgrid/default.nix+4−4

This diff is too big to show here.

pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nixnew file+37

This diff is too big to show here.

pkgs/applications/science/molecular-dynamics/gromacs/default.nix+3−3

This diff is too big to show here.

pkgs/applications/science/molecular-dynamics/lammps/default.nix+32−39

This diff is too big to show here.

pkgs/applications/science/physics/quantomatic/default.nixnew file+31

This diff is too big to show here.

pkgs/applications/science/physics/xfitter/default.nix+5−3

This diff is too big to show here.

pkgs/applications/science/physics/xfitter/calling_convention.patch → pkgs/applications/science/physics/xfitter/undefined_behavior.patchrenamed+106−7

This diff is too big to show here.

pkgs/applications/science/robotics/qgroundcontrol/default.nix+1

This diff is too big to show here.

pkgs/applications/search/catfish/default.nix+2−2

This diff is too big to show here.

pkgs/applications/search/recoll/default.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/arch/default.nix+1−1

This diff is too big to show here.

pkgs/applications/version-management/bazaar/tools.nix+1−1

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/default.nix+12

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/fast-export/default.nix+1−1

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-absorb/default.nixnew file+24

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix+3−3

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-bug/default.nixnew file+32

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-bug/deps.nixnew file+417

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-cola/default.nix+1

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-crypt/default.nix+4−5

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-recent/default.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-reparent/default.nixnew file+33

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-secret/default.nix+4−4

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-secrets/default.nix+14−22

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git-test/default.nixnew file+33

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/git/default.nix+29−40

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/gitweb/default.nix+1−1

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/grv/default.nix+6−2

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/hub/default.nix+6−5

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/lab/default.nixnew file+25

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/lab/deps.nixnew file+327

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/stgit/default.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix+4

This diff is too big to show here.

pkgs/applications/version-management/git-repo/default.nix+5−5

This diff is too big to show here.

pkgs/applications/version-management/git-review/default.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/gitea/default.nix+17−4

This diff is too big to show here.

pkgs/applications/version-management/gitkraken/default.nix+6−5

This diff is too big to show here.

pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patchdeleted−27

This diff is too big to show here.

pkgs/applications/version-management/gitlab-workhorse/deterministic-build.patchdeleted−11

This diff is too big to show here.

pkgs/applications/version-management/gitlab/data.jsonnew file+32

This diff is too big to show here.

pkgs/applications/version-management/gitlab/default.nix+15−31

This diff is too big to show here.

pkgs/applications/version-management/gitaly/Gemfile → pkgs/applications/version-management/gitlab/gitaly/Gemfilerenamed+12−7

This diff is too big to show here.

pkgs/applications/version-management/gitaly/Gemfile.lock → pkgs/applications/version-management/gitlab/gitaly/Gemfile.lockrenamed+76−70

This diff is too big to show here.

pkgs/applications/version-management/gitaly/default.nix → pkgs/applications/version-management/gitlab/gitaly/default.nixrenamed+2−2

This diff is too big to show here.

pkgs/applications/version-management/gitaly/gemset.nix → pkgs/applications/version-management/gitlab/gitaly/gemset.nixrenamed+153−144

This diff is too big to show here.

pkgs/applications/version-management/gitlab-shell/default.nix → pkgs/applications/version-management/gitlab/gitlab-shell/default.nixrenamed+2−2

This diff is too big to show here.

pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patchnew file+58

This diff is too big to show here.

pkgs/applications/version-management/gitlab-workhorse/default.nix → pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nixrenamed+5−4

This diff is too big to show here.

pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch → pkgs/applications/version-management/gitlab/gitlab-workhorse/remove-hardcoded-paths.patchrenamed

The content is the same.

pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile+51−45

This diff is too big to show here.

pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock+177−207

This diff is too big to show here.

pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix+254−290

This diff is too big to show here.

pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile+51−45

This diff is too big to show here.

pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock+177−207

This diff is too big to show here.

pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix+257−293

This diff is too big to show here.

pkgs/applications/version-management/gitlab/update.pynew file+235

This diff is too big to show here.

pkgs/applications/version-management/gitolite/default.nix+4−4

This diff is too big to show here.

pkgs/applications/version-management/meld/default.nix+35−30

This diff is too big to show here.

pkgs/applications/version-management/mercurial/default.nix+5−4

This diff is too big to show here.

pkgs/applications/version-management/monotone-viz/default.nix+3−3

This diff is too big to show here.

pkgs/applications/version-management/monotone/default.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/mr/default.nix+5−3

This diff is too big to show here.

pkgs/applications/version-management/peru/default.nix+5−3

This diff is too big to show here.

pkgs/applications/version-management/pijul/default.nix+13−6

This diff is too big to show here.

pkgs/applications/version-management/rcs/default.nix+1−1

This diff is too big to show here.

pkgs/applications/version-management/redmine/Gemfile.lock+2−2

This diff is too big to show here.

pkgs/applications/version-management/redmine/gemset.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/smartgithg/default.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/src/default.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/subversion/default.nix+10−4

This diff is too big to show here.

pkgs/applications/version-management/tortoisehg/default.nix+2−2

This diff is too big to show here.

pkgs/applications/version-management/vcsh/default.nix+3−7

This diff is too big to show here.

pkgs/applications/version-management/yadm/default.nix+4

This diff is too big to show here.

pkgs/applications/video/aegisub/default.nix+6

This diff is too big to show here.

pkgs/applications/video/bombono/default.nix+1−7

This diff is too big to show here.

pkgs/applications/video/cinelerra/default.nix+2−2

This diff is too big to show here.

pkgs/applications/video/clipgrab/default.nix+2−2

This diff is too big to show here.

pkgs/applications/video/gnomecast/default.nix+2−2

This diff is too big to show here.

pkgs/applications/video/handbrake/default.nix+39−33

This diff is too big to show here.

pkgs/applications/video/kazam/default.nix+2−2

This diff is too big to show here.

pkgs/applications/video/kino/default.nix+8−2

This diff is too big to show here.

pkgs/applications/video/kodi/default.nix+6−6

This diff is too big to show here.

pkgs/applications/video/kodi/plugins.nix+48−21

This diff is too big to show here.

pkgs/applications/video/kodi/yatp/dont-monkey.patchnew file+29

This diff is too big to show here.

pkgs/applications/video/makemkv/default.nix+13−5

This diff is too big to show here.

pkgs/applications/video/mapmap/default.nix+2

This diff is too big to show here.

pkgs/applications/video/mediathekview/default.nix+22−22

This diff is too big to show here.

pkgs/applications/video/miro/default.nixdeleted−90

This diff is too big to show here.

pkgs/applications/video/miro/gconf.patchdeleted−374

This diff is too big to show here.

pkgs/applications/video/miro/youtube-feeds.patchdeleted−15

This diff is too big to show here.

pkgs/applications/video/mkvtoolnix/default.nix+2−2

This diff is too big to show here.

pkgs/applications/video/motion/default.nix+11−9

This diff is too big to show here.

pkgs/applications/video/mpv/default.nix+9−3

This diff is too big to show here.

pkgs/applications/video/mpv/scripts/mpris.nix+2−2

This diff is too big to show here.

pkgs/applications/video/obs-studio/default.nix+17−3

This diff is too big to show here.

pkgs/applications/video/openshot-qt/default.nix+3−3

This diff is too big to show here.

pkgs/applications/video/openshot-qt/libopenshot.nix+2−2

This diff is too big to show here.

pkgs/applications/video/pitivi/default.nix+15−14

This diff is too big to show here.

pkgs/applications/video/plex-media-player/default.nix+11−11

This diff is too big to show here.

pkgs/applications/video/pyca/default.nixnew file+30

This diff is too big to show here.

pkgs/applications/video/qgifer/default.nixdeleted−25

This diff is too big to show here.

pkgs/applications/video/qmediathekview/default.nix+3−4

This diff is too big to show here.

pkgs/applications/video/shotcut/default.nix+2−2

This diff is too big to show here.

pkgs/applications/video/smplayer/default.nix+2−2

This diff is too big to show here.

pkgs/applications/video/smtube/default.nix+2−2

This diff is too big to show here.

pkgs/applications/video/vdr/default.nixnew file+78

This diff is too big to show here.

pkgs/applications/video/vdr/plugins.nixnew file+318

This diff is too big to show here.

pkgs/applications/video/vdr/wrapper.nixnew file+21

This diff is too big to show here.

pkgs/applications/video/vlc/default.nix+18−7

This diff is too big to show here.

pkgs/applications/video/wxcam/default.nix+5−5

This diff is too big to show here.

pkgs/applications/video/xawtv/default.nix+4−4

This diff is too big to show here.

pkgs/applications/video/xine-ui/default.nix+1−1

This diff is too big to show here.

pkgs/applications/video/xvidcap/default.nix+5−5

This diff is too big to show here.

pkgs/applications/video/zdfmediathk/default.nixdeleted−38

This diff is too big to show here.

pkgs/applications/virtualization/cntr/default.nixnew file+24

This diff is too big to show here.

pkgs/applications/virtualization/containerd/default.nix+24−22

This diff is too big to show here.

pkgs/development/python-modules/docker_compose/default.nix → pkgs/applications/virtualization/docker-compose/default.nixrenamed+2−2

This diff is too big to show here.

pkgs/applications/virtualization/docker/default.nix+14−13

This diff is too big to show here.

pkgs/applications/virtualization/driver/win-spice/default.nix+8−7

This diff is too big to show here.

pkgs/applications/virtualization/dynamips/default.nix+2−2

This diff is too big to show here.

pkgs/applications/virtualization/firecracker/default.nixnew file+35

This diff is too big to show here.

pkgs/applications/virtualization/lkl/default.nix+5−5

This diff is too big to show here.

pkgs/applications/virtualization/looking-glass-client/default.nix+6−6

This diff is too big to show here.

pkgs/applications/virtualization/open-vm-tools/default.nix+2−2

This diff is too big to show here.

pkgs/applications/virtualization/podman/conmon.nixnew file+33

This diff is too big to show here.

pkgs/applications/virtualization/podman/default.nixnew file+43

This diff is too big to show here.

pkgs/applications/virtualization/qemu/default.nix+19−19

This diff is too big to show here.

pkgs/applications/virtualization/railcar/cargo-lock.patchnew file+435

This diff is too big to show here.

pkgs/applications/virtualization/railcar/default.nixnew file+28

This diff is too big to show here.

pkgs/applications/virtualization/remotebox/default.nix+2−2

This diff is too big to show here.

pkgs/applications/virtualization/runc/default.nix+12−22

This diff is too big to show here.

pkgs/applications/virtualization/spice-vdagent/default.nix+1−1

This diff is too big to show here.

pkgs/applications/virtualization/virt-manager/default.nix+9−9

This diff is too big to show here.

pkgs/applications/virtualization/virt-manager/qt.nix+4−2

This diff is too big to show here.

pkgs/applications/virtualization/virt-what/default.nix+2−2

This diff is too big to show here.

pkgs/applications/virtualization/virtualbox/default.nix+9−9

This diff is too big to show here.

pkgs/applications/virtualization/virtualbox/extpack.nix+8−5

This diff is too big to show here.

pkgs/applications/virtualization/virtualbox/guest-additions/default.nix+2−2

This diff is too big to show here.

pkgs/applications/virtualization/xen/acpica-utils-20180427.patchnew file+63

This diff is too big to show here.

pkgs/applications/virtualization/xen/generic.nix+2−1

This diff is too big to show here.

pkgs/applications/window-managers/awesome/default.nix+2−2

This diff is too big to show here.

pkgs/applications/window-managers/dwm/dwm-status.nix+12−7

This diff is too big to show here.

pkgs/applications/window-managers/evilwm/default.nix+2−2

This diff is too big to show here.

pkgs/applications/window-managers/fluxbox/default.nix+2−2

This diff is too big to show here.

pkgs/applications/window-managers/i3/default.nix+2−2

This diff is too big to show here.

pkgs/applications/window-managers/i3/easyfocus.nix+2−2

This diff is too big to show here.

pkgs/applications/window-managers/i3/gaps.nix+2−2

This diff is too big to show here.

pkgs/applications/window-managers/i3/i3ipc-glib.nix+3−3

This diff is too big to show here.

pkgs/applications/window-managers/i3/status.nix+2−2

This diff is too big to show here.

pkgs/applications/window-managers/jwm/default.nix+3−3

This diff is too big to show here.

pkgs/applications/window-managers/jwm/jwm-settings-manager.nixnew file+44

This diff is too big to show here.

pkgs/applications/window-managers/kbdd/default.nix+8−6

This diff is too big to show here.

pkgs/applications/window-managers/larswm/default.nix+5−7

This diff is too big to show here.

pkgs/applications/window-managers/oroborus/default.nix+2−2

This diff is too big to show here.

pkgs/applications/window-managers/qtile/default.nix+7−7

This diff is too big to show here.

pkgs/applications/window-managers/ratpoison/default.nix+3−3

This diff is too big to show here.

pkgs/applications/window-managers/stalonetray/default.nix+3−3

This diff is too big to show here.

pkgs/applications/window-managers/sway/beta.nixnew file+43

This diff is too big to show here.

pkgs/applications/window-managers/sway/default.nix+1−1

This diff is too big to show here.

pkgs/applications/window-managers/sway/idle.nixnew file+31

This diff is too big to show here.

pkgs/applications/window-managers/sway/lock.nixnew file+34

This diff is too big to show here.

pkgs/applications/window-managers/sxhkd/unstable.nixdeleted−23

This diff is too big to show here.

pkgs/applications/window-managers/tabbed/default.nix+5−5

This diff is too big to show here.

pkgs/applications/window-managers/way-cooler/crates-io.nixnew file+2916

This diff is too big to show here.

pkgs/applications/window-managers/way-cooler/default.nix+18−6

This diff is too big to show here.

pkgs/applications/window-managers/way-cooler/way-cooler.nix+310−1851

This diff is too big to show here.

pkgs/applications/window-managers/yabar/unstable.nix+8−1

This diff is too big to show here.

pkgs/build-support/agda/default.nix+3−3

This diff is too big to show here.

pkgs/build-support/bintools-wrapper/default.nix+15−5

This diff is too big to show here.

pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c+1−1

This diff is too big to show here.

pkgs/build-support/build-fhs-userenv/chrootenv/default.nix+4−7

This diff is too big to show here.

pkgs/build-support/build-fhs-userenv/chrootenv/meson.buildnew file+5

This diff is too big to show here.

pkgs/build-support/build-fhs-userenv/default.nix+2−2

This diff is too big to show here.

pkgs/build-support/build-maven.nix+11−7

This diff is too big to show here.

pkgs/build-support/cc-wrapper/default.nix+17−4

This diff is too big to show here.

pkgs/build-support/closure-info.nix+2−2

This diff is too big to show here.

pkgs/build-support/docker/default.nix+55−50

This diff is too big to show here.

pkgs/build-support/docker/examples.nix+29

This diff is too big to show here.

pkgs/build-support/emacs/melpa.nix+14−15

This diff is too big to show here.

pkgs/build-support/emacs/trivial.nix+4−9

This diff is too big to show here.

pkgs/build-support/fetchgit/default.nix+2−1

This diff is too big to show here.

pkgs/build-support/fetchgit/nix-prefetch-git+1−1

This diff is too big to show here.

pkgs/build-support/fetchhg/default.nix+9−2

This diff is too big to show here.

pkgs/build-support/fetchipfs/default.nix+4−4

This diff is too big to show here.

pkgs/build-support/fetchmavenartifact/default.nix+1−1

This diff is too big to show here.

pkgs/build-support/fetchsvn/default.nix+4−3

This diff is too big to show here.

pkgs/build-support/fetchurl/default.nix+4−3

This diff is too big to show here.

pkgs/build-support/fetchurl/mirrors.nix+21−24

This diff is too big to show here.

pkgs/build-support/libredirect/default.nix+42−8

This diff is too big to show here.

pkgs/build-support/libredirect/libredirect.c+7

This diff is too big to show here.

pkgs/build-support/libredirect/test.cnew file+59

This diff is too big to show here.

pkgs/build-support/ocaml/dune.nixnew file+36

This diff is too big to show here.

pkgs/build-support/prefer-remote-fetch/default.nixnew file+19

This diff is too big to show here.

pkgs/build-support/rust/build-rust-crate/build-crate.nix+22−7

This diff is too big to show here.

pkgs/build-support/rust/build-rust-crate/configure-crate.nix+3

This diff is too big to show here.

pkgs/build-support/rust/build-rust-crate/default.nix+11−8

This diff is too big to show here.

pkgs/build-support/rust/build-rust-crate/helpers.nixnew file+27

This diff is too big to show here.

pkgs/build-support/rust/build-rust-crate/install-crate.nix+5−3

This diff is too big to show here.

pkgs/build-support/rust/carnix.nix+225−1439

This diff is too big to show here.

pkgs/build-support/rust/crates-io.nixnew file+2049

This diff is too big to show here.

pkgs/build-support/rust/default-crate-overrides.nix+62−27

This diff is too big to show here.

pkgs/build-support/rust/default.nix+7−9

This diff is too big to show here.

pkgs/build-support/rust/fetchcargo.nix+6−5

This diff is too big to show here.

pkgs/build-support/rust/make-rust-platform.nixnew file+18

This diff is too big to show here.

pkgs/build-support/setup-hooks/audit-tmpdir.sh+6−6

This diff is too big to show here.

pkgs/build-support/setup-hooks/auto-patchelf.sh+68−10

This diff is too big to show here.

pkgs/build-support/setup-hooks/breakpoint-hook.shnew file+9

This diff is too big to show here.

pkgs/build-support/setup-hooks/make-wrapper.sh+1−1

This diff is too big to show here.

pkgs/build-support/setup-hooks/patch-shebangs.sh+6−6

This diff is too big to show here.

pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh+1−1

This diff is too big to show here.

pkgs/build-support/singularity-tools/default.nix+4−1

This diff is too big to show here.

pkgs/build-support/templaterpm/nix-template-rpm.py+23−23

This diff is too big to show here.

pkgs/build-support/writers/default.nixnew file+262

This diff is too big to show here.

pkgs/build-support/writers/test.nixnew file+168

This diff is too big to show here.

pkgs/common-updater/scripts/update-source-version+8−3

This diff is too big to show here.

pkgs/data/documentation/std-man-pages/default.nix+1−1

This diff is too big to show here.

pkgs/data/fonts/agave/default.nixnew file+28

This diff is too big to show here.

pkgs/data/fonts/andika/default.nixnew file+31

This diff is too big to show here.

pkgs/data/fonts/ankacoder/condensed.nixnew file+24

This diff is too big to show here.

pkgs/data/fonts/ankacoder/default.nixnew file+24

This diff is too big to show here.

pkgs/data/fonts/b612/default.nixnew file+38

This diff is too big to show here.

pkgs/data/fonts/cantarell-fonts/default.nix+9−3

This diff is too big to show here.

pkgs/data/fonts/charis-sil/default.nixnew file+31

This diff is too big to show here.

pkgs/data/fonts/cherry/default.nixnew file+35

This diff is too big to show here.

pkgs/data/fonts/comfortaa/default.nix+3−3

This diff is too big to show here.

pkgs/data/fonts/cooper-hewitt/default.nixnew file+22

This diff is too big to show here.

pkgs/data/fonts/culmus/default.nix+13−8

This diff is too big to show here.

pkgs/data/fonts/doulos-sil/default.nixnew file+31

This diff is too big to show here.

pkgs/data/fonts/droid/default.nixdeleted−64

This diff is too big to show here.

pkgs/data/fonts/font-awesome-5/default.nix+3−5

This diff is too big to show here.

pkgs/data/fonts/freefont-ttf/default.nix+1−1

This diff is too big to show here.

pkgs/data/fonts/google-fonts/default.nix+1−3

This diff is too big to show here.

pkgs/data/fonts/hermit/default.nixnew file+28

This diff is too big to show here.

pkgs/data/fonts/ibm-plex/default.nix+2−2

This diff is too big to show here.

pkgs/data/fonts/inter-ui/default.nix+2−2

This diff is too big to show here.

pkgs/data/fonts/iosevka/bin.nix+2−2

This diff is too big to show here.

pkgs/data/fonts/liberationsansnarrow/default.nix → pkgs/data/fonts/liberation-sans-narrow/default.nixrenamed+12−12

This diff is too big to show here.

pkgs/data/fonts/liberationsansnarrow/binary.nixdeleted−22

This diff is too big to show here.

pkgs/data/fonts/lmodern/default.nix+5−5

This diff is too big to show here.

pkgs/data/fonts/luculent/default.nixnew file+23

This diff is too big to show here.

pkgs/data/fonts/material-design-icons/default.nixnew file+38

This diff is too big to show here.

pkgs/data/fonts/noto-fonts/default.nix+10−7

This diff is too big to show here.

pkgs/data/fonts/open-dyslexic/default.nix+3−3

This diff is too big to show here.

pkgs/data/fonts/open-sans/default.nixnew file+33

This diff is too big to show here.

pkgs/data/fonts/opensans-ttf/default.nixdeleted−27

This diff is too big to show here.

pkgs/data/fonts/overpass/default.nix+2−2

This diff is too big to show here.

pkgs/data/fonts/powerline-fonts/default.nix+3−3

This diff is too big to show here.

pkgs/data/fonts/redhat-liberation-fonts/default.nix+23−33

This diff is too big to show here.

pkgs/data/fonts/rictydiminished-with-firacode/default.nix+1−1

This diff is too big to show here.

pkgs/data/fonts/sarasa-gothic/default.nix+12−15

This diff is too big to show here.

pkgs/data/fonts/source-sans-pro/default.nix+7−5

This diff is too big to show here.

pkgs/data/fonts/terminus-font-ttf/default.nix+2−2

This diff is too big to show here.

pkgs/data/fonts/terminus-font/default.nix+9−11

This diff is too big to show here.

pkgs/data/fonts/twemoji-color-font/default.nix+2−2

This diff is too big to show here.

pkgs/data/fonts/unifont/default.nix+4−4

This diff is too big to show here.

pkgs/data/fonts/weather-icons/default.nixnew file+29

This diff is too big to show here.

pkgs/data/icons/bibata-cursors/default.nixnew file+41

This diff is too big to show here.

pkgs/data/icons/elementary-icon-theme/default.nix+23−10

This diff is too big to show here.

pkgs/data/icons/maia-icon-theme/default.nix+21−9

This diff is too big to show here.

pkgs/data/icons/paper-icon-theme/default.nix+5

This diff is too big to show here.

pkgs/data/icons/papirus-icon-theme/default.nix+2−2

This diff is too big to show here.

pkgs/data/icons/zafiro-icons/default.nixnew file+29

This diff is too big to show here.

pkgs/data/machine-learning/mnist/default.nixnew file+45

This diff is too big to show here.

pkgs/data/misc/hackage/default.nix+2−2

This diff is too big to show here.

pkgs/data/misc/iana-etc/default.nix+2−2

This diff is too big to show here.

pkgs/data/misc/mailcap/default.nixnew file+28

This diff is too big to show here.

pkgs/data/misc/miscfiles/default.nix+1−1

This diff is too big to show here.

pkgs/data/misc/nixos-artwork/wallpapers.nix+9

This diff is too big to show here.

pkgs/data/misc/osinfo-db/default.nix+2−2

This diff is too big to show here.

pkgs/data/misc/shared-mime-info/default.nix+3−4

This diff is too big to show here.

pkgs/data/misc/tzdata/default.nix+5−5

This diff is too big to show here.

pkgs/data/misc/wireless-regdb/default.nix+2−2

This diff is too big to show here.

pkgs/data/misc/xorg-rgb/default.nix+2−2

This diff is too big to show here.

pkgs/data/themes/ant-theme/default.nixnew file+39

This diff is too big to show here.

pkgs/misc/themes/matcha/default.nix → pkgs/data/themes/matcha/default.nixrenamed+5−5

This diff is too big to show here.

pkgs/misc/themes/materia-theme/default.nix → pkgs/data/themes/materia-theme/default.nixrenamed+2−3

This diff is too big to show here.

pkgs/data/themes/mojave/default.nixnew file+31

This diff is too big to show here.

pkgs/data/themes/nordic-polar/default.nixnew file+35

This diff is too big to show here.

pkgs/data/themes/nordic/default.nixnew file+43

This diff is too big to show here.

pkgs/misc/themes/plano/default.nix → pkgs/data/themes/plano/default.nixrenamed+2−2

This diff is too big to show here.

pkgs/data/themes/plata/default.nixnew file+80

This diff is too big to show here.

pkgs/data/themes/qogir/default.nixnew file+31

This diff is too big to show here.

pkgs/misc/themes/shades-of-gray/default.nix → pkgs/data/themes/shades-of-gray/default.nixrenamed+3−3

This diff is too big to show here.

pkgs/desktops/deepin/dbus-factory/default.nix+8−2

This diff is too big to show here.

pkgs/desktops/deepin/dde-api/default.nixnew file+66

This diff is too big to show here.

pkgs/desktops/deepin/dde-api/deps.nixnew file+102

This diff is too big to show here.

pkgs/desktops/deepin/dde-calendar/default.nix+5−3

This diff is too big to show here.

pkgs/desktops/deepin/dde-daemon/default.nixnew file+92

This diff is too big to show here.

pkgs/desktops/deepin/dde-daemon/deps.nixnew file+111

This diff is too big to show here.

pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix+5−3

This diff is too big to show here.

pkgs/desktops/deepin/dde-session-ui/default.nixnew file+62

This diff is too big to show here.

pkgs/desktops/deepin/deepin-desktop-base/default.nixnew file+47

This diff is too big to show here.

pkgs/desktops/deepin/deepin-desktop-schemas/default.nixnew file+46

This diff is too big to show here.

pkgs/desktops/deepin/deepin-gettext-tools/default.nix+3−1

This diff is too big to show here.

pkgs/desktops/deepin/deepin-gtk-theme/default.nix+11−8

This diff is too big to show here.

pkgs/desktops/deepin/deepin-icon-theme/default.nix+5−3

This diff is too big to show here.

pkgs/desktops/deepin/deepin-image-viewer/default.nix+6−3

This diff is too big to show here.

pkgs/desktops/deepin/deepin-menu/default.nix+5−3

This diff is too big to show here.

pkgs/desktops/deepin/deepin-metacity/default.nixnew file+64

This diff is too big to show here.

pkgs/desktops/deepin/deepin-movie-reborn/default.nixnew file+55

This diff is too big to show here.

pkgs/desktops/deepin/deepin-mutter/default.nix+5−4

This diff is too big to show here.

pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix+3−2

This diff is too big to show here.

pkgs/desktops/deepin/deepin-sound-theme/default.nix+5−2

This diff is too big to show here.

pkgs/desktops/deepin/deepin-terminal/default.nix+33−27

This diff is too big to show here.

pkgs/desktops/deepin/deepin-wallpapers/default.nixnew file+44

This diff is too big to show here.

pkgs/desktops/deepin/deepin-wm/default.nixnew file+60

This diff is too big to show here.

pkgs/desktops/deepin/default.nix+11−1

This diff is too big to show here.

pkgs/desktops/deepin/dtkcore/default.nix+5−3

This diff is too big to show here.

pkgs/desktops/deepin/dtkwidget/default.nix+5−4

This diff is too big to show here.

pkgs/desktops/deepin/dtkwm/default.nix+4−1

This diff is too big to show here.

pkgs/desktops/deepin/go-dbus-factory/default.nix+8−4

This diff is too big to show here.

pkgs/desktops/deepin/go-dbus-generator/default.nix+4−3

This diff is too big to show here.

pkgs/desktops/deepin/go-gir-generator/default.nix+20−5

This diff is too big to show here.

pkgs/desktops/deepin/go-lib/default.nix+9−5

This diff is too big to show here.

pkgs/desktops/deepin/qt5dxcb-plugin/default.nix+6−3

This diff is too big to show here.

pkgs/desktops/deepin/qt5integration/default.nix+7−6

This diff is too big to show here.

pkgs/desktops/deepin/update.nixnew file+38

This diff is too big to show here.

pkgs/desktops/enlightenment/efl.nix+6−3

This diff is too big to show here.

pkgs/desktops/enlightenment/terminology.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-2/desktop/mail-notification/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix+3−2

This diff is too big to show here.

pkgs/desktops/gnome-2/platform/GConf/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/gnome-2/platform/libglade/default.nix+2

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/accerciser/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/cheese/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/evolution/default.nix+4−4

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/file-roller/default.nix+3−2

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/gedit/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/glade/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix+6−6

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix+4−4

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/gnome-characters/default.nix+10−5

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix+4−4

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/gnome-documents/default.nix+13−5

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/gnome-logs/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/gnome-maps/default.nix+16−13

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/gnome-music/default.nix+7−7

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/bijiben/default.nix → pkgs/desktops/gnome-3/apps/gnome-notes/default.nixrenamed+6−6

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/gnome-photos/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix+14−8

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/gnome-weather/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/polari/default.nix+4−4

This diff is too big to show here.

pkgs/desktops/gnome-3/apps/seahorse/default.nix+17−14

This diff is too big to show here.

pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix+9−6

This diff is too big to show here.

pkgs/desktops/gnome-3/core/baobab/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/core/dconf-editor/default.nix+6−6

This diff is too big to show here.

pkgs/desktops/gnome-3/core/dconf/default.nix+13−8

This diff is too big to show here.

pkgs/desktops/gnome-3/core/empathy/default.nix+12−7

This diff is too big to show here.

pkgs/desktops/gnome-3/core/eog/default.nix+13−4

This diff is too big to show here.

pkgs/desktops/gnome-3/core/epiphany/default.nix+4−4

This diff is too big to show here.

pkgs/desktops/gnome-3/core/evince/default.nix+6−6

This diff is too big to show here.

pkgs/desktops/gnome-3/core/evolution-data-server/default.nix+7−6

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gdm/default.nix+12−12

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gdm/fix-paths.patch+14−14

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gdm/reset-environment.patchnew file+20

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gdm/sessions_dir.patchdeleted−52

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gjs/default.nix+6−6

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix+4−4

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-calculator/default.nix+4−4

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-contacts/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-control-center/default.nix+6−6

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch+24−28

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch+1−1

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-desktop/default.nix+6−9

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-keyring/default.nix+1−1

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-menus/default.nixdeleted−23

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix+9−8

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nixnew file+41

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-session/default.nix+11−11

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch+18−2

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix+4−7

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix+7−5

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-shell/default.nix+6−10

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-software/default.nix+8−10

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-system-log/default.nixdeleted−34

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix+9−8

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-terminal/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix+4

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/core/grilo-plugins/default.nix+8−11

This diff is too big to show here.

pkgs/desktops/gnome-3/core/grilo/default.nix+16−17

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix+4−4

This diff is too big to show here.

pkgs/desktops/gnome-3/core/gucharmap/default.nix+4−13

This diff is too big to show here.

pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/core/libpeas/default.nixdeleted−34

This diff is too big to show here.

pkgs/desktops/gnome-3/core/mutter/3.28.nixnew file+55

This diff is too big to show here.

pkgs/desktops/gnome-3/core/mutter/default.nix+5−5

This diff is too big to show here.

pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patchnew file+19

This diff is too big to show here.

pkgs/desktops/gnome-3/core/nautilus/default.nix+24−9

This diff is too big to show here.

pkgs/desktops/gnome-3/core/rygel/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/core/simple-scan/default.nix+15−31

This diff is too big to show here.

pkgs/desktops/gnome-3/core/sushi/default.nix+20−30

This diff is too big to show here.

pkgs/desktops/gnome-3/core/totem/default.nix+5−5

This diff is too big to show here.

pkgs/desktops/gnome-3/core/tracker-miners/default.nix+5−11

This diff is too big to show here.

pkgs/desktops/gnome-3/core/tracker/default.nix+21−4

This diff is too big to show here.

pkgs/desktops/gnome-3/core/yelp-xsl/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/core/yelp/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/core/zenity/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/default.nix+39−69

This diff is too big to show here.

pkgs/desktops/gnome-3/devtools/anjuta/default.nix+3−2

This diff is too big to show here.

pkgs/desktops/gnome-3/devtools/devhelp/default.nix+4−4

This diff is too big to show here.

pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/devtools/nemiver/default.nix+1

This diff is too big to show here.

pkgs/desktops/gnome-3/extensions/caffeine/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix+3−3

This diff is too big to show here.

pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/extensions/gsconnect/default.nixnew file+91

This diff is too big to show here.

pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patchnew file+44

This diff is too big to show here.

pkgs/desktops/gnome-3/extensions/icon-hider/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/extensions/system-monitor/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/find-latest-version.py+1−1

This diff is too big to show here.

pkgs/desktops/gnome-3/games/aisleriot/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/games/atomix/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/games/five-or-more/default.nix+18−11

This diff is too big to show here.

pkgs/desktops/gnome-3/games/gnome-chess/default.nix+4−4

This diff is too big to show here.

pkgs/desktops/gnome-3/games/gnome-mines/default.nix+5−5

This diff is too big to show here.

pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix+16−9

This diff is too big to show here.

pkgs/desktops/gnome-3/games/gnome-taquin/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/games/iagno/default.nix+11−9

This diff is too big to show here.

pkgs/desktops/gnome-3/games/lightsoff/default.nix+14−6

This diff is too big to show here.

pkgs/desktops/gnome-3/games/swell-foop/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/california/default.nixdeleted−47

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/geary/default.nix+26−4

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/gitg/default.nix+21−10

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/gnome-applets/default.nix+2−24

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix+140−62

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patchdeleted−30

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix+15−13

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/gnome-panel/default.nix+23−5

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nixnew file+96

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patchnew file+11

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix+4−4

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/gpaste/default.nix+18−14

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/metacity/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/nautilus-python/default.nixnew file+62

This diff is too big to show here.

pkgs/desktops/gnome-3/misc/pomodoro/default.nix+11−3

This diff is too big to show here.

pkgs/desktops/gnome-3/update.nix+12−7

This diff is too big to show here.

pkgs/desktops/gnustep/back/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnustep/base/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnustep/gui/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/gnustep/libobjc2/default.nix+1

This diff is too big to show here.

pkgs/desktops/lxde/core/lxrandr/default.nixnew file+23

This diff is too big to show here.

pkgs/desktops/mate/atril/default.nix+7−4

This diff is too big to show here.

pkgs/desktops/mate/caja-extensions/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/caja/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/engrampa/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/eom/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/libmatekbd/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/libmatemixer/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/libmateweather/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/marco/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-applets/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-calc/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-control-center/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-desktop/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-icon-theme-faenza/default.nix+9−3

This diff is too big to show here.

pkgs/desktops/mate/mate-icon-theme/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-media/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-menus/default.nix+5−5

This diff is too big to show here.

pkgs/desktops/mate/mate-notification-daemon/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-panel/default.nix+5−4

This diff is too big to show here.

pkgs/desktops/mate/mate-polkit/default.nix+5−5

This diff is too big to show here.

pkgs/desktops/mate/mate-power-manager/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-screensaver/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-sensors-applet/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-session-manager/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-settings-daemon/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-system-monitor/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-terminal/default.nix+5−5

This diff is too big to show here.

pkgs/desktops/mate/mate-themes/default.nix+7−3

This diff is too big to show here.

pkgs/desktops/mate/mate-user-guide/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mate-utils/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/mozo/default.nix+12−11

This diff is too big to show here.

pkgs/desktops/mate/pluma/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/mate/python-caja/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/maxx/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/plasma-5/breeze-qt5.nix+2−2

This diff is too big to show here.

pkgs/desktops/plasma-5/fetch.sh+1−1

This diff is too big to show here.

pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch+8−8

This diff is too big to show here.

pkgs/desktops/plasma-5/plasma-integration/D9070.patchdeleted−24

This diff is too big to show here.

pkgs/desktops/plasma-5/plasma-integration/default.nix−7

This diff is too big to show here.

pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch+5−9

This diff is too big to show here.

pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch+9−11

This diff is too big to show here.

pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch+3−3

This diff is too big to show here.

pkgs/desktops/plasma-5/plasma-workspace/default.nix−4

This diff is too big to show here.

pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch+17−17

This diff is too big to show here.

pkgs/desktops/plasma-5/srcs.nix+180−180

This diff is too big to show here.

pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix+3−1

This diff is too big to show here.

pkgs/desktops/rox/rox-filer/default.nix+1

This diff is too big to show here.

pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix+2−2

This diff is too big to show here.

pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix+2−2

This diff is too big to show here.

pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix+3−8

This diff is too big to show here.

pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix+4−9

This diff is too big to show here.

pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix+1−1

This diff is too big to show here.

pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix+2−9

This diff is too big to show here.

pkgs/desktops/xfce4-13/default.nix+1−3

This diff is too big to show here.

pkgs/desktops/xfce4-13/libxfce4ui/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/xfce4-13/libxfce4util/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/xfce4-13/xfce4-panel/default.nix+2−2

This diff is too big to show here.

pkgs/desktops/xfce4-13/xfce4-terminal/default.nix+2−1

This diff is too big to show here.

pkgs/development/mobile/androidenv/androidndk-pkgs.nix → pkgs/development/androidndk-pkgs/androidndk-pkgs.nixrenamed+16−10

This diff is too big to show here.

pkgs/development/androidndk-pkgs/default.nixnew file+34

This diff is too big to show here.

pkgs/development/arduino/platformio/core.nix+61−8

This diff is too big to show here.

pkgs/development/beam-modules/default.nix+7−4

This diff is too big to show here.

pkgs/development/beam-modules/hex-registry-snapshot.nix+2−2

This diff is too big to show here.

pkgs/development/beam-modules/hex/default.nix+3−3

This diff is too big to show here.

pkgs/development/compilers/adoptopenjdk-bin/generate-sources.pynew file+63

This diff is too big to show here.

pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nixnew file+59

This diff is too big to show here.

pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nixnew file+112

This diff is too big to show here.

pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nixnew file+10

This diff is too big to show here.

pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nixnew file+9

This diff is too big to show here.

pkgs/development/compilers/adoptopenjdk-bin/sources.jsonnew file+98

This diff is too big to show here.

pkgs/development/compilers/ats2/default.nix+3−3

This diff is too big to show here.

pkgs/development/compilers/chez/default.nix+1

This diff is too big to show here.

pkgs/development/compilers/chicken/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch → pkgs/development/compilers/chicken/4/0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patchrenamed

The content is the same.

pkgs/development/compilers/chicken/default.nix → pkgs/development/compilers/chicken/4/chicken.nixrenamed

The content is the same.

pkgs/development/compilers/chicken/4/default.nixnew file+21

This diff is too big to show here.

pkgs/development/tools/egg2nix/default.nix → pkgs/development/compilers/chicken/4/egg2nix.nixrenamed

The content is the same.

pkgs/development/compilers/chicken/eggDerivation.nix → pkgs/development/compilers/chicken/4/eggDerivation.nixrenamed+2−3

This diff is too big to show here.

pkgs/development/tools/egg2nix/chicken-eggs.nix → pkgs/development/compilers/chicken/4/eggs.nixrenamed

The content is the same.

pkgs/development/tools/egg2nix/chicken-eggs.scm → pkgs/development/compilers/chicken/4/eggs.scmrenamed

The content is the same.

pkgs/build-support/fetchegg/builder.sh → pkgs/development/compilers/chicken/4/fetchegg/builder.shrenamed

The content is the same.

pkgs/build-support/fetchegg/default.nix → pkgs/development/compilers/chicken/4/fetchegg/default.nixrenamed+1−1

This diff is too big to show here.

pkgs/development/compilers/chicken/overrides.nix → pkgs/development/compilers/chicken/4/overrides.nixrenamed

The content is the same.

pkgs/development/compilers/chicken/setup-hook.sh → pkgs/development/compilers/chicken/4/setup-hook.shrenamed

The content is the same.

pkgs/development/compilers/chicken/5/chicken.nixnew file+62

This diff is too big to show here.

pkgs/development/compilers/chicken/5/default.nixnew file+21

This diff is too big to show here.

pkgs/development/compilers/chicken/5/egg2nix.nixnew file+29

This diff is too big to show here.

pkgs/development/compilers/chicken/5/eggDerivation.nixnew file+41

This diff is too big to show here.

pkgs/development/compilers/chicken/5/eggs.nixnew file+91

This diff is too big to show here.

pkgs/development/compilers/chicken/5/eggs.scmnew file+3

This diff is too big to show here.

pkgs/development/compilers/chicken/5/fetchegg/builder.shnew file+10

This diff is too big to show here.

pkgs/development/compilers/chicken/5/fetchegg/default.nixnew file+25

This diff is too big to show here.

pkgs/development/compilers/chicken/5/overrides.nixnew file+2

This diff is too big to show here.

pkgs/development/compilers/chicken/5/setup-hook.shnew file+6

This diff is too big to show here.

pkgs/development/compilers/clasp/default.nix+95−39

This diff is too big to show here.

pkgs/development/compilers/clean/default.nix+5−5

This diff is too big to show here.

pkgs/development/compilers/closure/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/compcert/default.nix+37−13

This diff is too big to show here.

pkgs/development/compilers/crystal/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/cudatoolkit/default.nix+40−6

This diff is too big to show here.

pkgs/development/compilers/dmd/default.nix+22−47

This diff is too big to show here.

pkgs/development/compilers/dotnet/sdk/default.nix+3−3

This diff is too big to show here.

pkgs/development/compilers/dtc/default.nix+3−8

This diff is too big to show here.

pkgs/development/compilers/elm/README.mdnew file+24

This diff is too big to show here.

pkgs/development/compilers/elm/default.nix+11−94

This diff is too big to show here.

pkgs/development/compilers/elm/elm2nix.rbdeleted−26

This diff is too big to show here.

pkgs/development/compilers/elm/fetchElmDeps.nixnew file+11

This diff is too big to show here.

pkgs/development/compilers/elm/makeDotElm.nixnew file+30

This diff is too big to show here.

pkgs/development/compilers/elm/packages/elm-elm.nixdeleted−50

This diff is too big to show here.

pkgs/development/compilers/elm/packages/elm-srcs.nixnew file+62

This diff is too big to show here.

pkgs/development/compilers/elm/packages/elm.nix+1

This diff is too big to show here.

pkgs/development/compilers/elm/packages/tasty-quickcheck.nixdeleted−14

This diff is too big to show here.

pkgs/development/compilers/elm/update.sh+8−1

This diff is too big to show here.

pkgs/development/compilers/elm/versions.dat

Binary file not shown.

pkgs/development/compilers/factor-lang/default.nix+51−39

This diff is too big to show here.

pkgs/development/compilers/factor-lang/fuel-dir.patchnew file+20

This diff is too big to show here.

pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patchnew file+13

This diff is too big to show here.

pkgs/development/compilers/factor-lang/workdir-0.98-pre.patchnew file+24

This diff is too big to show here.

pkgs/development/compilers/fasm/bin.nixnew file+24

This diff is too big to show here.

pkgs/development/compilers/fasm/default.nixnew file+28

This diff is too big to show here.

pkgs/development/compilers/fpc/default.upstream+1−1

This diff is too big to show here.

pkgs/development/compilers/fpc/lazarus.nix+3−3

This diff is too big to show here.

pkgs/development/compilers/gambit/bootstrap.nix+6−6

This diff is too big to show here.

pkgs/development/compilers/gambit/build.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/gambit/default.nix+4−5

This diff is too big to show here.

pkgs/development/compilers/gambit/unstable.nix+8−7

This diff is too big to show here.

pkgs/development/compilers/gcc-arm-embedded/6/default.nix+1

This diff is too big to show here.

pkgs/development/compilers/gcc-arm-embedded/7/default.nix+1

This diff is too big to show here.

pkgs/development/compilers/gcc-arm-embedded/8/default.nixnew file+40

This diff is too big to show here.

pkgs/development/compilers/gcc-arm-embedded/default.nix+1

This diff is too big to show here.

pkgs/development/compilers/gcc/4.8/default.nix+40−30

This diff is too big to show here.

pkgs/development/compilers/gcc/4.9/default.nix+38−33

This diff is too big to show here.

pkgs/development/compilers/gcc/5/default.nix+31−27

This diff is too big to show here.

pkgs/development/compilers/gcc/6/default.nix+35−33

This diff is too big to show here.

pkgs/development/compilers/gcc/7/default.nix+38−28

This diff is too big to show here.

pkgs/development/compilers/gcc/8/default.nix+25−28

This diff is too big to show here.

pkgs/development/compilers/gcc/builder.sh−5

This diff is too big to show here.

pkgs/development/compilers/gcc/snapshot/default.nix+25−21

This diff is too big to show here.

pkgs/development/compilers/gcl/2.6.13-pre.nix+5−5

This diff is too big to show here.

pkgs/development/compilers/gcl/default.nix+4−4

This diff is too big to show here.

pkgs/development/compilers/gerbil/build.nix+5−5

This diff is too big to show here.

pkgs/development/compilers/gerbil/default.nix+10−8

This diff is too big to show here.

pkgs/development/compilers/gerbil/unstable.nix+9−8

This diff is too big to show here.

pkgs/development/compilers/ghc/7.10.3-binary.nixdeleted−163

This diff is too big to show here.

pkgs/development/compilers/ghc/8.2.1-binary.nix → pkgs/development/compilers/ghc/8.2.2-binary.nixrenamed+7−8

This diff is too big to show here.

pkgs/development/compilers/ghc/8.2.2.nix+6−9

This diff is too big to show here.

pkgs/development/compilers/ghc/8.4.3.nix → pkgs/development/compilers/ghc/8.4.4.nixrenamed+16−15

This diff is too big to show here.

pkgs/development/compilers/ghc/8.6.1.nix+9−12

This diff is too big to show here.

pkgs/development/compilers/ghc/7.10.3.nix → pkgs/development/compilers/ghc/8.6.2.nixrenamed+67−31

This diff is too big to show here.

pkgs/development/compilers/ghc/8.0.2.nix → pkgs/development/compilers/ghc/8.6.3.nixrenamed+61−35

This diff is too big to show here.

pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patchdeleted−23

This diff is too big to show here.

pkgs/development/compilers/ghc/ghc-gold-linker.patchdeleted−54

This diff is too big to show here.

pkgs/development/compilers/ghc/ghc-no-madv-free.patchdeleted−18

This diff is too big to show here.

pkgs/development/compilers/ghc/head.nix+6−8

This diff is too big to show here.

pkgs/development/compilers/ghc/relocation.patchdeleted−27

This diff is too big to show here.

pkgs/development/compilers/ghcjs-ng/8.4/git.json+2−2

This diff is too big to show here.

pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix+1

This diff is too big to show here.

pkgs/development/compilers/ghcjs/7.10/boot.patchdeleted−104

This diff is too big to show here.

pkgs/development/compilers/ghcjs/7.10/default.nixdeleted−50

This diff is too big to show here.

pkgs/development/compilers/ghcjs/7.10/shims.nixdeleted−7

This diff is too big to show here.

pkgs/development/compilers/ghcjs/7.10/stage2.nixdeleted−344

This diff is too big to show here.

pkgs/development/compilers/ghcjs/8.0/boot.patchdeleted−86

This diff is too big to show here.

pkgs/development/compilers/ghcjs/8.0/default.nixdeleted−50

This diff is too big to show here.

pkgs/development/compilers/ghcjs/8.0/shims.nixdeleted−7

This diff is too big to show here.

pkgs/development/compilers/ghcjs/8.0/stage2.nixdeleted−545

This diff is too big to show here.

pkgs/development/compilers/glslang/default.nix+3−11

This diff is too big to show here.

pkgs/development/compilers/go/1.10.nix+5−11

This diff is too big to show here.

pkgs/development/compilers/go/1.11.nix+93−48

This diff is too big to show here.

pkgs/development/compilers/go/1.9.nix+2−8

This diff is too big to show here.

pkgs/development/compilers/gprolog/default.nix+3−3

This diff is too big to show here.

pkgs/development/compilers/graalvm/default.nix+36−13

This diff is too big to show here.

pkgs/development/compilers/halide/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/iasl/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/ispc/default.nix+3−10

This diff is too big to show here.

pkgs/development/compilers/jetbrains-jdk/default.nix−5

This diff is too big to show here.

pkgs/development/compilers/jsonnet/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/julia/0004-hardened.patchdeleted−25

This diff is too big to show here.

pkgs/development/compilers/julia/1.0.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/julia/default.nix+3−4

This diff is too big to show here.

pkgs/development/compilers/julia/shared.nix+4−4

This diff is too big to show here.

pkgs/development/compilers/kotlin/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/ldc/default.nix+46−93

This diff is too big to show here.

pkgs/development/compilers/llvm/3.5/llvm.nix−6

This diff is too big to show here.

pkgs/development/compilers/llvm/3.7/llvm.nix−2

This diff is too big to show here.

pkgs/development/compilers/llvm/3.8/llvm.nix−2

This diff is too big to show here.

pkgs/development/compilers/llvm/3.9/llvm.nix−2

This diff is too big to show here.

pkgs/development/compilers/llvm/4/libc++/default.nix+5

This diff is too big to show here.

pkgs/development/compilers/llvm/4/libc++/libc++.anew file+1

This diff is too big to show here.

pkgs/development/compilers/llvm/4/libc++abi.nix+1

This diff is too big to show here.

pkgs/development/compilers/llvm/4/lldb.nix+1−1

This diff is too big to show here.

pkgs/development/compilers/llvm/4/llvm.nix+1−7

This diff is too big to show here.

pkgs/development/compilers/llvm/5/libc++/default.nix+5

This diff is too big to show here.

pkgs/development/compilers/llvm/5/libc++/libc++.anew file+1

This diff is too big to show here.

pkgs/development/compilers/llvm/5/libc++abi.nix+1

This diff is too big to show here.

pkgs/development/compilers/llvm/5/lldb.nix+1−1

This diff is too big to show here.

pkgs/development/compilers/llvm/5/llvm.nix+2−10

This diff is too big to show here.

pkgs/development/compilers/llvm/6/libc++/default.nix+5

This diff is too big to show here.

pkgs/development/compilers/llvm/6/libc++/libc++.anew file+1

This diff is too big to show here.

pkgs/development/compilers/llvm/6/libc++abi.nix+1

This diff is too big to show here.

pkgs/development/compilers/llvm/6/lldb.nix+1−1

This diff is too big to show here.

pkgs/development/compilers/llvm/6/llvm.nix+38−29

This diff is too big to show here.

pkgs/development/compilers/llvm/7/clang/default.nix+1−1

This diff is too big to show here.

pkgs/development/compilers/llvm/7/compiler-rt.nix+1−1

This diff is too big to show here.

pkgs/development/compilers/llvm/7/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/llvm/7/libc++/default.nix+6−1

This diff is too big to show here.

pkgs/development/compilers/llvm/7/libc++/libc++.anew file+1

This diff is too big to show here.

pkgs/development/compilers/llvm/7/libc++abi.nix+2−1

This diff is too big to show here.

pkgs/development/compilers/llvm/7/lld.nix+1−1

This diff is too big to show here.

pkgs/development/compilers/llvm/7/lldb.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/llvm/7/llvm.nix+30−31

This diff is too big to show here.

pkgs/development/compilers/llvm/7/openmp.nix+1−1

This diff is too big to show here.

pkgs/development/compilers/llvm/common.nixnew file+22

This diff is too big to show here.

pkgs/development/compilers/manticore/default.nix+3−3

This diff is too big to show here.

pkgs/development/compilers/mentor/default.nixdeleted−80

This diff is too big to show here.

pkgs/development/compilers/microscheme/default.nix+1−6

This diff is too big to show here.

pkgs/development/compilers/mit-scheme/default.nix+1−1

This diff is too big to show here.

pkgs/development/compilers/mlton/20130715.nixnew file+118

This diff is too big to show here.

pkgs/development/compilers/mlton/20180207-binary.nixnew file+57

This diff is too big to show here.

pkgs/development/compilers/mlton/default.nix+21−129

This diff is too big to show here.

pkgs/development/compilers/mlton/from-git-source.nixnew file+35

This diff is too big to show here.

pkgs/development/compilers/mlton/meta.nixnew file+15

This diff is too big to show here.

pkgs/development/compilers/mono/4.0.nixdeleted−9

This diff is too big to show here.

pkgs/development/compilers/mono/4.4.nixdeleted−8

This diff is too big to show here.

pkgs/development/compilers/mono/4.6.nixdeleted−8

This diff is too big to show here.

pkgs/development/compilers/mono/4.8.nix → pkgs/development/compilers/mono/4.nixrenamed+1−1

This diff is too big to show here.

pkgs/development/compilers/mono/5.0.nixdeleted−8

This diff is too big to show here.

pkgs/development/compilers/mono/5.14.nixdeleted−8

This diff is too big to show here.

pkgs/development/compilers/mono/5.4.nixdeleted−8

This diff is too big to show here.

pkgs/development/compilers/mono/5.8.nixdeleted−8

This diff is too big to show here.

pkgs/development/compilers/mono/5.nixnew file+8

This diff is too big to show here.

pkgs/development/compilers/mono/build-fix-llvm.patchdeleted−12

This diff is too big to show here.

pkgs/development/compilers/mono/generic-cmake.nixdeleted−92

This diff is too big to show here.

pkgs/development/compilers/mono/generic.nix+17−25

This diff is too big to show here.

pkgs/development/compilers/mono/llvm.nix+12−18

This diff is too big to show here.

pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patchdeleted−65

This diff is too big to show here.

pkgs/development/compilers/mruby/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/nasm/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/nextpnr/default.nix+48−9

This diff is too big to show here.

pkgs/development/compilers/nim/default.nix+20−21

This diff is too big to show here.

pkgs/development/compilers/ocaml/4.07.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/ocaml/ber-metaocaml-104.nixdeleted−83

This diff is too big to show here.

pkgs/development/compilers/ocaml/ber-metaocaml.nixnew file+96

This diff is too big to show here.

pkgs/development/compilers/ocaml/generic.nix+7−5

This diff is too big to show here.

pkgs/development/compilers/openjdk/10.nix → pkgs/development/compilers/openjdk/11.nixrenamed+21−59

This diff is too big to show here.

pkgs/development/compilers/openjdk/8.nix+11−20

This diff is too big to show here.

pkgs/development/compilers/openjdk/bootstrap.nix+2−10

This diff is too big to show here.

pkgs/development/compilers/openjdk/darwin/10.nix → pkgs/development/compilers/openjdk/darwin/11.nixrenamed+7−8

This diff is too big to show here.

pkgs/development/compilers/openspin/default.nixnew file+26

This diff is too big to show here.

pkgs/development/compilers/oraclejdk/jdk-linux-base.nix+27−23

This diff is too big to show here.

pkgs/development/compilers/oraclejdk/jdk10-linux.nixdeleted−155

This diff is too big to show here.

pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix+9−7

This diff is too big to show here.

pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix+9−7

This diff is too big to show here.

pkgs/development/compilers/osl/default.nix+3−3

This diff is too big to show here.

pkgs/development/compilers/pakcs/default.nix+3−1

This diff is too big to show here.

pkgs/development/compilers/ponyc/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/purescript/psc-package/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/reason/default.nix+8−9

This diff is too big to show here.

pkgs/development/compilers/rust/binaryBuild.nix+1−3

This diff is too big to show here.

pkgs/development/compilers/rust/bootstrap.nix+8−9

This diff is too big to show here.

pkgs/development/compilers/rust/cargo.nix+3−6

This diff is too big to show here.

pkgs/development/compilers/rust/default.nix+6−6

This diff is too big to show here.

pkgs/development/compilers/rust/rustc.nix+32−35

This diff is too big to show here.

pkgs/development/compilers/sbcl/default.nix+30−11

This diff is too big to show here.

pkgs/development/compilers/scala/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/scala/dotty-bare.nix+5−5

This diff is too big to show here.

pkgs/development/compilers/shaderc/default.nix+21−11

This diff is too big to show here.

pkgs/development/compilers/smlnj/bootstrap.nix+3−3

This diff is too big to show here.

pkgs/development/compilers/smlnj/default.nix+24−23

This diff is too big to show here.

pkgs/development/compilers/solc/default.nix+5−12

This diff is too big to show here.

pkgs/development/compilers/solc/patches/shared-libs-install.patch+21−14

This diff is too big to show here.

pkgs/development/compilers/swift/default.nix+23−29

This diff is too big to show here.

pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch+1−1

This diff is too big to show here.

pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch+1−1

This diff is too big to show here.

pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch+1−1

This diff is too big to show here.

pkgs/development/compilers/swift/patches/build-script-pax.patchdeleted−33

This diff is too big to show here.

pkgs/development/compilers/swift/patches/glibc-arch-headers.patchnew file+13

This diff is too big to show here.

pkgs/development/compilers/swift/patches/llvm-include-dirs.patchnew file+13

This diff is too big to show here.

pkgs/development/compilers/swift/purity.patch+1−1

This diff is too big to show here.

pkgs/development/compilers/terra/default.nix−4

This diff is too big to show here.

pkgs/development/compilers/tinycc/default.nix−4

This diff is too big to show here.

pkgs/development/compilers/urn/default.nix+2−2

This diff is too big to show here.

pkgs/development/compilers/urweb/default.nix+3−3

This diff is too big to show here.

pkgs/development/compilers/vala/default.nix+13−11

This diff is too big to show here.

pkgs/development/compilers/x11basic/default.nixnew file+48

This diff is too big to show here.

pkgs/development/compilers/yosys/default.nix+5−5

This diff is too big to show here.

pkgs/development/coq-modules/Cheerios/default.nixnew file+32

This diff is too big to show here.

pkgs/development/coq-modules/InfSeqExt/default.nixnew file+31

This diff is too big to show here.

pkgs/development/coq-modules/QuickChick/default.nix+16−3

This diff is too big to show here.

pkgs/development/coq-modules/StructTact/default.nixnew file+31

This diff is too big to show here.

pkgs/development/coq-modules/Velisarios/default.nixnew file+50

This diff is too big to show here.

pkgs/development/coq-modules/Verdi/default.nixnew file+32

This diff is too big to show here.

pkgs/development/coq-modules/autosubst/default.nix+1

This diff is too big to show here.

pkgs/development/coq-modules/bignums/default.nix+8−5

This diff is too big to show here.

pkgs/development/coq-modules/category-theory/default.nix+20−16

This diff is too big to show here.

pkgs/development/coq-modules/contribs/default.nix+2−2

This diff is too big to show here.

pkgs/development/coq-modules/coq-ext-lib/default.nix+2−1

This diff is too big to show here.

pkgs/development/coq-modules/coq-haskell/default.nix+1−1

This diff is too big to show here.

pkgs/development/coq-modules/coqprime/default.nix+7−4

This diff is too big to show here.

pkgs/development/coq-modules/corn/default.nixnew file+38

This diff is too big to show here.

pkgs/development/coq-modules/dpdgraph/default.nix+3−3

This diff is too big to show here.

pkgs/development/coq-modules/equations/default.nix+1−1

This diff is too big to show here.

pkgs/development/coq-modules/fiat/HEAD.nix+3−2

This diff is too big to show here.

pkgs/development/coq-modules/flocq/default.nix+23−6

This diff is too big to show here.

pkgs/development/coq-modules/heq/default.nix+1−1

This diff is too big to show here.

pkgs/development/coq-modules/math-classes/default.nix+3−3

This diff is too big to show here.

pkgs/development/coq-modules/mathcomp/default.nix+58−22

This diff is too big to show here.

pkgs/development/coq-modules/mathcomp/generic.nixdeleted−42

This diff is too big to show here.

pkgs/development/coq-modules/metalib/default.nix+1−1

This diff is too big to show here.

pkgs/development/coq-modules/paco/default.nix+1−1

This diff is too big to show here.

pkgs/development/coq-modules/simple-io/default.nixnew file+32

This diff is too big to show here.

pkgs/development/coq-modules/ssreflect/default.nix+31−28

This diff is too big to show here.

pkgs/development/coq-modules/ssreflect/generic.nixdeleted−49

This diff is too big to show here.

pkgs/development/dhall-modules/default.nixnew file+9

This diff is too big to show here.

pkgs/development/dhall-modules/prelude/v3.nixnew file+25

This diff is too big to show here.

pkgs/development/go-modules/generic/default.nix+169−155

This diff is too big to show here.

pkgs/development/guile-modules/guile-cairo/default.nix+6−5

This diff is too big to show here.

pkgs/development/guile-modules/guile-gnome/default.nix+1−1

This diff is too big to show here.

pkgs/development/guile-modules/guile-lib/default.nix+1−1

This diff is too big to show here.

pkgs/development/guile-modules/guile-opengl/default.nix+1−1

This diff is too big to show here.

pkgs/development/guile-modules/guile-sdl/default.nix+1−1

This diff is too big to show here.

pkgs/development/guile-modules/guile-sdl2/default.nix+4−4

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-common.nix+123−90

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-ghc-7.10.x.nixdeleted−239

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-ghc-8.0.x.nixdeleted−88

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix+15

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+22−40

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-ghc-head.nix+1−1

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-hackage2nix.yaml+1626−1441

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-halvm-2.4.0.nixdeleted−59

This diff is too big to show here.

pkgs/development/haskell-modules/configuration-nix.nix+26−1

This diff is too big to show here.

pkgs/development/haskell-modules/default.nix+4−1

This diff is too big to show here.

pkgs/development/haskell-modules/generic-builder.nix+14−6

This diff is too big to show here.

pkgs/development/haskell-modules/hackage-packages.nix+13343−8355

This diff is too big to show here.

pkgs/development/haskell-modules/lib.nix+68−6

This diff is too big to show here.

pkgs/development/haskell-modules/make-package-set.nix+10−7

This diff is too big to show here.

pkgs/development/haskell-modules/non-hackage-packages.nix+15

This diff is too big to show here.

pkgs/development/haskell-modules/patches/fgl-monad-fail.patch−61

This diff is too big to show here.

pkgs/development/haskell-modules/patches/opencv-fix-116.patch+11

This diff is too big to show here.

pkgs/development/idris-modules/categories.nix+2−3

This diff is too big to show here.

pkgs/development/idris-modules/curses.nix−33

This diff is too big to show here.

pkgs/development/idris-modules/default.nix−2

This diff is too big to show here.

pkgs/development/idris-modules/derive.nix+3−4

This diff is too big to show here.

pkgs/development/idris-modules/tparsec.nix+3−3

This diff is too big to show here.

pkgs/development/interpreters/angelscript/2.22.nix+1

This diff is too big to show here.

pkgs/development/interpreters/angelscript/default.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/bats/default.nix+5−2

This diff is too big to show here.

pkgs/development/interpreters/clisp/default.nix+5−4

This diff is too big to show here.

pkgs/development/interpreters/clisp/hg.nix+3−3

This diff is too big to show here.

pkgs/development/interpreters/clojure/default.nix+4−4

This diff is too big to show here.

pkgs/development/interpreters/clojurescript/lumo/default.nix+257

This diff is too big to show here.

pkgs/development/interpreters/clojurescript/lumo/deps.edn+12

This diff is too big to show here.

pkgs/development/interpreters/clojurescript/lumo/deps.nix+393

This diff is too big to show here.

pkgs/development/interpreters/clojurescript/lumo/package.json+42

This diff is too big to show here.

pkgs/development/interpreters/duktape/default.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/elixir/1.3.nix−7

This diff is too big to show here.

pkgs/development/interpreters/elixir/1.7.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/elixir/1.8.nix+7

This diff is too big to show here.

pkgs/development/interpreters/erlang/R21.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/erlang/generic-builder.nix+5−3

This diff is too big to show here.

pkgs/development/interpreters/gauche/default.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/gnu-apl/default.nix+1−1

This diff is too big to show here.

pkgs/development/interpreters/groovy/default.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/gtk-server/default.nix+4

This diff is too big to show here.

pkgs/development/interpreters/guile/1.8.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/guile/2.0.nix+3−3

This diff is too big to show here.

pkgs/development/interpreters/guile/default.nix+1−1

This diff is too big to show here.

pkgs/development/interpreters/hy/default.nix+9−9

This diff is too big to show here.

pkgs/development/interpreters/joker/default.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/joker/deps.nix+9

This diff is too big to show here.

pkgs/development/interpreters/jruby/default.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/love/11.1.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/lush/default.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/lush/default.upstream+1−1

This diff is too big to show here.

pkgs/development/interpreters/maude/default.nix+5

This diff is too big to show here.

pkgs/development/interpreters/metamath/default.nix+34

This diff is too big to show here.

pkgs/development/interpreters/mujs/default.nix+8−8

This diff is too big to show here.

pkgs/development/interpreters/perl/default.nix+14−20

This diff is too big to show here.

pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch+9−8

This diff is too big to show here.

pkgs/development/interpreters/php/default.nix+67−54

This diff is too big to show here.

pkgs/development/interpreters/php/fix-paths-php7.patch+18−15

This diff is too big to show here.

pkgs/development/interpreters/php/php71-darwin-isfinite.patch+60

This diff is too big to show here.

pkgs/development/interpreters/php/php72-darwin-isfinite.patch+62

This diff is too big to show here.

pkgs/development/interpreters/php/php73-darwin-isfinite.patch+60

This diff is too big to show here.

pkgs/development/interpreters/picolisp/default.nix+23−17

This diff is too big to show here.

pkgs/development/interpreters/proglodyte-wasm/default.nix

This diff is too big to show here.

pkgs/development/interpreters/pure/default.nix+1

This diff is too big to show here.

pkgs/development/interpreters/python/build-python-package-common.nix+2−3

This diff is too big to show here.

pkgs/development/interpreters/python/build-python-package-setuptools.nix+5−6

This diff is too big to show here.

pkgs/development/interpreters/python/build-python-package.nix+6−4

This diff is too big to show here.

pkgs/development/interpreters/python/cpython/2.7/boot.nix−2

This diff is too big to show here.

pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch+32

This diff is too big to show here.

pkgs/development/interpreters/python/cpython/2.7/default.nix+48−40

This diff is too big to show here.

pkgs/development/interpreters/python/cpython/3.4/default.nix−214

This diff is too big to show here.

pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch−51

This diff is too big to show here.

pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch−147

This diff is too big to show here.

pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch−48

This diff is too big to show here.

pkgs/development/interpreters/python/cpython/3.5/default.nix−213

This diff is too big to show here.

pkgs/development/interpreters/python/cpython/3.7/default.nix−196

This diff is too big to show here.

pkgs/development/interpreters/python/cpython/default.nix+107−82

This diff is too big to show here.

pkgs/development/interpreters/python/default.nix+156

This diff is too big to show here.

pkgs/development/interpreters/python/mk-python-derivation.nix+14−4

This diff is too big to show here.

pkgs/development/interpreters/python/pypy/2.7/default.nix−144

This diff is too big to show here.

pkgs/development/interpreters/python/pypy/default.nix+148

This diff is too big to show here.

pkgs/development/interpreters/python/pypy/prebuilt.nix+123

This diff is too big to show here.

pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch

This diff is too big to show here.

pkgs/development/interpreters/python/update-python-libraries/default.nix+12

This diff is too big to show here.

pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py+362

This diff is too big to show here.

pkgs/development/interpreters/python/wrap-python.nix+3−2

This diff is too big to show here.

pkgs/development/interpreters/python/wrap.sh+13−7

This diff is too big to show here.

pkgs/development/interpreters/python/wrapper.nix+3−1

This diff is too big to show here.

pkgs/development/interpreters/racket/default.nix+15−13

This diff is too big to show here.

pkgs/development/interpreters/racket/minimal.nix+1−1

This diff is too big to show here.

pkgs/development/interpreters/regina/default.upstream+1−1

This diff is too big to show here.

pkgs/development/interpreters/renpy/default.nix+2−2

This diff is too big to show here.

pkgs/development/interpreters/ruby/default.nix+27−22

This diff is too big to show here.

pkgs/development/interpreters/ruby/patchsets.nix+5−3

This diff is too big to show here.

pkgs/development/interpreters/spidermonkey/1.8.5.nix+1−4

This diff is too big to show here.

pkgs/development/interpreters/spidermonkey/17.nix−88

This diff is too big to show here.

pkgs/development/interpreters/spidermonkey/31.nix−64

This diff is too big to show here.

pkgs/development/interpreters/spidermonkey/38.nix+3−7

This diff is too big to show here.

pkgs/development/interpreters/spidermonkey/52.nix+10

This diff is too big to show here.

pkgs/development/interpreters/spidermonkey/60.nix+64

This diff is too big to show here.

pkgs/development/interpreters/supercollider/default.nix+3−2

This diff is too big to show here.

pkgs/development/interpreters/tcl/generic.nix+10−6

This diff is too big to show here.

pkgs/development/interpreters/tinyscheme/default.nix+33

This diff is too big to show here.

pkgs/development/java-modules/postgresql_jdbc/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/SDL/default.nix+14−9

This diff is too big to show here.

pkgs/development/libraries/SDL2/default.nix+18−16

This diff is too big to show here.

pkgs/development/libraries/SDL2_image/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/SDL2_mixer/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/SDL_sound/default.nix+5−3

This diff is too big to show here.

pkgs/development/libraries/Xaw3d/default.nix+1

This diff is too big to show here.

pkgs/development/libraries/a52dec/default.nix+4

This diff is too big to show here.

pkgs/development/libraries/accountsservice/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/ace/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/acl/default.nix+4−8

This diff is too big to show here.

pkgs/development/libraries/adns/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/aften/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix+7−8

This diff is too big to show here.

pkgs/development/libraries/agda/agda-stdlib/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/alembic/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/allegro/5.nix+17−9

This diff is too big to show here.

pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch+26

This diff is too big to show here.

pkgs/development/libraries/allegro/default.nix+7−6

This diff is too big to show here.

pkgs/development/libraries/appstream-glib/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/appstream/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/aravis/default.nix+89

This diff is too big to show here.

pkgs/development/libraries/arb/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/arb/git.nix−21

This diff is too big to show here.

pkgs/development/libraries/argp-standalone/default.nix+41

This diff is too big to show here.

pkgs/development/libraries/arguments/default.nix−1

This diff is too big to show here.

pkgs/development/libraries/armadillo/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/arrow-cpp/default.nix+40−9

This diff is too big to show here.

pkgs/development/libraries/aspell/dictionaries.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/at-spi2-atk/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/at-spi2-core/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/atk/default.nix+4−12

This diff is too big to show here.

pkgs/development/libraries/atkmm/default.nix+12−8

This diff is too big to show here.

pkgs/development/libraries/attr/default.nix+4−10

This diff is too big to show here.

pkgs/development/libraries/attr/fix-headers-musl.patch−54

This diff is too big to show here.

pkgs/development/libraries/aubio/default.nix+4−10

This diff is too big to show here.

pkgs/development/libraries/audio/lilv/default.nix+2−8

This diff is too big to show here.

pkgs/development/libraries/audio/lv2/default.nix+2−8

This diff is too big to show here.

pkgs/development/libraries/audio/lv2/unstable.nix+2−8

This diff is too big to show here.

pkgs/development/libraries/audio/lvtk/default.nix+6−11

This diff is too big to show here.

pkgs/development/libraries/audio/ntk/default.nix+2−11

This diff is too big to show here.

pkgs/development/libraries/audio/raul/default.nix+2−8

This diff is too big to show here.

pkgs/development/libraries/audio/sratom/default.nix+2−8

This diff is too big to show here.

pkgs/development/libraries/audio/suil/default.nix+2−7

This diff is too big to show here.

pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix+8−8

This diff is too big to show here.

pkgs/development/libraries/audio/zita-convolver/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/audio/zita-resampler/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/avahi/default.nix+7−3

This diff is too big to show here.

pkgs/development/libraries/aws-sdk-cpp/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/babl/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/bamf/default.nix+30−17

This diff is too big to show here.

pkgs/development/libraries/beignet/default.nix+2

This diff is too big to show here.

pkgs/development/libraries/boehm-gc/default.nix+5−4

This diff is too big to show here.

pkgs/development/libraries/boost/1.69.nix+11

This diff is too big to show here.

pkgs/development/libraries/boost/generic.nix+8−10

This diff is too big to show here.

pkgs/development/libraries/bootil/default.nix+15−13

This diff is too big to show here.

pkgs/development/libraries/box2d/default.nix+9−5

This diff is too big to show here.

pkgs/development/libraries/brigand/default.nix+26

This diff is too big to show here.

pkgs/development/libraries/buddy/default.nix+3

This diff is too big to show here.

pkgs/development/libraries/bwidget/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/c-ares/default.nix+2−11

This diff is too big to show here.

pkgs/development/libraries/caf/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/cairo/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/capnproto/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/capstone/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/catch/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/catch2/default.nix+27

This diff is too big to show here.

pkgs/development/libraries/ccrtp/1.8.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/ccrtp/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/chipmunk/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/clucene-core/2.x.nix+16−8

This diff is too big to show here.

pkgs/development/libraries/clutter-gtk/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/clutter/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/cmark/default.nix+1−2

This diff is too big to show here.

pkgs/development/libraries/cogl/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/commoncpp2/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/confuse/default.nix−17

This diff is too big to show here.

pkgs/development/libraries/cpp-hocon/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/cutelyst/default.nix+5−4

This diff is too big to show here.

pkgs/development/libraries/cwiid/default.nix+4

This diff is too big to show here.

pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch+12

This diff is too big to show here.

pkgs/development/libraries/cyrus-sasl/default.nix+14−29

This diff is too big to show here.

pkgs/development/libraries/dbus-cplusplus/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/dbus-sharp/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/dbus/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/dee/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/directfb/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/dlib/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/dqlite/default.nix+27

This diff is too big to show here.

pkgs/development/libraries/drumstick/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/dssi/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/easyloggingpp/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/eccodes/default.nix+9−5

This diff is too big to show here.

pkgs/development/libraries/editline/default.nix+11−2

This diff is too big to show here.

pkgs/development/libraries/eigen/3.3.nix−38

This diff is too big to show here.

pkgs/development/libraries/eigen/default.nix+7−9

This diff is too big to show here.

pkgs/development/libraries/eigen/include-dir.patch+49

This diff is too big to show here.

pkgs/development/libraries/elf-header/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/enchant/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/esdl/default.nix−32

This diff is too big to show here.

pkgs/development/libraries/exiv2/default.nix+3−25

This diff is too big to show here.

pkgs/development/libraries/farstream/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/fcppt/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/fdk-aac/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/fflas-ffpack/default.nix+10

This diff is too big to show here.

pkgs/development/libraries/ffmpeg-full/default.nix+8−9

This diff is too big to show here.

pkgs/development/libraries/ffmpeg/3.4.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/ffmpeg/4.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/ffmpeg/generic.nix+3−1

This diff is too big to show here.

pkgs/development/libraries/flatbuffers/default.nix+10−7

This diff is too big to show here.

pkgs/development/libraries/flatpak/default.nix+17−20

This diff is too big to show here.

pkgs/development/libraries/flatpak/fix-test-paths.patch+28−10

This diff is too big to show here.

pkgs/development/libraries/fltk/1.4.nix+52

This diff is too big to show here.

pkgs/development/libraries/fltk/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/fmt/default.nix+43

This diff is too big to show here.

pkgs/development/libraries/folks/default.nix+13−16

This diff is too big to show here.

pkgs/development/libraries/folly/default.nix+15−12

This diff is too big to show here.

pkgs/development/libraries/fontconfig/default.nix+2−3

This diff is too big to show here.

pkgs/development/libraries/fontconfig/make-fonts-cache.nix+2−1

This diff is too big to show here.

pkgs/development/libraries/freetds/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/freetype/default.nix+7

This diff is too big to show here.

pkgs/development/libraries/fribidi/default.nix+8

This diff is too big to show here.

pkgs/development/libraries/fstrcmp/default.nix+31

This diff is too big to show here.

pkgs/development/libraries/ganv/default.nix+2−8

This diff is too big to show here.

pkgs/development/libraries/gcab/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/gcc/libstdc++/5.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/gcr/default.nix+7−7

This diff is too big to show here.

pkgs/development/libraries/gdal/default.nix+16−2

This diff is too big to show here.

pkgs/development/libraries/gdbm/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/gdcm/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gdk-pixbuf/default.nix+17−30

This diff is too big to show here.

pkgs/development/libraries/gdl/default.nix+8−6

This diff is too big to show here.

pkgs/development/libraries/gecode/default.nix+11−7

This diff is too big to show here.

pkgs/development/libraries/gegl/4.0.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/geis/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch+55

This diff is too big to show here.

pkgs/development/libraries/geoclue/default.nix+28−25

This diff is too big to show here.

pkgs/development/libraries/geocode-glib/default.nix+6−7

This diff is too big to show here.

pkgs/development/libraries/geocode-glib/installed-tests-path.patch

This diff is too big to show here.

pkgs/development/libraries/geoip/default.nix+5

This diff is too big to show here.

pkgs/development/libraries/geos/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/getdns/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/gettext/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/gettext/gettext-setup-hook.sh+1−1

This diff is too big to show here.

pkgs/development/libraries/gexiv2/default.nix+14−14

This diff is too big to show here.

pkgs/development/libraries/gfbgraph/default.nix+7−9

This diff is too big to show here.

pkgs/development/libraries/git2/0.27.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/git2/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/glbinding/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/glfw/3.x.nix+10−2

This diff is too big to show here.

pkgs/development/libraries/glib-networking/default.nix+7−12

This diff is too big to show here.

pkgs/development/libraries/glib/default.nix+61−29

This diff is too big to show here.

pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch+11

This diff is too big to show here.

pkgs/development/libraries/glib/setup-hook.sh+1−1

This diff is too big to show here.

pkgs/development/libraries/glibc/common.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/glibc/default.nix+10−1

This diff is too big to show here.

pkgs/development/libraries/glibmm/default.nix+14−16

This diff is too big to show here.

pkgs/development/libraries/glpk/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/gmime/2.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gmime/3.nix+6−4

This diff is too big to show here.

pkgs/development/libraries/gnome-menus/default.nix+22

This diff is too big to show here.

pkgs/development/libraries/gnome-sharp/Makefile.in.patch−11

This diff is too big to show here.

pkgs/development/libraries/gnome-sharp/default.nix+27−9

This diff is too big to show here.

pkgs/development/libraries/gnu-config/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/gnu-efi/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gnutls-kdh/generic.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/gnutls/generic.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch+3−3

This diff is too big to show here.

pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch+41−26

This diff is too big to show here.

pkgs/development/libraries/gobject-introspection/default.nix+19−14

This diff is too big to show here.

pkgs/development/libraries/gobject-introspection/macos-shared-library.patch+36

This diff is too big to show here.

pkgs/development/libraries/gobject-introspection/test_shlibs.patch+50

This diff is too big to show here.

pkgs/development/libraries/goffice/0.8.nix−38

This diff is too big to show here.

pkgs/development/libraries/goffice/default.nix+16−7

This diff is too big to show here.

pkgs/development/libraries/goffice/pcre_info.patch−13

This diff is too big to show here.

pkgs/development/libraries/goocanvas/2.x.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/goocanvasmm/default.nix+31

This diff is too big to show here.

pkgs/development/libraries/google-gflags/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gpgme/default.nix+16−8

This diff is too big to show here.

pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch+129

This diff is too big to show here.

pkgs/development/libraries/granite/default.nix+36−15

This diff is too big to show here.

pkgs/development/libraries/grantlee/5/default.nix+1

This diff is too big to show here.

pkgs/development/libraries/grantlee/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/grib-api/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/grpc/default.nix+5−3

This diff is too big to show here.

pkgs/development/libraries/gsasl/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gsettings-qt/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gsignond/conf.patch+12

This diff is too big to show here.

pkgs/development/libraries/gsignond/default.nix+67

This diff is too big to show here.

pkgs/development/libraries/gsignond/plugin-load-env.patch+35

This diff is too big to show here.

pkgs/development/libraries/gsignond/plugins/lastfm.nix+38

This diff is too big to show here.

pkgs/development/libraries/gsignond/plugins/mail.nix+36

This diff is too big to show here.

pkgs/development/libraries/gsignond/plugins/oauth.nix+48

This diff is too big to show here.

pkgs/development/libraries/gsignond/plugins/sasl.nix+45

This diff is too big to show here.

pkgs/development/libraries/gsignond/wrapper.nix+25

This diff is too big to show here.

pkgs/development/libraries/gsl/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gsl/gsl-1_16.nix+5−3

This diff is too big to show here.

pkgs/development/libraries/gsound/default.nix+4−7

This diff is too big to show here.

pkgs/development/libraries/gspell/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gss/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/gssdp/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/bad/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/gstreamer/base/default.nix+5−5

This diff is too big to show here.

pkgs/development/libraries/gstreamer/core/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/gstreamer/ges/default.nix+8−4

This diff is too big to show here.

pkgs/development/libraries/gstreamer/good/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/libav/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/rtsp-server/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/gstreamer/ugly/default.nix+4−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/vaapi/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gstreamer/validate/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/gtest/default.nix+10−17

This diff is too big to show here.

pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch+30

This diff is too big to show here.

pkgs/development/libraries/gtk+/2.x.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gtk+/3.x.nix+16−6

This diff is too big to show here.

pkgs/development/libraries/gtk-mac-integration/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gtk-sharp-beans/default.nix+2−1

This diff is too big to show here.

pkgs/development/libraries/gtk-sharp/2.0.nix+34−15

This diff is too big to show here.

pkgs/development/libraries/gtkd/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/gtkdatabox/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gtkmm/3.x.nix+12−8

This diff is too big to show here.

pkgs/development/libraries/gtksourceview/3.x.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/gtksourceview/4.x.nix+5−5

This diff is too big to show here.

pkgs/development/libraries/gtksourceviewmm/4.x.nix+30

This diff is too big to show here.

pkgs/development/libraries/gtksourceviewmm/default.nix+7−3

This diff is too big to show here.

pkgs/development/libraries/gtkspell/3.nix+6−6

This diff is too big to show here.

pkgs/development/libraries/gtkspell/default.nix+7−4

This diff is too big to show here.

pkgs/development/libraries/gupnp-av/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/gupnp-dlna/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gupnp-igd/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gupnp/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/gusb/default.nix+24−16

This diff is too big to show here.

pkgs/development/libraries/gvfs/default.nix+32−63

This diff is too big to show here.

pkgs/development/libraries/harfbuzz/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/hivex/default.nix+3−4

This diff is too big to show here.

pkgs/development/libraries/hpx/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/hspell/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/http-parser/default.nix+12−32

This diff is too big to show here.

pkgs/development/libraries/hunspell/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/hwloc/default.nix+9−4

This diff is too big to show here.

pkgs/development/libraries/hyena/default.nix+1

This diff is too big to show here.

pkgs/development/libraries/hyperscan/default.nix+69

This diff is too big to show here.

pkgs/development/libraries/icu/63.nix+14

This diff is too big to show here.

pkgs/development/libraries/icu/base.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/id3lib/default.nix+5−2

This diff is too big to show here.

pkgs/development/libraries/igraph/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/ilmbase/cross.patch+35

This diff is too big to show here.

pkgs/development/libraries/ilmbase/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/imlib/default.nix+6−4

This diff is too big to show here.

pkgs/development/libraries/imlib2/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/incrtcl/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/intel-gmmlib/default.nix+25

This diff is too big to show here.

pkgs/development/libraries/intel-media-driver/default.nix+34

This diff is too big to show here.

pkgs/development/libraries/isl/0.12.2.nix−21

This diff is too big to show here.

pkgs/development/libraries/isl/0.20.0.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/jama/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/jansson/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/jasper/default.nix+1

This diff is too big to show here.

pkgs/development/libraries/java/commons/compress/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/java/commons/lang/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/java/commons/math/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/java/dbus-java/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/java/gwt-dragdrop/default.nix+5−4

This diff is too big to show here.

pkgs/development/libraries/java/gwt-widgets/default.nix+5−4

This diff is too big to show here.

pkgs/development/libraries/java/hsqldb/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/java/httpunit/default.nix+4−2

This diff is too big to show here.

pkgs/development/libraries/java/jdom/default.nix+5−2

This diff is too big to show here.

pkgs/development/libraries/java/jflex/default.nix+16−6

This diff is too big to show here.

pkgs/development/libraries/java/libmatthew-java/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/java/lombok/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/java/lucene/default.nix+4−2

This diff is too big to show here.

pkgs/development/libraries/java/mockobjects/default.nix+4−2

This diff is too big to show here.

pkgs/development/libraries/java/saxon/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/jemalloc/common.nix+20−11

This diff is too big to show here.

pkgs/development/libraries/jemalloc/default.nix+2−8

This diff is too big to show here.

pkgs/development/libraries/jemalloc/jemalloc450.nix+1−3

This diff is too big to show here.

pkgs/development/libraries/jitterentropy/default.nix+30

This diff is too big to show here.

pkgs/development/libraries/json-glib/default.nix+5−13

This diff is too big to show here.

pkgs/development/libraries/jsonrpc-glib/default.nix+5−8

This diff is too big to show here.

pkgs/development/libraries/judy/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/jxrlib/default.nix+28

This diff is too big to show here.

pkgs/development/libraries/kde-frameworks/fetch.sh+1−1

This diff is too big to show here.

pkgs/development/libraries/kde-frameworks/kio/default.nix+2−1

This diff is too big to show here.

pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch+1−1

This diff is too big to show here.

pkgs/development/libraries/kde-frameworks/srcs.nix+316−316

This diff is too big to show here.

pkgs/development/libraries/kerberos/krb5.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/keybinder/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/keybinder3/default.nix+8−8

This diff is too big to show here.

pkgs/development/libraries/kmsxx/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/kyotocabinet/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/lasem/default.nix+38

This diff is too big to show here.

pkgs/development/libraries/lasso/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/ldns/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/leatherman/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/lensfun/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/lesstif/default.nix+7−4

This diff is too big to show here.

pkgs/development/libraries/leveldb/default.nix+7−6

This diff is too big to show here.

pkgs/development/libraries/libHX/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/libaccounts-glib/default.nix+38−17

This diff is too big to show here.

pkgs/development/libraries/libaccounts-glib/py-override.patch+38

This diff is too big to show here.

pkgs/development/libraries/libaom/default.nix+17−5

This diff is too big to show here.

pkgs/development/libraries/libaosd/default.nix+36

This diff is too big to show here.

pkgs/development/libraries/libappindicator/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libarchive/CVE-2017-14166.patch−36

This diff is too big to show here.

pkgs/development/libraries/libarchive/CVE-2017-14502.patch−28

This diff is too big to show here.

pkgs/development/libraries/libarchive/default.nix+2−13

This diff is too big to show here.

pkgs/development/libraries/libassuan/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libatomic_ops/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libbap/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/libbfd/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libbladeRF/default.nix+21−5

This diff is too big to show here.

pkgs/development/libraries/libblockdev/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/libbsd/cdefs.patch−222

This diff is too big to show here.

pkgs/development/libraries/libbsd/darwin.patch+205−547

This diff is too big to show here.

pkgs/development/libraries/libbsd/default.nix+4−11

This diff is too big to show here.

pkgs/development/libraries/libbsd/features.patch−26

This diff is too big to show here.

pkgs/development/libraries/libbsd/musl.patch+14

This diff is too big to show here.

pkgs/development/libraries/libbsd/non-glibc.patch−74

This diff is too big to show here.

pkgs/development/libraries/libcacard/default.nix+22

This diff is too big to show here.

pkgs/development/libraries/libcdio/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libcdr/default.nix+2−10

This diff is too big to show here.

pkgs/development/libraries/libcec/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libchamplain/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libchop/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libcloudproviders/default.nix+8−14

This diff is too big to show here.

pkgs/development/libraries/libcloudproviders/fix-include.patch−11

This diff is too big to show here.

pkgs/development/libraries/libclthreads/default.nix+8−10

This diff is too big to show here.

pkgs/development/libraries/libclxclient/default.nix+14−6

This diff is too big to show here.

pkgs/development/libraries/libcollectdclient/default.nix+1−5

This diff is too big to show here.

pkgs/development/libraries/libcouchbase/default.nix+5−3

This diff is too big to show here.

pkgs/development/libraries/libcroco/default.nix+3−4

This diff is too big to show here.

pkgs/development/libraries/libdap/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libdazzle/default.nix+9−6

This diff is too big to show here.

pkgs/development/libraries/libdbusmenu-qt/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix+9−7

This diff is too big to show here.

pkgs/development/libraries/libdbusmenu/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libdeflate/default.nix+31

This diff is too big to show here.

pkgs/development/libraries/libdigidocpp/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libdrm/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libdwarf/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libe-book/default.upstream+1−1

This diff is too big to show here.

pkgs/development/libraries/libepc/default.nix+47

This diff is too big to show here.

pkgs/development/libraries/libestr/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libevdev/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libextractor/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libexttextcat/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/libfakekey/default.nix+5−2

This diff is too big to show here.

pkgs/development/libraries/libffi/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libfive/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/libfm/default.nix+10−4

This diff is too big to show here.

pkgs/development/libraries/libfprint/default.nix+16−9

This diff is too big to show here.

pkgs/development/libraries/libftdi/1.x.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/libgcrypt/default.nix+3−11

This diff is too big to show here.

pkgs/development/libraries/libgcrypt/fix-jent-locking.patch−29

This diff is too big to show here.

pkgs/development/libraries/libgda/default.nix+13−20

This diff is too big to show here.

pkgs/development/libraries/libgdamm/default.nix+39

This diff is too big to show here.

pkgs/development/libraries/libgdata/default.nix+8−12

This diff is too big to show here.

pkgs/development/libraries/libgdiplus/default.nix+34−18

This diff is too big to show here.

pkgs/development/libraries/libgdiplus/giflib.patch−143

This diff is too big to show here.

pkgs/development/libraries/libgee/default.nix+5−8

This diff is too big to show here.

pkgs/development/libraries/libgepub/default.nix+4−7

This diff is too big to show here.

pkgs/development/libraries/libgit2-glib/default.nix+10−7

This diff is too big to show here.

pkgs/development/libraries/libgksu/default.nix+12−12

This diff is too big to show here.

pkgs/development/libraries/libglvnd/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libgnome-keyring/default.nix+1

This diff is too big to show here.

pkgs/development/libraries/libgnomekbd/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/libgnurl/default.nix+12−18

This diff is too big to show here.

pkgs/development/libraries/libgpg-error/default.nix+6−3

This diff is too big to show here.

pkgs/development/libraries/libgpiod/default.nix+38

This diff is too big to show here.

pkgs/development/libraries/libgpod/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/libgrss/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/libgsf/default.nix+11−4

This diff is too big to show here.

pkgs/development/libraries/libgtop/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libgudev/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libguestfs/default.nix+8−7

This diff is too big to show here.

pkgs/development/libraries/libgweather/default.nix+6−9

This diff is too big to show here.

pkgs/development/libraries/libgxps/default.nix+18−8

This diff is too big to show here.

pkgs/development/libraries/libhandy/default.nix+57

This diff is too big to show here.

pkgs/development/libraries/libharu/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libhttpseverywhere/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/libiberty/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libibverbs/default.nix−79

This diff is too big to show here.

pkgs/development/libraries/libical/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/libicns/default.nix+5−2

This diff is too big to show here.

pkgs/development/libraries/libiconv/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libiconv/setup-hook.sh+4−2

This diff is too big to show here.

pkgs/development/libraries/libid3tag/CVE-2017-11550-and-CVE-2017-11551.patch+13

This diff is too big to show here.

pkgs/development/libraries/libid3tag/default.nix+4−1

This diff is too big to show here.

pkgs/development/libraries/libidn/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libiio/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libimagequant/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libindicate/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libinfinity/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libinput/default.nix+29−14

This diff is too big to show here.

pkgs/development/libraries/libiodbc/default.nix+6−4

This diff is too big to show here.

pkgs/development/libraries/libipfix/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libite/default.nix+1

This diff is too big to show here.

pkgs/development/libraries/libjpeg-turbo/default.nix+22−8

This diff is too big to show here.

pkgs/development/libraries/libjson/default.nix+10−3

This diff is too big to show here.

pkgs/development/libraries/libkate/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/libksba/default.nix+4−1

This diff is too big to show here.

pkgs/development/libraries/liblangtag/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/liblastfm/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/liblastfmSF/default.nix+1

This diff is too big to show here.

pkgs/development/libraries/liblcf/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/liblinear/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/liblognorm/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/liblqr-1/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libmanette/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libmatchbox/default.nix+3

This diff is too big to show here.

pkgs/development/libraries/libmatheval/default.nix+8−8

This diff is too big to show here.

pkgs/development/libraries/libmd/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libmediaart/default.nix+10−8

This diff is too big to show here.

pkgs/development/libraries/libmesode/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libmicrohttpd/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/libmikmod/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libmilter/default.nix+5−2

This diff is too big to show here.

pkgs/development/libraries/libmkv/default.nix+5

This diff is too big to show here.

pkgs/development/libraries/libmms/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/libmp3splt/default.nix+1

This diff is too big to show here.

pkgs/development/libraries/libmtp/default.nix+5−5

This diff is too big to show here.

pkgs/development/libraries/libmusicbrainz/5.x.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/libmusicbrainz/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/libmwaw/default.upstream+1−1

This diff is too big to show here.

pkgs/development/libraries/libmx/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libnatspec/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/libndctl/default.nix+28−31

This diff is too big to show here.

pkgs/development/libraries/libnetfilter_queue/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/libnftnl/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libngspice/default.nix+6−5

This diff is too big to show here.

pkgs/development/libraries/libnice/default.nix+44−7

This diff is too big to show here.

pkgs/development/libraries/libnih/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libnotify/default.nix+5−4

This diff is too big to show here.

pkgs/development/libraries/libnova/default.nix+5−4

This diff is too big to show here.

pkgs/development/libraries/liboauth/default.nix+1

This diff is too big to show here.

pkgs/development/libraries/libodfgen/default.upstream+1−1

This diff is too big to show here.

pkgs/development/libraries/libofa/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/libogg/default.nix+6

This diff is too big to show here.

pkgs/development/libraries/liboggz/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/libopcodes/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libopenaptx/default.nix+25

This diff is too big to show here.

pkgs/development/libraries/libopus/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libopusenc/default.nix+28

This diff is too big to show here.

pkgs/development/libraries/libosinfo/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/libosmium/default.nix+24

This diff is too big to show here.

pkgs/development/libraries/libowfat/default.nix+15−3

This diff is too big to show here.

pkgs/development/libraries/libp11/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libpcap/default.nix+8−16

This diff is too big to show here.

pkgs/development/libraries/libpeas/default.nix+36

This diff is too big to show here.

pkgs/development/libraries/libpfm/default.nix+6−1

This diff is too big to show here.

pkgs/development/libraries/libpng/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/libpqxx/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/libpsl/default.nix+5−6

This diff is too big to show here.

pkgs/development/libraries/libqalculate/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/libqmatrixclient/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libqrencode/default.nix−35

This diff is too big to show here.

pkgs/development/libraries/libraw/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/librdf/redland.nix+4−2

This diff is too big to show here.

pkgs/development/libraries/librdmacm/default.nix−36

This diff is too big to show here.

pkgs/development/libraries/libre/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/librealsense/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/librelp/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/librem/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libressl/default.nix+9−9

This diff is too big to show here.

pkgs/development/libraries/librest/default.nix+7−8

This diff is too big to show here.

pkgs/development/libraries/librevenge/default.upstream+1−1

This diff is too big to show here.

pkgs/development/libraries/librime/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/librsvg/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/libs3/default.nix+5−8

This diff is too big to show here.

pkgs/development/libraries/libsass/default.nix+2−10

This diff is too big to show here.

pkgs/development/libraries/libsearpc/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libsecret/default.nix+19−11

This diff is too big to show here.

pkgs/development/libraries/libsigcxx/1.2.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/libsigcxx/default.nix+13−8

This diff is too big to show here.

pkgs/development/libraries/libsignal-protocol-c/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libsignon-glib/default.nix+53

This diff is too big to show here.

pkgs/development/libraries/libsigsegv/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libskk/default.nix+6−6

This diff is too big to show here.

pkgs/development/libraries/libsolv/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/libsoup/default.nix+13−17

This diff is too big to show here.

pkgs/development/libraries/libssh/default.nix+3−13

This diff is too big to show here.

pkgs/development/libraries/libssh2/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/libtar/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libtasn1/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libtensorflow/default.nix+11

This diff is too big to show here.

pkgs/development/libraries/libtiff/default.nix+11−17

This diff is too big to show here.

pkgs/development/libraries/libtiger/default.nix+1

This diff is too big to show here.

pkgs/development/libraries/libtorrent-rasterbar/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/libtoxcore/default.nix+2−3

This diff is too big to show here.

pkgs/development/libraries/libtxc_dxtn/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/libuchardet/default.nix+17−11

This diff is too big to show here.

pkgs/development/libraries/libui/default.nix+42−46

This diff is too big to show here.

pkgs/development/libraries/libunarr/default.nix+21

This diff is too big to show here.

pkgs/development/libraries/libunique/3.x.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libunique/default.nix+2

This diff is too big to show here.

pkgs/development/libraries/libunistring/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libunity/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libunwind/default.nix+4−7

This diff is too big to show here.

pkgs/development/libraries/libunwind/version-1.2.1.patch−13

This diff is too big to show here.

pkgs/development/libraries/liburcu/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libusb/default.nix+10−2

This diff is too big to show here.

pkgs/development/libraries/libusb1/default.nix+9−4

This diff is too big to show here.

pkgs/development/libraries/libuv/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/libva-utils/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libva/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libvdpau/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libversion/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libvirt-glib/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/libvirt/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/libvncserver/default.nix+8−1

This diff is too big to show here.

pkgs/development/libraries/libvpx/git.nix−182

This diff is too big to show here.

pkgs/development/libraries/libwacom/default.nix+10−7

This diff is too big to show here.

pkgs/development/libraries/libwebp/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libwebsockets/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libwmf/default.nix+4−2

This diff is too big to show here.

pkgs/development/libraries/libwnck/3.x.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/libwpd/0.8.nix+7−4

This diff is too big to show here.

pkgs/development/libraries/libwpg/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix+32

This diff is too big to show here.

pkgs/development/libraries/libxklavier/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libxl/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/libxmi/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/libxml2/default.nix+6−18

This diff is too big to show here.

pkgs/development/libraries/libxmlb/default.nix+34

This diff is too big to show here.

pkgs/development/libraries/libxslt/default.nix+6−12

This diff is too big to show here.

pkgs/development/libraries/libxslt/patch-ah.patch−69

This diff is too big to show here.

pkgs/development/libraries/libzapojit/default.nix+7−9

This diff is too big to show here.

pkgs/development/libraries/lightning/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/lightstep-tracer-cpp/default.nix+9−13

This diff is too big to show here.

pkgs/development/libraries/lirc/default.nix+13−7

This diff is too big to show here.

pkgs/development/libraries/live555/default.nix+18−6

This diff is too big to show here.

pkgs/development/libraries/lmdb/default.nix+2−3

This diff is too big to show here.

pkgs/development/libraries/log4cplus/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/log4shib/default.nix+2

This diff is too big to show here.

pkgs/development/libraries/loudmouth/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/mailcore2/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/mapnik/default.nix+31−36

This diff is too big to show here.

pkgs/development/libraries/martyr/default.nix+1

This diff is too big to show here.

pkgs/development/libraries/matio/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/mbedtls/1.3.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/mbedtls/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/mdds/0.12.1.nix−17

This diff is too big to show here.

pkgs/development/libraries/mdds/0.7.1.nix−17

This diff is too big to show here.

pkgs/development/libraries/mdds/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/menu-cache/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/mesa/default.nix+21−17

This diff is too big to show here.

pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch+10−10

This diff is too big to show here.

pkgs/development/libraries/minixml/default.nix+10−6

This diff is too big to show here.

pkgs/development/libraries/mm-common/default.nix+33

This diff is too big to show here.

pkgs/development/libraries/mono-addins/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/mono-zeroconf/default.nix+1

This diff is too big to show here.

pkgs/development/libraries/movit/default.nix+7−5

This diff is too big to show here.

pkgs/development/libraries/mp4v2/default.nix+7−1

This diff is too big to show here.

pkgs/development/libraries/mpich/default.nix+10−9

This diff is too big to show here.

pkgs/development/libraries/mps/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/msgpack/generic.nix−2

This diff is too big to show here.

pkgs/development/libraries/msilbc/default.nix+4−2

This diff is too big to show here.

pkgs/development/libraries/mythes/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/nanoflann/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/nanomsg/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/ncurses/default.nix+12−8

This diff is too big to show here.

pkgs/development/libraries/ncurses/st-0.7.patch−13

This diff is too big to show here.

pkgs/development/libraries/ndn-cxx/default.nix+16−25

This diff is too big to show here.

pkgs/development/libraries/neon/0.29.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/neon/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/netcdf-fortran/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/netcdf/default.nix+3

This diff is too big to show here.

pkgs/development/libraries/nettle/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/nghttp2/default.nix+9−4

This diff is too big to show here.

pkgs/development/libraries/nix-plugins/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/nlohmann_json/default.nix+2−4

This diff is too big to show here.

pkgs/development/libraries/nlopt/default.nix+7−5

This diff is too big to show here.

pkgs/development/libraries/notify-sharp/default.nix+1

This diff is too big to show here.

pkgs/development/libraries/nspr/default.nix+7−3

This diff is too big to show here.

pkgs/development/libraries/nss/default.nix+6−4

This diff is too big to show here.

pkgs/development/libraries/nss_wrapper/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/ntl/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/ntrack/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/nv-codec-headers/default.nix+4−4

This diff is too big to show here.

pkgs/development/libraries/ode/default.nix+4−2

This diff is too big to show here.

pkgs/development/libraries/ogre/1.9.x.nix+8−8

This diff is too big to show here.

pkgs/development/libraries/ogre/default.nix+8−8

This diff is too big to show here.

pkgs/development/libraries/ois/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/olm/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/oniguruma/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/opal/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/openal-soft/default.nix+7−5

This diff is too big to show here.

pkgs/development/libraries/openbabel/default.nix+9−1

This diff is too big to show here.

pkgs/development/libraries/opencascade/default.nix+7−6

This diff is too big to show here.

pkgs/development/libraries/opencollada/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/opencsg/default.nix+4−5

This diff is too big to show here.

pkgs/development/libraries/opencv/3.x.nix+16−10

This diff is too big to show here.

pkgs/development/libraries/opencv/4.x.nix+292

This diff is too big to show here.

pkgs/development/libraries/opencv/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/opendbx/default.nix+6

This diff is too big to show here.

pkgs/development/libraries/opendht/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/opendkim/default.nix+5−1

This diff is too big to show here.

pkgs/development/libraries/openfst/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/openh264/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/openjpeg/2.1.nix−8

This diff is too big to show here.

pkgs/development/libraries/openjpeg/2.x.nix+31

This diff is too big to show here.

pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch+55

This diff is too big to show here.

pkgs/development/libraries/openjpeg/generic.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/openldap/default.nix+21−12

This diff is too big to show here.

pkgs/development/libraries/openmpi/default.nix+5−6

This diff is too big to show here.

pkgs/development/libraries/openpam/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/openscenegraph/3.4.0.nix+39

This diff is too big to show here.

pkgs/development/libraries/openscenegraph/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch+16

This diff is too big to show here.

pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch

This diff is too big to show here.

pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch

This diff is too big to show here.

pkgs/development/libraries/openssl/1.1/nix-ssl-cert-file.patch+15

This diff is too big to show here.

pkgs/development/libraries/openssl/chacha.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/openssl/darwin-arch.patch−12

This diff is too big to show here.

pkgs/development/libraries/openssl/default.nix+21−15

This diff is too big to show here.

pkgs/development/libraries/openssl/nix-ssl-cert-file.patch−14

This diff is too big to show here.

pkgs/development/libraries/opentracing-cpp/default.nix+21

This diff is too big to show here.

pkgs/development/libraries/openwsman/default.nix+4−2

This diff is too big to show here.

pkgs/development/libraries/openzwave/default.nix+6−4

This diff is too big to show here.

pkgs/development/libraries/osip/3.nix−17

This diff is too big to show here.

pkgs/development/libraries/osip/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/osm-gps-map/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/p11-kit/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/pagmo2/default.nix+16−18

This diff is too big to show here.

pkgs/development/libraries/pango/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/pangomm/default.nix+11−8

This diff is too big to show here.

pkgs/development/libraries/pangoxsl/default.nix+5−2

This diff is too big to show here.

pkgs/development/libraries/parquet-cpp/default.nix−39

This diff is too big to show here.

pkgs/development/libraries/pcl/default.nix−1

This diff is too big to show here.

pkgs/development/libraries/pcre2/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/phonon/backends/gstreamer.nix+1

This diff is too big to show here.

pkgs/development/libraries/phonon/backends/vlc.nix+1

This diff is too big to show here.

pkgs/development/libraries/physics/apfelgrid/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/physics/cernlib/default.nix+3−1

This diff is too big to show here.

pkgs/development/libraries/physics/fastjet/default.nix+2−8

This diff is too big to show here.

pkgs/development/libraries/physics/geant4/g4py/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/physics/herwig/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/physics/hoppet/default.nix+6−1

This diff is too big to show here.

pkgs/development/libraries/physics/qcdnum/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/physics/rivet/default.nix+2−4

This diff is too big to show here.

pkgs/development/libraries/physics/thepeg/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/physics/yoda/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/pipewire/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/pixman/default.nix+4−13

This diff is too big to show here.

pkgs/development/libraries/png++/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/podofo/default.nix+15−14

This diff is too big to show here.

pkgs/development/libraries/poker-eval/default.nix−24

This diff is too big to show here.

pkgs/development/libraries/polkit-qt-1/qt-4.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/polkit/default.nix+11−10

This diff is too big to show here.

pkgs/development/libraries/poppler/0.61.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/poppler/default.nix+6−6

This diff is too big to show here.

pkgs/development/libraries/popt/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/postgis/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/prison/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/protobuf/generic-v3.nix+10−4

This diff is too big to show here.

pkgs/development/libraries/protozero/default.nix+22

This diff is too big to show here.

pkgs/development/libraries/psqlodbc/default.nix

This diff is too big to show here.

pkgs/development/libraries/pth/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/ptlib/default.nix+1

This diff is too big to show here.

pkgs/development/libraries/pupnp/default.nix+3−2

This diff is too big to show here.

pkgs/development/libraries/pyotherside/default.nix+29

This diff is too big to show here.

pkgs/development/libraries/pyotherside/qml-path.patch+12

This diff is too big to show here.

pkgs/development/libraries/python-qt/default.nix+42

This diff is too big to show here.

pkgs/development/libraries/qgnomeplatform/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/qjson/default.nix+4−2

This diff is too big to show here.

pkgs/development/libraries/qmlbox2d/default.nix+3−3

This diff is too big to show here.

pkgs/development/libraries/qmltermwidget/default.nix+8−7

This diff is too big to show here.

pkgs/development/libraries/qoauth/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/qpdf/default.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/qrencode/default.nix+47

This diff is too big to show here.

pkgs/development/libraries/qrupdate/default.nix+5−2

This diff is too big to show here.

pkgs/development/libraries/qt-3/default.nix+7−7

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.11/default.nix+7−3

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.11/qtbase-fixguicmake.patch+30

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.11/qtwebengine-paxmark-mksnapshot.patch−48

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/default.nix+146

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/fetch.sh+2

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/qtbase-darwin-nseventtype.patch+13

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/qtbase-darwin.patch+70

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/qtbase-fixguicmake.patch+30

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/qtbase-revert-no-macos10.10.patch+102

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/qtbase.patch+1096

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/qtdeclarative.patch+33

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/qtscript.patch+13

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/qtserialport.patch+22

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/qtwebkit.patch+12

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.12/srcs.nix+325

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.6/default.nix+2−3

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch+30

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.6/qtwebengine-paxmark-mksnapshot.patch−46

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.9/default.nix+5−3

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch+30

This diff is too big to show here.

pkgs/development/libraries/qt-5/5.9/qtwebengine-paxmark-mksnapshot.patch−48

This diff is too big to show here.

pkgs/development/libraries/qt-5/README.md+2−2

This diff is too big to show here.

pkgs/development/libraries/qt-5/modules/qtbase.nix+5−1

This diff is too big to show here.

pkgs/development/libraries/qt-5/modules/qtdeclarative.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/qt-5/modules/qtmacextras.nix+5−3

This diff is too big to show here.

pkgs/development/libraries/qt-5/modules/qtwebengine.nix+3−5

This diff is too big to show here.

pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix+6

This diff is too big to show here.

pkgs/development/libraries/qt-5/modules/qtwebkit.nix+5−3

This diff is too big to show here.

pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix+2−2

This diff is too big to show here.

pkgs/development/libraries/qt-mobility/default.nix+4−3

This diff is too big to show here.

pkgs/development/libraries/qtscriptgenerator/default.nix+1−1

This diff is too big to show here.

pkgs/development/libraries/qtstyleplugin-kvantum/default.nix+5−5

This diff is too big to show here.

pkgs/development/libraries/range-v3/default.nix+2−2

This diff is too big to show here.