summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-10-11 00:27:42 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-10-11 00:27:42 +0200
commit1882368e8a3225f75f83efebc925ddc01b16d7d5 (patch)
tree937c001d58a8c2458808d1d7221e1e08b7cd6238
parentdb3b1c12cbb136da533ae37e7c5e83b7dec504ee (diff)
parentaabcf2d8f52c68ad37d72bf80d90608831450af5 (diff)
Merge branch 'staging-next' into staging
-rw-r--r--.editorconfig6
-rw-r--r--lib/default.nix2
-rw-r--r--lib/modules.nix17
-rw-r--r--lib/trivial.nix6
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--nixos/doc/manual/release-notes/rl-2009.xml35
-rw-r--r--nixos/modules/security/pam.nix2
-rw-r--r--nixos/modules/services/misc/snapper.nix10
-rw-r--r--nixos/modules/services/misc/ssm-agent.nix23
-rw-r--r--nixos/modules/services/x11/display-managers/default.nix7
-rw-r--r--nixos/modules/tasks/network-interfaces.nix8
-rw-r--r--pkgs/applications/audio/carla/default.nix4
-rw-r--r--pkgs/applications/audio/friture/default.nix5
-rw-r--r--pkgs/applications/audio/helio-workstation/default.nix9
-rw-r--r--pkgs/applications/audio/munt/default.nix8
-rw-r--r--pkgs/applications/audio/puddletag/default.nix1
-rw-r--r--pkgs/applications/audio/soundkonverter/default.nix18
-rw-r--r--pkgs/applications/backup/vorta/default.nix4
-rw-r--r--pkgs/applications/editors/android-studio/default.nix6
-rw-r--r--pkgs/applications/editors/retext/default.nix6
-rw-r--r--pkgs/applications/editors/vscode/vscode.nix6
-rw-r--r--pkgs/applications/gis/qgis/unwrapped.nix4
-rw-r--r--pkgs/applications/gis/zombietrackergps/default.nix57
-rw-r--r--pkgs/applications/graphics/c3d/default.nix19
-rw-r--r--pkgs/applications/graphics/cq-editor/default.nix6
-rw-r--r--pkgs/applications/graphics/f3d/default.nix28
-rw-r--r--pkgs/applications/graphics/lazpaint/default.nix12
-rw-r--r--pkgs/applications/misc/dupeguru/default.nix9
-rw-r--r--pkgs/applications/misc/electron-cash/default.nix21
-rw-r--r--pkgs/applications/misc/electrum/ltc.nix4
-rw-r--r--pkgs/applications/misc/gpxsee/default.nix4
-rw-r--r--pkgs/applications/misc/kdeconnect/default.nix43
-rw-r--r--pkgs/applications/misc/mkgmap/build.xml.patch41
-rw-r--r--pkgs/applications/misc/mkgmap/default.nix86
-rw-r--r--pkgs/applications/misc/mkgmap/deps.nix31
-rw-r--r--pkgs/applications/misc/mkgmap/fix-failing-test.patch22
-rw-r--r--pkgs/applications/misc/mkgmap/splitter/build.xml.patch54
-rw-r--r--pkgs/applications/misc/mkgmap/splitter/default.nix78
-rw-r--r--pkgs/applications/misc/mkgmap/splitter/fix-failing-test.patch11
-rw-r--r--pkgs/applications/misc/mkgmap/splitter/testinputs.nix18
-rw-r--r--pkgs/applications/misc/mkgmap/testinputs.nix66
-rw-r--r--pkgs/applications/networking/browsers/chromium/browser.nix2
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix22
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix21
-rw-r--r--pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patch26
-rw-r--r--pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch65
-rw-r--r--pkgs/applications/networking/browsers/chromium/patches/enable-video-acceleration-on-linux.patch48
-rw-r--r--pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch61
-rw-r--r--pkgs/applications/networking/browsers/chromium/upstream-info.json18
-rw-r--r--pkgs/applications/networking/browsers/elinks/debian-patches.nix34
-rw-r--r--pkgs/applications/networking/browsers/elinks/debian-patches.txt8
-rw-r--r--pkgs/applications/networking/browsers/elinks/default.nix49
-rw-r--r--pkgs/applications/networking/cluster/minikube/default.nix6
-rw-r--r--pkgs/applications/networking/cluster/terraform-providers/data.nix1163
-rw-r--r--pkgs/applications/networking/cluster/terraform-providers/default.nix27
-rw-r--r--pkgs/applications/networking/cluster/terraform-providers/keycloak/default.nix2
-rw-r--r--pkgs/applications/networking/cluster/terraform-providers/providers.json1037
-rwxr-xr-xpkgs/applications/networking/cluster/terraform-providers/update-all177
-rwxr-xr-xpkgs/applications/networking/cluster/terraform-providers/update-all-providers22
-rwxr-xr-xpkgs/applications/networking/cluster/terraform-providers/update-provider77
-rw-r--r--pkgs/applications/networking/cluster/terraform/default.nix49
-rw-r--r--pkgs/applications/networking/flent/default.nix6
-rw-r--r--pkgs/applications/networking/gns3/default.nix6
-rw-r--r--pkgs/applications/networking/hpmyroom/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/rambox/default.nix6
-rw-r--r--pkgs/applications/networking/maestral-qt/default.nix5
-rw-r--r--pkgs/applications/networking/mailreaders/mailnag/default.nix7
-rw-r--r--pkgs/applications/science/electronics/horizon-eda/default.nix75
-rw-r--r--pkgs/applications/science/electronics/kicad/base.nix64
-rwxr-xr-xpkgs/applications/science/electronics/kicad/update.sh12
-rw-r--r--pkgs/applications/science/electronics/kicad/versions.nix56
-rw-r--r--pkgs/applications/science/physics/sacrifice/default.nix1
-rw-r--r--pkgs/applications/science/physics/sacrifice/pythia83xx.patch55
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix8
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-trim/default.nix6
-rw-r--r--pkgs/applications/virtualization/virt-manager/qt.nix11
-rw-r--r--pkgs/data/fonts/cascadia-code/default.nix4
-rw-r--r--pkgs/data/themes/marwaita-pop_os/default.nix46
-rw-r--r--pkgs/data/themes/skeu/default.nix46
-rw-r--r--pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix9
-rw-r--r--pkgs/development/compilers/lobster/default.nix6
-rw-r--r--pkgs/development/coq-modules/bignums/default.nix4
-rw-r--r--pkgs/development/coq-modules/coq-ext-lib/default.nix3
-rw-r--r--pkgs/development/coq-modules/dpdgraph/default.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix12
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml344
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix5
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix2102
-rw-r--r--pkgs/development/haskell-modules/non-hackage-packages.nix2
-rw-r--r--pkgs/development/interpreters/cyclone/default.nix51
-rw-r--r--pkgs/development/libraries/arrow-cpp/default.nix4
-rw-r--r--pkgs/development/libraries/gdcm/default.nix4
-rw-r--r--pkgs/development/libraries/hwloc/default.nix4
-rw-r--r--pkgs/development/libraries/kpeoplevcard/default.nix40
-rw-r--r--pkgs/development/libraries/ldutils/default.nix41
-rw-r--r--pkgs/development/libraries/libavif/default.nix60
-rw-r--r--pkgs/development/libraries/libcint/default.nix10
-rw-r--r--pkgs/development/libraries/libck/default.nix2
-rw-r--r--pkgs/development/libraries/pangolin/default.nix24
-rw-r--r--pkgs/development/libraries/physics/pythia/default.nix15
-rw-r--r--pkgs/development/libraries/pulseaudio-qt/default.nix35
-rw-r--r--pkgs/development/libraries/qscintilla/default.nix10
-rw-r--r--pkgs/development/libraries/science/biology/gifticlib/default.nix34
-rw-r--r--pkgs/development/libraries/simpleitk/default.nix17
-rw-r--r--pkgs/development/libraries/tinycdb/default.nix35
-rw-r--r--pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix10
-rw-r--r--pkgs/development/python-modules/androguard/default.nix70
-rw-r--r--pkgs/development/python-modules/batchgenerators/default.nix11
-rw-r--r--pkgs/development/python-modules/beancount/default.nix4
-rw-r--r--pkgs/development/python-modules/ibis-framework/default.nix10
-rw-r--r--pkgs/development/python-modules/internetarchive/default.nix17
-rw-r--r--pkgs/development/python-modules/maestral/default.nix19
-rw-r--r--pkgs/development/python-modules/mocket/default.nix4
-rw-r--r--pkgs/development/python-modules/nose-timer/default.nix20
-rw-r--r--pkgs/development/python-modules/nvchecker/default.nix29
-rw-r--r--pkgs/development/python-modules/pyatmo/default.nix26
-rw-r--r--pkgs/development/python-modules/pymetno/default.nix4
-rw-r--r--pkgs/development/python-modules/pyqt/5.x.nix4
-rw-r--r--pkgs/development/python-modules/pyqtwebengine/default.nix9
-rw-r--r--pkgs/development/python-modules/shortuuid/default.nix3
-rw-r--r--pkgs/development/python-modules/sip/default.nix4
-rw-r--r--pkgs/development/python-modules/threadpoolctl/default.nix11
-rw-r--r--pkgs/development/python-modules/voluptuous/default.nix7
-rw-r--r--pkgs/development/python-modules/yeelight/default.nix35