update: 2024.4.1 -> 2024.4.2

- removed patch for frontend package-lock.json, meaning IFD (import from
  derivation) is no longer an issue

Flake lock file updates:

• Updated input 'authentik-src':
    'github:goauthentik/authentik/ca70c963e55daf73b479a4513da06ac5cea77718' (2024-04-26)
  → 'github:goauthentik/authentik/1f5953b5b7e72c085246e8f19b94482dac946d83' (2024-05-07)
• Updated input 'poetry2nix':
    'github:nix-community/poetry2nix/9245811b58905453033f1ef551f516cbee71c42c' (2024-04-26)
  → 'github:nix-community/poetry2nix/e6b36523407ae6a7a4dfe29770c30b3a3563b43a' (2024-05-06)
• Updated input 'poetry2nix/treefmt-nix':
    'github:numtide/treefmt-nix/e504621290a1fd896631ddbc5e9c16f4366c9f65' (2024-02-19)
  → 'github:numtide/treefmt-nix/c6aaf729f34a36c445618580a9f95a48f5e4e03f' (2024-04-25)

components/frontend-package-lock-json-missing-integrity-infos.patch

@@ -1,25 +0,0 @@
-diff --git a/web/package-lock.json b/web/package-lock.json
---- a/web/package-lock.json
-+++ b/web/package-lock.json
-@@ -6663,7 +6663,9 @@
-             "license": "MIT",
-             "dependencies": {
-                 "type-fest": "^2.19.0"
--            }
-+            },
-+            "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.2.tgz",
-+            "integrity": "sha512-ePrvE/pS1vsKR9Xr+o+YwdqNgHUyXvg+1Xjx0h9LrVx7Zq4zNe06pd63F5EvzTbCbJsHj7GHr9tkiaqm7U8WRA=="
-         },
-         "node_modules/@storybook/csf-plugin": {
-             "version": "8.0.8",
-@@ -8654,7 +8656,9 @@
-         "node_modules/@types/find-cache-dir": {
-             "version": "3.2.1",
-             "dev": true,
--            "license": "MIT"
-+            "license": "MIT",
-+            "resolved": "https://registry.npmjs.org/@types/find-cache-dir/-/find-cache-dir-3.2.1.tgz",
-+            "integrity": "sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw=="
-         },
-         "node_modules/@types/grecaptcha": {
-             "version": "3.0.9",

components/frontend.nix

@@ -3,24 +3,8 @@
 , authentikComponents
 , buildNapalmPackage
 , nodejs_21
-, applyPatches
 }:
-let
+buildNapalmPackage "${authentik-src}/web" rec {
-  patched-src = applyPatches {
-    src = authentik-src;
-    name = "patched-authentik-source";
-    patches = [
-      # Should be obsolete with the next release (i.e. 2024.4.2).
-      #
-      # The underlying issue was partially fixed by backporting https://github.com/goauthentik/authentik/pull/9419
-      # to 2024.4, but two deps are still missing the resolved/integrity fields in 2024.4.1
-      #
-      # (this introduces IFD)
-      ./frontend-package-lock-json-missing-integrity-infos.patch
-    ];
-  };
-in
-buildNapalmPackage "${patched-src}/web" rec {
   version = authentik-version; # 0.0.0 specified upstream in package.json
   NODE_ENV = "production";
   nodejs = nodejs_21;

flake.lock

@@ -3,16 +3,16 @@
     "authentik-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1714145986,
+        "lastModified": 1715092773,
-        "narHash": "sha256-1xFQ5mUWXxW4bJttI+pw7Uj/F+fpgr2cSJzFpBKfio0=",
+        "narHash": "sha256-B+ZLD1D/UQty1urQ0qDFo67vjsk/jtssjqIQOY0Oxq4=",
         "owner": "goauthentik",
         "repo": "authentik",
-        "rev": "ca70c963e55daf73b479a4513da06ac5cea77718",
+        "rev": "1f5953b5b7e72c085246e8f19b94482dac946d83",
         "type": "github"
       },
       "original": {
         "owner": "goauthentik",
-        "ref": "version/2024.4.1",
+        "ref": "version/2024.4.2",
         "repo": "authentik",
         "type": "github"
       }
@@ -160,11 +160,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1714113962,
+        "lastModified": 1715017507,
-        "narHash": "sha256-7nVz2XUgVtnTQIYcuuqdLjZL8ifb7W8jciT+Szsx920=",
+        "narHash": "sha256-RN2Vsba56PfX02DunWcZYkMLsipp928h+LVAWMYmbZg=",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "9245811b58905453033f1ef551f516cbee71c42c",
+        "rev": "e6b36523407ae6a7a4dfe29770c30b3a3563b43a",
         "type": "github"
       },
       "original": {
@@ -221,11 +221,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708335038,
+        "lastModified": 1714058656,
-        "narHash": "sha256-ETLZNFBVCabo7lJrpjD6cAbnE11eDOjaQnznmg/6hAE=",
+        "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "e504621290a1fd896631ddbc5e9c16f4366c9f65",
+        "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -27,7 +27,7 @@
       };
     };
     authentik-src = { # change version string in outputs as well when updating
-      url = "github:goauthentik/authentik/version/2024.4.1";
+      url = "github:goauthentik/authentik/version/2024.4.2";
       flake = false;
     };
   };
