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

2 files changed, 17 insertions, 54 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libbluray/default.nix b/nixpkgs/pkgs/development/libraries/libbluray/default.nix
index 5b262c66e18e..bc10d06b846c 100644
--- a/nixpkgs/pkgs/development/libraries/libbluray/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libbluray/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, fontconfig, autoreconfHook, DiskArbitration
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, fontconfig, autoreconfHook, DiskArbitration
 , withJava ? false, jdk, ant
 , withAACS ? false, libaacs
 , withBDplus ? false, libbdplus
@@ -6,51 +6,39 @@
 , withFonts ? true, freetype
 }:
 
-with lib;
-
 # Info on how to use:
 # https://wiki.archlinux.org/index.php/BluRay
 
 stdenv.mkDerivation rec {
   pname = "libbluray";
-  version  = "1.3.1";
+  version = "1.3.4";
 
   src = fetchurl {
-    url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-wksPQcW3N7u2XFRP5jSVY3p3HBClGd/IAudp8RK0O3U=";
+    url = "https://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2";
+    hash = "sha256-R4/9aKD13ejvbKmJt/A1taCiLFmRQuXNP/ewO76+Xys=";
   };
 
-  patches = [
-    ./BDJ-JARFILE-path.patch
-    ./libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch
-  ];
-
   nativeBuildInputs = [ pkg-config autoreconfHook ]
-    ++ optionals withJava [ ant ];
+    ++ lib.optionals withJava [ ant ];
 
   buildInputs = [ fontconfig ]
-                ++ optional withJava jdk
-                ++ optional withMetadata libxml2
-                ++ optional withFonts freetype
-                ++ optional stdenv.isDarwin DiskArbitration
-                ;
+    ++ lib.optional withJava jdk
+    ++ lib.optional withMetadata libxml2
+    ++ lib.optional withFonts freetype
+    ++ lib.optional stdenv.isDarwin DiskArbitration;
 
-  propagatedBuildInputs = optional withAACS libaacs;
+  propagatedBuildInputs = lib.optional withAACS libaacs;
 
-  NIX_LDFLAGS = toString [
-    (optionalString withAACS   "-L${libaacs}/lib -laacs")
-    (optionalString withBDplus "-L${libbdplus}/lib -lbdplus")
-  ];
+  NIX_LDFLAGS = lib.optionalString withAACS "-L${libaacs}/lib -laacs"
+    + lib.optionalString withBDplus " -L${libbdplus}/lib -lbdplus";
 
-  preConfigure = ''
-    ${optionalString withJava ''export JDK_HOME="${jdk.home}"''}
+  preConfigure = lib.optionalString withJava ''
+    export JDK_HOME="${jdk.home}"
   '';
 
-  configureFlags =  with lib;
-                    optional (! withJava) "--disable-bdjava-jar"
-                 ++ optional (! withMetadata) "--without-libxml2"
-                 ++ optional (! withFonts) "--without-freetype"
-                 ;
+  configureFlags = lib.optional (!withJava) "--disable-bdjava-jar"
+    ++ lib.optional (!withMetadata) "--without-libxml2"
+    ++ lib.optional (!withFonts) "--without-freetype";
 
   meta = with lib; {
     homepage = "http://www.videolan.org/developers/libbluray.html";
diff --git a/nixpkgs/pkgs/development/libraries/libbluray/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch b/nixpkgs/pkgs/development/libraries/libbluray/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch
deleted file mode 100644
index 158468e7839d..000000000000
--- a/nixpkgs/pkgs/development/libraries/libbluray/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8f26777b1ce124ff761f80ef52d6be10bcea323e Mon Sep 17 00:00:00 2001
-From: Fridrich Strba <fstrba@suse.com>
-Date: Mon, 25 Apr 2022 14:28:58 +0300
-Subject: [PATCH] Fix build failure after Oracle Java CPU for April 2022
-
---- a/src/libbluray/bdj/java/java/io/BDFileSystem.java
-+++ b/src/libbluray/bdj/java/java/io/BDFileSystem.java
-@@ -227,6 +227,17 @@ public abstract class BDFileSystem extends FileSystem {
-         return fs.isAbsolute(f);
-     }
- 
-+    public boolean isInvalid(File f) {
-+        try {
-+            Method m = fs.getClass().getDeclaredMethod("isInvalid", new Class[] { File.class });
-+            Object[] args = new Object[] {(Object)f};
-+            Boolean result = (Boolean)m.invoke(fs, args);
-+            return result.booleanValue();
-+        } finally {
-+            return false;
-+        }
-+    }
-+
-     public String resolve(File f) {
-         if (!booted)
-             return fs.resolve(f);