diff --git a/pkgs/additional/fractal-nixified/Cargo.nix b/pkgs/additional/fractal-nixified/Cargo.nix
index 4ed22f845..7c146579c 100644
--- a/pkgs/additional/fractal-nixified/Cargo.nix
+++ b/pkgs/additional/fractal-nixified/Cargo.nix
@@ -1,17 +1,13 @@
 
-# This file was @generated by crate2nix 0.10.0 with the command:
-#   "generate" "-f" "/home/colin/ref/repos/gnome/fractal/Cargo.toml"
+# This file was @generated by crate2nix 0.11.0-rc.4 with the command:
+#   "generate"
 # See https://github.com/kolloch/crate2nix for more info.
 
 { nixpkgs ? <nixpkgs>
 , pkgs ? import nixpkgs { config = {}; }
 , lib ? pkgs.lib
 , stdenv ? pkgs.stdenv
-, buildRustCrateForPkgs ? if buildRustCrate != null
-    then lib.warn "crate2nix: Passing `buildRustCrate` as argument to Cargo.nix is deprecated. If you don't customize `buildRustCrate`, replace `callPackage ./Cargo.nix {}` by `import ./Cargo.nix { inherit pkgs; }`, and if you need to customize `buildRustCrate`, use `buildRustCrateForPkgs` instead." (_: buildRustCrate)
-    else pkgs: pkgs.buildRustCrate
-  # Deprecated
-, buildRustCrate ? null
+, buildRustCrateForPkgs ? pkgs: pkgs.buildRustCrate
   # This is used as the `crateOverrides` argument for `buildRustCrate`.
 , defaultCrateOverrides ? pkgs.defaultCrateOverrides
   # The features to enable for the root_crate or the workspace_members.
@@ -180,14 +176,14 @@ rec {
           {
             name = "cpufeatures";
             packageId = "cpufeatures";
-            target = { target, features }: ((target."arch" == "aarch64") || (target."arch" == "x86_64") || (target."arch" == "x86"));
+            target = { target, features }: (("aarch64" == target."arch") || ("x86_64" == target."arch") || ("x86" == target."arch"));
           }
           {
             name = "zeroize";
             packageId = "zeroize";
             optional = true;
             usesDefaultFeatures = false;
-            target = { target, features }: ((target."aes_armv8" or false) && (target."arch" == "aarch64"));
+            target = { target, features }: ((target."aes_armv8" or false) && ("aarch64" == target."arch"));
             features = [ "aarch64" ];
           }
           {
@@ -195,7 +191,7 @@ rec {
             packageId = "zeroize";
             optional = true;
             usesDefaultFeatures = false;
-            target = { target, features }: (!((target."aes_armv8" or false) && (target."arch" == "aarch64")));
+            target = { target, features }: (!((target."aes_armv8" or false) && ("aarch64" == target."arch")));
           }
         ];
         devDependencies = [
@@ -227,7 +223,7 @@ rec {
             name = "once_cell";
             packageId = "once_cell";
             usesDefaultFeatures = false;
-            target = { target, features }: (!((target."arch" == "arm") && (target."os" == "none")));
+            target = { target, features }: (!(("arm" == target."arch") && ("none" == target."os")));
             features = [ "unstable" "alloc" ];
           }
         ];
@@ -957,14 +953,14 @@ rec {
             name = "async-global-executor";
             packageId = "async-global-executor";
             optional = true;
-            target = { target, features }: (!(target."os" == "unknown"));
+            target = { target, features }: (!("unknown" == target."os"));
             features = [ "async-io" ];
           }
           {
             name = "async-io";
             packageId = "async-io";
             optional = true;
-            target = { target, features }: (!(target."os" == "unknown"));
+            target = { target, features }: (!("unknown" == target."os"));
           }
           {
             name = "async-lock";
@@ -975,7 +971,7 @@ rec {
             name = "async-process";
             packageId = "async-process";
             optional = true;
-            target = { target, features }: (!(target."os" == "unknown"));
+            target = { target, features }: (!("unknown" == target."os"));
           }
           {
             name = "crossbeam-utils";
@@ -986,7 +982,7 @@ rec {
             name = "futures-channel";
             packageId = "futures-channel";
             optional = true;
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
           }
           {
             name = "futures-core";
@@ -1003,13 +999,13 @@ rec {
             name = "futures-lite";
             packageId = "futures-lite";
             optional = true;
-            target = { target, features }: (!(target."os" == "unknown"));
+            target = { target, features }: (!("unknown" == target."os"));
           }
           {
             name = "gloo-timers";
             packageId = "gloo-timers";
             optional = true;
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
             features = [ "futures" ];
           }
           {
@@ -1052,7 +1048,7 @@ rec {
             name = "wasm-bindgen-futures";
             packageId = "wasm-bindgen-futures";
             optional = true;
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
           }
         ];
         features = {
@@ -1281,6 +1277,7 @@ rec {
           {
             name = "tokio";
             packageId = "tokio";
+            rename = "tokio_1";
             features = [ "macros" "time" "rt-multi-thread" ];
           }
         ];
@@ -1972,7 +1969,7 @@ rec {
           {
             name = "cpufeatures";
             packageId = "cpufeatures";
-            target = { target, features }: ((target."arch" == "x86_64") || (target."arch" == "x86"));
+            target = { target, features }: (("x86_64" == target."arch") || ("x86" == target."arch"));
           }
           {
             name = "zeroize";
@@ -2070,7 +2067,7 @@ rec {
           {
             name = "android-tzdata";
             packageId = "android-tzdata";
-            target = { target, features }: (target."os" == "android");
+            target = { target, features }: ("android" == target."os");
           }
           {
             name = "iana-time-zone";
@@ -2083,7 +2080,7 @@ rec {
             name = "js-sys";
             packageId = "js-sys";
             optional = true;
-            target = { target, features }: ((target."arch" == "wasm32") && (!((target."os" == "emscripten") || (target."os" == "wasi"))));
+            target = { target, features }: (("wasm32" == target."arch") && (!(("emscripten" == target."os") || ("wasi" == target."os"))));
           }
           {
             name = "num-traits";
@@ -2099,7 +2096,7 @@ rec {
             name = "wasm-bindgen";
             packageId = "wasm-bindgen";
             optional = true;
-            target = { target, features }: ((target."arch" == "wasm32") && (!((target."os" == "emscripten") || (target."os" == "wasi"))));
+            target = { target, features }: (("wasm32" == target."arch") && (!(("emscripten" == target."os") || ("wasi" == target."os"))));
           }
           {
             name = "winapi";
@@ -2376,17 +2373,17 @@ rec {
           {
             name = "libc";
             packageId = "libc";
-            target = { target, features }: (stdenv.hostPlatform.config == "aarch64-linux-android");
+            target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "aarch64-linux-android");
           }
           {
             name = "libc";
             packageId = "libc";
-            target = { target, features }: ((target."arch" == "aarch64") && (target."os" == "linux"));
+            target = { target, features }: (("aarch64" == target."arch") && ("linux" == target."os"));
           }
           {
             name = "libc";
             packageId = "libc";
-            target = { target, features }: ((target."arch" == "aarch64") && (target."vendor" == "apple"));
+            target = { target, features }: (("aarch64" == target."arch") && ("apple" == target."vendor"));
           }
         ];
 
@@ -2616,12 +2613,12 @@ rec {
           {
             name = "cpufeatures";
             packageId = "cpufeatures";
-            target = { target, features }: (target."arch" == "x86_64");
+            target = { target, features }: ("x86_64" == target."arch");
           }
           {
             name = "curve25519-dalek-derive";
             packageId = "curve25519-dalek-derive";
-            target = { target, features }: ((!(target."curve25519_dalek_backend" or "" == "fiat")) && (!(target."curve25519_dalek_backend" or "" == "serial")) && (target."arch" == "x86_64"));
+            target = { target, features }: ((!("fiat" == target."curve25519_dalek_backend" or "")) && (!("serial" == target."curve25519_dalek_backend" or "")) && ("x86_64" == target."arch"));
           }
           {
             name = "digest";
@@ -2632,7 +2629,7 @@ rec {
           {
             name = "fiat-crypto";
             packageId = "fiat-crypto";
-            target = { target, features }: (target."curve25519_dalek_backend" or "" == "fiat");
+            target = { target, features }: ("fiat" == target."curve25519_dalek_backend" or "");
           }
           {
             name = "serde";
@@ -3211,7 +3208,7 @@ rec {
             name = "redox_users";
             packageId = "redox_users";
             usesDefaultFeatures = false;
-            target = { target, features }: (target."os" == "redox");
+            target = { target, features }: ("redox" == target."os");
           }
           {
             name = "windows-sys";
@@ -3495,17 +3492,17 @@ rec {
           {
             name = "errno-dragonfly";
             packageId = "errno-dragonfly";
-            target = { target, features }: (target."os" == "dragonfly");
+            target = { target, features }: ("dragonfly" == target."os");
           }
           {
             name = "libc";
             packageId = "libc";
-            target = { target, features }: (target."os" == "hermit");
+            target = { target, features }: ("hermit" == target."os");
           }
           {
             name = "libc";
             packageId = "libc";
-            target = { target, features }: (target."os" == "wasi");
+            target = { target, features }: ("wasi" == target."os");
           }
           {
             name = "libc";
@@ -3721,14 +3718,14 @@ rec {
           {
             name = "instant";
             packageId = "instant";
-            target = { target, features }: ((target."arch" == "wasm32") && (!(target."os" == "wasi")));
+            target = { target, features }: (("wasm32" == target."arch") && (!("wasi" == target."os")));
           }
         ];
         devDependencies = [
           {
             name = "instant";
             packageId = "instant";
-            target = {target, features}: ((target."arch" == "wasm32") && (!(target."os" == "wasi")));
+            target = {target, features}: (("wasm32" == target."arch") && (!("wasi" == target."os")));
             features = [ "wasm-bindgen" ];
           }
         ];
@@ -3838,7 +3835,7 @@ rec {
             name = "miniz_oxide";
             packageId = "miniz_oxide";
             usesDefaultFeatures = false;
-            target = { target, features }: ((target."arch" == "wasm32") && (!(target."os" == "emscripten")));
+            target = { target, features }: (("wasm32" == target."arch") && (!("emscripten" == target."os")));
             features = [ "with-alloc" ];
           }
         ];
@@ -3975,18 +3972,17 @@ rec {
         version = "5.0.0-beta2";
         edition = "2021";
         crateBin = [
-          { name = "fractal"; path = "src/main.rs"; }
+          {
+            name = "fractal";
+            path = "src/main.rs";
+            requiredFeatures = [ ];
+          }
         ];
-        src = lib.cleanSourceWith {
-          filter = sourceFilter;
-          src = pkgs.fetchFromGitLab {
-            domain = "gitlab.gnome.org";
-            owner = "GNOME";
-            repo = "fractal";
-            rev = "350a65cb0a221c70fc3e4746898036a345ab9ed8";
-            hash = "sha256-z6uURqMG5pT8rXZCv5IzTjXxtt/f4KUeCDSgk90aWdo=";
-          };
-        };
+        # We can't filter paths with references in Nix 2.4
+        # See https://github.com/NixOS/nix/issues/5410
+        src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
+          then lib.cleanSourceWith { filter = sourceFilter;  src = ./.; }
+          else ./.;
         authors = [
           "Julian Sparber <julian@sparber.net>"
         ];
@@ -5093,7 +5089,7 @@ rec {
             name = "js-sys";
             packageId = "js-sys";
             optional = true;
-            target = { target, features }: (((target."arch" == "wasm32") || (target."arch" == "wasm64")) && (target."os" == "unknown"));
+            target = { target, features }: ((("wasm32" == target."arch") || ("wasm64" == target."arch")) && ("unknown" == target."os"));
           }
           {
             name = "libc";
@@ -5105,14 +5101,14 @@ rec {
             name = "wasi";
             packageId = "wasi 0.11.0+wasi-snapshot-preview1";
             usesDefaultFeatures = false;
-            target = { target, features }: (target."os" == "wasi");
+            target = { target, features }: ("wasi" == target."os");
           }
           {
             name = "wasm-bindgen";
             packageId = "wasm-bindgen";
             optional = true;
             usesDefaultFeatures = false;
-            target = { target, features }: (((target."arch" == "wasm32") || (target."arch" == "wasm64")) && (target."os" == "unknown"));
+            target = { target, features }: ((("wasm32" == target."arch") || ("wasm64" == target."arch")) && ("unknown" == target."os"));
           }
         ];
         features = {
@@ -5831,7 +5827,8 @@ rec {
         crateName = "gst-plugin-gtk4";
         version = "0.10.10";
         edition = "2021";
-        sha256 = "1432gk56pxsks0lvicbs4srd4p15qdrik92nnb388795ny8crq6i";type = [ "cdylib" "rlib" ];
+        sha256 = "1432gk56pxsks0lvicbs4srd4p15qdrik92nnb388795ny8crq6i";
+        libName = "gstgtk4";type = [ "cdylib" "rlib" ];
         authors = [
           "Bilal Elmoussaoui <bil.elmoussaoui@gmail.com>"
           "Jordan Petridis <jordan@centricular.com>"
@@ -5842,7 +5839,7 @@ rec {
             name = "gdk4-win32";
             packageId = "gdk4-win32";
             rename = "gdk_win32";
-            target = { target, features }: (target."os" == "windows");
+            target = { target, features }: ("windows" == target."os");
             features = [ "v4_4" ];
           }
           {
@@ -5867,14 +5864,14 @@ rec {
             name = "gstreamer-gl";
             packageId = "gstreamer-gl";
             rename = "gst_gl";
-            target = { target, features }: (target."os" == "macos");
+            target = { target, features }: ("macos" == target."os");
             features = [ "v1_16" ];
           }
           {
             name = "gstreamer-gl";
             packageId = "gstreamer-gl";
             rename = "gst_gl";
-            target = { target, features }: (target."os" == "windows");
+            target = { target, features }: ("windows" == target."os");
             features = [ "v1_20" ];
           }
           {
@@ -5891,14 +5888,14 @@ rec {
             name = "gtk4";
             packageId = "gtk4";
             rename = "gtk";
-            target = { target, features }: (target."os" == "macos");
+            target = { target, features }: ("macos" == target."os");
             features = [ "v4_6" ];
           }
           {
             name = "gtk4";
             packageId = "gtk4";
             rename = "gtk";
-            target = { target, features }: (target."os" == "windows");
+            target = { target, features }: ("windows" == target."os");
             features = [ "v4_6" ];
           }
           {
@@ -5908,7 +5905,7 @@ rec {
           {
             name = "windows-sys";
             packageId = "windows-sys";
-            target = { target, features }: (target."os" == "windows");
+            target = { target, features }: ("windows" == target."os");
             features = [ "Win32_Graphics_OpenGL" "Win32_Foundation" "Win32_Graphics_Gdi" ];
           }
         ];
@@ -7008,7 +7005,7 @@ rec {
           {
             name = "crunchy";
             packageId = "crunchy";
-            target = { target, features }: (target."arch" == "spirv");
+            target = { target, features }: ("spirv" == target."arch");
           }
         ];
         devDependencies = [
@@ -7594,32 +7591,32 @@ rec {
           {
             name = "android_system_properties";
             packageId = "android_system_properties";
-            target = { target, features }: (target."os" == "android");
+            target = { target, features }: ("android" == target."os");
           }
           {
             name = "core-foundation-sys";
             packageId = "core-foundation-sys";
-            target = { target, features }: ((target."os" == "macos") || (target."os" == "ios"));
+            target = { target, features }: (("macos" == target."os") || ("ios" == target."os"));
           }
           {
             name = "iana-time-zone-haiku";
             packageId = "iana-time-zone-haiku";
-            target = { target, features }: (target."os" == "haiku");
+            target = { target, features }: ("haiku" == target."os");
           }
           {
             name = "js-sys";
             packageId = "js-sys";
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
           }
           {
             name = "wasm-bindgen";
             packageId = "wasm-bindgen";
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
           }
           {
             name = "windows";
             packageId = "windows";
-            target = { target, features }: (target."os" == "windows");
+            target = { target, features }: ("windows" == target."os");
             features = [ "Globalization" ];
           }
         ];
@@ -7804,6 +7801,7 @@ rec {
           {
             name = "jpeg-decoder";
             packageId = "jpeg-decoder";
+            rename = "jpeg";
             usesDefaultFeatures = false;
             features = [ "platform_independent" ];
           }
@@ -8060,60 +8058,60 @@ rec {
             name = "js-sys";
             packageId = "js-sys";
             optional = true;
-            target = { target, features }: (stdenv.hostPlatform.config == "asmjs-unknown-emscripten");
+            target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "asmjs-unknown-emscripten");
           }
           {
             name = "js-sys";
             packageId = "js-sys";
             optional = true;
-            target = { target, features }: (stdenv.hostPlatform.config == "wasm32-unknown-emscripten");
+            target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "wasm32-unknown-emscripten");
           }
           {
             name = "js-sys";
             packageId = "js-sys";
             optional = true;
-            target = { target, features }: (stdenv.hostPlatform.config == "wasm32-unknown-unknown");
+            target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "wasm32-unknown-unknown");
           }
           {
             name = "wasm-bindgen";
             packageId = "wasm-bindgen";
             rename = "wasm-bindgen_rs";
             optional = true;
-            target = { target, features }: (stdenv.hostPlatform.config == "asmjs-unknown-emscripten");
+            target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "asmjs-unknown-emscripten");
           }
           {
             name = "wasm-bindgen";
             packageId = "wasm-bindgen";
             rename = "wasm-bindgen_rs";
             optional = true;
-            target = { target, features }: (stdenv.hostPlatform.config == "wasm32-unknown-emscripten");
+            target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "wasm32-unknown-emscripten");
           }
           {
             name = "wasm-bindgen";
             packageId = "wasm-bindgen";
             rename = "wasm-bindgen_rs";
             optional = true;
-            target = { target, features }: (stdenv.hostPlatform.config == "wasm32-unknown-unknown");
+            target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "wasm32-unknown-unknown");
           }
           {
             name = "web-sys";
             packageId = "web-sys";
             optional = true;
-            target = { target, features }: (stdenv.hostPlatform.config == "asmjs-unknown-emscripten");
+            target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "asmjs-unknown-emscripten");
             features = [ "Window" "Performance" "PerformanceTiming" ];
           }
           {
             name = "web-sys";
             packageId = "web-sys";
             optional = true;
-            target = { target, features }: (stdenv.hostPlatform.config == "wasm32-unknown-emscripten");
+            target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "wasm32-unknown-emscripten");
             features = [ "Window" "Performance" "PerformanceTiming" ];
           }
           {
             name = "web-sys";
             packageId = "web-sys";
             optional = true;
-            target = { target, features }: (stdenv.hostPlatform.config == "wasm32-unknown-unknown");
+            target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "wasm32-unknown-unknown");
             features = [ "Window" "Performance" "PerformanceTiming" ];
           }
         ];
@@ -8139,7 +8137,7 @@ rec {
             name = "hermit-abi";
             packageId = "hermit-abi";
             optional = true;
-            target = { target, features }: (target."os" == "hermit");
+            target = { target, features }: ("hermit" == target."os");
           }
           {
             name = "libc";
@@ -8330,6 +8328,7 @@ rec {
           {
             name = "serde";
             packageId = "serde";
+            rename = "serde_crate";
             features = [ "derive" ];
           }
         ];
@@ -8902,12 +8901,12 @@ rec {
           {
             name = "objc";
             packageId = "objc";
-            target = { target, features }: (target."os" == "macos");
+            target = { target, features }: ("macos" == target."os");
           }
           {
             name = "objc-foundation";
             packageId = "objc-foundation";
-            target = { target, features }: (target."os" == "macos");
+            target = { target, features }: ("macos" == target."os");
           }
           {
             name = "regex";
@@ -9213,7 +9212,7 @@ rec {
           {
             name = "backoff";
             packageId = "backoff";
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
             features = [ "tokio" ];
           }
           {
@@ -9263,7 +9262,7 @@ rec {
           {
             name = "gloo-timers";
             packageId = "gloo-timers";
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
             features = [ "futures" ];
           }
           {
@@ -9326,14 +9325,14 @@ rec {
             name = "reqwest";
             packageId = "reqwest";
             usesDefaultFeatures = false;
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
             features = [ "stream" ];
           }
           {
             name = "reqwest";
             packageId = "reqwest";
             usesDefaultFeatures = false;
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
           }
           {
             name = "ruma";
@@ -9364,14 +9363,14 @@ rec {
             name = "tokio";
             packageId = "tokio";
             usesDefaultFeatures = false;
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
             features = [ "sync" "fs" "rt" "macros" ];
           }
           {
             name = "tokio";
             packageId = "tokio";
             usesDefaultFeatures = false;
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
             features = [ "sync" ];
           }
           {
@@ -9400,7 +9399,7 @@ rec {
             name = "tokio";
             packageId = "tokio";
             usesDefaultFeatures = false;
-            target = {target, features}: (!(target."arch" == "wasm32"));
+            target = {target, features}: (!("wasm32" == target."arch"));
             features = [ "sync" "rt-multi-thread" "macros" ];
           }
         ];
@@ -9519,7 +9518,7 @@ rec {
             name = "tokio";
             packageId = "tokio";
             usesDefaultFeatures = false;
-            target = {target, features}: (!(target."arch" == "wasm32"));
+            target = {target, features}: (!("wasm32" == target."arch"));
             features = [ "sync" "rt-multi-thread" "macros" ];
           }
         ];
@@ -9556,13 +9555,13 @@ rec {
             name = "futures-util";
             packageId = "futures-util";
             usesDefaultFeatures = false;
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
             features = [ "alloc" "channel" ];
           }
           {
             name = "gloo-timers";
             packageId = "gloo-timers";
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
             features = [ "futures" ];
           }
           {
@@ -9586,14 +9585,14 @@ rec {
             name = "tokio";
             packageId = "tokio";
             usesDefaultFeatures = false;
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
             features = [ "sync" "rt" "time" ];
           }
           {
             name = "wasm-bindgen-futures";
             packageId = "wasm-bindgen-futures";
             optional = true;
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
           }
         ];
         features = {
@@ -9733,14 +9732,14 @@ rec {
             name = "tokio";
             packageId = "tokio";
             usesDefaultFeatures = false;
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
             features = [ "sync" "time" ];
           }
           {
             name = "tokio";
             packageId = "tokio";
             usesDefaultFeatures = false;
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
             features = [ "sync" ];
           }
           {
@@ -9812,7 +9811,7 @@ rec {
           {
             name = "getrandom";
             packageId = "getrandom";
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
             features = [ "js" ];
           }
           {
@@ -10451,7 +10450,7 @@ rec {
           {
             name = "libc";
             packageId = "libc";
-            target = { target, features }: (target."os" == "wasi");
+            target = { target, features }: ("wasi" == target."os");
           }
           {
             name = "libc";
@@ -10461,7 +10460,7 @@ rec {
           {
             name = "wasi";
             packageId = "wasi 0.11.0+wasi-snapshot-preview1";
-            target = { target, features }: (target."os" == "wasi");
+            target = { target, features }: ("wasi" == target."os");
           }
           {
             name = "windows-sys";
@@ -10525,52 +10524,52 @@ rec {
           {
             name = "lazy_static";
             packageId = "lazy_static";
-            target = { target, features }: ((target."os" == "macos") || (target."os" == "ios"));
+            target = { target, features }: (("macos" == target."os") || ("ios" == target."os"));
           }
           {
             name = "libc";
             packageId = "libc";
-            target = { target, features }: ((target."os" == "macos") || (target."os" == "ios"));
+            target = { target, features }: (("macos" == target."os") || ("ios" == target."os"));
           }
           {
             name = "log";
             packageId = "log";
-            target = { target, features }: (!((target."os" == "windows") || (target."os" == "macos") || (target."os" == "ios")));
+            target = { target, features }: (!(("windows" == target."os") || ("macos" == target."os") || ("ios" == target."os")));
           }
           {
             name = "openssl";
             packageId = "openssl";
-            target = { target, features }: (!((target."os" == "windows") || (target."os" == "macos") || (target."os" == "ios")));
+            target = { target, features }: (!(("windows" == target."os") || ("macos" == target."os") || ("ios" == target."os")));
           }
           {
             name = "openssl-probe";
             packageId = "openssl-probe";
-            target = { target, features }: (!((target."os" == "windows") || (target."os" == "macos") || (target."os" == "ios")));
+            target = { target, features }: (!(("windows" == target."os") || ("macos" == target."os") || ("ios" == target."os")));
           }
           {
             name = "openssl-sys";
             packageId = "openssl-sys";
-            target = { target, features }: (!((target."os" == "windows") || (target."os" == "macos") || (target."os" == "ios")));
+            target = { target, features }: (!(("windows" == target."os") || ("macos" == target."os") || ("ios" == target."os")));
           }
           {
             name = "schannel";
             packageId = "schannel";
-            target = { target, features }: (target."os" == "windows");
+            target = { target, features }: ("windows" == target."os");
           }
           {
             name = "security-framework";
             packageId = "security-framework";
-            target = { target, features }: ((target."os" == "macos") || (target."os" == "ios"));
+            target = { target, features }: (("macos" == target."os") || ("ios" == target."os"));
           }
           {
             name = "security-framework-sys";
             packageId = "security-framework-sys";
-            target = { target, features }: ((target."os" == "macos") || (target."os" == "ios"));
+            target = { target, features }: (("macos" == target."os") || ("ios" == target."os"));
           }
           {
             name = "tempfile";
             packageId = "tempfile";
-            target = { target, features }: ((target."os" == "macos") || (target."os" == "ios"));
+            target = { target, features }: (("macos" == target."os") || ("ios" == target."os"));
           }
         ];
         devDependencies = [
@@ -10622,7 +10621,7 @@ rec {
             name = "memoffset";
             packageId = "memoffset 0.7.1";
             optional = true;
-            target = { target, features }: (!(target."os" == "redox"));
+            target = { target, features }: (!("redox" == target."os"));
           }
           {
             name = "pin-utils";
@@ -10698,7 +10697,7 @@ rec {
           {
             name = "winapi";
             packageId = "winapi";
-            target = { target, features }: (target."os" == "windows");
+            target = { target, features }: ("windows" == target."os");
             features = [ "consoleapi" "errhandlingapi" "fileapi" "handleapi" "processenv" ];
           }
         ];
@@ -11086,7 +11085,7 @@ rec {
           {
             name = "hermit-abi";
             packageId = "hermit-abi";
-            target = { target, features }: (target."os" == "hermit");
+            target = { target, features }: ("hermit" == target."os");
           }
           {
             name = "libc";
@@ -11684,7 +11683,7 @@ rec {
           {
             name = "redox_syscall";
             packageId = "redox_syscall 0.3.5";
-            target = { target, features }: (target."os" == "redox");
+            target = { target, features }: ("redox" == target."os");
           }
           {
             name = "smallvec";
@@ -12387,7 +12386,7 @@ rec {
           {
             name = "libc";
             packageId = "libc";
-            target = { target, features }: ((target."unix" or false) || (target."os" == "fuchsia") || (target."os" == "vxworks"));
+            target = { target, features }: ((target."unix" or false) || ("fuchsia" == target."os") || ("vxworks" == target."os"));
           }
           {
             name = "log";
@@ -12428,7 +12427,7 @@ rec {
           {
             name = "cpufeatures";
             packageId = "cpufeatures";
-            target = { target, features }: ((target."arch" == "x86_64") || (target."arch" == "x86"));
+            target = { target, features }: (("x86_64" == target."arch") || ("x86" == target."arch"));
           }
           {
             name = "opaque-debug";
@@ -13193,7 +13192,7 @@ rec {
             packageId = "async-compression";
             optional = true;
             usesDefaultFeatures = false;
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
             features = [ "tokio" ];
           }
           {
@@ -13207,7 +13206,7 @@ rec {
           {
             name = "encoding_rs";
             packageId = "encoding_rs";
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "futures-core";
@@ -13222,7 +13221,7 @@ rec {
           {
             name = "h2";
             packageId = "h2";
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "http";
@@ -13231,62 +13230,62 @@ rec {
           {
             name = "http-body";
             packageId = "http-body";
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "hyper";
             packageId = "hyper";
             usesDefaultFeatures = false;
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
             features = [ "tcp" "http1" "http2" "client" "runtime" ];
           }
           {
             name = "hyper-tls";
             packageId = "hyper-tls";
             optional = true;
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "ipnet";
             packageId = "ipnet";
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "js-sys";
             packageId = "js-sys";
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
           }
           {
             name = "log";
             packageId = "log";
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "mime";
             packageId = "mime";
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "native-tls";
             packageId = "native-tls";
             rename = "native-tls-crate";
             optional = true;
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "once_cell";
             packageId = "once_cell";
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "percent-encoding";
             packageId = "percent-encoding";
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "pin-project-lite";
             packageId = "pin-project-lite";
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "serde";
@@ -13300,7 +13299,7 @@ rec {
           {
             name = "serde_json";
             packageId = "serde_json";
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
           }
           {
             name = "serde_urlencoded";
@@ -13310,27 +13309,27 @@ rec {
             name = "tokio";
             packageId = "tokio";
             usesDefaultFeatures = false;
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
             features = [ "net" "time" ];
           }
           {
             name = "tokio-native-tls";
             packageId = "tokio-native-tls";
             optional = true;
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "tokio-socks";
             packageId = "tokio-socks";
             optional = true;
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "tokio-util";
             packageId = "tokio-util";
             optional = true;
             usesDefaultFeatures = false;
-            target = { target, features }: (!(target."arch" == "wasm32"));
+            target = { target, features }: (!("wasm32" == target."arch"));
             features = [ "codec" "io" ];
           }
           {
@@ -13344,23 +13343,23 @@ rec {
           {
             name = "wasm-bindgen";
             packageId = "wasm-bindgen";
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
           }
           {
             name = "wasm-bindgen-futures";
             packageId = "wasm-bindgen-futures";
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
           }
           {
             name = "wasm-streams";
             packageId = "wasm-streams";
             optional = true;
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
           }
           {
             name = "web-sys";
             packageId = "web-sys";
-            target = { target, features }: (target."arch" == "wasm32");
+            target = { target, features }: ("wasm32" == target."arch");
             features = [ "AbortController" "AbortSignal" "Headers" "Request" "RequestInit" "RequestMode" "Response" "Window" "FormData" "Blob" "BlobPropertyBag" "ServiceWorkerGlobalScope" "RequestCredentials" "File" "ReadableStream" ];
           }
           {
@@ -13374,26 +13373,26 @@ rec {
             name = "hyper";
             packageId = "hyper";
             usesDefaultFeatures = false;
-            target = {target, features}: (!(target."arch" == "wasm32"));
+            target = {target, features}: (!("wasm32" == target."arch"));
             features = [ "tcp" "stream" "http1" "http2" "client" "server" "runtime" ];
           }
           {
             name = "serde";
             packageId = "serde";
-            target = {target, features}: (!(target."arch" == "wasm32"));
+            target = {target, features}: (!("wasm32" == target."arch"));
             features = [ "derive" ];
           }
           {
             name = "tokio";
             packageId = "tokio";
             usesDefaultFeatures = false;
-            target = {target, features}: (!(target."arch" == "wasm32"));
+            target = {target, features}: (!("wasm32" == target."arch"));
             features = [ "macros" "rt-multi-thread" ];
           }
           {
             name = "wasm-bindgen";
             packageId = "wasm-bindgen";
-            target = {target, features}: (target."arch" == "wasm32");
+            target = {target, features}: ("wasm32" == target."arch");
             features = [ "serde-serialize" ];
           }
         ];
@@ -13781,7 +13780,7 @@ rec {
             name = "js-sys";
             packageId = "js-sys";
             optional = true;
-            target = { target, features }: ((target."arch" == "wasm32") && (target."os" == "unknown"));
+            target = { target, features }: (("wasm32" == target."arch") && ("unknown" == target."os"));
           }
           {
             name = "js_int";
@@ -14186,14 +14185,14 @@ rec {
             rename = "libc_errno";
             optional = true;
             usesDefaultFeatures = false;
-            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && (target."os" == "linux") && ((target."arch" == "x86") || ((target."arch" == "x86_64") && (target."pointer_width" == "64")) || ((target."endian" == "little") && ((target."arch" == "arm") || ((target."arch" == "aarch64") && (target."pointer_width" == "64")) || (target."arch" == "powerpc64") || (target."arch" == "riscv64") || (target."arch" == "mips") || (target."arch" == "mips64")))));
+            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && ("linux" == target."os") && (("x86" == target."arch") || (("x86_64" == target."arch") && ("64" == target."pointer_width")) || (("little" == target."endian") && (("arm" == target."arch") || (("aarch64" == target."arch") && ("64" == target."pointer_width")) || ("powerpc64" == target."arch") || ("riscv64" == target."arch") || ("mips" == target."arch") || ("mips64" == target."arch")))));
           }
           {
             name = "errno";
             packageId = "errno";
             rename = "libc_errno";
             usesDefaultFeatures = false;
-            target = { target, features }: ((!(target."windows" or false)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!((target."os" == "linux") && ((target."arch" == "x86") || ((target."arch" == "x86_64") && (target."pointer_width" == "64")) || ((target."endian" == "little") && ((target."arch" == "arm") || ((target."arch" == "aarch64") && (target."pointer_width" == "64")) || (target."arch" == "powerpc64") || (target."arch" == "riscv64") || (target."arch" == "mips") || (target."arch" == "mips64"))))))));
+            target = { target, features }: ((!(target."windows" or false)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!(("linux" == target."os") && (("x86" == target."arch") || (("x86_64" == target."arch") && ("64" == target."pointer_width")) || (("little" == target."endian") && (("arm" == target."arch") || (("aarch64" == target."arch") && ("64" == target."pointer_width")) || ("powerpc64" == target."arch") || ("riscv64" == target."arch") || ("mips" == target."arch") || ("mips64" == target."arch"))))))));
           }
           {
             name = "errno";
@@ -14213,27 +14212,27 @@ rec {
             name = "libc";
             packageId = "libc";
             optional = true;
-            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && (target."os" == "linux") && ((target."arch" == "x86") || ((target."arch" == "x86_64") && (target."pointer_width" == "64")) || ((target."endian" == "little") && ((target."arch" == "arm") || ((target."arch" == "aarch64") && (target."pointer_width" == "64")) || (target."arch" == "powerpc64") || (target."arch" == "riscv64") || (target."arch" == "mips") || (target."arch" == "mips64")))));
+            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && ("linux" == target."os") && (("x86" == target."arch") || (("x86_64" == target."arch") && ("64" == target."pointer_width")) || (("little" == target."endian") && (("arm" == target."arch") || (("aarch64" == target."arch") && ("64" == target."pointer_width")) || ("powerpc64" == target."arch") || ("riscv64" == target."arch") || ("mips" == target."arch") || ("mips64" == target."arch")))));
             features = [ "extra_traits" ];
           }
           {
             name = "libc";
             packageId = "libc";
-            target = { target, features }: ((!(target."windows" or false)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!((target."os" == "linux") && ((target."arch" == "x86") || ((target."arch" == "x86_64") && (target."pointer_width" == "64")) || ((target."endian" == "little") && ((target."arch" == "arm") || ((target."arch" == "aarch64") && (target."pointer_width" == "64")) || (target."arch" == "powerpc64") || (target."arch" == "riscv64") || (target."arch" == "mips") || (target."arch" == "mips64"))))))));
+            target = { target, features }: ((!(target."windows" or false)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!(("linux" == target."os") && (("x86" == target."arch") || (("x86_64" == target."arch") && ("64" == target."pointer_width")) || (("little" == target."endian") && (("arm" == target."arch") || (("aarch64" == target."arch") && ("64" == target."pointer_width")) || ("powerpc64" == target."arch") || ("riscv64" == target."arch") || ("mips" == target."arch") || ("mips64" == target."arch"))))))));
             features = [ "extra_traits" ];
           }
           {
             name = "linux-raw-sys";
             packageId = "linux-raw-sys 0.3.8";
             usesDefaultFeatures = false;
-            target = { target, features }: (((target."os" == "android") || (target."os" == "linux")) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!((target."os" == "linux") && ((target."arch" == "x86") || ((target."arch" == "x86_64") && (target."pointer_width" == "64")) || ((target."endian" == "little") && ((target."arch" == "arm") || ((target."arch" == "aarch64") && (target."pointer_width" == "64")) || (target."arch" == "powerpc64") || (target."arch" == "riscv64") || (target."arch" == "mips") || (target."arch" == "mips64"))))))));
+            target = { target, features }: ((("android" == target."os") || ("linux" == target."os")) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!(("linux" == target."os") && (("x86" == target."arch") || (("x86_64" == target."arch") && ("64" == target."pointer_width")) || (("little" == target."endian") && (("arm" == target."arch") || (("aarch64" == target."arch") && ("64" == target."pointer_width")) || ("powerpc64" == target."arch") || ("riscv64" == target."arch") || ("mips" == target."arch") || ("mips64" == target."arch"))))))));
             features = [ "general" "ioctl" "no_std" ];
           }
           {
             name = "linux-raw-sys";
             packageId = "linux-raw-sys 0.3.8";
             usesDefaultFeatures = false;
-            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && (target."os" == "linux") && ((target."arch" == "x86") || ((target."arch" == "x86_64") && (target."pointer_width" == "64")) || ((target."endian" == "little") && ((target."arch" == "arm") || ((target."arch" == "aarch64") && (target."pointer_width" == "64")) || (target."arch" == "powerpc64") || (target."arch" == "riscv64") || (target."arch" == "mips") || (target."arch" == "mips64")))));
+            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && ("linux" == target."os") && (("x86" == target."arch") || (("x86_64" == target."arch") && ("64" == target."pointer_width")) || (("little" == target."endian") && (("arm" == target."arch") || (("aarch64" == target."arch") && ("64" == target."pointer_width")) || ("powerpc64" == target."arch") || ("riscv64" == target."arch") || ("mips" == target."arch") || ("mips64" == target."arch")))));
             features = [ "general" "errno" "ioctl" "no_std" ];
           }
           {
@@ -14247,6 +14246,7 @@ rec {
           {
             name = "errno";
             packageId = "errno";
+            rename = "libc_errno";
             usesDefaultFeatures = false;
           }
           {
@@ -14308,14 +14308,14 @@ rec {
             rename = "libc_errno";
             optional = true;
             usesDefaultFeatures = false;
-            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && (target."os" == "linux") && (target."endian" == "little") && ((target."arch" == "arm") || ((target."arch" == "aarch64") && (target."pointer_width" == "64")) || (target."arch" == "riscv64") || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "powerpc64")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips32r6")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips64")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips64r6")) || (target."arch" == "x86") || ((target."arch" == "x86_64") && (target."pointer_width" == "64"))));
+            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && ("linux" == target."os") && ("little" == target."endian") && (("arm" == target."arch") || (("aarch64" == target."arch") && ("64" == target."pointer_width")) || ("riscv64" == target."arch") || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch")) || ("x86" == target."arch") || (("x86_64" == target."arch") && ("64" == target."pointer_width"))));
           }
           {
             name = "errno";
             packageId = "errno";
             rename = "libc_errno";
             usesDefaultFeatures = false;
-            target = { target, features }: ((!(target."windows" or false)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!((target."os" == "linux") && (target."endian" == "little") && ((target."arch" == "arm") || ((target."arch" == "aarch64") && (target."pointer_width" == "64")) || (target."arch" == "riscv64") || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "powerpc64")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips32r6")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips64")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips64r6")) || (target."arch" == "x86") || ((target."arch" == "x86_64") && (target."pointer_width" == "64")))))));
+            target = { target, features }: ((!(target."windows" or false)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!(("linux" == target."os") && ("little" == target."endian") && (("arm" == target."arch") || (("aarch64" == target."arch") && ("64" == target."pointer_width")) || ("riscv64" == target."arch") || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch")) || ("x86" == target."arch") || (("x86_64" == target."arch") && ("64" == target."pointer_width")))))));
           }
           {
             name = "errno";
@@ -14328,27 +14328,27 @@ rec {
             name = "libc";
             packageId = "libc";
             optional = true;
-            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && (target."os" == "linux") && (target."endian" == "little") && ((target."arch" == "arm") || ((target."arch" == "aarch64") && (target."pointer_width" == "64")) || (target."arch" == "riscv64") || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "powerpc64")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips32r6")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips64")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips64r6")) || (target."arch" == "x86") || ((target."arch" == "x86_64") && (target."pointer_width" == "64"))));
+            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && ("linux" == target."os") && ("little" == target."endian") && (("arm" == target."arch") || (("aarch64" == target."arch") && ("64" == target."pointer_width")) || ("riscv64" == target."arch") || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch")) || ("x86" == target."arch") || (("x86_64" == target."arch") && ("64" == target."pointer_width"))));
             features = [ "extra_traits" ];
           }
           {
             name = "libc";
             packageId = "libc";
-            target = { target, features }: ((!(target."windows" or false)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!((target."os" == "linux") && (target."endian" == "little") && ((target."arch" == "arm") || ((target."arch" == "aarch64") && (target."pointer_width" == "64")) || (target."arch" == "riscv64") || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "powerpc64")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips32r6")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips64")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips64r6")) || (target."arch" == "x86") || ((target."arch" == "x86_64") && (target."pointer_width" == "64")))))));
+            target = { target, features }: ((!(target."windows" or false)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!(("linux" == target."os") && ("little" == target."endian") && (("arm" == target."arch") || (("aarch64" == target."arch") && ("64" == target."pointer_width")) || ("riscv64" == target."arch") || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch")) || ("x86" == target."arch") || (("x86_64" == target."arch") && ("64" == target."pointer_width")))))));
             features = [ "extra_traits" ];
           }
           {
             name = "linux-raw-sys";
             packageId = "linux-raw-sys 0.4.5";
             usesDefaultFeatures = false;
-            target = { target, features }: (((target."os" == "android") || (target."os" == "linux")) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!((target."os" == "linux") && (target."endian" == "little") && ((target."arch" == "arm") || ((target."arch" == "aarch64") && (target."pointer_width" == "64")) || (target."arch" == "riscv64") || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "powerpc64")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips32r6")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips64")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips64r6")) || (target."arch" == "x86") || ((target."arch" == "x86_64") && (target."pointer_width" == "64")))))));
+            target = { target, features }: ((("android" == target."os") || ("linux" == target."os")) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!(("linux" == target."os") && ("little" == target."endian") && (("arm" == target."arch") || (("aarch64" == target."arch") && ("64" == target."pointer_width")) || ("riscv64" == target."arch") || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch")) || ("x86" == target."arch") || (("x86_64" == target."arch") && ("64" == target."pointer_width")))))));
             features = [ "general" "ioctl" "no_std" ];
           }
           {
             name = "linux-raw-sys";
             packageId = "linux-raw-sys 0.4.5";
             usesDefaultFeatures = false;
-            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && (target."os" == "linux") && (target."endian" == "little") && ((target."arch" == "arm") || ((target."arch" == "aarch64") && (target."pointer_width" == "64")) || (target."arch" == "riscv64") || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "powerpc64")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips32r6")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips64")) || ((target."rustix_use_experimental_asm" or false) && (target."arch" == "mips64r6")) || (target."arch" == "x86") || ((target."arch" == "x86_64") && (target."pointer_width" == "64"))));
+            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && ("linux" == target."os") && ("little" == target."endian") && (("arm" == target."arch") || (("aarch64" == target."arch") && ("64" == target."pointer_width")) || ("riscv64" == target."arch") || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch")) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch")) || ("x86" == target."arch") || (("x86_64" == target."arch") && ("64" == target."pointer_width"))));
             features = [ "general" "errno" "ioctl" "no_std" ];
           }
           {
@@ -14362,6 +14362,7 @@ rec {
           {
             name = "errno";
             packageId = "errno";
+            rename = "libc_errno";
             usesDefaultFeatures = false;
           }
           {
@@ -14631,17 +14632,17 @@ rec {
           {
             name = "proc-macro2";
             packageId = "proc-macro2";
-            target = { target, features }: (!((target."arch" == "x86_64") && (target."os" == "linux") && (target."env" == "gnu")));
+            target = { target, features }: (!(("x86_64" == target."arch") && ("linux" == target."os") && ("gnu" == target."env")));
           }
           {
             name = "quote";
             packageId = "quote";
-            target = { target, features }: (!((target."arch" == "x86_64") && (target."os" == "linux") && (target."env" == "gnu")));
+            target = { target, features }: (!(("x86_64" == target."arch") && ("linux" == target."os") && ("gnu" == target."env")));
           }
           {
             name = "syn";
             packageId = "syn 2.0.28";
-            target = { target, features }: (!((target."arch" == "x86_64") && (target."os" == "linux") && (target."env" == "gnu")));
+            target = { target, features }: (!(("x86_64" == target."arch") && ("linux" == target."os") && ("gnu" == target."env")));
           }
         ];
         features = {
@@ -14815,7 +14816,7 @@ rec {
           {
             name = "cpufeatures";
             packageId = "cpufeatures";
-            target = { target, features }: ((target."arch" == "aarch64") || (target."arch" == "x86") || (target."arch" == "x86_64"));
+            target = { target, features }: (("aarch64" == target."arch") || ("x86" == target."arch") || ("x86_64" == target."arch"));
           }
           {
             name = "digest";
@@ -14854,7 +14855,7 @@ rec {
           {
             name = "cpufeatures";
             packageId = "cpufeatures";
-            target = { target, features }: ((target."arch" == "aarch64") || (target."arch" == "x86_64") || (target."arch" == "x86"));
+            target = { target, features }: (("aarch64" == target."arch") || ("x86_64" == target."arch") || ("x86" == target."arch"));
           }
           {
             name = "digest";
@@ -15612,12 +15613,12 @@ rec {
           {
             name = "redox_syscall";
             packageId = "redox_syscall 0.3.5";
-            target = { target, features }: (target."os" == "redox");
+            target = { target, features }: ("redox" == target."os");
           }
           {
             name = "rustix";
             packageId = "rustix 0.38.8";
-            target = { target, features }: ((target."unix" or false) || (target."os" == "wasi"));
+            target = { target, features }: ((target."unix" or false) || ("wasi" == target."os"));
             features = [ "fs" ];
           }
           {
@@ -15763,7 +15764,7 @@ rec {
           {
             name = "wasi";
             packageId = "wasi 0.10.0+wasi-snapshot-preview1";
-            target = { target, features }: (target."os" == "wasi");
+            target = { target, features }: ("wasi" == target."os");
           }
           {
             name = "winapi";
@@ -15870,7 +15871,7 @@ rec {
             name = "socket2";
             packageId = "socket2 0.5.3";
             optional = true;
-            target = { target, features }: (!(target."family" == "wasm"));
+            target = { target, features }: (!(builtins.elem "wasm" target."family"));
             features = [ "all" ];
           }
           {
@@ -15902,7 +15903,7 @@ rec {
           {
             name = "socket2";
             packageId = "socket2 0.5.3";
-            target = {target, features}: (!(target."family" == "wasm"));
+            target = {target, features}: (!(builtins.elem "wasm" target."family"));
           }
           {
             name = "windows-sys";
@@ -16884,7 +16885,8 @@ rec {
           {
             name = "wasm-bindgen";
             packageId = "wasm-bindgen";
-            target = {target, features}: (target."target" == "wasm32-unknown-unknown");
+            rename = "wasm-bindgen";
+            target = {target, features}: ("wasm32-unknown-unknown" == target."target");
           }
         ];
         features = {
@@ -17879,12 +17881,12 @@ rec {
           {
             name = "winapi-i686-pc-windows-gnu";
             packageId = "winapi-i686-pc-windows-gnu";
-            target = { target, features }: (stdenv.hostPlatform.config == "i686-pc-windows-gnu");
+            target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "i686-pc-windows-gnu");
           }
           {
             name = "winapi-x86_64-pc-windows-gnu";
             packageId = "winapi-x86_64-pc-windows-gnu";
-            target = { target, features }: (stdenv.hostPlatform.config == "x86_64-pc-windows-gnu");
+            target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "x86_64-pc-windows-gnu");
           }
         ];
         features = {
@@ -18880,37 +18882,37 @@ rec {
           {
             name = "windows_aarch64_gnullvm";
             packageId = "windows_aarch64_gnullvm";
-            target = { target, features }: (stdenv.hostPlatform.config == "aarch64-pc-windows-gnullvm");
+            target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "aarch64-pc-windows-gnullvm");
           }
           {
             name = "windows_aarch64_msvc";
             packageId = "windows_aarch64_msvc";
-            target = { target, features }: ((target."arch" == "aarch64") && (target."env" == "msvc") && (!(target."windows_raw_dylib" or false)));
+            target = { target, features }: (("aarch64" == target."arch") && ("msvc" == target."env") && (!(target."windows_raw_dylib" or false)));
           }
           {
             name = "windows_i686_gnu";
             packageId = "windows_i686_gnu";
-            target = { target, features }: ((target."arch" == "x86") && (target."env" == "gnu") && (!(target."windows_raw_dylib" or false)));
+            target = { target, features }: (("x86" == target."arch") && ("gnu" == target."env") && (!(target."windows_raw_dylib" or false)));
           }
           {
             name = "windows_i686_msvc";
             packageId = "windows_i686_msvc";
-            target = { target, features }: ((target."arch" == "x86") && (target."env" == "msvc") && (!(target."windows_raw_dylib" or false)));
+            target = { target, features }: (("x86" == target."arch") && ("msvc" == target."env") && (!(target."windows_raw_dylib" or false)));
           }
           {
             name = "windows_x86_64_gnu";
             packageId = "windows_x86_64_gnu";
-            target = { target, features }: ((target."arch" == "x86_64") && (target."env" == "gnu") && (!(target."abi" == "llvm")) && (!(target."windows_raw_dylib" or false)));
+            target = { target, features }: (("x86_64" == target."arch") && ("gnu" == target."env") && (!("llvm" == target."abi")) && (!(target."windows_raw_dylib" or false)));
           }
           {
             name = "windows_x86_64_gnullvm";
             packageId = "windows_x86_64_gnullvm";
-            target = { target, features }: (stdenv.hostPlatform.config == "x86_64-pc-windows-gnullvm");
+            target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "x86_64-pc-windows-gnullvm");
           }
           {
             name = "windows_x86_64_msvc";
             packageId = "windows_x86_64_msvc";
-            target = { target, features }: ((target."arch" == "x86_64") && (target."env" == "msvc") && (!(target."windows_raw_dylib" or false)));
+            target = { target, features }: (("x86_64" == target."arch") && ("msvc" == target."env") && (!(target."windows_raw_dylib" or false)));
           }
         ];
 
@@ -19188,7 +19190,7 @@ rec {
           {
             name = "async-process";
             packageId = "async-process";
-            target = { target, features }: (target."os" == "macos");
+            target = { target, features }: ("macos" == target."os");
           }
           {
             name = "async-recursion";
@@ -19605,26 +19607,25 @@ rec {
   /* Target (platform) data for conditional dependencies.
     This corresponds roughly to what buildRustCrate is setting.
   */
-  defaultTarget = {
-    unix = true;
-    windows = false;
+  makeDefaultTarget = platform: {
+    unix = platform.isUnix;
+    windows = platform.isWindows;
     fuchsia = true;
     test = false;
 
-    # This doesn't appear to be officially documented anywhere yet.
-    # See https://github.com/rust-lang-nursery/rust-forge/issues/101.
-    os =
-      if stdenv.hostPlatform.isDarwin
-      then "macos"
-      else stdenv.hostPlatform.parsed.kernel.name;
-    arch = stdenv.hostPlatform.parsed.cpu.name;
-    family = "unix";
+    /* We are choosing an arbitrary rust version to grab `lib` from,
+      which is unfortunate, but `lib` has been version-agnostic the
+      whole time so this is good enough for now.
+    */
+    os = pkgs.rust.lib.toTargetOs platform;
+    arch = pkgs.rust.lib.toTargetArch platform;
+    family = pkgs.rust.lib.toTargetFamily platform;
     env = "gnu";
     endian =
-      if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian"
+      if platform.parsed.cpu.significantByte.name == "littleEndian"
       then "little" else "big";
-    pointer_width = toString stdenv.hostPlatform.parsed.cpu.bits;
-    vendor = stdenv.hostPlatform.parsed.vendor.name;
+    pointer_width = toString platform.parsed.cpu.bits;
+    vendor = platform.parsed.vendor.name;
     debug_assertions = false;
   };
 
@@ -19827,12 +19828,12 @@ rec {
     , crateConfigs ? crates
     , buildRustCrateForPkgsFunc
     , runTests
-    , target ? defaultTarget
+    , makeTarget ? makeDefaultTarget
     } @ args:
       assert (builtins.isAttrs crateConfigs);
       assert (builtins.isString packageId);
       assert (builtins.isList features);
-      assert (builtins.isAttrs target);
+      assert (builtins.isAttrs (makeTarget stdenv.hostPlatform));
       assert (builtins.isBool runTests);
       let
         rootPackageId = packageId;
@@ -19840,7 +19841,7 @@ rec {
           (
             args // {
               inherit rootPackageId;
-              target = target // { test = runTests; };
+              target = makeTarget stdenv.hostPlatform // { test = runTests; };
             }
           );
         # Memoize built packages so that reappearing packages are only built once.
@@ -19849,6 +19850,7 @@ rec {
           let
             self = {
               crates = lib.mapAttrs (packageId: value: buildByPackageIdForPkgsImpl self pkgs packageId) crateConfigs;
+              target = makeTarget pkgs.stdenv.hostPlatform;
               build = mkBuiltByPackageIdByPkgs pkgs.buildPackages;
             };
           in
@@ -19865,7 +19867,8 @@ rec {
                 (crateConfig'.devDependencies or [ ]);
             dependencies =
               dependencyDerivations {
-                inherit features target;
+                inherit features;
+                inherit (self) target;
                 buildByPackageId = depPackageId:
                   # proc_macro crates must be compiled for the build architecture
                   if crateConfigs.${depPackageId}.procMacro or false
@@ -19877,24 +19880,26 @@ rec {
               };
             buildDependencies =
               dependencyDerivations {
-                inherit features target;
+                inherit features;
+                inherit (self.build) target;
                 buildByPackageId = depPackageId:
                   self.build.crates.${depPackageId};
                 dependencies = crateConfig.buildDependencies or [ ];
               };
-            filterEnabledDependenciesForThis = dependencies: filterEnabledDependencies {
-              inherit dependencies features target;
-            };
             dependenciesWithRenames =
-              lib.filter (d: d ? "rename")
-                (
-                  filterEnabledDependenciesForThis
-                    (
-                      (crateConfig.buildDependencies or [ ])
-                      ++ (crateConfig.dependencies or [ ])
-                      ++ devDependencies
-                    )
-                );
+              let
+                buildDeps = filterEnabledDependencies {
+                  inherit features;
+                  inherit (self) target;
+                  dependencies = crateConfig.dependencies or [ ] ++ devDependencies;
+                };
+                hostDeps = filterEnabledDependencies {
+                  inherit features;
+                  inherit (self.build) target;
+                  dependencies = crateConfig.buildDependencies or [ ];
+                };
+              in
+              lib.filter (d: d ? "rename") (hostDeps ++ buildDeps);
             # Crate renames have the form:
             #
             # {
@@ -19969,7 +19974,7 @@ rec {
     else val;
 
   /* Returns various tools to debug a crate. */
-  debugCrate = { packageId, target ? defaultTarget }:
+  debugCrate = { packageId, target ? makeDefaultTarget stdenv.hostPlatform }:
     assert (builtins.isString packageId);
     let
       debug = rec {
@@ -20145,15 +20150,14 @@ rec {
       dependencies;
 
   /* Returns whether the given feature should enable the given dependency. */
-  doesFeatureEnableDependency = { name, rename ? null, ... }: feature:
+  doesFeatureEnableDependency = dependency: feature:
     let
+      name = dependency.rename or dependency.name;
       prefix = "${name}/";
       len = builtins.stringLength prefix;
       startsWithPrefix = builtins.substring 0 len feature == prefix;
     in
-    (rename == null && feature == name)
-    || (rename != null && rename == feature)
-    || startsWithPrefix;
+    feature == name || feature == "dep:" + name || startsWithPrefix;
 
   /* Returns the expanded features for the given inputFeatures by applying the
     rules in featureMap.
@@ -20188,7 +20192,9 @@ rec {
             let
               enabled = builtins.any (doesFeatureEnableDependency dependency) features;
             in
-            if (dependency.optional or false) && enabled then [ dependency.name ] else [ ]
+            if (dependency.optional or false) && enabled
+            then [ (dependency.rename or dependency.name) ]
+            else [ ]
         )
         dependencies;
     in
@@ -20210,11 +20216,21 @@ rec {
       explicitFeatures = dependency.features or [ ];
       additionalDependencyFeatures =
         let
-          dependencyPrefix = (dependency.rename or dependency.name) + "/";
-          dependencyFeatures =
-            builtins.filter (f: lib.hasPrefix dependencyPrefix f) features;
+          name = dependency.rename or dependency.name;
+          stripPrefixMatch = prefix: s:
+            if lib.hasPrefix prefix s
+            then lib.removePrefix prefix s
+            else null;
+          extractFeature = feature: lib.findFirst
+            (f: f != null)
+            null
+            (map (prefix: stripPrefixMatch prefix feature) [
+              (name + "/")
+              (name + "?/")
+            ]);
+          dependencyFeatures = lib.filter (f: f != null) (map extractFeature features);
         in
-        builtins.map (lib.removePrefix dependencyPrefix) dependencyFeatures;
+        dependencyFeatures;
     in
     defaultOrNil ++ explicitFeatures ++ additionalDependencyFeatures;
 
diff --git a/pkgs/additional/fractal-nixified/default.nix b/pkgs/additional/fractal-nixified/default.nix
index 89497698e..449aa6403 100644
--- a/pkgs/additional/fractal-nixified/default.nix
+++ b/pkgs/additional/fractal-nixified/default.nix
@@ -15,6 +15,25 @@ let
   cargoNix = import ./Cargo.nix {
     inherit pkgs;
     release = false;
+    defaultCrateOverrides = pkgs.defaultCrateOverrides // {
+      fractal = attrs: attrs // {
+        src = pkgs.fetchFromGitLab {
+          domain = "gitlab.gnome.org";
+          owner = "GNOME";
+          repo = "fractal";
+          rev = "350a65cb0a221c70fc3e4746898036a345ab9ed8";
+          hash = "sha256-z6uURqMG5pT8rXZCv5IzTjXxtt/f4KUeCDSgk90aWdo=";
+        };
+      };
+    };
+    # defaultCrateOverrides = pkgs.defaultCrateOverrides // {
+    #   js_int = attrs: attrs // {
+    #     features = attrs.features ++ [ "serde" ];
+    #   };
+    #   serde = attrs: attrs // {
+    #     features = attrs.features ++ [ "derive" "serde_derive" ];
+    #   };
+    # };
   };
 in
   cargoNix.workspaceMembers.fractal.build