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

Conflicts:
	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/libraries/mesa/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix

Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391

5 files changed, 23 insertions, 35 deletions

diff --git a/nixpkgs/pkgs/servers/keycloak/default.nix b/nixpkgs/pkgs/servers/keycloak/default.nix
index 714aa674cc9a..b2bd54c56b2c 100644
--- a/nixpkgs/pkgs/servers/keycloak/default.nix
+++ b/nixpkgs/pkgs/servers/keycloak/default.nix
@@ -3,7 +3,6 @@
 , fetchzip
 , makeWrapper
 , jre
-, writeText
 , nixosTests
 , callPackage
 
@@ -13,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "keycloak";
-  version = "21.1.1";
+  version = "22.0.1";
 
   src = fetchzip {
     url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
-    hash = "sha256-ZX5UKjU9BEtO/uA25WhSUmeO6jQ1FpKF1irFx2fwPBU=";
+    hash = "sha256-I0tmCcXqS1nfA7ZQd0qUsSWEUYvNa/caCZU8AYWSO7Y=";
   };
 
   nativeBuildInputs = [ makeWrapper jre ];
diff --git a/nixpkgs/pkgs/servers/keycloak/keycloak-discord/default.nix b/nixpkgs/pkgs/servers/keycloak/keycloak-discord/default.nix
index 047bc67fbc56..0605145ff96f 100644
--- a/nixpkgs/pkgs/servers/keycloak/keycloak-discord/default.nix
+++ b/nixpkgs/pkgs/servers/keycloak/keycloak-discord/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/wadahiro/keycloak-discord";
     description = "Keycloak Social Login extension for Discord";
-    license = licenses.apsl20;
+    license = licenses.asl20;
     maintainers = with maintainers; [ mkg20001 ];
   };
 }
diff --git a/nixpkgs/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/nixpkgs/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix
index e8d917fea3bd..7a7442d8946a 100644
--- a/nixpkgs/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix
+++ b/nixpkgs/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix
@@ -1,27 +1,28 @@
-{ stdenv, lib, fetchurl }:
+{ maven, lib, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+maven.buildMavenPackage rec {
   pname = "keycloak-metrics-spi";
-  version = "3.0.0";
+  version = "4.0.0";
 
-  src = fetchurl {
-    url = "https://github.com/aerogear/keycloak-metrics-spi/releases/download/${version}/keycloak-metrics-spi-${version}.jar";
-    sha256 = "1r06xjnvd7wxl64jqpms6jnl4csfwigb9n9lxcjpkgh2jzfs43sp";
+  src = fetchFromGitHub {
+    owner = "aerogear";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-pacmx5w1VVWz3HmHO6sc2friNUpzo4zyJI1/TQgCXlc=";
   };
 
-  dontUnpack = true;
-  dontBuild = true;
+  mvnHash = "sha256-rwAc2KtKo4vJ0JWwPquMyt+FHVNTmMpzBPbo8lWDN/A=";
 
   installPhase = ''
-    mkdir -p $out
-    install "$src" "$out"
+    runHook preInstall
+    install -Dm444 -t "$out" target/keycloak-metrics-spi-*.jar
+    runHook postInstall
   '';
 
   meta = with lib; {
     homepage = "https://github.com/aerogear/keycloak-metrics-spi";
     description = "Keycloak Service Provider that adds a metrics endpoint";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.apsl20;
+    license = licenses.asl20;
     maintainers = with maintainers; [ benley ];
   };
 }
diff --git a/nixpkgs/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/nixpkgs/pkgs/servers/keycloak/scim-for-keycloak/default.nix
index e2dca3f632e1..e192f38fcb10 100644
--- a/nixpkgs/pkgs/servers/keycloak/scim-for-keycloak/default.nix
+++ b/nixpkgs/pkgs/servers/keycloak/scim-for-keycloak/default.nix
@@ -1,11 +1,9 @@
 { lib
-, stdenv
 , fetchFromGitHub
 , maven
-, javaPackages
 }:
 
-javaPackages.mavenfod rec {
+maven.buildMavenPackage rec {
   pname = "scim-for-keycloak";
   version = "kc-15-b2"; # When updating also update mvnHash
 
@@ -16,11 +14,7 @@ javaPackages.mavenfod rec {
     sha256 = "K34c7xISjEETI3jFkRLdZ0C8pZHTWtPtrrIzwC76Tv0=";
   };
 
-  mvnHash = "sha256-kDYhXTEOAWH/dcRJalKtbwBpoxcD1aX9eqcRKs6ewbE=";
-
-  nativeBuildInputs = [
-    maven
-  ];
+  mvnHash = "sha256-MWxm2q6tx8YcdEsleC2h+s+lp9whi11VQ1yFr8AZUyQ=";
 
   installPhase = ''
     EAR=$(find -iname "*.ear")
diff --git a/nixpkgs/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix b/nixpkgs/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix
index 8f0ecd740488..cc6e41aa81f8 100644
--- a/nixpkgs/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix
+++ b/nixpkgs/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix
@@ -1,26 +1,20 @@
 { lib
-, stdenv
 , fetchFromGitHub
 , maven
-, javaPackages
 }:
 
-javaPackages.mavenfod rec {
+maven.buildMavenPackage {
   pname = "scim-keycloak-user-storage-spi";
-  version = "unstable-2023-04-12";
+  version = "unstable-2023-07-10";
 
   src = fetchFromGitHub {
     owner = "justin-stephenson";
     repo = "scim-keycloak-user-storage-spi";
-    rev = "e2a78d9dddbb21a42a9aaeb5c72b5ed1ef76d2a0";
-    hash = "sha256-xFEXMZw575hONMG9ZNQ+5xKEVeKvGyzurqbAW48Mrg8=";
+    rev = "54a3fd77b05079c9ebd931e8b6a3725310a1f7b7";
+    hash = "sha256-rQR8+LevFHTFLoyCPSu50jdSXu4YgBibjVB804rEsFs=";
   };
 
-  mvnHash = "sha256-CK42d+Ta1/XNQWCLaje6sI+C90YvzUcteuasVkUPfCk=";
-
-  nativeBuildInputs = [
-    maven
-  ];
+  mvnHash = "sha256-vNPSNoOmtD1UMfWvLm8CH7RRatyeu3fnX9zteZpkay0=";
 
   installPhase = ''
     install -D "target/scim-user-spi-0.0.1-SNAPSHOT.jar" "$out/scim-user-spi-0.0.1-SNAPSHOT.jar"