summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-11-03 07:33:32 +0000
committerAlyssa Ross <hi@alyssa.is>2021-11-03 07:34:33 +0000
commit703ffa2f5d1d7b4d1dc60511be8badc0f52e0b26 (patch)
tree269407794cb33dbfbce1c140e8a22e0f84573741
parent8f5da907b03a79a7c1b77a4c553a2283f4db9a45 (diff)
parenta24ac8728e64cefbdbcf413f684ee0a5c7eddc1d (diff)
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
-rw-r--r--README.md2
-rw-r--r--lib/strings.nix2
-rw-r--r--maintainers/maintainer-list.nix13
-rw-r--r--maintainers/team-list.nix1
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml7
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md2
-rw-r--r--nixos/modules/hardware/flirc.nix12
-rw-r--r--nixos/modules/module-list.nix2
-rw-r--r--nixos/modules/services/finance/odoo.nix122
-rw-r--r--nixos/modules/services/networking/ddclient.nix47
-rw-r--r--nixos/tests/all-tests.nix2
-rw-r--r--nixos/tests/bittorrent.nix2
-rw-r--r--nixos/tests/odoo.nix27
-rw-r--r--pkgs/applications/audio/ptcollab/default.nix4
-rw-r--r--pkgs/applications/editors/oni2/common.nix252
-rw-r--r--pkgs/applications/editors/oni2/default.nix16
-rw-r--r--pkgs/applications/editors/oni2/esy_skia_use_nixpkgs.patch13
-rw-r--r--pkgs/applications/editors/oni2/extensions.lock497
-rw-r--r--pkgs/applications/editors/oni2/extensions.nix629
-rw-r--r--pkgs/applications/editors/oni2/node.lock376
-rw-r--r--pkgs/applications/editors/oni2/node.nix453
-rw-r--r--pkgs/applications/finance/odoo/default.nix103
-rw-r--r--pkgs/applications/misc/binance/default.nix4
-rw-r--r--pkgs/applications/misc/josm/default.nix10
-rw-r--r--pkgs/applications/misc/tty-solitaire/default.nix18
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/release_sources.nix786
-rw-r--r--pkgs/applications/networking/browsers/firefox/common.nix65
-rw-r--r--pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff85.patch6
-rw-r--r--pkgs/applications/networking/browsers/firefox/lto-dependentlibs-generation-ffx83.patch45
-rw-r--r--pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch24
-rw-r--r--pkgs/applications/networking/browsers/firefox/packages.nix33
-rw-r--r--pkgs/applications/networking/cluster/argocd/default.nix2
-rw-r--r--pkgs/applications/networking/cluster/fluxcd/default.nix2
-rw-r--r--pkgs/applications/networking/cluster/k3s/default.nix2
-rw-r--r--pkgs/applications/networking/cluster/linkerd/generic.nix2
-rw-r--r--pkgs/applications/networking/cluster/temporal/default.nix2
-rw-r--r--pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix39
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix2
-rw-r--r--pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-78.patch13
-rw-r--r--pkgs/applications/networking/mailreaders/thunderbird/packages.nix28
-rw-r--r--pkgs/applications/version-management/git-and-tools/gst/default.nix4
-rw-r--r--pkgs/applications/video/flirc/99-flirc.rules11
-rw-r--r--pkgs/applications/video/flirc/default.nix45
-rw-r--r--pkgs/applications/video/kodi-packages/libretro-snes9x/default.nix31
-rw-r--r--pkgs/applications/video/kodi-packages/libretro/default.nix24
-rw-r--r--pkgs/applications/video/kodi/build-kodi-binary-addon.nix8
-rw-r--r--pkgs/build-support/writers/default.nix8
-rw-r--r--pkgs/data/fonts/terminus-font/SOURCE_DATE_EPOCH-for-otb.patch83
-rw-r--r--pkgs/data/fonts/terminus-font/default.nix30
-rw-r--r--pkgs/desktops/gnome/extensions/collisions.json4
-rw-r--r--pkgs/desktops/gnome/extensions/extensionRenames.nix6
-rw-r--r--pkgs/desktops/gnome/extensions/extensions.json96
-rw-r--r--pkgs/desktops/mate/mate-panel/default.nix4
-rw-r--r--pkgs/desktops/xfce/applications/ristretto/default.nix6
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix4
-rw-r--r--pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix4
-rw-r--r--pkgs/development/beam-modules/elixir-ls/default.nix3
-rw-r--r--pkgs/development/beam-modules/fetch-mix-deps.nix4
-rw-r--r--pkgs/development/beam-modules/mix-release.nix4
-rw-r--r--pkgs/development/compilers/asl/Makefile-nixos.def31
-rw-r--r--pkgs/development/compilers/asl/default.nix57
-rw-r--r--pkgs/development/compilers/reason/default.nix2
-rw-r--r--pkgs/development/compilers/rust/1_45.nix54
-rw-r--r--pkgs/development/compilers/rust/1_56.nix3
-rw-r--r--pkgs/development/compilers/rust/default.nix3
-rw-r--r--pkgs/development/compilers/rust/rustc.nix7
-rw-r--r--pkgs/development/libraries/SDL2_gfx/default.nix4
-rw-r--r--pkgs/development/libraries/SDL2_image/default.nix7
-rw-r--r--pkgs/development/libraries/SDL2_net/default.nix4
-rw-r--r--pkgs/development/libraries/SDL2_ttf/default.nix4
-rw-r--r--pkgs/development/libraries/libks/default.nix48
-rw-r--r--pkgs/development/libraries/libmtp/default.nix37
-rw-r--r--pkgs/development/libraries/libressl/default.nix7
-rw-r--r--pkgs/development/libraries/nss/3.53.nix180
-rw-r--r--pkgs/development/libraries/sofia-sip/default.nix4
-rw-r--r--pkgs/development/libraries/xmlsec/default.nix8
-rw-r--r--pkgs/development/node-packages/default.nix4
-rw-r--r--pkgs/development/node-packages/node-packages.json2
-rw-r--r--pkgs/development/node-packages/node-packages.nix1138
-rw-r--r--pkgs/development/ocaml-modules/bz2/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/coin/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/cudf/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/dune-site/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/gluten/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/junit/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/mccs/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/mrmime/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/ocamlgraph/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/piaf/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/prettym/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/reason-native/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/rosetta/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/unstrctrd/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/uuuu/default.nix2
-rw-r--r--pkgs/development/ocaml-modules/yuscii/default.nix2
-rw-r--r--pkgs/development/python-modules/aioapns/default.nix2
-rw-r--r--pkgs/development/python-modules/blspy/default.nix7
-rw-r--r--pkgs/development/python-modules/buildout/default.nix2
-rw-r--r--pkgs/development/python-modules/cftime/default.nix4
-rw-r--r--pkgs/development/python-modules/ebaysdk/default.nix31
-rw-r--r--pkgs/development/python-modules/gigalixir/default.nix2
-rw-r--r--pkgs/development/python-modules/huggingface-hub/default.nix11
-rw-r--r--pkgs/development/python-modules/intensity-normalization/default.nix4
-rw-r--r--pkgs/development/python-modules/jaeger-client/default.nix2
-rw-r--r--pkgs/development/python-modules/pytest-astropy/default.nix10
-rw-r--r--pkgs/development/python-modules/rollbar/default.nix2
-rw-r--r--pkgs/development/python-modules/spacy-transformers/default.nix4
-rw-r--r--pkgs/development/python-modules/threadloop/default.nix2
-rw-r--r--pkgs/development/python-modules/transformers/default.nix8
-rw-r--r--pkgs/development/python-modules/werkzeug/1.nix8
-rw-r--r--pkgs/development/tools/conftest/default.nix2
-rw-r--r--pkgs/development/tools/go-containerregistry/default.nix2