Merge branches 'sb/add/beancount_payeeverif', 'sb/fix/borgbackup' and…

… 'sb/update/foundationdb'

nixos/tests/all-tests.nix

@@ -352,6 +352,7 @@ in {
   fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {};
   forgejo = handleTest ./forgejo.nix { forgejoPackage = pkgs.forgejo; };
   forgejo-lts = handleTest ./forgejo.nix { forgejoPackage = pkgs.forgejo-lts; };
+  foundationdb = handleTest ./foundationdb.nix {};
   freenet = handleTest ./freenet.nix {};
   freeswitch = handleTest ./freeswitch.nix {};
   freetube = discoverTests (import ./freetube.nix);

nixos/tests/foundationdb.nix

@@ -0,0 +1,24 @@
+import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.foundationdb, ...} : {
+  name = "foundationdb";
+  meta.maintainers = with lib.maintainers; [ siriobalmelli ];
+
+  nodes = {
+    server = { _, ... }: {
+      services.foundationdb = {
+        inherit package;
+        enable = true;
+        serverProcesses = 1;
+        traceFormat = "json";
+      };
+
+      # fail test if unable to start the first time
+      systemd.services.foundationdb.serviceConfig.Restart = lib.mkForce "no";
+    };
+  };
+
+  testScript = { nodes, ... }:
+  ''
+    server.wait_for_unit("foundationdb.service")
+    server.succeed("fdbcli --exec status")
+  '';
+})

pkgs/servers/foundationdb/default.nix

@@ -3,14 +3,15 @@
 
 , cmake, ninja, python3, openjdk8, mono, openssl, boost178
 , pkg-config, msgpack-cxx, toml11
+, nixosTests
 }@args:
 
 let
   cmakeBuild = import ./cmake.nix args;
 in {
   foundationdb71 = cmakeBuild {
-    version = "7.1.32";
-    hash    = "sha256-CNJ4w1ECadj2KtcfbBPBQpXQeq9BAiw54hUgRTWPFzY=";
+    version = "7.1.62";
+    hash    = "sha256-4IsOx691EFrSbOx4cpmhPyOam4tbx0BSScKMfE3qBV0=";
     boost   = boost178;
     ssl     = openssl;
 
@@ -26,5 +27,9 @@ in {
         hash = "sha256-bneRoZvCzJp0Hp/G0SzAyUyuDrWErSpzv+ickZQJR5w=";
       })
     ];
+  } // {
+    passthrough.tests = {
+      inherit (nixosTests) foundationdb;
+    };
   };
 }

pkgs/tools/backup/borgbackup/default.nix

@@ -108,6 +108,13 @@ python.pkgs.buildPythonApplication rec {
     "test_get_config_dir"
     # https://github.com/borgbackup/borg/issues/6573
     "test_basic_functionality"
+  ] ++ lib.optionals (stdenv.system == "x86_64-darwin") [
+    # xattr-related failures on x86_64-darwin
+    # see https://github.com/borgbackup/borg/issues/204
+    "test_can_read_repo_even_if_nonce_is_deleted"
+    "test_extract_xattrs_resourcefork"
+    "test_overwrite"
+    "test_sparse_file"
   ];
 
   preCheck = ''