Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 26 insertions, 28 deletions

diff --git a/overlays/patches/firefox/release/D6995.diff b/overlays/patches/firefox/release/D6995.diff
index bb02e8a2b0aa..011173813974 100644
--- a/overlays/patches/firefox/release/D6995.diff
+++ b/overlays/patches/firefox/release/D6995.diff
@@ -1,33 +1,31 @@
 diff --git a/toolkit/moz.build b/toolkit/moz.build
-index 14f4638b693e..1ed5c2002991 100644
+index fd2295bd9f6d3..827c29aba408d 100644
 --- a/toolkit/moz.build
 +++ b/toolkit/moz.build
-@@ -75,3 +75,6 @@ with Files("mozapps/preferences/**"):
- 
- with Files("l10n-registry.manifest"):
-     BUG_COMPONENT = ("Core", "Localization")
+@@ -96,3 +96,6 @@ GeneratedFile(
+     script="content/neterror/gen_aboutneterror_codes.py",
+     inputs=["/toolkit/locales/en-US/toolkit/neterror/nsserrors.ftl"],
+ )
 +
 +if CONFIG["ENABLE_TESTS"]:
 +    DIRS += ["tests/gtest"]
 diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
-index 50a64a2b469c..b97fedabe5ca 100644
+index ea1e5a80613ef..7575ef4cf6718 100644
 --- a/toolkit/xre/nsXREDirProvider.cpp
 +++ b/toolkit/xre/nsXREDirProvider.cpp
-@@ -412,13 +412,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
-     nsCOMPtr<nsIFile> localDir;
-     rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), false);
-     if (NS_SUCCEEDED(rv)) {
+@@ -367,11 +367,6 @@ nsXREDirProvider::GetFile(const char* aProperty, bool* aPersistent,
+   } else if (!strcmp(aProperty, XRE_USER_NATIVE_MANIFESTS)) {
+     rv = GetUserDataDirectoryHome(getter_AddRefs(file), false);
+     NS_ENSURE_SUCCESS(rv, rv);
 -#  if defined(XP_MACOSX)
--      rv = localDir->AppendNative("Mozilla"_ns);
--#  else
--      rv = localDir->AppendNative(".mozilla"_ns);
--#  endif
--    }
--    if (NS_SUCCEEDED(rv)) {
-       localDir.swap(file);
-     }
+-    rv = file->AppendNative("Mozilla"_ns);
+-#  else   // defined(XP_MACOSX)
+-    rv = file->AppendNative(".mozilla"_ns);
+-#  endif  // defined(XP_MACOSX)
    }
-@@ -1417,6 +1410,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+ #endif  // defined(XP_UNIX) || defined(XP_MACOSX)
+   else if (!strcmp(aProperty, XRE_UPDATE_ROOT_DIR)) {
+@@ -1223,6 +1218,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
    NS_ENSURE_SUCCESS(rv, rv);
  
    localDir = dirFileMac;
@@ -37,7 +35,7 @@ index 50a64a2b469c..b97fedabe5ca 100644
  #elif defined(XP_IOS)
    nsAutoCString userDir;
    if (GetUIKitDirectory(aLocal, userDir)) {
-@@ -1440,6 +1436,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+@@ -1246,6 +1244,9 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
    NS_ENSURE_SUCCESS(rv, rv);
  
    rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir));
@@ -47,7 +45,7 @@ index 50a64a2b469c..b97fedabe5ca 100644
  #elif defined(XP_UNIX)
    const char* homeDir = getenv("HOME");
    if (!homeDir || !*homeDir) return NS_ERROR_FAILURE;
-@@ -1460,8 +1459,51 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
+@@ -1266,8 +1267,51 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
        if (NS_SUCCEEDED(rv)) rv = localDir->AppendNative(".cache"_ns);
      }
    } else {
@@ -99,7 +97,7 @@ index 50a64a2b469c..b97fedabe5ca 100644
    }
  #else
  #  error "Don't know how to get product dir on your platform"
-@@ -1559,20 +1601,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
+@@ -1357,20 +1401,12 @@ nsresult nsXREDirProvider::AppendSysUserExtensionPath(nsIFile* aFile) {
  
  #if defined(XP_MACOSX) || defined(XP_WIN)
  
@@ -120,7 +118,7 @@ index 50a64a2b469c..b97fedabe5ca 100644
    static const char* const sExtensions = "extensions";
    rv = aFile->AppendNative(nsDependentCString(sExtensions));
    NS_ENSURE_SUCCESS(rv, rv);
-@@ -1637,9 +1671,6 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+@@ -1435,9 +1471,6 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
    NS_ENSURE_SUCCESS(rv, rv);
  #elif defined(XP_UNIX)
    nsAutoCString folder;
@@ -130,7 +128,7 @@ index 50a64a2b469c..b97fedabe5ca 100644
  
    if (!profile.IsEmpty()) {
      // Skip any leading path characters
-@@ -1659,8 +1690,12 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
+@@ -1457,8 +1490,12 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
        folder.Append(vendor);
        ToLowerCase(folder);
  
@@ -146,10 +144,10 @@ index 50a64a2b469c..b97fedabe5ca 100644
        folder.Truncate();
      }
 diff --git a/xpcom/io/nsAppFileLocationProvider.cpp b/xpcom/io/nsAppFileLocationProvider.cpp
-index ef974f99048f..b4025f056297 100644
+index aedaad1b4ff91..40ee7ee00f596 100644
 --- a/xpcom/io/nsAppFileLocationProvider.cpp
 +++ b/xpcom/io/nsAppFileLocationProvider.cpp
-@@ -233,7 +233,7 @@ nsresult nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) {
+@@ -168,7 +168,7 @@ nsresult nsAppFileLocationProvider::CloneMozBinDirectory(nsIFile** aLocalFile) {
  // GetProductDirectory - Gets the directory which contains the application data
  // folder
  //
@@ -158,7 +156,7 @@ index ef974f99048f..b4025f056297 100644
  // WIN    : <Application Data folder on user's machine>\Mozilla
  // Mac    : :Documents:Mozilla:
  //----------------------------------------------------------------------------------------
-@@ -277,19 +277,80 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
+@@ -207,19 +207,80 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
      return rv;
    }
  #elif defined(XP_UNIX)
@@ -240,7 +238,7 @@ index ef974f99048f..b4025f056297 100644
    rv = localDir->Exists(&exists);
  
    if (NS_SUCCEEDED(rv) && !exists) {
-@@ -309,7 +370,7 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
+@@ -239,7 +300,7 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile,
  // GetDefaultUserProfileRoot - Gets the directory which contains each user
  // profile dir
  //