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

6 files changed, 27 insertions, 91 deletions

diff --git a/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix b/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix
index eb90fbc27592..227015b76b97 100644
--- a/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gvm-libs/default.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gvm-libs";
-  version = "22.7.0";
+  version = "22.7.1";
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-Jc8qNONdlyzpCCgwhMdwG2D2CO9o0l4vH9sE+NjidE4=";
+    hash = "sha256-TSi537RLZGwnyC1nL/Ge3lTlV2FmH1nmAzFSHmaTv04=";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/development/libraries/mpfi/default.nix b/nixpkgs/pkgs/development/libraries/mpfi/default.nix
index 152c35e6e6f0..4bc568523c9f 100644
--- a/nixpkgs/pkgs/development/libraries/mpfi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/mpfi/default.nix
@@ -1,23 +1,32 @@
-{lib, stdenv, fetchurl, autoreconfHook, texinfo, mpfr}:
+{lib, stdenv, fetchFromGitLab, autoreconfHook, texinfo, mpfr}:
 stdenv.mkDerivation rec {
   pname = "mpfi";
   version = "1.5.4";
-  file_nr = "38111";
 
-  src = fetchurl {
-    # NOTE: the file_nr is whats important here. The actual package name (including the version)
-    # is ignored. To find out the correct file_nr, go to https://gforge.inria.fr/projects/mpfi/
-    # and click on Download in the section "Latest File Releases".
-    url = "https://gforge.inria.fr/frs/download.php/file/${file_nr}/mpfi-${version}.tgz";
-    sha256 = "sha256-Ozk4WV1yCvF5c96vcnz8DdQcixbCCtwQOpcPSkOuOlY=";
+  src = fetchFromGitLab {
+    domain = "gitlab.inria.fr";
+    owner = "mpfi";
+    repo = "mpfi";
+
+    # Apparently there is an upstream off-by-one-commit error in tagging
+    # Conditional to allow auto-updaters to try new releases
+    # TODO: remove the conditional after an upstream update
+    # rev = version;
+    rev = if version == "1.5.4" then
+      "feab26bc54529417af983950ddbffb3a4c334d4f"
+    else version;
+
+    sha256 = "sha256-aj/QmJ38ifsW36JFQcbp55aIQRvOpiqLHwEh/aFXsgo=";
   };
 
+  sourceRoot = "source/mpfi";
+
   nativeBuildInputs = [ autoreconfHook texinfo ];
   buildInputs = [ mpfr ];
 
   meta = {
     description = "A multiple precision interval arithmetic library based on MPFR";
-    homepage = "https://gforge.inria.fr/projects/mpfi/";
+    homepage = "http://perso.ens-lyon.fr/nathalie.revol/software.html";
     license = lib.licenses.lgpl21Plus;
     maintainers = [lib.maintainers.raskin];
     platforms = lib.platforms.unix;
diff --git a/nixpkgs/pkgs/development/libraries/openssl/1.1/CVE-2023-4807.patch b/nixpkgs/pkgs/development/libraries/openssl/1.1/CVE-2023-4807.patch
deleted file mode 100644
index 7312b41fc740..000000000000
--- a/nixpkgs/pkgs/development/libraries/openssl/1.1/CVE-2023-4807.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4bfac4471f53c4f74c8d81020beb938f92d84ca5 Mon Sep 17 00:00:00 2001
-From: Bernd Edlinger <bernd.edlinger@hotmail.de>
-Date: Tue, 22 Aug 2023 16:07:30 +0200
-Subject: [PATCH] Avoid clobbering non-volatile XMM registers
-
-This affects some Poly1305 assembler functions
-which are only used for certain CPU types.
-
-Remove those functions for Windows targets,
-as a simple interim solution.
-
-Fixes #21522
-
-Reviewed-by: Tomas Mraz <tomas@openssl.org>
-Reviewed-by: Paul Dale <pauli@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/21808)
-
-(cherry picked from commit 7b8e27bc2e02238986d89ef0ece067ec1b48e165)
----
- crypto/poly1305/asm/poly1305-x86_64.pl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/poly1305/asm/poly1305-x86_64.pl
-index fa9bfb7a7b81..24bab9d0bcf9 100755
---- a/crypto/poly1305/asm/poly1305-x86_64.pl
-+++ b/crypto/poly1305/asm/poly1305-x86_64.pl
-@@ -195,7 +195,7 @@ sub poly1305_iteration {
- 	bt	\$`5+32`,%r9		# AVX2?
- 	cmovc	%rax,%r10
- ___
--$code.=<<___	if ($avx>3);
-+$code.=<<___	if ($avx>3 && !$win64);
- 	mov	\$`(1<<31|1<<21|1<<16)`,%rax
- 	shr	\$32,%r9
- 	and	%rax,%r9
-@@ -2724,7 +2724,7 @@ sub poly1305_iteration {
- .cfi_endproc
- .size	poly1305_blocks_avx512,.-poly1305_blocks_avx512
- ___
--if ($avx>3) {
-+if ($avx>3 && !$win64) {
- ########################################################################
- # VPMADD52 version using 2^44 radix.
- #
diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix
index 93786881a520..231875340567 100644
--- a/nixpkgs/pkgs/development/libraries/openssl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix
@@ -236,14 +236,11 @@ in {
   # the permitted insecure version to ensure it gets cached for our users
   # and backport this to stable release (23.05).
   openssl_1_1 = common {
-    version = "1.1.1v";
-    sha256 = "sha256-1ml+KHHncjhGBALpNi1H0YOCsV758karpse9eA04prA=";
+    version = "1.1.1w";
+    sha256 = "sha256-zzCYlQy02FOtlcCEHx+cbT3BAtzPys1SHZOSUgi3asg=";
     patches = [
       ./1.1/nix-ssl-cert-file.patch
 
-      # https://www.openssl.org/news/secadv/20230908.txt
-      ./1.1/CVE-2023-4807.patch
-
       (if stdenv.hostPlatform.isDarwin
        then ./use-etc-ssl-certs-darwin.patch
        else ./use-etc-ssl-certs.patch)
diff --git a/nixpkgs/pkgs/development/libraries/swiftshader/default.nix b/nixpkgs/pkgs/development/libraries/swiftshader/default.nix
index cfcccd018f9d..36564110d283 100644
--- a/nixpkgs/pkgs/development/libraries/swiftshader/default.nix
+++ b/nixpkgs/pkgs/development/libraries/swiftshader/default.nix
@@ -2,22 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "swiftshader";
-  version = "2020-11-06";
+  version = "2023-09-11";
 
   src = fetchgit {
     url = "https://swiftshader.googlesource.com/SwiftShader";
-    rev = "4ed9d3498dcffa987acba1a8007ff8dec336f263";
-    sha256 = "1gz2zflfacxf34s78djddf93brn9kyxj4byc4p2ip1pin43lh2lg";
+    rev = "4e40d502c440cc59b25fa3a5fee0eadbab7442aa";
+    sha256 = "085bdqn80s7zw5h2pz6xff3j34hmkxb9wxzgjmzdr9c24zwp2k1c";
   };
 
   nativeBuildInputs = [ cmake python3 jq ];
-  buildInputs = [ libX11 libXext zlib ];
-
-  env.NIX_CFLAGS_COMPILE = toString [
-    # Needed with GCC 12
-    "-Wno-error=array-bounds"
-    "-Wno-error=uninitialized"
-  ];
 
   # Make sure we include the drivers and icd files in the output as the cmake
   # generated install command only puts in the spirv-tools stuff.
@@ -35,35 +28,17 @@ stdenv.mkDerivation rec {
     mkdir -p "$(dirname "$vk_icd_json")"
     jq ".ICD.library_path = \"$vk_so_path\"" <Linux/vk_swiftshader_icd.json >"$vk_icd_json"
 
-    #
-    # GL driver
-    #
-    gl_so_path="$out/lib/libEGL.so"
-    mkdir -p "$(dirname "$gl_so_path")"
-    mv Linux/libEGL.so "$gl_so_path"
-
-    gl_icd_json="$out/share/glvnd/egl_vendor.d/swiftshader.json"
-    mkdir -p "$(dirname "$gl_icd_json")"
-    cat >"$gl_icd_json" <<EOF
-    {
-      "file_format_version" : "1.0.0",
-      "ICD" : {
-          "library_path" : "$gl_so_path"
-      }
-    }
-    EOF
-
     runHook postInstall
   '';
 
   meta = with lib; {
     description =
-      "A high-performance CPU-based implementation of the Vulkan, OpenGL ES, and Direct3D 9 graphics APIs";
+      "A high-performance CPU-based implementation of the Vulkan 1.3 graphics API";
     homepage = "https://opensource.google/projects/swiftshader";
     license = licenses.asl20;
     # Should be possible to support Darwin by changing the install phase with
     # 's/Linux/Darwin/' and 's/so/dylib/' or something similar.
-    platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "mipsel-linux" ];
+    platforms = with platforms; linux;
     maintainers = with maintainers; [ expipiplus1 ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/wayland/default.nix b/nixpkgs/pkgs/development/libraries/wayland/default.nix
index fbed7a3b5206..52a1d9db3d28 100644
--- a/nixpkgs/pkgs/development/libraries/wayland/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wayland/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchurl
-, substituteAll
 , meson
 , pkg-config
 , ninja