Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'

Conflicts:
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/pkgs/build-support/go/module.nix

3 files changed, 57 insertions, 5 deletions

diff --git a/nixpkgs/pkgs/by-name/fr/francis/package.nix b/nixpkgs/pkgs/by-name/fr/francis/package.nix
new file mode 100644
index 000000000000..95a25ea95a29
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/fr/francis/package.nix
@@ -0,0 +1,52 @@
+{ cmake
+, fetchFromGitLab
+, kdePackages
+, lib
+, pkg-config
+, stdenv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "francis";
+  version = "1.1.0";
+
+  src = fetchFromGitLab {
+    domain = "invent.kde.org";
+    repo = "francis";
+    owner = "utilities";
+    rev = "v${version}";
+    hash = "sha256-TvLFzGWb3RROGywhNzCvnFG00PpKC2k+/w1bgwTCESg=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    kdePackages.kirigami
+    kdePackages.kirigami-addons
+    kdePackages.plasma5support
+    kdePackages.qqc2-desktop-style
+    kdePackages.qtsvg
+    kdePackages.qtwayland
+    kdePackages.wrapQtAppsHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    kdePackages.kiconthemes
+    # otherwise buttons are blank on non-kde
+    kdePackages.breeze-icons
+  ];
+
+  cmakeFlags = [
+    # fix can't find Qt6QmlCompilerPlusPrivate
+    "-DQT_NO_FIND_QMLSC=TRUE"
+  ];
+
+  meta = with lib; {
+    description = "Using the well-known pomodoro technique to help you get more productive";
+    homepage = "https://apps.kde.org/francis/";
+    license = with licenses; [ bsd2 bsd3 cc0 lgpl2Plus lgpl21Plus gpl3Plus ];
+    mainProgram = "francis";
+    maintainers = with maintainers; [ cimm ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix b/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix
index e6ce4c97d2b0..e293e5c48fa3 100644
--- a/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix
+++ b/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix
@@ -26,13 +26,13 @@ let
   pieBuild = stdenv.hostPlatform.isMusl;
 in buildGoModule rec {
   pname = "frankenphp";
-  version = "1.1.2";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "dunglas";
     repo = "frankenphp";
     rev = "v${version}";
-    hash = "sha256-r6BMlcjvRbVnBHsfRhJyMiyZzH2Z+FLOYz6ik4I8p+A=";
+    hash = "sha256-I1O5ZujFRIgbe+6k1FmCedywYwN1zA+owU+tLBtN7nU=";
   };
 
   sourceRoot = "${src.name}/caddy";
@@ -40,7 +40,7 @@ in buildGoModule rec {
   # frankenphp requires C code that would be removed with `go mod tidy`
   # https://github.com/golang/go/issues/26366
   proxyVendor = true;
-  vendorHash = "sha256-gxBD2KPkWtAM0MsaQ9Ed4QDjJCg1uJQpXvnCOnAsZTw=";
+  vendorHash = "sha256-u+7pUt6SmNI/smE3l3CQl+e/ZsVRSeVJgprR0aslrMI=";
 
   buildInputs = [ phpUnwrapped brotli ] ++ phpUnwrapped.buildInputs;
   nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config darwin.cctools darwin.autoSignDarwinBinariesHook ];
diff --git a/nixpkgs/pkgs/by-name/fr/freefilesync/package.nix b/nixpkgs/pkgs/by-name/fr/freefilesync/package.nix
index eb8e8cf9b295..529516bb0da9 100644
--- a/nixpkgs/pkgs/by-name/fr/freefilesync/package.nix
+++ b/nixpkgs/pkgs/by-name/fr/freefilesync/package.nix
@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freefilesync";
-  version = "13.4";
+  version = "13.5";
 
   src = fetchurl {
     url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
       rm -f $out
       tryDownload "$url"
     '';
-    hash = "sha256-0c4HYlah9aHsMMyCz/TjgA59pTce4hogz5n6Xf9Myho=";
+    hash = "sha256-8At8QobAQR2mQnFjFSPTkEuxmP9M8gINP0qH28J3ynY=";
   };
 
   sourceRoot = ".";