summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Maggesi <1809783+maggesi@users.noreply.github.com>2019-10-07 16:04:15 +0200
committerMarco Maggesi <1809783+maggesi@users.noreply.github.com>2019-10-07 16:04:15 +0200
commit2b05a35e08a4ff732f037b67ade05c063ef0c5ce (patch)
tree811ab5c8fb4b5eaa70eb5171d08a40b6cc0c4e91
parentc70d7fa7603c7c4ea64211dd2be5995a55310245 (diff)
parent520a658b26e169d43caad9d488eb3dd4576e80d9 (diff)
Merge branch 'master' of github.com:NixOS/nixpkgs
-rw-r--r--doc/languages-frameworks/beam.xml15
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--maintainers/scripts/luarocks-packages.csv1
-rw-r--r--nixos/doc/manual/man-configuration.xml4
-rw-r--r--nixos/doc/manual/man-nixos-build-vms.xml4
-rw-r--r--nixos/doc/manual/man-nixos-enter.xml4
-rw-r--r--nixos/doc/manual/man-nixos-generate-config.xml4
-rw-r--r--nixos/doc/manual/man-nixos-install.xml4
-rw-r--r--nixos/doc/manual/man-nixos-option.xml4
-rw-r--r--nixos/doc/manual/man-nixos-rebuild.xml4
-rw-r--r--nixos/doc/manual/man-nixos-version.xml4
-rw-r--r--nixos/doc/manual/release-notes/rl-1909.xml11
-rw-r--r--nixos/doc/manual/release-notes/rl-2003.xml8
-rw-r--r--nixos/lib/make-disk-image.nix14
-rw-r--r--nixos/modules/config/system-environment.nix4
-rw-r--r--nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix3
-rw-r--r--nixos/modules/installer/cd-dvd/iso-image.nix19
-rw-r--r--nixos/modules/installer/tools/nixos-generate-config.pl20
-rw-r--r--nixos/modules/installer/tools/tools.nix1
-rw-r--r--nixos/modules/misc/ids.nix4
-rw-r--r--nixos/modules/module-list.nix1
-rw-r--r--nixos/modules/programs/blcr.nix27
-rw-r--r--nixos/modules/rename.nix3
-rw-r--r--nixos/modules/services/databases/memcached.nix1
-rw-r--r--nixos/modules/services/monitoring/thanos.nix34
-rw-r--r--nixos/modules/services/networking/zeronet.nix92
-rw-r--r--nixos/modules/services/web-apps/documize.nix11
-rw-r--r--nixos/modules/services/x11/desktop-managers/gnome3.nix2
-rw-r--r--nixos/modules/services/x11/desktop-managers/pantheon.nix5
-rw-r--r--nixos/modules/services/x11/desktop-managers/xfce4-14.nix6
-rw-r--r--nixos/modules/services/x11/display-managers/gdm.nix10
-rw-r--r--nixos/modules/system/boot/stage-1-init.sh27
-rw-r--r--nixos/modules/tasks/network-interfaces-systemd.nix12
-rw-r--r--nixos/modules/tasks/network-interfaces.nix5
-rw-r--r--nixos/modules/virtualisation/containers.nix7
-rw-r--r--nixos/tests/networking.nix23
-rw-r--r--nixos/tests/predictable-interface-names.nix1
-rw-r--r--nixos/tests/systemd-networkd-wireguard.nix1
-rw-r--r--pkgs/applications/audio/friture/default.nix44
-rw-r--r--pkgs/applications/audio/friture/factorial.patch13
-rw-r--r--pkgs/applications/audio/kid3/default.nix4
-rw-r--r--pkgs/applications/audio/snd/default.nix4
-rw-r--r--pkgs/applications/audio/spotifyd/default.nix4
-rw-r--r--pkgs/applications/editors/android-studio/default.nix6
-rw-r--r--pkgs/applications/editors/nano/default.nix4
-rw-r--r--pkgs/applications/editors/neovim/default.nix4
-rw-r--r--pkgs/applications/editors/sublime/3/packages.nix12
-rw-r--r--pkgs/applications/editors/vscode/generic.nix6
-rw-r--r--pkgs/applications/editors/vscode/vscodium.nix8
-rw-r--r--pkgs/applications/graphics/kodelife/default.nix4
-rw-r--r--pkgs/applications/graphics/openscad/default.nix4
-rw-r--r--pkgs/applications/graphics/pdfcpu/default.nix4
-rw-r--r--pkgs/applications/misc/cipher/default.nix57
-rw-r--r--pkgs/applications/misc/cmatrix/default.nix1
-rw-r--r--pkgs/applications/misc/dbeaver/default.nix4
-rw-r--r--pkgs/applications/misc/ddgr/default.nix10
-rw-r--r--pkgs/applications/misc/font-manager/default.nix12
-rw-r--r--pkgs/applications/misc/gpxsee/default.nix4
-rw-r--r--pkgs/applications/misc/grip/default.nix3
-rw-r--r--pkgs/applications/misc/gxneur/default.nix3
-rw-r--r--pkgs/applications/misc/jgmenu/default.nix4
-rw-r--r--pkgs/applications/misc/mysql-workbench/default.nix6
-rw-r--r--pkgs/applications/misc/overmind/default.nix4
-rw-r--r--pkgs/applications/misc/pdfpc/default.nix18
-rw-r--r--pkgs/applications/misc/syncthingtray/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/ephemeral/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/release_sources.nix746
-rw-r--r--pkgs/applications/networking/browsers/firefox/packages.nix4
-rw-r--r--pkgs/applications/networking/gns3/default.nix12
-rw-r--r--pkgs/applications/networking/gns3/gui.nix4
-rw-r--r--pkgs/applications/networking/gns3/server.nix36
-rw-r--r--pkgs/applications/networking/instant-messengers/rambox/pro.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/signal-cli/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix21
-rw-r--r--pkgs/applications/networking/remote/anydesk/default.nix18
-rw-r--r--pkgs/applications/networking/remote/teamviewer/default.nix4
-rw-r--r--pkgs/applications/networking/sync/onedrive/default.nix4
-rw-r--r--pkgs/applications/networking/znc/modules.nix10
-rw-r--r--pkgs/applications/office/qownnotes/default.nix4
-rw-r--r--pkgs/applications/office/timetable/default.nix4
-rw-r--r--pkgs/applications/science/astronomy/gildas/default.nix6
-rw-r--r--pkgs/applications/science/math/cbc/default.nix4
-rw-r--r--pkgs/applications/science/math/cntk/default.nix19
-rw-r--r--pkgs/applications/science/molecular-dynamics/gromacs/default.nix25
-rw-r--r--pkgs/applications/version-management/git-and-tools/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/delta/default.nix22
-rw-r--r--pkgs/applications/version-management/git-and-tools/hub/default.nix4
-rw-r--r--pkgs/applications/version-management/gitlab/gitaly/default.nix3
-rw-r--r--pkgs/applications/version-management/sourcehut/core.nix7
-rw-r--r--pkgs/applications/version-management/src/default.nix4
-rw-r--r--pkgs/applications/virtualization/OVMF/default.nix2
-rw-r--r--pkgs/applications/virtualization/lkl/default.nix6
-rw-r--r--pkgs/applications/virtualization/podman/default.nix4
-rw-r--r--pkgs/applications/window-managers/2bwm/default.nix4
-rw-r--r--pkgs/data/fonts/ibm-plex/default.nix4
-rw-r--r--pkgs/data/fonts/nerdfonts/default.nix4
-rw-r--r--pkgs/data/icons/elementary-xfce-icon-theme/default.nix4
-rw-r--r--pkgs/data/icons/numix-icon-theme-circle/default.nix6
-rw-r--r--pkgs/data/icons/numix-icon-theme-square/default.nix4
-rw-r--r--pkgs/data/icons/numix-icon-theme/default.nix6
-rw-r--r--pkgs/desktops/deepin/deepin-terminal/default.nix4
-rw-r--r--pkgs/desktops/enlightenment/enlightenment.nix4
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch4
-rw-r--r--pkgs/desktops/lxqt/libfm-qt/default.nix10
-rw-r--r--pkgs/desktops/lxqt/lxqt-archiver/default.nix8
-rw-r--r--pkgs/desktops/mate/mate-common/default.nix4
-rw-r--r--pkgs/desktops/mate/mate-utils/default.nix4
-rw-r--r--pkgs/desktops/mate/mozo/default.nix4
-rw-r--r--pkgs/desktops/mate/pluma/default.nix4
-rw-r--r--pkgs/desktops/mate/python-caja/default.nix4
-rw-r--r--pkgs/desktops/pantheon/default.nix1
-rw-r--r--pkgs/desktops/pantheon/desktop/elementary-default-settings/0001-Build-with-Meson.patch309
-rw-r--r--pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch25
-rw-r--r--pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix67
-rw-r--r--pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override2
-rw-r--r--pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix6
-rw-r--r--pkgs/desktops/pantheon/desktop/elementary-session-settings/default-elementary-dockitems.desktop8
-rw-r--r--pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix61
-rw-r--r--pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch272
-rw-r--r--pkgs/development/compilers/llvm/7/libc++abi.nix3
-rw-r--r--pkgs/development/compilers/llvm/9/clang/default.nix1
-rw-r--r--pkgs/development/compilers/tinycc/default.nix22
-rw-r--r--pkgs/development/compilers/vlang/default.nix4
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix5
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix10
-rw-r--r--pkgs/development/interpreters/angelscript/default.nix4