ci: update scim-cli & nc

flake.lock

@@ -18,13 +18,31 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733212471,
+        "lastModified": 1738680400,
-        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
+        "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+        "rev": "799ba5bffed04ced7067a91798353d360788b30d",
         "type": "github"
       },
       "original": {
@@ -36,20 +54,49 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1728492678,
+        "lastModified": 1738680400,
-        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
+        "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
+        "rev": "799ba5bffed04ced7067a91798353d360788b30d",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "pyproject-build-systems": {
+      "inputs": {
+        "nixpkgs": [
+          "scim2-cli",
+          "nixpkgs"
+        ],
+        "pyproject-nix": [
+          "scim2-cli",
+          "pyproject-nix"
+        ],
+        "uv2nix": [
+          "scim2-cli",
+          "uv2nix"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737338290,
+        "narHash": "sha256-gnXlfFEHA+/jMH7R+7y3JxrI3WfOjgBhzzJNuFW70UU=",
+        "owner": "pyproject-nix",
+        "repo": "build-system-pkgs",
+        "rev": "e1487e5cefda0c7990bdd2e660bee20971680e45",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pyproject-nix",
+        "repo": "build-system-pkgs",
+        "type": "github"
+      }
+    },
     "pyproject-nix": {
       "inputs": {
         "nixpkgs": [
@@ -58,15 +105,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1731223003,
+        "lastModified": 1738204167,
-        "narHash": "sha256-hFf8/IeZKPUubMC452Mm+JiAEnvcw/a4Cvn2bcpeJqs=",
+        "narHash": "sha256-J5M2sj3x4ocM93shScT/3Z4XWHZhwwW1NyQK+C+8Mys=",
-        "owner": "nix-community",
+        "owner": "pyproject-nix",
         "repo": "pyproject.nix",
-        "rev": "359dd9cd562730bbd31ab164832aae4dacd9c302",
+        "rev": "0d9f4b90cee1b5c5d6c142ef22de1e246e003ccc",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "pyproject-nix",
         "repo": "pyproject.nix",
         "type": "github"
       }
@@ -80,17 +127,18 @@
     },
     "scim2-cli": {
       "inputs": {
+        "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs_2",
+        "pyproject-build-systems": "pyproject-build-systems",
         "pyproject-nix": "pyproject-nix",
-        "systems": "systems_2",
         "uv2nix": "uv2nix"
       },
       "locked": {
-        "lastModified": 1733309709,
+        "lastModified": 1738756843,
-        "narHash": "sha256-Qp5kgHsyWehyBhsrVzfhlCxqDFV155XVK3xZPtnQD/g=",
+        "narHash": "sha256-pxLpjjLz/9d46lH8pClmk+oG8E6Nkh+CMClVSomO4Qw=",
         "owner": "hrenard",
         "repo": "scim2-cli",
-        "rev": "c67b7bca854b7c8659d111fb4064e9f455931f68",
+        "rev": "08760c5e300cb9678fc6dcc67fcdad9ed2506518",
         "type": "github"
       },
       "original": {
@@ -124,8 +172,9 @@
         "type": "github"
       },
       "original": {
-        "id": "systems",
+        "owner": "nix-systems",
-        "type": "indirect"
+        "repo": "default",
+        "type": "github"
       }
     },
     "uv2nix": {
@@ -140,15 +189,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1731223088,
+        "lastModified": 1738653454,
-        "narHash": "sha256-qkij76/APgVXsgagQ0z0lTy3qeorfTuY5S91tzROSe0=",
+        "narHash": "sha256-tAFX8mPZtZ+zVE/+bwPC3U+u5MxjpNP0gG24DG26jVs=",
-        "owner": "adisbladis",
+        "owner": "pyproject-nix",
         "repo": "uv2nix",
-        "rev": "638bb9e42147ebd6344053b20f05516b7b4674d7",
+        "rev": "05b0c148bc53aebc6a906b6d0ac41dde5954cd47",
         "type": "github"
       },
       "original": {
-        "owner": "adisbladis",
+        "owner": "pyproject-nix",
         "repo": "uv2nix",
         "type": "github"
       }

flake.nix

@@ -26,7 +26,7 @@
           'logfile' => getenv('NEXTCLOUD_DATA_DIR').'/nextcloud.log',
           'apps_paths' => [
                   [
-                          'path'=> '${pkgs.nextcloud28}/apps',
+                          'path'=> '${pkgs.nextcloud29}/apps',
                           'url' => '/apps',
                           'writable' => false,
                   ],
@@ -41,7 +41,7 @@
         occ = pkgs.writeShellApplication {
           name = "occ";
           runtimeInputs = with pkgs; [
-            nextcloud28
+            nextcloud29
             php
           ];
           text = ''
@@ -51,7 +51,7 @@
             mkdir "$NEXTCLOUD_CONFIG_DIR"
             mkdir "$NEXTCLOUD_DATA_DIR/apps"
             cp ${config} "$NEXTCLOUD_CONFIG_DIR/config.php"
-            exec php ${pkgs.nextcloud28}/occ "$@"
+            exec php ${pkgs.nextcloud29}/occ "$@"
           '';
         };
 
@@ -185,6 +185,7 @@
                   inherit scimserviceprovider;
                 };
                 config = {
+                  dbtype = "sqlite";
                   adminpassFile = "${(pkgs.writeText "ncpass" ''P@ssw0rd'')}";
                 };
               };
@@ -198,9 +199,7 @@
           testScript = ''
             machine.wait_for_unit("nginx.service")
             machine.wait_for_unit("phpfpm-nextcloud.service")
-            result = machine.execute("scim2 --url http://localhost/index.php/apps/scimserviceprovider --header 'Authorization: Basic cm9vdDpQQHNzdzByZA==' test -v")[1]
+            machine.succeed("scim2 --url http://localhost/index.php/apps/scimserviceprovider --header 'Authorization: Basic cm9vdDpQQHNzdzByZA==' test -v --dont-check-content-type")
-            if "ERROR" in result:
-              raise Exception(result)
           '';
         };
         devShells.default = pkgs.mkShell {