@@ -46,7 +46,7 @@
     { inherit inputs; }
     ({ inputs, lib, withSystem, ... }:
     let
-      authentik-version = "2024.4.1"; # to pass to the drvs of some components
+      authentik-version = "2024.4.2"; # to pass to the drvs of some components
     in {
       systems = [
         "x86_64-linux"

poetry2nix-python-overrides.nix

@@ -27,7 +27,6 @@ pkgs:
         nativeBuildInputs = oA.nativeBuildInputs ++ [
           final.setuptools
           final.tomli
-          final.cython-3
           pkgs.postgresql
         ];
       });
@@ -42,7 +41,7 @@ pkgs:
             src = oA.src;
             sourceRoot = "${oA.pname}-${oA.version}/src/rust";
             name = "${oA.pname}-${oA.version}";
-            sha256 = "sha256-qaXQiF1xZvv4sNIiR2cb5TfD7oNiYdvUwcm37nh2P2M=";
+            sha256 = "sha256-Pw3ftpcDMfZr/w6US5fnnyPVsFSB9+BuIKazDocYjTU=";
           };
       });
       dnspython = prev.dnspython.overrideAttrs (oA: {
@@ -67,33 +66,6 @@ pkgs:
           final.poetry-core
         ];
       });
-      # alias because lxml references cython_3 in nativeBuildInputs
-      cython_3 = final.cython-3;
-      #pyyaml = pkgs.python312.pkgs.pyyaml;
-      pyyaml = prev.pyyaml.overrideAttrs (oA:
-      let
-        # checks if derivation is cython with major version 3
-        isNotCython3 = drv:
-          let
-            drvInfo = builtins.parseDrvName drv.name;
-            isCython = pkgs.lib.hasSuffix "-cython" drvInfo.name;
-            isVersion3 = pkgs.lib.versions.major drvInfo.version == "3";
-          in
-          isCython -> !isVersion3;
-
-        # removes cython3 derivation from list
-        removeCython3 = builtins.filter isNotCython3;
-      in
-      {
-        # pyyaml 6.0.1 doesn't build with cython3, see upstream nixpkgs
-        nativeBuildInputs = (removeCython3 oA.nativeBuildInputs) ++ [
-          pkgs.python312Packages.cython_0
-          final.setuptools
-        ];
-        buildInputs = oA.buildInputs ++ [
-          pkgs.libyaml
-        ];
-      });
     }
   )
 ]