summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-09-24 23:09:00 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-09-24 23:09:00 +0200
commitd471c5d1f3f2ea49adc0e3673a081a19ad43e7a8 (patch)
treed1ee5f9826286d94d81f19d7e6631993c53a6af7
parent17f5821f94b3918dc03281a13419f59cbc30d5df (diff)
parentd341a1c6148ec60e9eeeb0a2ec4479969039c0ec (diff)
Merge branch 'staging-next' into staging
-rw-r--r--doc/builders/images/dockertools.xml12
-rw-r--r--doc/builders/images/ocitools.xml3
-rw-r--r--doc/builders/packages/citrix.xml8
-rw-r--r--doc/builders/packages/urxvt.xml50
-rw-r--r--doc/contributing/submitting-changes.xml12
-rw-r--r--doc/languages-frameworks/beam.xml6
-rw-r--r--doc/languages-frameworks/go.xml114
-rw-r--r--doc/languages-frameworks/perl.xml198
-rw-r--r--doc/languages-frameworks/qt.xml2
-rw-r--r--doc/languages-frameworks/ruby.xml25
-rw-r--r--doc/languages-frameworks/texlive.xml10
-rw-r--r--doc/manual.xml2
-rw-r--r--doc/stdenv/multiple-output.xml2
-rw-r--r--doc/using/configuration.xml8
-rw-r--r--doc/using/overlays.xml10
-rw-r--r--lib/modules.nix14
-rw-r--r--lib/options.nix30
-rwxr-xr-xlib/tests/modules.sh26
-rw-r--r--lib/types.nix18
-rw-r--r--maintainers/maintainer-list.nix12
-rw-r--r--nixos/doc/manual/administration/imperative-containers.xml32
-rw-r--r--nixos/doc/manual/administration/maintenance-mode.xml2
-rw-r--r--nixos/doc/manual/administration/network-problems.xml4
-rw-r--r--nixos/doc/manual/administration/rebooting.xml6
-rw-r--r--nixos/doc/manual/administration/rollback.xml6
-rw-r--r--nixos/doc/manual/administration/service-mgmt.xml6
-rw-r--r--nixos/doc/manual/administration/user-sessions.xml2
-rw-r--r--nixos/doc/manual/configuration/adding-custom-packages.xml2
-rw-r--r--nixos/doc/manual/configuration/linux-kernel.xml16
-rw-r--r--nixos/doc/manual/configuration/luks-file-systems.xml20
-rw-r--r--nixos/doc/manual/configuration/user-mgmt.xml8
-rw-r--r--nixos/doc/manual/configuration/x-windows.xml2
-rw-r--r--nixos/doc/manual/development/meta-attributes.xml2
-rw-r--r--nixos/doc/manual/development/writing-documentation.xml4
-rw-r--r--nixos/doc/manual/installation/installing-behind-a-proxy.xml14
-rw-r--r--nixos/doc/manual/installation/installing-from-other-distro.xml16
-rw-r--r--nixos/doc/manual/installation/upgrading.xml12
-rw-r--r--nixos/doc/manual/man-nixos-enter.xml4
-rw-r--r--nixos/doc/manual/man-nixos-version.xml4
-rw-r--r--nixos/lib/utils.nix5
-rw-r--r--nixos/modules/hardware/system-76.nix56
-rw-r--r--nixos/modules/hardware/video/nvidia.nix2
-rw-r--r--nixos/modules/module-list.nix1
-rw-r--r--nixos/modules/services/backup/borgbackup.xml8
-rw-r--r--nixos/modules/services/web-apps/codimd.nix39
-rw-r--r--nixos/modules/system/activation/top-level.nix6
-rw-r--r--nixos/modules/system/boot/stage-1-init.sh1
-rw-r--r--nixos/modules/virtualisation/containers.nix8
-rw-r--r--nixos/modules/virtualisation/cri-o.nix21
-rw-r--r--nixos/modules/virtualisation/podman.nix9
-rw-r--r--nixos/tests/codimd.nix10
-rw-r--r--nixos/tests/magnetico.nix7
-rw-r--r--pkgs/applications/audio/drumkv1/default.nix4
-rw-r--r--pkgs/applications/audio/fdkaac/default.nix6
-rw-r--r--pkgs/applications/audio/jamulus/default.nix4
-rw-r--r--pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch52
-rw-r--r--pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch27
-rw-r--r--pkgs/applications/audio/littlegptracker/default.nix72
-rw-r--r--pkgs/applications/audio/mpg123/default.nix26
-rw-r--r--pkgs/applications/audio/picard/default.nix4
-rw-r--r--pkgs/applications/blockchains/wasabibackend/deps.nix8
-rw-r--r--pkgs/applications/editors/vscode/vscode.nix6
-rw-r--r--pkgs/applications/misc/1password/default.nix8
-rw-r--r--pkgs/applications/misc/fetchmail/default.nix4
-rw-r--r--pkgs/applications/misc/go-jira/default.nix4
-rw-r--r--pkgs/applications/misc/grip/default.nix4
-rw-r--r--pkgs/applications/misc/weather/default.nix83
-rw-r--r--pkgs/applications/networking/browsers/chromium/upstream-info.json18
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/release_sources.nix770
-rw-r--r--pkgs/applications/networking/browsers/firefox/common.nix2
-rw-r--r--pkgs/applications/networking/browsers/firefox/packages.nix8
-rw-r--r--pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix6
-rw-r--r--pkgs/applications/networking/browsers/vivaldi/default.nix4
-rw-r--r--pkgs/applications/networking/datovka/default.nix4
-rw-r--r--pkgs/applications/networking/gns3/default.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/zoom-us/default.nix4
-rw-r--r--pkgs/applications/networking/ipfs/default.nix13
-rw-r--r--pkgs/applications/networking/sniffers/kismet/default.nix4
-rw-r--r--pkgs/applications/office/gtg/default.nix6
-rw-r--r--pkgs/applications/office/homebank/default.nix4
-rw-r--r--pkgs/applications/science/biology/bwa/default.nix9
-rw-r--r--pkgs/applications/science/biology/obitools/obitools3.nix38
-rw-r--r--pkgs/applications/science/biology/octopus/default.nix4
-rw-r--r--pkgs/applications/science/biology/truvari/default.nix19
-rw-r--r--pkgs/applications/science/chemistry/jmol/default.nix4
-rw-r--r--pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch12
-rw-r--r--pkgs/applications/science/logic/avy/default.nix12
-rw-r--r--pkgs/applications/science/logic/cvc3/default.nix9
-rw-r--r--pkgs/applications/science/logic/why3/default.nix6
-rw-r--r--pkgs/applications/version-management/git-and-tools/gitstatus/default.nix58
-rw-r--r--pkgs/applications/video/obs-studio/v4l2sink.nix4
-rw-r--r--pkgs/applications/video/vcs/default.nix39
-rw-r--r--pkgs/applications/video/vcs/fonts.patch23
-rw-r--r--pkgs/applications/virtualization/crun/default.nix5
-rw-r--r--pkgs/applications/virtualization/podman/default.nix4
-rw-r--r--pkgs/build-support/rust/default.nix8
-rw-r--r--pkgs/data/fonts/comic-neue/default.nix54
-rw-r--r--pkgs/development/chez-modules/chez-mit/default.nix1
-rw-r--r--pkgs/development/chez-modules/chez-scmutils/default.nix1
-rw-r--r--pkgs/development/compilers/chez/default.nix2
-rw-r--r--pkgs/development/compilers/chez/setup-hook.sh5
-rw-r--r--pkgs/development/compilers/dotnet/default.nix48
-rw-r--r--pkgs/development/compilers/elm/default.nix12
-rw-r--r--pkgs/development/compilers/elm/packages/elm-format.nix16
-rw-r--r--pkgs/development/compilers/llvm/rocm/default.nix4
-rw-r--r--pkgs/development/compilers/lobster/default.nix66
-rw-r--r--pkgs/development/compilers/lobster/test-can-run-hello-world.nix13
-rw-r--r--pkgs/development/coq-modules/metalib/default.nix49
-rw-r--r--pkgs/development/dotnet-modules/python-language-server/deps.nix42
-rw-r--r--pkgs/development/interpreters/perl/default.nix2
-rw-r--r--pkgs/development/interpreters/python/default.nix2
-rw-r--r--pkgs/development/libraries/audiality2/default.nix39
-rw-r--r--pkgs/development/libraries/crc32c/default.nix5
-rw-r--r--pkgs/development/libraries/hiredis/default.nix4
-rw-r--r--pkgs/development/libraries/libbacktrace/default.nix23
-rw-r--r--pkgs/development/libraries/neatvnc/default.nix9
-rw-r--r--pkgs/development/libraries/rocclr/default.nix4
-rw-r--r--pkgs/development/libraries/rocm-comgr/default.nix4
-rw-r--r--pkgs/development/libraries/rocm-device-libs/default.nix4
-rw-r--r--pkgs/development/libraries/rocm-opencl-runtime/default.nix4
-rw-r--r--pkgs/development/libraries/rocm-runtime/default.nix2
-rw-r--r--pkgs/development/libraries/rocm-thunk/default.nix4
-rw-r--r--pkgs/development/libraries/sundials/2.x.nix2
-rw-r--r--pkgs/development/libraries/sundials/default.nix4
-rw-r--r--pkgs/development/libraries/vulkan-loader/default.nix4
-rw-r--r--pkgs/development/libraries/zimg/default.nix4
-rw-r--r--pkgs/development/ocaml-modules/csexp/default.nix6
-rw-r--r--pkgs/development/ocaml-modules/irmin/1.4.ni