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

3 files changed, 14 insertions, 14 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/0.4.nix b/nixpkgs/pkgs/development/libraries/libdwarf/0.4.nix
deleted file mode 100644
index c5b14f5a05ef..000000000000
--- a/nixpkgs/pkgs/development/libraries/libdwarf/0.4.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, zlib }:
-callPackage ./common.nix rec {
-  version = "0.4.1";
-  url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
-  sha512 = "793fe487de80fe6878f022b90f49ec334a0d7db071ff22a11902db5e3457cc7f3f853945a9ac74de2c40f7f388277f21c5b2e62745bca92d2bb55c51e9577693";
-  buildInputs = [ zlib ];
-  knownVulnerabilities = [];
-}
diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/20210528.nix b/nixpkgs/pkgs/development/libraries/libdwarf/20210528.nix
new file mode 100644
index 000000000000..01ab2d720bf0
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libdwarf/20210528.nix
@@ -0,0 +1,8 @@
+{ callPackage, zlib, libelf }:
+callPackage ./common.nix rec {
+  version = "20210528";
+  url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
+  sha512 = "e0f9c88554053ee6c1b1333960891189e7820c4a4ddc302b7e63754a4cdcfc2acb1b4b6083a722d1204a75e994fff3401ecc251b8c3b24090f8cb4046d90f870";
+  buildInputs = [ zlib libelf ];
+  knownVulnerabilities = [ "CVE-2022-32200" "CVE-2022-39170" ];
+}
diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix
index 5bb2d6aa6f72..2beb4efc4bcd 100644
--- a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix
@@ -1,8 +1,8 @@
-{ callPackage, zlib, libelf }:
+{ callPackage, zlib }:
 callPackage ./common.nix rec {
-  version = "20210528";
-  url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
-  sha512 = "e0f9c88554053ee6c1b1333960891189e7820c4a4ddc302b7e63754a4cdcfc2acb1b4b6083a722d1204a75e994fff3401ecc251b8c3b24090f8cb4046d90f870";
-  buildInputs = [ zlib libelf ];
-  knownVulnerabilities = [ "CVE-2022-32200" ];
+  version = "0.4.2";
+  url = "https://www.prevanders.net/libdwarf-${version}.tar.xz";
+  sha512 = "6d2a3ebf0104362dd9cecec272935684f977db119810eea0eec88c9f56a042f260a4f6ed3bbabde8592fe16f98cbd81b4ab2878005140e05c8f475df6380d1c2";
+  buildInputs = [ zlib ];
+  knownVulnerabilities = [];
 }