diff --git a/Cargo.lock b/Cargo.lock
index a252307..7660b96 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -120,12 +120,6 @@ version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
 [[package]]
 name = "async-channel"
 version = "2.1.1"
@@ -203,15 +197,6 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "bare-metal"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3"
-dependencies = [
- "rustc_version 0.2.3",
-]
-
 [[package]]
 name = "base64"
 version = "0.9.3"
@@ -255,12 +240,6 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
 
-[[package]]
-name = "bitfield"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719"
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -549,38 +528,6 @@ version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
-[[package]]
-name = "cortex-m"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ec610d8f49840a5b376c69663b6369e71f4b34484b9b2eb29fb918d92516cb9"
-dependencies = [
- "bare-metal",
- "bitfield",
- "embedded-hal",
- "volatile-register",
-]
-
-[[package]]
-name = "cortex-m-rt"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee84e813d593101b1723e13ec38b6ab6abbdbaaa4546553f5395ed274079ddb1"
-dependencies = [
- "cortex-m-rt-macros",
-]
-
-[[package]]
-name = "cortex-m-rt-macros"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f6f3e36f203cfedbc78b357fb28730aa2c6dc1ab060ee5c2405e843988d3c7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.11"
@@ -599,15 +546,6 @@ dependencies = [
  "crc-catalog",
 ]
 
-[[package]]
-name = "crc-any"
-version = "2.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "774646b687f63643eb0f4bf13dc263cb581c8c9e57973b6ddf78bda3994d88df"
-dependencies = [
- "debug-helper",
-]
-
 [[package]]
 name = "crc-catalog"
 version = "2.4.0"
@@ -623,12 +561,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "critical-section"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
-
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.4"
@@ -699,7 +631,7 @@ dependencies = [
 
 [[package]]
 name = "dashboard"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "cairo-rs",
  "chrono",
@@ -730,12 +662,6 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
-[[package]]
-name = "debug-helper"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e"
-
 [[package]]
 name = "deflate"
 version = "0.8.6"
@@ -828,25 +754,6 @@ dependencies = [
  "serde 1.0.193",
 ]
 
-[[package]]
-name = "embedded-dma"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "994f7e5b5cb23521c22304927195f236813053eb9c065dd2226a32ba64695446"
-dependencies = [
- "stable_deref_trait",
-]
-
-[[package]]
-name = "embedded-hal"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35949884794ad573cf46071e41c9b60efb0cb311e3ca01f7af807af1debc66ff"
-dependencies = [
- "nb 0.1.3",
- "void",
-]
-
 [[package]]
 name = "emseries"
 version = "0.6.0"
@@ -976,7 +883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
 dependencies = [
  "memoffset",
- "rustc_version 0.4.0",
+ "rustc_version",
 ]
 
 [[package]]
@@ -1139,45 +1046,6 @@ dependencies = [
  "percent-encoding 2.3.1",
 ]
 
-[[package]]
-name = "frunk"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a351b59e12f97b4176ee78497dff72e4276fb1ceb13e19056aca7fa0206287"
-dependencies = [
- "frunk_core",
- "frunk_derives",
-]
-
-[[package]]
-name = "frunk_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af2469fab0bd07e64ccf0ad57a1438f63160c69b2e57f04a439653d68eb558d6"
-
-[[package]]
-name = "frunk_derives"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e"
-dependencies = [
- "frunk_proc_macro_helpers",
- "quote",
- "syn 2.0.41",
-]
-
-[[package]]
-name = "frunk_proc_macro_helpers"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35b54add839292b743aeda6ebedbd8b11e93404f902c56223e51b9ec18a13d2c"
-dependencies = [
- "frunk_core",
- "proc-macro2",
- "quote",
- "syn 2.0.41",
-]
-
 [[package]]
 name = "ft-core"
 version = "0.1.0"
@@ -1196,15 +1064,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 
-[[package]]
-name = "fugit"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17186ad64927d5ac8f02c1e77ccefa08ccd9eaa314d5a4772278aa204a22f7e7"
-dependencies = [
- "gcd",
-]
-
 [[package]]
 name = "futures"
 version = "0.3.29"
@@ -1305,12 +1164,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "gcd"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a"
-
 [[package]]
 name = "gdk-pixbuf"
 version = "0.18.3"
@@ -2076,15 +1929,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.12.0"
@@ -2445,21 +2289,6 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "nb"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f"
-dependencies = [
- "nb 1.1.0",
-]
-
-[[package]]
-name = "nb"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d"
-
 [[package]]
 name = "nix"
 version = "0.27.1"
@@ -2575,26 +2404,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
-dependencies = [
- "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "object"
 version = "0.32.1"
@@ -2679,12 +2488,6 @@ dependencies = [
  "system-deps",
 ]
 
-[[package]]
-name = "panic-halt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de96540e0ebde571dc55c73d60ef407c653844e6f9a1e2fdbd40c07b9252d812"
-
 [[package]]
 name = "parking"
 version = "2.2.0"
@@ -2827,18 +2630,6 @@ dependencies = [
  "siphasher 0.3.11",
 ]
 
-[[package]]
-name = "pico-blink"
-version = "0.1.0"
-dependencies = [
- "cortex-m",
- "cortex-m-rt",
- "embedded-hal",
- "fugit",
- "panic-halt",
- "rp-pico",
-]
-
 [[package]]
 name = "pin-project"
 version = "1.1.3"
@@ -2871,17 +2662,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "pio"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76e09694b50f89f302ed531c1f2a7569f0be5867aee4ab4f8f729bbeec0078e3"
-dependencies = [
- "arrayvec",
- "num_enum",
- "paste",
-]
-
 [[package]]
 name = "pkcs1"
 version = "0.7.5"
@@ -3351,76 +3131,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "rp-pico"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6341771e6f8e5d130b2b3cbc23435b7847761adf198af09f4b2a60407d43bd56"
-dependencies = [
- "cortex-m-rt",
- "fugit",
- "rp2040-boot2",
- "rp2040-hal",
- "usb-device",
-]
-
-[[package]]
-name = "rp2040-boot2"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c92f344f63f950ee36cf4080050e4dce850839b9175da38f9d2ffb69b4dbb21"
-dependencies = [
- "crc-any",
-]
-
-[[package]]
-name = "rp2040-hal"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f21deadb5f29f05be9e665049c9c6d6385c6ed3437574c995658a041f71453"
-dependencies = [
- "cortex-m",
- "critical-section",
- "embedded-dma",
- "embedded-hal",
- "frunk",
- "fugit",
- "itertools 0.10.5",
- "nb 1.1.0",
- "paste",
- "pio",
- "rand_core 0.6.4",
- "rp2040-hal-macros",
- "rp2040-pac",
- "usb-device",
- "vcell",
- "void",
-]
-
-[[package]]
-name = "rp2040-hal-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86479063e497efe1ae81995ef9071f54fd1c7427e04d6c5b84cde545ff672a5e"
-dependencies = [
- "cortex-m-rt",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "rp2040-pac"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12d9d8375815f543f54835d01160d4e47f9e2cae75f17ff8f1ec19ce1da96e4c"
-dependencies = [
- "cortex-m",
- "cortex-m-rt",
- "critical-section",
- "vcell",
-]
-
 [[package]]
 name = "rsa"
 version = "0.9.6"
@@ -3453,22 +3163,13 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.20",
+ "semver",
 ]
 
 [[package]]
@@ -3590,27 +3291,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6"
 
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
 
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
 [[package]]
 name = "serde"
 version = "0.9.15"
@@ -3796,7 +3482,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c"
 dependencies = [
- "itertools 0.12.0",
+ "itertools",
  "nom",
  "unicode_categories",
 ]
@@ -3997,12 +3683,6 @@ dependencies = [
  "urlencoding",
 ]
 
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
 [[package]]
 name = "stringprep"
 version = "0.1.4"
@@ -4593,12 +4273,6 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
-[[package]]
-name = "usb-device"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f6cc3adc849b5292b4075fc0d5fdcf2f24866e88e336dd27a8943090a520508"
-
 [[package]]
 name = "utf-8"
 version = "0.7.6"
@@ -4640,12 +4314,6 @@ dependencies = [
  "getrandom",
 ]
 
-[[package]]
-name = "vcell"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002"
-
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -4682,21 +4350,6 @@ dependencies = [
  "warp",
 ]
 
-[[package]]
-name = "void"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-
-[[package]]
-name = "volatile-register"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de437e2a6208b014ab52972a27e59b33fa2920d3e00fe05026167a1c509d19cc"
-dependencies = [
- "vcell",
-]
-
 [[package]]
 name = "wait-timeout"
 version = "0.2.0"
diff --git a/Cargo.nix b/Cargo.nix
index e19c9ae..8df1559 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -1,9 +1,5 @@
 
-<<<<<<< HEAD
 # This file was @generated by crate2nix 0.11.0 with the command:
-=======
-# This file was @generated by crate2nix 0.11.1 with the command:
->>>>>>> 4366a49 (Start nixifying applications)
 #   "generate"
 # See https://github.com/kolloch/crate2nix for more info.
 
@@ -39,7 +35,6 @@ rec {
   # You can override the features with
   # workspaceMembers."${crateName}".build.override { features = [ "default" "feature1" ... ]; }.
   workspaceMembers = {
-<<<<<<< HEAD
     "authdb" = rec {
       packageId = "authdb";
       build = internal.buildRustCrateWithFeatures {
@@ -50,8 +45,6 @@ rec {
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
     "changeset" = rec {
       packageId = "changeset";
       build = internal.buildRustCrateWithFeatures {
@@ -132,7 +125,6 @@ rec {
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-<<<<<<< HEAD
     "fitnesstrax" = rec {
       packageId = "fitnesstrax";
       build = internal.buildRustCrateWithFeatures {
@@ -143,8 +135,6 @@ rec {
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
     "fluent-ergonomics" = rec {
       packageId = "fluent-ergonomics";
       build = internal.buildRustCrateWithFeatures {
@@ -155,7 +145,6 @@ rec {
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-<<<<<<< HEAD
     "ft-core" = rec {
       packageId = "ft-core";
       build = internal.buildRustCrateWithFeatures {
@@ -166,8 +155,6 @@ rec {
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
     "geo-types" = rec {
       packageId = "geo-types";
       build = internal.buildRustCrateWithFeatures {
@@ -248,19 +235,6 @@ rec {
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-<<<<<<< HEAD
-    "pico-blink" = rec {
-      packageId = "pico-blink";
-      build = internal.buildRustCrateWithFeatures {
-        packageId = "pico-blink";
-      };
-
-      # Debug support which might change between releases.
-      # File a bug if you depend on any for non-debug work!
-      debug = internal.debugCrate { inherit packageId; };
-    };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
     "result-extended" = rec {
       packageId = "result-extended";
       build = internal.buildRustCrateWithFeatures {
@@ -291,7 +265,6 @@ rec {
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-<<<<<<< HEAD
     "timezone-testing" = rec {
       packageId = "timezone-testing";
       build = internal.buildRustCrateWithFeatures {
@@ -302,8 +275,6 @@ rec {
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
     "tree" = rec {
       packageId = "tree";
       build = internal.buildRustCrateWithFeatures {
@@ -314,7 +285,6 @@ rec {
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-<<<<<<< HEAD
     "visions" = rec {
       packageId = "visions";
       build = internal.buildRustCrateWithFeatures {
@@ -325,8 +295,6 @@ rec {
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
   };
 
   # A derivation that joins the outputs of all workspace members together.
@@ -415,15 +383,9 @@ rec {
       };
       "ahash" = rec {
         crateName = "ahash";
-<<<<<<< HEAD
         version = "0.8.6";
         edition = "2018";
         sha256 = "0yn9i8nc6mmv28ig9w3dga571q09vg9f1f650mi5z8phx42r6hli";
-=======
-        version = "0.8.3";
-        edition = "2018";
-        sha256 = "0bzcsxdl2wd6j2p4214qh9sqkqn69gi7f9lk1xi8yj063r6zd69c";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Tom Kaitchuck <Tom.Kaitchuck@gmail.com>"
         ];
@@ -441,7 +403,6 @@ rec {
             name = "once_cell";
             packageId = "once_cell";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             target = { target, features }: (!(("arm" == target."arch") && ("none" == target."os")));
             features = [ "unstable" "alloc" ];
           }
@@ -451,11 +412,6 @@ rec {
             usesDefaultFeatures = false;
             features = [ "simd" ];
           }
-=======
-            target = { target, features }: (!(("arm" == target."arch" or null) && ("none" == target."os" or null)));
-            features = [ "unstable" "alloc" ];
-          }
->>>>>>> 4366a49 (Start nixifying applications)
         ];
         buildDependencies = [
           {
@@ -476,15 +432,9 @@ rec {
       };
       "aho-corasick" = rec {
         crateName = "aho-corasick";
-<<<<<<< HEAD
         version = "1.1.2";
         edition = "2021";
         sha256 = "1w510wnixvlgimkx1zjbvlxh6xps2vjgfqgwf5a6adlbjp5rv5mj";
-=======
-        version = "1.1.1";
-        edition = "2021";
-        sha256 = "1aqqalh66jygy54fbnpglzrb9dwlrvn6zl1nhncdvynl8w376pga";
->>>>>>> 4366a49 (Start nixifying applications)
         libName = "aho_corasick";
         authors = [
           "Andrew Gallant <jamslam@gmail.com>"
@@ -548,15 +498,9 @@ rec {
       };
       "anstream" = rec {
         crateName = "anstream";
-<<<<<<< HEAD
         version = "0.6.5";
         edition = "2021";
         sha256 = "1dm1mdbs1x6y3m3pz0qlamgiskb50i4q859676kx0pz8r8pajr6n";
-=======
-        version = "0.6.4";
-        edition = "2021";
-        sha256 = "0i2a9390vwhc42c5njz38n56jfwg17v64nqw9232j9gb2sz1xf9a";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "anstyle";
@@ -606,15 +550,9 @@ rec {
       };
       "anstyle-parse" = rec {
         crateName = "anstyle-parse";
-<<<<<<< HEAD
         version = "0.2.3";
         edition = "2021";
         sha256 = "134jhzrz89labrdwxxnjxqjdg06qvaflj1wkfnmyapwyldfwcnn7";
-=======
-        version = "0.2.2";
-        edition = "2021";
-        sha256 = "0h11is6a9pv027yw26ijrqhzrps5kyk3k58xzyk5x3w6q64rlyri";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "utf8parse";
@@ -631,7 +569,6 @@ rec {
       };
       "anstyle-query" = rec {
         crateName = "anstyle-query";
-<<<<<<< HEAD
         version = "1.0.2";
         edition = "2021";
         sha256 = "0j3na4b1nma39g4x7cwvj009awxckjf3z2vkwhldgka44hqj72g2";
@@ -639,15 +576,6 @@ rec {
           {
             name = "windows-sys";
             packageId = "windows-sys 0.52.0";
-=======
-        version = "1.0.0";
-        edition = "2021";
-        sha256 = "0js9bgpqz21g0p2nm350cba1d0zfyixsma9lhyycic5sw55iv8aw";
-        dependencies = [
-          {
-            name = "windows-sys";
-            packageId = "windows-sys";
->>>>>>> 4366a49 (Start nixifying applications)
             target = { target, features }: (target."windows" or false);
             features = [ "Win32_System_Console" "Win32_Foundation" ];
           }
@@ -656,15 +584,9 @@ rec {
       };
       "anstyle-wincon" = rec {
         crateName = "anstyle-wincon";
-<<<<<<< HEAD
         version = "3.0.2";
         edition = "2021";
         sha256 = "19v0fv400bmp4niqpzxnhg83vz12mmqv7l2l8vi80qcdxj0lpm8w";
-=======
-        version = "3.0.1";
-        edition = "2021";
-        sha256 = "0a066gr4p7bha8qwnxyrpbrqzjdvk8l7pdg7isljimpls889ssgh";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "anstyle";
@@ -672,11 +594,7 @@ rec {
           }
           {
             name = "windows-sys";
-<<<<<<< HEAD
             packageId = "windows-sys 0.52.0";
-=======
-            packageId = "windows-sys";
->>>>>>> 4366a49 (Start nixifying applications)
             target = { target, features }: (target."windows" or false);
             features = [ "Win32_System_Console" "Win32_Foundation" ];
           }
@@ -697,21 +615,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "std" ];
       };
-<<<<<<< HEAD
-      "arrayvec" = rec {
-        crateName = "arrayvec";
-        version = "0.7.4";
-        edition = "2018";
-        sha256 = "04b7n722jij0v3fnm3qk072d5ysc2q30rl9fz33zpfhzah30mlwn";
-        authors = [
-          "bluss"
-        ];
-        features = {
-          "default" = [ "std" ];
-          "serde" = [ "dep:serde" ];
-          "zeroize" = [ "dep:zeroize" ];
-        };
-      };
       "async-channel" = rec {
         crateName = "async-channel";
         version = "2.1.1";
@@ -752,8 +655,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "std" ];
       };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "atoi" = rec {
         crateName = "atoi";
         version = "2.0.0";
@@ -775,7 +676,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "std" ];
       };
-<<<<<<< HEAD
       "atomic-write-file" = rec {
         crateName = "atomic-write-file";
         version = "0.1.2";
@@ -865,8 +765,6 @@ rec {
         ];
 
       };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "autocfg 0.1.8" = rec {
         crateName = "autocfg";
         version = "0.1.8";
@@ -906,11 +804,7 @@ rec {
             name = "addr2line";
             packageId = "addr2line";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             target = { target, features }: (!((target."windows" or false) && ("msvc" == target."env") && (!("uwp" == target."vendor"))));
-=======
-            target = { target, features }: (!((target."windows" or false) && ("msvc" == target."env" or null) && (!("uwp" == target."vendor" or null))));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "cfg-if";
@@ -920,31 +814,19 @@ rec {
             name = "libc";
             packageId = "libc";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             target = { target, features }: (!((target."windows" or false) && ("msvc" == target."env") && (!("uwp" == target."vendor"))));
-=======
-            target = { target, features }: (!((target."windows" or false) && ("msvc" == target."env" or null) && (!("uwp" == target."vendor" or null))));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "miniz_oxide";
             packageId = "miniz_oxide 0.7.1";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             target = { target, features }: (!((target."windows" or false) && ("msvc" == target."env") && (!("uwp" == target."vendor"))));
-=======
-            target = { target, features }: (!((target."windows" or false) && ("msvc" == target."env" or null) && (!("uwp" == target."vendor" or null))));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "object";
             packageId = "object";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             target = { target, features }: (!((target."windows" or false) && ("msvc" == target."env") && (!("uwp" == target."vendor"))));
-=======
-            target = { target, features }: (!((target."windows" or false) && ("msvc" == target."env" or null) && (!("uwp" == target."vendor" or null))));
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "read_core" "elf" "macho" "pe" "unaligned" "archive" ];
           }
           {
@@ -970,51 +852,20 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "std" ];
       };
-<<<<<<< HEAD
-      "bare-metal" = rec {
-        crateName = "bare-metal";
-        version = "0.2.5";
-        edition = "2015";
-        sha256 = "1cy5pbb92fznnri72y6drfpjxj4qdmd62f0rrlgy70dxlppn9ssx";
-        authors = [
-          "Jorge Aparicio <jorge@japaric.io>"
-        ];
-        buildDependencies = [
-          {
-            name = "rustc_version";
-            packageId = "rustc_version 0.2.3";
-          }
-        ];
-        features = {
-        };
-        resolvedDefaultFeatures = [ "const-fn" ];
-      };
       "base64 0.21.5" = rec {
         crateName = "base64";
         version = "0.21.5";
         edition = "2018";
         sha256 = "1y8x2xs9nszj5ix7gg4ycn5a6wy7ca74zxwqri3bdqzdjha6lqrm";
-=======
-      "base64 0.21.4" = rec {
-        crateName = "base64";
-        version = "0.21.4";
-        edition = "2018";
-        sha256 = "18jhmsli1l7zn6pgslgjdrnghqnz12g68n25fv48ids3yfk3x94v";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Alice Maz <alice@alicemaz.com>"
           "Marshall Pierce <marshall@mpierce.org>"
         ];
         features = {
           "default" = [ "std" ];
-<<<<<<< HEAD
           "std" = [ "alloc" ];
         };
         resolvedDefaultFeatures = [ "alloc" "default" "std" ];
-=======
-        };
-        resolvedDefaultFeatures = [ "default" "std" ];
->>>>>>> 4366a49 (Start nixifying applications)
       };
       "base64 0.9.3" = rec {
         crateName = "base64";
@@ -1097,19 +948,6 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
-      "bitfield" = rec {
-        crateName = "bitfield";
-        version = "0.13.2";
-        edition = "2015";
-        sha256 = "06g7jb5r2b856vnhx76081fg90jvmy61kjqcfjysgmd5hclvvbs6";
-        authors = [
-          "Loïc Damien <loic.damien@dzamlo.ch>"
-        ];
-
-      };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "bitflags 1.3.2" = rec {
         crateName = "bitflags";
         version = "1.3.2";
@@ -1125,30 +963,18 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" ];
       };
-<<<<<<< HEAD
       "bitflags 2.4.1" = rec {
         crateName = "bitflags";
         version = "2.4.1";
         edition = "2021";
         sha256 = "01ryy3kd671b0ll4bhdvhsz67vwz1lz53fz504injrd7wpv64xrj";
-=======
-      "bitflags 2.4.0" = rec {
-        crateName = "bitflags";
-        version = "2.4.0";
-        edition = "2021";
-        sha256 = "0dc6xa7flfl59makmhixjcrslwlvdxxwrgxbr8p7bkvz53k2ls5l";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The Rust Project Developers"
         ];
         dependencies = [
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
             usesDefaultFeatures = false;
           }
@@ -1219,15 +1045,9 @@ rec {
       };
       "byteorder" = rec {
         crateName = "byteorder";
-<<<<<<< HEAD
         version = "1.5.0";
         edition = "2021";
         sha256 = "0jzncxyf404mwqdbspihyzpkndfgda450l0893pz5xj685cg5l0z";
-=======
-        version = "1.4.3";
-        edition = "2018";
-        sha256 = "0456lv9xi1a5bcm32arknf33ikv76p3fr9yzki4lb2897p2qkh8l";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Andrew Gallant <jamslam@gmail.com>"
         ];
@@ -1253,15 +1073,9 @@ rec {
       };
       "cairo-rs" = rec {
         crateName = "cairo-rs";
-<<<<<<< HEAD
         version = "0.18.3";
         edition = "2021";
         sha256 = "18d80lk853bjhx36rjaj78clzfjrmlgi01863drnmshdgxi16dpk";
-=======
-        version = "0.17.10";
-        edition = "2021";
-        sha256 = "02lz7kvml4m6fx02hy1pgk6ysils9di8n75m166kcpla0b206dmb";
->>>>>>> 4366a49 (Start nixifying applications)
         libName = "cairo";
         authors = [
           "The gtk-rs Project Developers"
@@ -1269,11 +1083,7 @@ rec {
         dependencies = [
           {
             name = "bitflags";
-<<<<<<< HEAD
             packageId = "bitflags 2.4.1";
-=======
-            packageId = "bitflags 1.3.2";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "cairo-sys-rs";
@@ -1282,11 +1092,7 @@ rec {
           }
           {
             name = "glib";
-<<<<<<< HEAD
             packageId = "glib";
-=======
-            packageId = "glib 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
           }
           {
@@ -1304,10 +1110,6 @@ rec {
         ];
         features = {
           "default" = [ "use_glib" ];
-<<<<<<< HEAD
-=======
-          "dox" = [ "ffi/dox" "glib/dox" "freetype" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "freetype" = [ "ffi/freetype" "freetype-rs" ];
           "freetype-rs" = [ "dep:freetype-rs" ];
           "glib" = [ "dep:glib" ];
@@ -1327,15 +1129,9 @@ rec {
       };
       "cairo-sys-rs" = rec {
         crateName = "cairo-sys-rs";
-<<<<<<< HEAD
         version = "0.18.2";
         edition = "2021";
         sha256 = "0lfsxl7ylw3phbnwmz3k58j1gnqi6kc2hdc7g3bb7f4hwnl9yp38";
-=======
-        version = "0.17.10";
-        edition = "2021";
-        sha256 = "1ccw4z59dx60khngx79g64c75abfwy7wnq57h2z82j7vn5k0q7b9";
->>>>>>> 4366a49 (Start nixifying applications)
         libName = "cairo_sys";
         authors = [
           "The gtk-rs Project Developers"
@@ -1343,11 +1139,7 @@ rec {
         dependencies = [
           {
             name = "glib-sys";
-<<<<<<< HEAD
             packageId = "glib-sys";
-=======
-            packageId = "glib-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "glib";
             optional = true;
           }
@@ -1363,10 +1155,6 @@ rec {
           }
         ];
         features = {
-<<<<<<< HEAD
-=======
-          "dox" = [ "x11/dox" "glib/dox" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "glib" = [ "dep:glib" ];
           "use_glib" = [ "glib" ];
           "v1_18" = [ "v1_16" ];
@@ -1451,11 +1239,7 @@ rec {
         devDependencies = [
           {
             name = "uuid";
-<<<<<<< HEAD
             packageId = "uuid 1.6.1";
-=======
-            packageId = "uuid 1.4.1";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "v4" ];
           }
         ];
@@ -1471,11 +1255,7 @@ rec {
             name = "android-tzdata";
             packageId = "android-tzdata";
             optional = true;
-<<<<<<< HEAD
             target = { target, features }: ("android" == target."os");
-=======
-            target = { target, features }: ("android" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "iana-time-zone";
@@ -1488,11 +1268,7 @@ rec {
             name = "js-sys";
             packageId = "js-sys";
             optional = true;
-<<<<<<< HEAD
             target = { target, features }: (("wasm32" == target."arch") && (!(("emscripten" == target."os") || ("wasi" == target."os"))));
-=======
-            target = { target, features }: (("wasm32" == target."arch" or null) && (!(("emscripten" == target."os" or null) || ("wasi" == target."os" or null))));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "num-traits";
@@ -1501,11 +1277,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
             usesDefaultFeatures = false;
           }
@@ -1513,19 +1285,11 @@ rec {
             name = "wasm-bindgen";
             packageId = "wasm-bindgen";
             optional = true;
-<<<<<<< HEAD
             target = { target, features }: (("wasm32" == target."arch") && (!(("emscripten" == target."os") || ("wasi" == target."os"))));
           }
           {
             name = "windows-targets";
             packageId = "windows-targets 0.48.5";
-=======
-            target = { target, features }: (("wasm32" == target."arch" or null) && (!(("emscripten" == target."os" or null) || ("wasi" == target."os" or null))));
-          }
-          {
-            name = "windows-targets";
-            packageId = "windows-targets";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
             target = { target, features }: (target."windows" or false);
           }
@@ -1551,15 +1315,9 @@ rec {
       };
       "chrono-tz" = rec {
         crateName = "chrono-tz";
-<<<<<<< HEAD
         version = "0.8.4";
         edition = "2021";
         sha256 = "0xhd3dsfs72im0sbc7w889lfy7bxgjlbvqhj5a1yvxhxwb08acg2";
-=======
-        version = "0.8.3";
-        edition = "2021";
-        sha256 = "1dxbx8jjxvkw4g05glr3km55b77ya70nwpq5wbddz9z9p739ndpi";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "chrono";
@@ -1573,11 +1331,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
             usesDefaultFeatures = false;
           }
@@ -1598,32 +1352,18 @@ rec {
         ];
         features = {
           "arbitrary" = [ "dep:arbitrary" ];
-<<<<<<< HEAD
           "case-insensitive" = [ "dep:uncased" "chrono-tz-build/case-insensitive" "phf/uncased" ];
           "default" = [ "std" ];
           "filter-by-regex" = [ "chrono-tz-build/filter-by-regex" ];
           "serde" = [ "dep:serde" ];
-=======
-          "case-insensitive" = [ "uncased" "chrono-tz-build/case-insensitive" "phf/uncased" ];
-          "default" = [ "std" ];
-          "filter-by-regex" = [ "chrono-tz-build/filter-by-regex" ];
-          "serde" = [ "dep:serde" ];
-          "uncased" = [ "dep:uncased" ];
->>>>>>> 4366a49 (Start nixifying applications)
         };
         resolvedDefaultFeatures = [ "default" "serde" "std" ];
       };
       "chrono-tz-build" = rec {
         crateName = "chrono-tz-build";
-<<<<<<< HEAD
         version = "0.2.1";
         edition = "2021";
         sha256 = "03rmzd69cn7fp0fgkjr5042b3g54s2l941afjm3001ls7kqkjgj3";
-=======
-        version = "0.2.0";
-        edition = "2021";
-        sha256 = "1kqywd9y8jn0kpw5npd2088qbrdsb6jd39k0snbfsmrgjkffpxg2";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "parse-zoneinfo";
@@ -1649,17 +1389,10 @@ rec {
       };
       "clap" = rec {
         crateName = "clap";
-<<<<<<< HEAD
         version = "4.4.11";
         edition = "2021";
         crateBin = [];
         sha256 = "1wj5gb2fnqls00zfahg3490bdfc36d9cwpl80qjacb5jyrqzdbxz";
-=======
-        version = "4.4.6";
-        edition = "2021";
-        crateBin = [];
-        sha256 = "0mmragwn4wqp42ksv67wj9fdq5pj8d5iab4f7vs0gpicdksh8iyh";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "clap_builder";
@@ -1696,15 +1429,9 @@ rec {
       };
       "clap_builder" = rec {
         crateName = "clap_builder";
-<<<<<<< HEAD
         version = "4.4.11";
         edition = "2021";
         sha256 = "1fxdsmw1ilgswz3lg2hjlvsdyyz04k78scjirlbd7c9bc83ba5m2";
-=======
-        version = "4.4.6";
-        edition = "2021";
-        sha256 = "0iafh05fjzgaldx10j9qik9ir5sqz1mrcdy7lcgbspm6mjp1y8qf";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "anstream";
@@ -1741,15 +1468,9 @@ rec {
       };
       "clap_derive" = rec {
         crateName = "clap_derive";
-<<<<<<< HEAD
         version = "4.4.7";
         edition = "2021";
         sha256 = "0hk4hcxl56qwqsf4hmf7c0gr19r9fbxk0ah2bgkr36pmmaph966g";
-=======
-        version = "4.4.2";
-        edition = "2021";
-        sha256 = "0wxq692izvj0gn4i29002xs8l02wpzx6jwr4z17bhs8dy9ph2qh8";
->>>>>>> 4366a49 (Start nixifying applications)
         procMacro = true;
         dependencies = [
           {
@@ -1766,11 +1487,7 @@ rec {
           }
           {
             name = "syn";
-<<<<<<< HEAD
             packageId = "syn 2.0.41";
-=======
-            packageId = "syn 2.0.37";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "full" ];
           }
         ];
@@ -1782,15 +1499,9 @@ rec {
       };
       "clap_lex" = rec {
         crateName = "clap_lex";
-<<<<<<< HEAD
         version = "0.6.0";
         edition = "2021";
         sha256 = "1l8bragdvim7mva9flvd159dskn2bdkpl0jqrr41wnjfn8pcfbvh";
-=======
-        version = "0.5.1";
-        edition = "2021";
-        sha256 = "0qgrlq509vr49wq91jh50f9pm5f8lxmv1rcbklxnsg4nprxcaz6d";
->>>>>>> 4366a49 (Start nixifying applications)
 
       };
       "cloudabi" = rec {
@@ -1832,7 +1543,6 @@ rec {
         sha256 = "1ix7w85kwvyybwi2jdkl3yva2r2bvdcc3ka2grjfzfgrapqimgxc";
 
       };
-<<<<<<< HEAD
       "concurrent-queue" = rec {
         crateName = "concurrent-queue";
         version = "2.4.0";
@@ -1857,8 +1567,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "std" ];
       };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "config" = rec {
         crateName = "config";
         version = "0.1.0";
@@ -1875,11 +1583,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "derive" ];
           }
           {
@@ -1924,15 +1628,9 @@ rec {
       };
       "const-oid" = rec {
         crateName = "const-oid";
-<<<<<<< HEAD
         version = "0.9.6";
         edition = "2021";
         sha256 = "1y0jnqaq7p2wvspnx7qj76m7hjcqpz73qzvr9l2p9n2s51vr6if2";
-=======
-        version = "0.9.5";
-        edition = "2021";
-        sha256 = "0vxb4d25mgk8y0phay7j078limx2553716ixsr1x5605k31j5h98";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "RustCrypto Developers"
         ];
@@ -1952,11 +1650,7 @@ rec {
         dependencies = [
           {
             name = "time";
-<<<<<<< HEAD
             packageId = "time 0.3.31";
-=======
-            packageId = "time 0.3.29";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
             features = [ "std" "parsing" "formatting" "macros" ];
           }
@@ -2034,15 +1728,9 @@ rec {
       };
       "core-foundation" = rec {
         crateName = "core-foundation";
-<<<<<<< HEAD
         version = "0.9.4";
         edition = "2018";
         sha256 = "13zvbbj07yk3b61b8fhwfzhy35535a583irf23vlcg59j7h9bqci";
-=======
-        version = "0.9.3";
-        edition = "2015";
-        sha256 = "0ii1ihpjb30fk38gdikm5wqlkmyr8k46fh4k2r8sagz5dng7ljhr";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The Servo Project Developers"
         ];
@@ -2050,10 +1738,7 @@ rec {
           {
             name = "core-foundation-sys";
             packageId = "core-foundation-sys";
-<<<<<<< HEAD
             usesDefaultFeatures = false;
-=======
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "libc";
@@ -2062,18 +1747,14 @@ rec {
         ];
         features = {
           "chrono" = [ "dep:chrono" ];
-<<<<<<< HEAD
           "default" = [ "link" ];
           "link" = [ "core-foundation-sys/link" ];
-=======
->>>>>>> 4366a49 (Start nixifying applications)
           "mac_os_10_7_support" = [ "core-foundation-sys/mac_os_10_7_support" ];
           "mac_os_10_8_features" = [ "core-foundation-sys/mac_os_10_8_features" ];
           "uuid" = [ "dep:uuid" ];
           "with-chrono" = [ "chrono" ];
           "with-uuid" = [ "uuid" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "default" "link" ];
       };
       "core-foundation-sys" = rec {
@@ -2081,118 +1762,19 @@ rec {
         version = "0.8.6";
         edition = "2018";
         sha256 = "13w6sdf06r0hn7bx2b45zxsg1mm2phz34jikm6xc5qrbr6djpsh6";
-=======
-      };
-      "core-foundation-sys" = rec {
-        crateName = "core-foundation-sys";
-        version = "0.8.4";
-        edition = "2015";
-        sha256 = "1yhf471qj6snnm2mcswai47vsbc9w30y4abmdp4crb4av87sb5p4";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The Servo Project Developers"
         ];
         features = {
-<<<<<<< HEAD
           "default" = [ "link" ];
         };
         resolvedDefaultFeatures = [ "default" "link" ];
       };
-      "cortex-m" = rec {
-        crateName = "cortex-m";
-        version = "0.7.7";
-        edition = "2018";
-        sha256 = "1fbca698v4gv57mv5fc48jrz8wcy6sv675n6fsrsah4qykc11ilf";
-        authors = [
-          "The Cortex-M Team <cortex-m@teams.rust-embedded.org>"
-          "Jorge Aparicio <jorge@japaric.io>"
-        ];
-        dependencies = [
-          {
-            name = "bare-metal";
-            packageId = "bare-metal";
-            features = [ "const-fn" ];
-          }
-          {
-            name = "bitfield";
-            packageId = "bitfield";
-          }
-          {
-            name = "embedded-hal";
-            packageId = "embedded-hal";
-          }
-          {
-            name = "volatile-register";
-            packageId = "volatile-register";
-          }
-        ];
-        features = {
-          "cm7-r0p1" = [ "cm7" ];
-          "critical-section" = [ "dep:critical-section" ];
-          "critical-section-single-core" = [ "critical-section/restore-state-bool" ];
-          "serde" = [ "dep:serde" ];
-        };
-      };
-      "cortex-m-rt" = rec {
-        crateName = "cortex-m-rt";
-        version = "0.7.3";
-        edition = "2021";
-        sha256 = "1cfxg502gvcmaczmaij5maxbvaxnda5w6gp14cbin44ksl9yi17f";
-        authors = [
-          "The Cortex-M Team <cortex-m@teams.rust-embedded.org>"
-          "Jorge Aparicio <jorge@japaric.io>"
-          "Hideki Sekine <sekineh@me.com>"
-        ];
-        dependencies = [
-          {
-            name = "cortex-m-rt-macros";
-            packageId = "cortex-m-rt-macros";
-          }
-        ];
-        features = {
-        };
-        resolvedDefaultFeatures = [ "device" ];
-      };
-      "cortex-m-rt-macros" = rec {
-        crateName = "cortex-m-rt-macros";
-        version = "0.7.0";
-        edition = "2018";
-        sha256 = "1iyki0wq8pj0qbjhw1mbq5njraihhyr7ydcbqzdzwg10dziz7xph";
-        procMacro = true;
-        authors = [
-          "Jorge Aparicio <jorge@japaric.io>"
-        ];
-        dependencies = [
-          {
-            name = "proc-macro2";
-            packageId = "proc-macro2";
-          }
-          {
-            name = "quote";
-            packageId = "quote";
-          }
-          {
-            name = "syn";
-            packageId = "syn 1.0.109";
-            features = [ "extra-traits" "full" ];
-          }
-        ];
-
-      };
       "cpufeatures" = rec {
         crateName = "cpufeatures";
         version = "0.2.11";
         edition = "2018";
         sha256 = "1l0gzsyy576n017g9bf0vkv5hhg9cpz1h1libxyfdlzcgbh0yhnf";
-=======
-        };
-      };
-      "cpufeatures" = rec {
-        crateName = "cpufeatures";
-        version = "0.2.9";
-        edition = "2018";
-        sha256 = "1wg1vmsx3gd30xkc7h7r6nfx7njx063hqjimgyrb0qj17bzpcyx1";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "RustCrypto Developers"
         ];
@@ -2205,25 +1787,17 @@ rec {
           {
             name = "libc";
             packageId = "libc";
-<<<<<<< HEAD
             target = { target, features }: (("aarch64" == target."arch") && ("linux" == target."os"));
-=======
-            target = { target, features }: (("aarch64" == target."arch" or null) && ("linux" == target."os" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "libc";
             packageId = "libc";
-<<<<<<< HEAD
             target = { target, features }: (("aarch64" == target."arch") && ("apple" == target."vendor"));
           }
           {
             name = "libc";
             packageId = "libc";
             target = { target, features }: (("loongarch64" == target."arch") && ("linux" == target."os"));
-=======
-            target = { target, features }: (("aarch64" == target."arch" or null) && ("apple" == target."vendor" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
 
@@ -2245,43 +1819,11 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
-      "crc-any" = rec {
-        crateName = "crc-any";
-        version = "2.4.3";
-        edition = "2021";
-        sha256 = "1pw89ncs7gbqvxnkp5spks61qn6bcg13vwab1zml6dpnhyv4cikp";
-        authors = [
-          "Magic Len <len@magiclen.org>"
-        ];
-        dependencies = [
-          {
-            name = "debug-helper";
-            packageId = "debug-helper";
-            optional = true;
-          }
-        ];
-        features = {
-          "alloc" = [ "debug-helper" ];
-          "debug-helper" = [ "dep:debug-helper" ];
-          "default" = [ "alloc" ];
-          "development" = [ "std" ];
-          "heapless" = [ "dep:heapless" ];
-        };
-        resolvedDefaultFeatures = [ "alloc" "debug-helper" "default" ];
-      };
       "crc-catalog" = rec {
         crateName = "crc-catalog";
         version = "2.4.0";
         edition = "2018";
         sha256 = "1xg7sz82w3nxp1jfn425fvn1clvbzb3zgblmxsyqpys0dckp9lqr";
-=======
-      "crc-catalog" = rec {
-        crateName = "crc-catalog";
-        version = "2.2.0";
-        edition = "2018";
-        sha256 = "115l7pzskv5xzp9i7146rp1qrbfdi7gikig1p80p6zpham7fib4w";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Akhil Velagapudi <akhilvelagapudi@gmail.com>"
         ];
@@ -2307,29 +1849,11 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "std" ];
       };
-<<<<<<< HEAD
-      "critical-section" = rec {
-        crateName = "critical-section";
-        version = "1.1.2";
-        edition = "2018";
-        sha256 = "05pj0pvkdyc9r30xxabam4n8zxdbzxcddr0gdypajcbqjgwgynbh";
-        features = {
-          "std" = [ "restore-state-bool" ];
-        };
-        resolvedDefaultFeatures = [ "restore-state-u8" ];
-      };
       "crossbeam-deque" = rec {
         crateName = "crossbeam-deque";
         version = "0.8.4";
         edition = "2018";
         sha256 = "0la7fx9n1vbx3h23va0xmcy36hziql1pkik08s3j3asv4479ma7w";
-=======
-      "crossbeam-deque" = rec {
-        crateName = "crossbeam-deque";
-        version = "0.8.3";
-        edition = "2018";
-        sha256 = "1vqczbcild7nczh5z116w8w46z991kpjyw7qxkf24c14apwdcvyf";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "cfg-if";
@@ -2358,15 +1882,9 @@ rec {
       };
       "crossbeam-epoch" = rec {
         crateName = "crossbeam-epoch";
-<<<<<<< HEAD
         version = "0.9.16";
         edition = "2018";
         sha256 = "1anr32r8px0vb65cgwbwp3zhqz69scz5dgq9bmx54w5qa59yjbrd";
-=======
-        version = "0.9.15";
-        edition = "2018";
-        sha256 = "1ixwc3cq816wb8rlh3ix4jnybqbyyq4l61nwlx0mfm3ck0s148df";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "cfg-if";
@@ -2381,14 +1899,6 @@ rec {
             name = "memoffset";
             packageId = "memoffset";
           }
-<<<<<<< HEAD
-=======
-          {
-            name = "scopeguard";
-            packageId = "scopeguard";
-            usesDefaultFeatures = false;
-          }
->>>>>>> 4366a49 (Start nixifying applications)
         ];
         buildDependencies = [
           {
@@ -2407,15 +1917,9 @@ rec {
       };
       "crossbeam-queue" = rec {
         crateName = "crossbeam-queue";
-<<<<<<< HEAD
         version = "0.3.9";
         edition = "2018";
         sha256 = "0lz17pgydh29w8brld8dysi1m4n5bxfpnj8w9bxk0q6xpyyzbg5r";
-=======
-        version = "0.3.8";
-        edition = "2018";
-        sha256 = "1p9s6n4ckwdgxkb7a8ay9zjzmgc8ppfbxix2vr07rwskibmb7kyi";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "cfg-if";
@@ -2436,15 +1940,9 @@ rec {
       };
       "crossbeam-utils" = rec {
         crateName = "crossbeam-utils";
-<<<<<<< HEAD
         version = "0.8.17";
         edition = "2018";
         sha256 = "13y7wh993i7q71kg6wcfj65w3rlmizzrz7cqgz1l9whlgw9rcvf0";
-=======
-        version = "0.8.16";
-        edition = "2018";
-        sha256 = "153j0gikblz7n7qdvdi8pslhi008s1yp9cmny6vw07ad7pbb48js";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "cfg-if";
@@ -2518,19 +2016,11 @@ rec {
           }
           {
             name = "gio";
-<<<<<<< HEAD
             packageId = "gio";
           }
           {
             name = "glib";
             packageId = "glib";
-=======
-            packageId = "gio 0.17.10";
-          }
-          {
-            name = "glib";
-            packageId = "glib 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "gtk4";
@@ -2542,7 +2032,7 @@ rec {
       };
       "dashboard" = rec {
         crateName = "dashboard";
-        version = "0.1.1";
+        version = "0.1.2";
         edition = "2018";
         crateBin = [
           {
@@ -2589,19 +2079,11 @@ rec {
           }
           {
             name = "gio";
-<<<<<<< HEAD
             packageId = "gio";
           }
           {
             name = "glib";
             packageId = "glib";
-=======
-            packageId = "gio 0.17.10";
-          }
-          {
-            name = "glib";
-            packageId = "glib 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "gtk4";
@@ -2633,11 +2115,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "serde_derive";
@@ -2667,15 +2145,9 @@ rec {
       };
       "data-encoding" = rec {
         crateName = "data-encoding";
-<<<<<<< HEAD
         version = "2.5.0";
         edition = "2018";
         sha256 = "1rcbnwfmfxhlshzbn3r7srm3azqha3mn33yxyqxkzz2wpqcjm5ky";
-=======
-        version = "2.4.0";
-        edition = "2018";
-        sha256 = "023k3dk8422jgbj7k72g63x51h1mhv91dhw1j4h205vzh6fnrrn2";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Julien Cretin <git@ia0.eu>"
         ];
@@ -2685,19 +2157,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "alloc" "default" "std" ];
       };
-<<<<<<< HEAD
-      "debug-helper" = rec {
-        crateName = "debug-helper";
-        version = "0.3.13";
-        edition = "2021";
-        sha256 = "0bhnpzpgmg8dkdr27g2b49slf6ca79m4idcb01z2krs0qkifhy7m";
-        authors = [
-          "Magic Len <len@magiclen.org>"
-        ];
-
-      };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "deflate" = rec {
         crateName = "deflate";
         version = "0.8.6";
@@ -2764,7 +2223,6 @@ rec {
       };
       "deranged" = rec {
         crateName = "deranged";
-<<<<<<< HEAD
         version = "0.3.10";
         edition = "2021";
         sha256 = "1p4i64nkadamksa943d6gk39sl1kximz0xr69n408fvsl1q0vcwf";
@@ -2783,27 +2241,12 @@ rec {
           "default" = [ "std" ];
           "num" = [ "dep:num-traits" ];
           "powerfmt" = [ "dep:powerfmt" ];
-=======
-        version = "0.3.8";
-        edition = "2021";
-        sha256 = "0ikrhil2621rz9haakphdzrx035qwr175f639p8qyrazjj56wsgj";
-        authors = [
-          "Jacob Pratt <jacob@jhpratt.dev>"
-        ];
-        features = {
-          "default" = [ "std" ];
-          "num" = [ "dep:num-traits" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "quickcheck" = [ "dep:quickcheck" "alloc" ];
           "rand" = [ "dep:rand" ];
           "serde" = [ "dep:serde" ];
           "std" = [ "alloc" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "alloc" "powerfmt" "std" ];
-=======
-        resolvedDefaultFeatures = [ "alloc" "std" ];
->>>>>>> 4366a49 (Start nixifying applications)
       };
       "digest" = rec {
         crateName = "digest";
@@ -2850,11 +2293,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "alloc" "block-buffer" "const-oid" "core-api" "default" "mac" "oid" "std" "subtle" ];
       };
-<<<<<<< HEAD
       "dimensioned 0.7.0" = rec {
-=======
-      "dimensioned" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "dimensioned";
         version = "0.7.0";
         edition = "2015";
@@ -2875,11 +2314,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
           }
           {
@@ -2898,7 +2333,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "serde" "std" ];
       };
-<<<<<<< HEAD
       "dimensioned 0.8.0" = rec {
         crateName = "dimensioned";
         version = "0.8.0";
@@ -2940,8 +2374,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "serde" "std" ];
       };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "displaydoc" = rec {
         crateName = "displaydoc";
         version = "0.2.4";
@@ -2962,11 +2394,7 @@ rec {
           }
           {
             name = "syn";
-<<<<<<< HEAD
             packageId = "syn 2.0.41";
-=======
-            packageId = "syn 2.0.37";
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
         features = {
@@ -3005,11 +2433,7 @@ rec {
         dependencies = [
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
             features = [ "derive" ];
           }
@@ -3020,53 +2444,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "serde" "use_std" ];
       };
-<<<<<<< HEAD
-      "embedded-dma" = rec {
-        crateName = "embedded-dma";
-        version = "0.2.0";
-        edition = "2018";
-        sha256 = "0ijld5jblcka4b95s1lwxd9k109nyaap34h44g122ddjbidpwkwr";
-        authors = [
-          "Jan Teske <jteske@posteo.net>"
-          "Thales Fragoso <thales.fragosoz@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "stable_deref_trait";
-            packageId = "stable_deref_trait";
-            usesDefaultFeatures = false;
-          }
-        ];
-
-      };
-      "embedded-hal" = rec {
-        crateName = "embedded-hal";
-        version = "0.2.7";
-        edition = "2015";
-        sha256 = "1zv6pkgg2yl0mzvh3jp326rhryqfnv4l27h78v7p7maag629i51m";
-        authors = [
-          "The Embedded HAL Team <embedded-hal@teams.rust-embedded.org>"
-          "Jorge Aparicio <jorge@japaric.io>"
-          "Jonathan 'theJPster' Pallant <github@thejpster.org.uk>"
-        ];
-        dependencies = [
-          {
-            name = "nb";
-            packageId = "nb 0.1.3";
-          }
-          {
-            name = "void";
-            packageId = "void";
-            usesDefaultFeatures = false;
-          }
-        ];
-        features = {
-          "unproven" = [ "nb/unstable" ];
-        };
-        resolvedDefaultFeatures = [ "unproven" ];
-      };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "emseries" = rec {
         crateName = "emseries";
         version = "0.6.0";
@@ -3092,11 +2469,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "serde_derive";
@@ -3119,11 +2492,7 @@ rec {
         devDependencies = [
           {
             name = "dimensioned";
-<<<<<<< HEAD
             packageId = "dimensioned 0.7.0";
-=======
-            packageId = "dimensioned";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "serde" ];
           }
           {
@@ -3158,15 +2527,9 @@ rec {
       };
       "env_logger" = rec {
         crateName = "env_logger";
-<<<<<<< HEAD
         version = "0.10.1";
         edition = "2021";
         sha256 = "1kmy9xmfjaqfvd4wkxr1f7d16ld3h9b487vqs2q9r0s8f3kg7cwm";
-=======
-        version = "0.10.0";
-        edition = "2021";
-        sha256 = "1w797qgkrmqdacsbc0j6yvpnmvfc9lx6k8fm79rndkxci5mapkc5";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "humantime";
@@ -3214,46 +2577,24 @@ rec {
       };
       "errno" = rec {
         crateName = "errno";
-<<<<<<< HEAD
         version = "0.3.8";
         edition = "2018";
         sha256 = "0ia28ylfsp36i27g1qih875cyyy4by2grf80ki8vhgh6vinf8n52";
-=======
-        version = "0.3.4";
-        edition = "2018";
-        sha256 = "101l57wd4chi4z8dh44lbnb4z7baamm742876bppcvwr8dyz1m5d";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Chris Wong <lambda.fairy@gmail.com>"
         ];
         dependencies = [
           {
-<<<<<<< HEAD
             name = "libc";
             packageId = "libc";
             usesDefaultFeatures = false;
             target = { target, features }: ("hermit" == target."os");
-=======
-            name = "errno-dragonfly";
-            packageId = "errno-dragonfly";
-            target = { target, features }: ("dragonfly" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "libc";
             packageId = "libc";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             target = { target, features }: ("wasi" == target."os");
-=======
-            target = { target, features }: ("hermit" == target."os" or null);
-          }
-          {
-            name = "libc";
-            packageId = "libc";
-            usesDefaultFeatures = false;
-            target = { target, features }: ("wasi" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "libc";
@@ -3263,11 +2604,7 @@ rec {
           }
           {
             name = "windows-sys";
-<<<<<<< HEAD
             packageId = "windows-sys 0.52.0";
-=======
-            packageId = "windows-sys";
->>>>>>> 4366a49 (Start nixifying applications)
             target = { target, features }: (target."windows" or false);
             features = [ "Win32_Foundation" "Win32_System_Diagnostics_Debug" ];
           }
@@ -3278,32 +2615,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "std" ];
       };
-<<<<<<< HEAD
-=======
-      "errno-dragonfly" = rec {
-        crateName = "errno-dragonfly";
-        version = "0.1.2";
-        edition = "2018";
-        sha256 = "1grrmcm6q8512hkq5yzch3yv8wafflc2apbmsaabiyk44yqz2s5a";
-        authors = [
-          "Michael Neumann <mneumann@ntecs.de>"
-        ];
-        dependencies = [
-          {
-            name = "libc";
-            packageId = "libc";
-            usesDefaultFeatures = false;
-          }
-        ];
-        buildDependencies = [
-          {
-            name = "cc";
-            packageId = "cc";
-          }
-        ];
-
-      };
->>>>>>> 4366a49 (Start nixifying applications)
       "etcetera" = rec {
         crateName = "etcetera";
         version = "0.8.0";
@@ -3320,22 +2631,14 @@ rec {
           }
           {
             name = "windows-sys";
-<<<<<<< HEAD
             packageId = "windows-sys 0.48.0";
-=======
-            packageId = "windows-sys";
->>>>>>> 4366a49 (Start nixifying applications)
             target = { target, features }: (target."windows" or false);
             features = [ "Win32_Foundation" "Win32_UI_Shell" ];
           }
         ];
 
       };
-<<<<<<< HEAD
       "event-listener 2.5.3" = rec {
-=======
-      "event-listener" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "event-listener";
         version = "2.5.3";
         edition = "2018";
@@ -3345,7 +2648,6 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "event-listener 4.0.1" = rec {
         crateName = "event-listener";
         version = "4.0.1";
@@ -3406,8 +2708,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "std" ];
       };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "exr" = rec {
         crateName = "exr";
         version = "1.71.0";
@@ -3473,15 +2773,9 @@ rec {
       };
       "fdeflate" = rec {
         crateName = "fdeflate";
-<<<<<<< HEAD
         version = "0.3.1";
         edition = "2021";
         sha256 = "0s5885wdsih2hqx3hsl7l8cl3666fgsgiwvglifzy229hpydmmk4";
-=======
-        version = "0.3.0";
-        edition = "2021";
-        sha256 = "045fyccqx0wbfrh36sgcf79za5qg95vpihmbklj0dvhlqpmbsafk";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The image-rs Developers"
         ];
@@ -3510,11 +2804,7 @@ rec {
         buildDependencies = [
           {
             name = "rustc_version";
-<<<<<<< HEAD
-            packageId = "rustc_version 0.4.0";
-=======
             packageId = "rustc_version";
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
 
@@ -3525,14 +2815,6 @@ rec {
         edition = "2018";
         crateBin = [
           {
-<<<<<<< HEAD
-=======
-            name = "auth-cli";
-            path = "src/bin/cli.rs";
-            requiredFeatures = [ ];
-          }
-          {
->>>>>>> 4366a49 (Start nixifying applications)
             name = "file-service";
             path = "src/main.rs";
             requiredFeatures = [ ];
@@ -3549,13 +2831,10 @@ rec {
         ];
         dependencies = [
           {
-<<<<<<< HEAD
             name = "authdb";
             packageId = "authdb";
           }
           {
-=======
->>>>>>> 4366a49 (Start nixifying applications)
             name = "base64ct";
             packageId = "base64ct";
             features = [ "alloc" ];
@@ -3592,11 +2871,7 @@ rec {
           }
           {
             name = "http";
-<<<<<<< HEAD
             packageId = "http 0.2.11";
-=======
-            packageId = "http";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "image";
@@ -3624,11 +2899,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "derive" ];
           }
           {
@@ -3640,14 +2911,6 @@ rec {
             packageId = "sha2";
           }
           {
-<<<<<<< HEAD
-=======
-            name = "sqlx";
-            packageId = "sqlx";
-            features = [ "runtime-tokio" "sqlite" ];
-          }
-          {
->>>>>>> 4366a49 (Start nixifying applications)
             name = "thiserror";
             packageId = "thiserror";
           }
@@ -3688,10 +2951,9 @@ rec {
         };
         resolvedDefaultFeatures = [ "categories" "default" "grapheme_clusters" ];
       };
-<<<<<<< HEAD
       "fitnesstrax" = rec {
         crateName = "fitnesstrax";
-        version = "0.1.0";
+        version = "0.2.0";
         edition = "2021";
         crateBin = [
           {
@@ -3770,13 +3032,6 @@ rec {
         version = "1.0.28";
         edition = "2018";
         sha256 = "03llhsh4gqdirnfxxb9g2w9n0721dyn4yjir3pz7z4vjaxb3yc26";
-=======
-      "flate2" = rec {
-        crateName = "flate2";
-        version = "1.0.27";
-        edition = "2018";
-        sha256 = "045hvzdv3159qqjlgr5i3p4d346briddkipwyb5iv7ay17l8xjf6";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Alex Crichton <alex@alexcrichton.com>"
           "Josh Triplett <josh@joshtriplett.org>"
@@ -3797,11 +3052,7 @@ rec {
             name = "miniz_oxide";
             packageId = "miniz_oxide 0.7.1";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             target = { target, features }: (("wasm32" == target."arch") && (!("emscripten" == target."os")));
-=======
-            target = { target, features }: (("wasm32" == target."arch" or null) && (!("emscripten" == target."os" or null)));
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "with-alloc" ];
           }
         ];
@@ -3877,11 +3128,7 @@ rec {
           }
           {
             name = "self_cell";
-<<<<<<< HEAD
             packageId = "self_cell 0.10.3";
-=======
-            packageId = "self_cell";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "smallvec";
@@ -4064,26 +3311,16 @@ rec {
       };
       "form_urlencoded" = rec {
         crateName = "form_urlencoded";
-<<<<<<< HEAD
         version = "1.2.1";
         edition = "2018";
         sha256 = "0milh8x7nl4f450s3ddhg57a3flcv6yq8hlkyk6fyr3mcb128dp1";
-=======
-        version = "1.2.0";
-        edition = "2018";
-        sha256 = "0ljn0kz23nr9yf3432k656k178nh4jqryfji9b0jw343dz7w2ax6";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The rust-url developers"
         ];
         dependencies = [
           {
             name = "percent-encoding";
-<<<<<<< HEAD
             packageId = "percent-encoding 2.3.1";
-=======
-            packageId = "percent-encoding 2.3.0";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
           }
         ];
@@ -4094,104 +3331,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "alloc" "default" "std" ];
       };
-<<<<<<< HEAD
-      "frunk" = rec {
-        crateName = "frunk";
-        version = "0.4.2";
-        edition = "2021";
-        sha256 = "11v242h7zjka0lckxcffn5pjgr3jzxyljy7ffr0ppy8jkssm38qi";
-        authors = [
-          "Lloyd <lloydmeta@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "frunk_core";
-            packageId = "frunk_core";
-            usesDefaultFeatures = false;
-          }
-          {
-            name = "frunk_derives";
-            packageId = "frunk_derives";
-            usesDefaultFeatures = false;
-          }
-        ];
-        features = {
-          "default" = [ "validated" "proc-macros" ];
-          "frunk_proc_macros" = [ "dep:frunk_proc_macros" ];
-          "proc-macros" = [ "frunk_proc_macros" ];
-          "serde" = [ "dep:serde" ];
-          "std" = [ "frunk_core/std" ];
-          "validated" = [ "std" ];
-        };
-      };
-      "frunk_core" = rec {
-        crateName = "frunk_core";
-        version = "0.4.2";
-        edition = "2021";
-        sha256 = "1mjqnn7dclwn8d5g0mrfkg360cgn70a7mm8arx6fc1xxn3x6j95g";
-        authors = [
-          "Lloyd <lloydmeta@gmail.com>"
-        ];
-        features = {
-          "default" = [ "std" ];
-          "serde" = [ "dep:serde" ];
-        };
-      };
-      "frunk_derives" = rec {
-        crateName = "frunk_derives";
-        version = "0.4.2";
-        edition = "2021";
-        sha256 = "0blsy6aq6rbvxcc0337g15083w24s8539fmv8rwp1qan2qprkymh";
-        procMacro = true;
-        authors = [
-          "Lloyd <lloydmeta@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "frunk_proc_macro_helpers";
-            packageId = "frunk_proc_macro_helpers";
-            usesDefaultFeatures = false;
-          }
-          {
-            name = "quote";
-            packageId = "quote";
-          }
-          {
-            name = "syn";
-            packageId = "syn 2.0.41";
-          }
-        ];
-
-      };
-      "frunk_proc_macro_helpers" = rec {
-        crateName = "frunk_proc_macro_helpers";
-        version = "0.1.2";
-        edition = "2021";
-        sha256 = "0b1xl4cfrfai7qi5cb4h9x0967miv3dvwvnsmr1vg4ljhgflmd9m";
-        authors = [
-          "Lloyd <lloydmeta@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "frunk_core";
-            packageId = "frunk_core";
-            usesDefaultFeatures = false;
-          }
-          {
-            name = "proc-macro2";
-            packageId = "proc-macro2";
-          }
-          {
-            name = "quote";
-            packageId = "quote";
-          }
-          {
-            name = "syn";
-            packageId = "syn 2.0.41";
-          }
-        ];
-
-      };
       "ft-core" = rec {
         crateName = "ft-core";
         version = "0.1.0";
@@ -4233,8 +3372,6 @@ rec {
         ];
 
       };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "fuchsia-cprng" = rec {
         crateName = "fuchsia-cprng";
         version = "0.1.1";
@@ -4245,37 +3382,11 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
-      "fugit" = rec {
-        crateName = "fugit";
-        version = "0.3.7";
-        edition = "2021";
-        sha256 = "1rzp49521akq49vs9m8llgmdkk08zb77rry10a7srm9797b6l60p";
-        authors = [
-          "Emil Fresk <emil.fresk@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "gcd";
-            packageId = "gcd";
-          }
-        ];
-        features = {
-          "defmt" = [ "dep:defmt" ];
-        };
-      };
       "futures" = rec {
         crateName = "futures";
         version = "0.3.29";
         edition = "2018";
         sha256 = "0dak2ilpcmyjrb1j54fzy9hlw6vd10vqljq9gd59pbrq9dqr00ns";
-=======
-      "futures" = rec {
-        crateName = "futures";
-        version = "0.3.28";
-        edition = "2018";
-        sha256 = "0h7c1xvxk751c7xlnph6fh3rb77z4lig4qif7f8q79db2az2ld13";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "futures-channel";
@@ -4334,15 +3445,9 @@ rec {
       };
       "futures-channel" = rec {
         crateName = "futures-channel";
-<<<<<<< HEAD
         version = "0.3.29";
         edition = "2018";
         sha256 = "1jxsifvrbqzdadk0svbax71cba5d3qg3wgjq8i160mxmd1kdckgz";
-=======
-        version = "0.3.28";
-        edition = "2018";
-        sha256 = "1wmm9wm5zjigxz61qkscmxp7c30zp08dy63spjz5pch9gva1hmcm";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "futures-core";
@@ -4367,15 +3472,9 @@ rec {
       };
       "futures-core" = rec {
         crateName = "futures-core";
-<<<<<<< HEAD
         version = "0.3.29";
         edition = "2018";
         sha256 = "1308bpj0g36nhx2y6bl4mm6f1gnh9xyvvw2q2wpdgnb6dv3247gb";
-=======
-        version = "0.3.28";
-        edition = "2018";
-        sha256 = "137fdxy5amg9zkpa1kqnj7bnha6b94fmddz59w973x96gqxmijjb";
->>>>>>> 4366a49 (Start nixifying applications)
         features = {
           "default" = [ "std" ];
           "portable-atomic" = [ "dep:portable-atomic" ];
@@ -4385,15 +3484,9 @@ rec {
       };
       "futures-executor" = rec {
         crateName = "futures-executor";
-<<<<<<< HEAD
         version = "0.3.29";
         edition = "2018";
         sha256 = "1g4pjni0sw28djx6mlcfz584abm2lpifz86cmng0kkxh7mlvhkqg";
-=======
-        version = "0.3.28";
-        edition = "2018";
-        sha256 = "1q468di96knnla72xdvswic1ir2qkrf5czsdigc5n4l86a1fxv6c";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "futures-core";
@@ -4454,15 +3547,9 @@ rec {
       };
       "futures-io" = rec {
         crateName = "futures-io";
-<<<<<<< HEAD
         version = "0.3.29";
         edition = "2018";
         sha256 = "1ajsljgny3zfxwahba9byjzclrgvm1ypakca8z854k2w7cb4mwwb";
-=======
-        version = "0.3.28";
-        edition = "2018";
-        sha256 = "0r4rhkdhq1my4fahlhz59barqa511bylq813w3w4gvbidq4p9zsg";
->>>>>>> 4366a49 (Start nixifying applications)
         features = {
           "default" = [ "std" ];
         };
@@ -4470,15 +3557,9 @@ rec {
       };
       "futures-macro" = rec {
         crateName = "futures-macro";
-<<<<<<< HEAD
         version = "0.3.29";
         edition = "2018";
         sha256 = "1nwd18i8kvpkdfwm045hddjli0n96zi7pn6f99zi9c74j7ym7cak";
-=======
-        version = "0.3.28";
-        edition = "2018";
-        sha256 = "0wpfsqxwqk5k569xl0jzz4zxy85x695mndf7y9jn66q6jid59jl9";
->>>>>>> 4366a49 (Start nixifying applications)
         procMacro = true;
         dependencies = [
           {
@@ -4491,11 +3572,7 @@ rec {
           }
           {
             name = "syn";
-<<<<<<< HEAD
             packageId = "syn 2.0.41";
-=======
-            packageId = "syn 2.0.37";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "full" ];
           }
         ];
@@ -4503,15 +3580,9 @@ rec {
       };
       "futures-sink" = rec {
         crateName = "futures-sink";
-<<<<<<< HEAD
         version = "0.3.29";
         edition = "2018";
         sha256 = "05q8jykqddxzp8nwf00wjk5m5mqi546d7i8hsxma7hiqxrw36vg3";
-=======
-        version = "0.3.28";
-        edition = "2018";
-        sha256 = "0vkv4frf4c6gm1ag9imjz8d0xvpnn22lkylsls0rffx147zf8fzl";
->>>>>>> 4366a49 (Start nixifying applications)
         features = {
           "default" = [ "std" ];
           "std" = [ "alloc" ];
@@ -4520,15 +3591,9 @@ rec {
       };
       "futures-task" = rec {
         crateName = "futures-task";
-<<<<<<< HEAD
         version = "0.3.29";
         edition = "2018";
         sha256 = "1qmsss8rb5ppql4qvd4r70h9gpfcpd0bg2b3qilxrnhdkc397lgg";
-=======
-        version = "0.3.28";
-        edition = "2018";
-        sha256 = "0ravgihyarbplj32zp60asirfnaalw2wfsa0afhnl3kcpqrd3lvn";
->>>>>>> 4366a49 (Start nixifying applications)
         features = {
           "default" = [ "std" ];
           "std" = [ "alloc" ];
@@ -4537,15 +3602,9 @@ rec {
       };
       "futures-util" = rec {
         crateName = "futures-util";
-<<<<<<< HEAD
         version = "0.3.29";
         edition = "2018";
         sha256 = "0141rkqh0psj4h8x8lgsl1p29dhqr7z2wcixkcbs60z74kb2d5d1";
-=======
-        version = "0.3.28";
-        edition = "2018";
-        sha256 = "0cwmls9369w6q6hwlbm10q0plr6hmg8w28fpqvv4rmbjnx01xc16";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "futures-channel";
@@ -4626,61 +3685,28 @@ rec {
         };
         resolvedDefaultFeatures = [ "alloc" "async-await" "async-await-macro" "channel" "default" "futures-channel" "futures-io" "futures-macro" "futures-sink" "io" "memchr" "sink" "slab" "std" ];
       };
-<<<<<<< HEAD
-      "gcd" = rec {
-        crateName = "gcd";
-        version = "2.3.0";
-        edition = "2021";
-        sha256 = "06l4fib4dh4m6gazdrzzzinhvcpcfh05r4i4gzscl03vnjhqnx8x";
-        authors = [
-          "Corey Farwell <coreyf@rwell.org>"
-        ];
-
-      };
       "gdk-pixbuf" = rec {
         crateName = "gdk-pixbuf";
         version = "0.18.3";
         edition = "2021";
         sha256 = "0b68ssdyapvq3bgsna9frabbzhjkvvzz8jld4mxkphr29nvk4vs4";
-=======
-      "gdk-pixbuf" = rec {
-        crateName = "gdk-pixbuf";
-        version = "0.17.10";
-        edition = "2021";
-        sha256 = "05q7ajsp2z8xi355h26k7lvq7n3lj9xm61vhn045g3238v46npb9";
->>>>>>> 4366a49 (Start nixifying applications)
         libName = "gdk_pixbuf";
         authors = [
           "The gtk-rs Project Developers"
         ];
         dependencies = [
           {
-<<<<<<< HEAD
-=======
-            name = "bitflags";
-            packageId = "bitflags 1.3.2";
-          }
-          {
->>>>>>> 4366a49 (Start nixifying applications)
             name = "gdk-pixbuf-sys";
             packageId = "gdk-pixbuf-sys";
             rename = "ffi";
           }
           {
             name = "gio";
-<<<<<<< HEAD
             packageId = "gio";
           }
           {
             name = "glib";
             packageId = "glib";
-=======
-            packageId = "gio 0.17.10";
-          }
-          {
-            name = "glib";
-            packageId = "glib 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "libc";
@@ -4692,25 +3718,15 @@ rec {
           }
         ];
         features = {
-<<<<<<< HEAD
-=======
-          "dox" = [ "glib/dox" "gio/dox" "ffi/dox" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "v2_40" = [ "ffi/v2_40" ];
           "v2_42" = [ "v2_40" "ffi/v2_42" ];
         };
       };
       "gdk-pixbuf-sys" = rec {
         crateName = "gdk-pixbuf-sys";
-<<<<<<< HEAD
         version = "0.18.0";
         edition = "2021";
         sha256 = "1xya543c4ffd2n7aiwwrdxsyc9casdbasafi6ixcknafckm3k61z";
-=======
-        version = "0.17.10";
-        edition = "2021";
-        sha256 = "1jvh91lzanr1a8c5h6ya8i4jzx7ifs8mjxjnmg8dfriw24yfr1cj";
->>>>>>> 4366a49 (Start nixifying applications)
         libName = "gdk_pixbuf_sys";
         authors = [
           "The gtk-rs Project Developers"
@@ -4718,29 +3734,17 @@ rec {
         dependencies = [
           {
             name = "gio-sys";
-<<<<<<< HEAD
             packageId = "gio-sys";
-=======
-            packageId = "gio-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "gio";
           }
           {
             name = "glib-sys";
-<<<<<<< HEAD
             packageId = "glib-sys";
-=======
-            packageId = "glib-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "glib";
           }
           {
             name = "gobject-sys";
-<<<<<<< HEAD
             packageId = "gobject-sys";
-=======
-            packageId = "gobject-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "gobject";
           }
           {
@@ -4755,36 +3759,19 @@ rec {
           }
         ];
         features = {
-<<<<<<< HEAD
-=======
-          "dox" = [ "glib/dox" "gobject/dox" "gio/dox" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "v2_42" = [ "v2_40" ];
         };
       };
       "gdk4" = rec {
         crateName = "gdk4";
-<<<<<<< HEAD
         version = "0.7.3";
         edition = "2021";
         sha256 = "1xiacc63p73apr033gjrb9dsk0y4yxnsljwfxbwfry41snd03nvy";
-=======
-        version = "0.6.3";
-        edition = "2021";
-        sha256 = "1zri4z8nxsp88mvk8vhk6xqpc4g1l69zi9w1z3fkwvm211jgkay3";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The gtk-rs Project Developers"
         ];
         dependencies = [
           {
-<<<<<<< HEAD
-=======
-            name = "bitflags";
-            packageId = "bitflags 1.3.2";
-          }
-          {
->>>>>>> 4366a49 (Start nixifying applications)
             name = "cairo-rs";
             packageId = "cairo-rs";
           }
@@ -4799,20 +3786,12 @@ rec {
           }
           {
             name = "gio";
-<<<<<<< HEAD
             packageId = "gio";
-=======
-            packageId = "gio 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "v2_66" ];
           }
           {
             name = "glib";
-<<<<<<< HEAD
             packageId = "glib";
-=======
-            packageId = "glib 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "v2_66" ];
           }
           {
@@ -4821,29 +3800,19 @@ rec {
           }
           {
             name = "pango";
-<<<<<<< HEAD
             packageId = "pango";
-=======
-            packageId = "pango 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "v1_46" ];
           }
         ];
         features = {
-<<<<<<< HEAD
           "gl" = [ "dep:gl" ];
           "v4_10" = [ "ffi/v4_10" "v4_8" ];
           "v4_12" = [ "ffi/v4_12" "v4_10" ];
-=======
-          "dox" = [ "ffi/dox" "glib/dox" "gio/dox" "gdk-pixbuf/dox" "cairo-rs/dox" "pango/dox" ];
-          "v4_10" = [ "ffi/v4_10" "v4_8" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "v4_2" = [ "ffi/v4_2" ];
           "v4_4" = [ "ffi/v4_4" "v4_2" ];
           "v4_6" = [ "ffi/v4_6" "v4_4" ];
           "v4_8" = [ "ffi/v4_8" "v4_6" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "v4_10" "v4_2" "v4_4" "v4_6" "v4_8" ];
       };
       "gdk4-sys" = rec {
@@ -4851,15 +3820,6 @@ rec {
         version = "0.7.2";
         edition = "2021";
         sha256 = "1w7yvir565sjrrw828lss07749hfpfsr19jdjzwivkx36brl7ayv";
-=======
-        resolvedDefaultFeatures = [ "v4_2" "v4_4" "v4_6" "v4_8" ];
-      };
-      "gdk4-sys" = rec {
-        crateName = "gdk4-sys";
-        version = "0.6.3";
-        edition = "2021";
-        sha256 = "0r7dm9vyzg2xlzdgxqa190gd1403mhw4q09x754rq24cc2hjmj8v";
->>>>>>> 4366a49 (Start nixifying applications)
         libName = "gdk4_sys";
         authors = [
           "The gtk-rs Project Developers"
@@ -4877,29 +3837,17 @@ rec {
           }
           {
             name = "gio-sys";
-<<<<<<< HEAD
             packageId = "gio-sys";
-=======
-            packageId = "gio-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "gio";
           }
           {
             name = "glib-sys";
-<<<<<<< HEAD
             packageId = "glib-sys";
-=======
-            packageId = "glib-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "glib";
           }
           {
             name = "gobject-sys";
-<<<<<<< HEAD
             packageId = "gobject-sys";
-=======
-            packageId = "gobject-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "gobject";
           }
           {
@@ -4908,11 +3856,7 @@ rec {
           }
           {
             name = "pango-sys";
-<<<<<<< HEAD
             packageId = "pango-sys";
-=======
-            packageId = "pango-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "pango";
           }
         ];
@@ -4927,22 +3871,13 @@ rec {
           }
         ];
         features = {
-<<<<<<< HEAD
           "v4_10" = [ "v4_8" ];
           "v4_12" = [ "v4_10" ];
-=======
-          "dox" = [ "glib/dox" "gobject/dox" "gio/dox" "gdk_pixbuf/dox" "pango/dox" "cairo/dox" ];
-          "v4_10" = [ "v4_8" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "v4_4" = [ "v4_2" ];
           "v4_6" = [ "v4_4" ];
           "v4_8" = [ "v4_6" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "v4_10" "v4_2" "v4_4" "v4_6" "v4_8" ];
-=======
-        resolvedDefaultFeatures = [ "v4_2" "v4_4" "v4_6" "v4_8" ];
->>>>>>> 4366a49 (Start nixifying applications)
       };
       "generic-array 0.11.2" = rec {
         crateName = "generic-array";
@@ -5005,15 +3940,9 @@ rec {
       };
       "getrandom" = rec {
         crateName = "getrandom";
-<<<<<<< HEAD
         version = "0.2.11";
         edition = "2018";
         sha256 = "03q7120cc2kn7ry013i67zmjl2g9q73h1ks5z08hq5v9syz0d47y";
-=======
-        version = "0.2.10";
-        edition = "2018";
-        sha256 = "09zlimhhskzf7cmgcszix05wyz2i6fcpvh711cv1klsxl6r3chdy";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The Rand Project Developers"
         ];
@@ -5032,11 +3961,7 @@ rec {
             name = "wasi";
             packageId = "wasi 0.11.0+wasi-snapshot-preview1";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             target = { target, features }: ("wasi" == target."os");
-=======
-            target = { target, features }: ("wasi" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
         features = {
@@ -5099,15 +4024,9 @@ rec {
       };
       "gimli" = rec {
         crateName = "gimli";
-<<<<<<< HEAD
         version = "0.28.1";
         edition = "2018";
         sha256 = "0lv23wc8rxvmjia3mcxc6hj9vkqnv1bqq0h8nzjcgf71mrxx6wa2";
-=======
-        version = "0.28.0";
-        edition = "2018";
-        sha256 = "1h7hcl3chfvd2gfrrxjymnwj7anqxjslvz20kcargkvsya2dgf3g";
->>>>>>> 4366a49 (Start nixifying applications)
         features = {
           "default" = [ "read-all" "write" ];
           "endian-reader" = [ "read" "dep:stable_deref_trait" ];
@@ -5120,102 +4039,11 @@ rec {
         };
         resolvedDefaultFeatures = [ "read" "read-core" ];
       };
-<<<<<<< HEAD
       "gio" = rec {
         crateName = "gio";
         version = "0.18.4";
         edition = "2021";
         sha256 = "0wsc6mnx057s4ailacg99dwgna38dbqli5x7a6y9rdw75x9qzz6l";
-=======
-      "gio 0.17.10" = rec {
-        crateName = "gio";
-        version = "0.17.10";
-        edition = "2021";
-        sha256 = "02nkqpq1a6ikzhv5x4nyfvzx8zk5dkjsjm50ns4qdybwjf93x5x6";
-        authors = [
-          "The gtk-rs Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "bitflags";
-            packageId = "bitflags 1.3.2";
-          }
-          {
-            name = "futures-channel";
-            packageId = "futures-channel";
-          }
-          {
-            name = "futures-core";
-            packageId = "futures-core";
-            usesDefaultFeatures = false;
-          }
-          {
-            name = "futures-io";
-            packageId = "futures-io";
-          }
-          {
-            name = "futures-util";
-            packageId = "futures-util";
-            usesDefaultFeatures = false;
-          }
-          {
-            name = "gio-sys";
-            packageId = "gio-sys 0.17.10";
-            rename = "ffi";
-          }
-          {
-            name = "glib";
-            packageId = "glib 0.17.10";
-          }
-          {
-            name = "libc";
-            packageId = "libc";
-          }
-          {
-            name = "once_cell";
-            packageId = "once_cell";
-          }
-          {
-            name = "pin-project-lite";
-            packageId = "pin-project-lite";
-          }
-          {
-            name = "smallvec";
-            packageId = "smallvec";
-          }
-          {
-            name = "thiserror";
-            packageId = "thiserror";
-          }
-        ];
-        devDependencies = [
-          {
-            name = "futures-util";
-            packageId = "futures-util";
-            features = [ "io" ];
-          }
-        ];
-        features = {
-          "dox" = [ "ffi/dox" "glib/dox" ];
-          "v2_58" = [ "ffi/v2_58" "glib/v2_58" ];
-          "v2_60" = [ "v2_58" "ffi/v2_60" "glib/v2_60" ];
-          "v2_62" = [ "v2_60" "ffi/v2_62" "glib/v2_62" ];
-          "v2_64" = [ "v2_62" "ffi/v2_64" "glib/v2_64" ];
-          "v2_66" = [ "v2_64" "ffi/v2_66" "glib/v2_66" ];
-          "v2_68" = [ "v2_66" "ffi/v2_68" "glib/v2_68" ];
-          "v2_70" = [ "v2_68" "ffi/v2_70" "glib/v2_70" ];
-          "v2_72" = [ "v2_70" "ffi/v2_72" "glib/v2_72" ];
-          "v2_74" = [ "v2_72" "ffi/v2_74" "glib/v2_74" ];
-          "v2_76" = [ "v2_74" "ffi/v2_76" "glib/v2_76" ];
-        };
-        resolvedDefaultFeatures = [ "v2_58" "v2_60" "v2_62" "v2_64" "v2_66" ];
-      };
-      "gio 0.18.2" = rec {
-        crateName = "gio";
-        version = "0.18.2";
-        edition = "2021";
-        sha256 = "1caryyr1sciqd25np4v4701nkb7h59gqzpwaiqjrp6g5x222y1ap";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The gtk-rs Project Developers"
         ];
@@ -5240,20 +4068,12 @@ rec {
           }
           {
             name = "gio-sys";
-<<<<<<< HEAD
             packageId = "gio-sys";
-=======
-            packageId = "gio-sys 0.18.1";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "ffi";
           }
           {
             name = "glib";
-<<<<<<< HEAD
             packageId = "glib";
-=======
-            packageId = "glib 0.18.2";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "libc";
@@ -5296,65 +4116,9 @@ rec {
           "v2_76" = [ "v2_74" "ffi/v2_76" "glib/v2_76" ];
           "v2_78" = [ "v2_76" "ffi/v2_78" "glib/v2_78" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "v2_58" "v2_60" "v2_62" "v2_64" "v2_66" ];
       };
       "gio-sys" = rec {
-=======
-      };
-      "gio-sys 0.17.10" = rec {
-        crateName = "gio-sys";
-        version = "0.17.10";
-        edition = "2021";
-        sha256 = "1hr84vgpz1hbs9q7wgvpnwhbxwh9kim0z5aqv6v6ki0j1b1qgkqc";
-        libName = "gio_sys";
-        authors = [
-          "The gtk-rs Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "glib-sys";
-            packageId = "glib-sys 0.17.10";
-            rename = "glib";
-          }
-          {
-            name = "gobject-sys";
-            packageId = "gobject-sys 0.17.10";
-            rename = "gobject";
-          }
-          {
-            name = "libc";
-            packageId = "libc";
-          }
-          {
-            name = "winapi";
-            packageId = "winapi";
-            target = { target, features }: (target."windows" or false);
-            features = [ "ws2def" "winsock2" ];
-          }
-        ];
-        buildDependencies = [
-          {
-            name = "system-deps";
-            packageId = "system-deps";
-          }
-        ];
-        features = {
-          "dox" = [ "glib/dox" "gobject/dox" ];
-          "v2_60" = [ "v2_58" ];
-          "v2_62" = [ "v2_60" ];
-          "v2_64" = [ "v2_62" ];
-          "v2_66" = [ "v2_64" ];
-          "v2_68" = [ "v2_66" ];
-          "v2_70" = [ "v2_68" ];
-          "v2_72" = [ "v2_70" ];
-          "v2_74" = [ "v2_72" ];
-          "v2_76" = [ "v2_74" ];
-        };
-        resolvedDefaultFeatures = [ "v2_58" "v2_60" "v2_62" "v2_64" "v2_66" ];
-      };
-      "gio-sys 0.18.1" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "gio-sys";
         version = "0.18.1";
         edition = "2021";
@@ -5366,20 +4130,12 @@ rec {
         dependencies = [
           {
             name = "glib-sys";
-<<<<<<< HEAD
             packageId = "glib-sys";
-=======
-            packageId = "glib-sys 0.18.1";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "glib";
           }
           {
             name = "gobject-sys";
-<<<<<<< HEAD
             packageId = "gobject-sys";
-=======
-            packageId = "gobject-sys 0.18.0";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "gobject";
           }
           {
@@ -5411,7 +4167,6 @@ rec {
           "v2_76" = [ "v2_74" ];
           "v2_78" = [ "v2_76" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "v2_58" "v2_60" "v2_62" "v2_64" "v2_66" ];
       };
       "glib" = rec {
@@ -5419,25 +4174,13 @@ rec {
         version = "0.18.4";
         edition = "2021";
         sha256 = "0kjws6ns6dym48nzxz9skhipk55flc2hy5q5kzg4w12wvizvs6wm";
-=======
-      };
-      "glib 0.17.10" = rec {
-        crateName = "glib";
-        version = "0.17.10";
-        edition = "2021";
-        sha256 = "0jqlipn9zixj8fpqlg45v0f06j2ghdz72cml2akcxlnlm1dx9ynk";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The gtk-rs Project Developers"
         ];
         dependencies = [
           {
             name = "bitflags";
-<<<<<<< HEAD
             packageId = "bitflags 2.4.1";
-=======
-            packageId = "bitflags 1.3.2";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "futures-channel";
@@ -5463,136 +4206,22 @@ rec {
           }
           {
             name = "gio-sys";
-<<<<<<< HEAD
             packageId = "gio-sys";
-=======
-            packageId = "gio-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "gio_ffi";
             optional = true;
           }
           {
             name = "glib-macros";
-<<<<<<< HEAD
             packageId = "glib-macros";
           }
           {
             name = "glib-sys";
             packageId = "glib-sys";
-=======
-            packageId = "glib-macros 0.17.10";
-          }
-          {
-            name = "glib-sys";
-            packageId = "glib-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "ffi";
           }
           {
             name = "gobject-sys";
-<<<<<<< HEAD
             packageId = "gobject-sys";
-=======
-            packageId = "gobject-sys 0.17.10";
-            rename = "gobject_ffi";
-          }
-          {
-            name = "libc";
-            packageId = "libc";
-          }
-          {
-            name = "memchr";
-            packageId = "memchr";
-          }
-          {
-            name = "once_cell";
-            packageId = "once_cell";
-          }
-          {
-            name = "smallvec";
-            packageId = "smallvec";
-            features = [ "union" "const_generics" "const_new" ];
-          }
-          {
-            name = "thiserror";
-            packageId = "thiserror";
-          }
-        ];
-        features = {
-          "default" = [ "gio" ];
-          "dox" = [ "ffi/dox" "gobject_ffi/dox" "log_macros" ];
-          "gio" = [ "gio_ffi" ];
-          "gio_ffi" = [ "dep:gio_ffi" ];
-          "log" = [ "rs-log" ];
-          "log_macros" = [ "log" ];
-          "rs-log" = [ "dep:rs-log" ];
-          "v2_58" = [ "ffi/v2_58" "gobject_ffi/v2_58" ];
-          "v2_60" = [ "v2_58" "ffi/v2_60" ];
-          "v2_62" = [ "v2_60" "ffi/v2_62" "gobject_ffi/v2_62" ];
-          "v2_64" = [ "v2_62" "ffi/v2_64" ];
-          "v2_66" = [ "v2_64" "ffi/v2_66" "gobject_ffi/v2_66" ];
-          "v2_68" = [ "v2_66" "ffi/v2_68" "gobject_ffi/v2_68" ];
-          "v2_70" = [ "v2_68" "ffi/v2_70" "gobject_ffi/v2_70" ];
-          "v2_72" = [ "v2_70" "ffi/v2_72" "gobject_ffi/v2_72" ];
-          "v2_74" = [ "v2_72" "ffi/v2_74" "gobject_ffi/v2_74" ];
-          "v2_76" = [ "v2_74" "ffi/v2_76" "gobject_ffi/v2_76" ];
-        };
-        resolvedDefaultFeatures = [ "default" "gio" "gio_ffi" "v2_58" "v2_60" "v2_62" "v2_64" "v2_66" ];
-      };
-      "glib 0.18.2" = rec {
-        crateName = "glib";
-        version = "0.18.2";
-        edition = "2021";
-        sha256 = "06dxrhispzz20n33b5k2gg723p27rprc87xbxb2ng06f07xnlc8w";
-        authors = [
-          "The gtk-rs Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "bitflags";
-            packageId = "bitflags 2.4.0";
-          }
-          {
-            name = "futures-channel";
-            packageId = "futures-channel";
-          }
-          {
-            name = "futures-core";
-            packageId = "futures-core";
-            usesDefaultFeatures = false;
-          }
-          {
-            name = "futures-executor";
-            packageId = "futures-executor";
-          }
-          {
-            name = "futures-task";
-            packageId = "futures-task";
-            usesDefaultFeatures = false;
-          }
-          {
-            name = "futures-util";
-            packageId = "futures-util";
-          }
-          {
-            name = "gio-sys";
-            packageId = "gio-sys 0.18.1";
-            rename = "gio_ffi";
-            optional = true;
-          }
-          {
-            name = "glib-macros";
-            packageId = "glib-macros 0.18.2";
-          }
-          {
-            name = "glib-sys";
-            packageId = "glib-sys 0.18.1";
-            rename = "ffi";
-          }
-          {
-            name = "gobject-sys";
-            packageId = "gobject-sys 0.18.0";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "gobject_ffi";
           }
           {
@@ -5636,11 +4265,7 @@ rec {
           "v2_76" = [ "v2_74" "ffi/v2_76" "gobject_ffi/v2_76" ];
           "v2_78" = [ "v2_76" "ffi/v2_78" "gobject_ffi/v2_78" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "default" "gio" "gio_ffi" "v2_58" "v2_60" "v2_62" "v2_64" "v2_66" ];
-=======
-        resolvedDefaultFeatures = [ "default" "gio" "gio_ffi" ];
->>>>>>> 4366a49 (Start nixifying applications)
       };
       "glib-build-tools 0.16.3" = rec {
         crateName = "glib-build-tools";
@@ -5668,7 +4293,6 @@ rec {
           "gio" = [ "dep:gio" ];
         };
       };
-<<<<<<< HEAD
       "glib-build-tools 0.18.0" = rec {
         crateName = "glib-build-tools";
         version = "0.18.0";
@@ -5686,36 +4310,18 @@ rec {
         version = "0.18.3";
         edition = "2021";
         sha256 = "19crnw5a57w02njpbsmdqwbkncl6hw6g3mv554y8dqzcrri3jybj";
-=======
-      "glib-macros 0.17.10" = rec {
-        crateName = "glib-macros";
-        version = "0.17.10";
-        edition = "2021";
-        sha256 = "09nyh22nryip4i22mdrixzl4q0r5h5lxcn40mgqr30rk6y9wg9gc";
->>>>>>> 4366a49 (Start nixifying applications)
         procMacro = true;
         authors = [
           "The gtk-rs Project Developers"
         ];
         dependencies = [
           {
-<<<<<<< HEAD
-=======
-            name = "anyhow";
-            packageId = "anyhow";
-          }
-          {
->>>>>>> 4366a49 (Start nixifying applications)
             name = "heck";
             packageId = "heck";
           }
           {
             name = "proc-macro-crate";
-<<<<<<< HEAD
             packageId = "proc-macro-crate 2.0.1";
-=======
-            packageId = "proc-macro-crate";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "proc-macro-error";
@@ -5731,93 +4337,13 @@ rec {
           }
           {
             name = "syn";
-<<<<<<< HEAD
             packageId = "syn 2.0.41";
-=======
-            packageId = "syn 1.0.109";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "full" ];
           }
         ];
 
       };
-<<<<<<< HEAD
       "glib-sys" = rec {
-=======
-      "glib-macros 0.18.2" = rec {
-        crateName = "glib-macros";
-        version = "0.18.2";
-        edition = "2021";
-        sha256 = "0iqyzyarmgvm2jlfglrpqkpmsialy7y571jic0ix8dmi48w91npq";
-        procMacro = true;
-        authors = [
-          "The gtk-rs Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "heck";
-            packageId = "heck";
-          }
-          {
-            name = "proc-macro-crate";
-            packageId = "proc-macro-crate";
-          }
-          {
-            name = "proc-macro-error";
-            packageId = "proc-macro-error";
-          }
-          {
-            name = "proc-macro2";
-            packageId = "proc-macro2";
-          }
-          {
-            name = "quote";
-            packageId = "quote";
-          }
-          {
-            name = "syn";
-            packageId = "syn 2.0.37";
-            features = [ "full" ];
-          }
-        ];
-
-      };
-      "glib-sys 0.17.10" = rec {
-        crateName = "glib-sys";
-        version = "0.17.10";
-        edition = "2021";
-        sha256 = "1w64ppa12s9ky6gfdaqhq9w30ad6hskll812jb3sl2xsggmac2nq";
-        libName = "glib_sys";
-        authors = [
-          "The gtk-rs Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "libc";
-            packageId = "libc";
-          }
-        ];
-        buildDependencies = [
-          {
-            name = "system-deps";
-            packageId = "system-deps";
-          }
-        ];
-        features = {
-          "v2_60" = [ "v2_58" ];
-          "v2_62" = [ "v2_60" ];
-          "v2_64" = [ "v2_62" ];
-          "v2_66" = [ "v2_64" ];
-          "v2_68" = [ "v2_66" ];
-          "v2_70" = [ "v2_68" ];
-          "v2_72" = [ "v2_70" ];
-          "v2_74" = [ "v2_72" ];
-          "v2_76" = [ "v2_74" ];
-        };
-        resolvedDefaultFeatures = [ "v2_58" "v2_60" "v2_62" "v2_64" "v2_66" ];
-      };
-      "glib-sys 0.18.1" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "glib-sys";
         version = "0.18.1";
         edition = "2021";
@@ -5850,10 +4376,7 @@ rec {
           "v2_76" = [ "v2_74" ];
           "v2_78" = [ "v2_76" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "v2_58" "v2_60" "v2_62" "v2_64" "v2_66" ];
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       };
       "gm-control-panel" = rec {
         crateName = "gm-control-panel";
@@ -5891,19 +4414,11 @@ rec {
           }
           {
             name = "gio";
-<<<<<<< HEAD
             packageId = "gio";
           }
           {
             name = "glib";
             packageId = "glib";
-=======
-            packageId = "gio 0.17.10";
-          }
-          {
-            name = "glib";
-            packageId = "glib 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "gtk4";
@@ -5919,11 +4434,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "serde_json";
@@ -5943,49 +4454,7 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "gobject-sys" = rec {
-=======
-      "gobject-sys 0.17.10" = rec {
-        crateName = "gobject-sys";
-        version = "0.17.10";
-        edition = "2021";
-        sha256 = "0ql0pcab6dxjapiglxcjaavbbh1sznyc2wj5q273b9j0fwqw6d6d";
-        libName = "gobject_sys";
-        authors = [
-          "The gtk-rs Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "glib-sys";
-            packageId = "glib-sys 0.17.10";
-            rename = "glib";
-          }
-          {
-            name = "libc";
-            packageId = "libc";
-          }
-        ];
-        buildDependencies = [
-          {
-            name = "system-deps";
-            packageId = "system-deps";
-          }
-        ];
-        features = {
-          "dox" = [ "glib/dox" ];
-          "v2_62" = [ "v2_58" ];
-          "v2_66" = [ "v2_62" ];
-          "v2_68" = [ "v2_66" ];
-          "v2_70" = [ "v2_68" ];
-          "v2_72" = [ "v2_70" ];
-          "v2_74" = [ "v2_72" ];
-          "v2_76" = [ "v2_74" ];
-        };
-        resolvedDefaultFeatures = [ "v2_58" "v2_62" "v2_66" ];
-      };
-      "gobject-sys 0.18.0" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "gobject-sys";
         version = "0.18.0";
         edition = "2021";
@@ -5997,11 +4466,7 @@ rec {
         dependencies = [
           {
             name = "glib-sys";
-<<<<<<< HEAD
             packageId = "glib-sys";
-=======
-            packageId = "glib-sys 0.18.1";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "glib";
           }
           {
@@ -6025,7 +4490,6 @@ rec {
           "v2_76" = [ "v2_74" ];
           "v2_78" = [ "v2_74" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "v2_58" "v2_62" "v2_66" ];
       };
       "graphene-rs" = rec {
@@ -6033,14 +4497,6 @@ rec {
         version = "0.18.1";
         edition = "2021";
         sha256 = "00f4q1ra4haap5i7lazwhkdgnb49fs8adk2nm6ki6mjhl76jh8iv";
-=======
-      };
-      "graphene-rs" = rec {
-        crateName = "graphene-rs";
-        version = "0.17.10";
-        edition = "2021";
-        sha256 = "1na0kg5q746kpg0x8hic06rqknbjs9050i85idafsnav4q0vpx6y";
->>>>>>> 4366a49 (Start nixifying applications)
         libName = "graphene";
         authors = [
           "The gtk-rs Project Developers"
@@ -6048,11 +4504,7 @@ rec {
         dependencies = [
           {
             name = "glib";
-<<<<<<< HEAD
             packageId = "glib";
-=======
-            packageId = "glib 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "graphene-sys";
@@ -6065,24 +4517,14 @@ rec {
           }
         ];
         features = {
-<<<<<<< HEAD
           "v1_12" = [ "ffi/v1_12" ];
-=======
-          "dox" = [ "ffi/dox" "glib/dox" ];
->>>>>>> 4366a49 (Start nixifying applications)
         };
       };
       "graphene-sys" = rec {
         crateName = "graphene-sys";
-<<<<<<< HEAD
         version = "0.18.1";
         edition = "2021";
         sha256 = "0n8zlg7z26lwpnvlqp1hjlgrs671skqwagdpm7r8i1zwx3748hfc";
-=======
-        version = "0.17.10";
-        edition = "2021";
-        sha256 = "07dj19zwffl0h8qjs7lxf3czb5p2myixj2zadkiparkags0zqmhq";
->>>>>>> 4366a49 (Start nixifying applications)
         libName = "graphene_sys";
         authors = [
           "The gtk-rs Project Developers"
@@ -6090,11 +4532,7 @@ rec {
         dependencies = [
           {
             name = "glib-sys";
-<<<<<<< HEAD
             packageId = "glib-sys";
-=======
-            packageId = "glib-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "glib";
           }
           {
@@ -6113,10 +4551,6 @@ rec {
           }
         ];
         features = {
-<<<<<<< HEAD
-=======
-          "dox" = [ "glib/dox" ];
->>>>>>> 4366a49 (Start nixifying applications)
         };
       };
       "grid" = rec {
@@ -6142,27 +4576,14 @@ rec {
       };
       "gsk4" = rec {
         crateName = "gsk4";
-<<<<<<< HEAD
         version = "0.7.3";
         edition = "2021";
         sha256 = "0zhzs2dkgiinhgc11akpn2harq3x5n1iq21dnc4h689g3lsqx58d";
-=======
-        version = "0.6.3";
-        edition = "2021";
-        sha256 = "0g1srhahmhdl6rqbz98bawzf1gp6hf9m4y4rvbi1bb3wz92fy0bg";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The gtk-rs Project Developers"
         ];
         dependencies = [
           {
-<<<<<<< HEAD
-=======
-            name = "bitflags";
-            packageId = "bitflags 1.3.2";
-          }
-          {
->>>>>>> 4366a49 (Start nixifying applications)
             name = "cairo-rs";
             packageId = "cairo-rs";
           }
@@ -6173,11 +4594,7 @@ rec {
           }
           {
             name = "glib";
-<<<<<<< HEAD
             packageId = "glib";
-=======
-            packageId = "glib 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "v2_66" ];
           }
           {
@@ -6196,16 +4613,11 @@ rec {
           }
           {
             name = "pango";
-<<<<<<< HEAD
             packageId = "pango";
-=======
-            packageId = "pango 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "v1_46" ];
           }
         ];
         features = {
-<<<<<<< HEAD
           "broadway" = [ "ffi/broadway" ];
           "v4_10" = [ "ffi/v4_10" "gdk/v4_10" "v4_6" ];
           "v4_14" = [ "ffi/v4_14" "v4_10" ];
@@ -6221,21 +4633,6 @@ rec {
         version = "0.7.3";
         edition = "2021";
         sha256 = "0mbdlm9qi1hql48rr29vsj9vlqwc7gxg67wg1q19z67azwz9xg8j";
-=======
-          "dox" = [ "ffi/dox" "gdk/dox" "graphene/dox" "glib/dox" "cairo-rs/dox" "pango/dox" ];
-          "v4_10" = [ "ffi/v4_10" "gdk/v4_10" "v4_6" ];
-          "v4_2" = [ "ffi/v4_2" "gdk/v4_2" ];
-          "v4_4" = [ "ffi/v4_4" "gdk/v4_4" "v4_2" ];
-          "v4_6" = [ "ffi/v4_6" "gdk/v4_6" "v4_4" ];
-        };
-        resolvedDefaultFeatures = [ "v4_2" "v4_4" "v4_6" ];
-      };
-      "gsk4-sys" = rec {
-        crateName = "gsk4-sys";
-        version = "0.6.3";
-        edition = "2021";
-        sha256 = "1c013zdd0yzcfmkz1gj28dbfz2zmypi8baimjk9264yg9pxq8yn0";
->>>>>>> 4366a49 (Start nixifying applications)
         libName = "gsk4_sys";
         authors = [
           "The gtk-rs Project Developers"
@@ -6253,20 +4650,12 @@ rec {
           }
           {
             name = "glib-sys";
-<<<<<<< HEAD
             packageId = "glib-sys";
-=======
-            packageId = "glib-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "glib";
           }
           {
             name = "gobject-sys";
-<<<<<<< HEAD
             packageId = "gobject-sys";
-=======
-            packageId = "gobject-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "gobject";
           }
           {
@@ -6280,11 +4669,7 @@ rec {
           }
           {
             name = "pango-sys";
-<<<<<<< HEAD
             packageId = "pango-sys";
-=======
-            packageId = "pango-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "pango";
           }
         ];
@@ -6295,7 +4680,6 @@ rec {
           }
         ];
         features = {
-<<<<<<< HEAD
           "v4_10" = [ "v4_6" ];
           "v4_14" = [ "v4_10" ];
           "v4_4" = [ "v4_2" ];
@@ -6308,32 +4692,11 @@ rec {
         version = "0.7.3";
         edition = "2021";
         sha256 = "0hh8nzglmz94v1m1h6vy8z12m6fr7ia467ry0md5fa4p7sm53sss";
-=======
-          "dox" = [ "glib/dox" "gobject/dox" "pango/dox" "cairo/dox" "graphene/dox" "gdk/dox" ];
-          "v4_10" = [ "v4_6" ];
-          "v4_4" = [ "v4_2" ];
-          "v4_6" = [ "v4_4" ];
-        };
-        resolvedDefaultFeatures = [ "v4_2" "v4_4" "v4_6" ];
-      };
-      "gtk4" = rec {
-        crateName = "gtk4";
-        version = "0.6.6";
-        edition = "2021";
-        sha256 = "12y8ck3y555mvv65lwm7l19f23wycq68ngwql0afyp6p9jh352mj";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The gtk-rs Project Developers"
         ];
         dependencies = [
           {
-<<<<<<< HEAD
-=======
-            name = "bitflags";
-            packageId = "bitflags 1.3.2";
-          }
-          {
->>>>>>> 4366a49 (Start nixifying applications)
             name = "cairo-rs";
             packageId = "cairo-rs";
           }
@@ -6356,20 +4719,12 @@ rec {
           }
           {
             name = "gio";
-<<<<<<< HEAD
             packageId = "gio";
-=======
-            packageId = "gio 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "v2_66" ];
           }
           {
             name = "glib";
-<<<<<<< HEAD
             packageId = "glib";
-=======
-            packageId = "glib 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "v2_66" ];
           }
           {
@@ -6396,23 +4751,13 @@ rec {
             packageId = "libc";
           }
           {
-<<<<<<< HEAD
             name = "pango";
             packageId = "pango";
-=======
-            name = "once_cell";
-            packageId = "once_cell";
-          }
-          {
-            name = "pango";
-            packageId = "pango 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "v1_46" ];
           }
         ];
         features = {
           "blueprint" = [ "gtk4-macros/blueprint" ];
-<<<<<<< HEAD
           "gnome_42" = [ "v4_6" "cairo-rs/v1_16" "gdk-pixbuf/v2_42" "gio/v2_72" ];
           "gnome_43" = [ "v4_8" "cairo-rs/v1_16" "gdk-pixbuf/v2_42" "gio/v2_74" ];
           "gnome_44" = [ "v4_10" "cairo-rs/v1_16" "gdk-pixbuf/v2_42" "gio/v2_76" ];
@@ -6420,20 +4765,12 @@ rec {
           "v4_10" = [ "ffi/v4_10" "v4_8" "gdk/v4_10" "gsk/v4_10" ];
           "v4_12" = [ "ffi/v4_12" "v4_10" "gdk/v4_12" ];
           "v4_14" = [ "ffi/v4_14" "v4_12" "gsk/v4_14" ];
-=======
-          "dox" = [ "gdk/dox" "gsk/dox" "ffi/dox" "cairo-rs/dox" "gdk-pixbuf/dox" "gio/dox" "glib/dox" "graphene/dox" "pango/dox" ];
-          "gnome_42" = [ "v4_6" "cairo-rs/v1_16" "gdk-pixbuf/v2_42" "gio/v2_72" ];
-          "gnome_43" = [ "v4_8" "cairo-rs/v1_16" "gdk-pixbuf/v2_42" "gio/v2_74" ];
-          "gnome_44" = [ "v4_10" "cairo-rs/v1_16" "gdk-pixbuf/v2_42" "gio/v2_76" ];
-          "v4_10" = [ "ffi/v4_10" "v4_8" "gdk/v4_10" "gsk/v4_10" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "v4_2" = [ "ffi/v4_2" "gdk/v4_2" "gsk/v4_2" ];
           "v4_4" = [ "ffi/v4_4" "v4_2" "gdk/v4_4" "gsk/v4_4" ];
           "v4_6" = [ "ffi/v4_6" "v4_4" "gdk/v4_6" "gsk/v4_6" "pango/v1_50" ];
           "v4_8" = [ "ffi/v4_8" "v4_6" "gdk/v4_8" ];
           "xml_validation" = [ "gtk4-macros/xml_validation" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "v4_10" "v4_2" "v4_4" "v4_6" "v4_8" ];
       };
       "gtk4-macros" = rec {
@@ -6441,15 +4778,6 @@ rec {
         version = "0.7.2";
         edition = "2021";
         sha256 = "0bw3cchiycf7dw1bw4p8946gv38azxy05a5w0ndgcmxnz6fc8znm";
-=======
-        resolvedDefaultFeatures = [ "v4_2" "v4_4" "v4_6" "v4_8" ];
-      };
-      "gtk4-macros" = rec {
-        crateName = "gtk4-macros";
-        version = "0.6.6";
-        edition = "2021";
-        sha256 = "03shq84fvay3zqdccr2j22v6kkdi8fj4v61dakpd6xhgaxhnnkba";
->>>>>>> 4366a49 (Start nixifying applications)
         procMacro = true;
         authors = [
           "The gtk-rs Project Developers"
@@ -6461,11 +4789,7 @@ rec {
           }
           {
             name = "proc-macro-crate";
-<<<<<<< HEAD
             packageId = "proc-macro-crate 1.3.1";
-=======
-            packageId = "proc-macro-crate";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "proc-macro-error";
@@ -6493,15 +4817,9 @@ rec {
       };
       "gtk4-sys" = rec {
         crateName = "gtk4-sys";
-<<<<<<< HEAD
         version = "0.7.3";
         edition = "2021";
         sha256 = "1f2ylskyqkjdik9fij2m46pra4jagnif5xyalbxfk3334fmc9n2l";
-=======
-        version = "0.6.3";
-        edition = "2021";
-        sha256 = "0bz26ix7pl4d1m63zacaw1vw5021vm5r7wn7fsg02zmh0zvq70jz";
->>>>>>> 4366a49 (Start nixifying applications)
         libName = "gtk4_sys";
         authors = [
           "The gtk-rs Project Developers"
@@ -6524,29 +4842,17 @@ rec {
           }
           {
             name = "gio-sys";
-<<<<<<< HEAD
             packageId = "gio-sys";
-=======
-            packageId = "gio-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "gio";
           }
           {
             name = "glib-sys";
-<<<<<<< HEAD
             packageId = "glib-sys";
-=======
-            packageId = "glib-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "glib";
           }
           {
             name = "gobject-sys";
-<<<<<<< HEAD
             packageId = "gobject-sys";
-=======
-            packageId = "gobject-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "gobject";
           }
           {
@@ -6565,11 +4871,7 @@ rec {
           }
           {
             name = "pango-sys";
-<<<<<<< HEAD
             packageId = "pango-sys";
-=======
-            packageId = "pango-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "pango";
           }
         ];
@@ -6580,20 +4882,13 @@ rec {
           }
         ];
         features = {
-<<<<<<< HEAD
           "v4_10" = [ "v4_8" ];
           "v4_12" = [ "v4_10" ];
           "v4_14" = [ "v4_12" ];
-=======
-          "dox" = [ "glib/dox" "gobject/dox" "gio/dox" "gdk_pixbuf/dox" "pango/dox" "cairo/dox" "graphene/dox" "gdk/dox" "gsk/dox" ];
-          "v4_10" = [ "v4_8" ];
-          "v4_12" = [ "v4_10" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "v4_4" = [ "v4_2" ];
           "v4_6" = [ "v4_4" ];
           "v4_8" = [ "v4_6" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "v4_10" "v4_2" "v4_4" "v4_6" "v4_8" ];
       };
       "h2" = rec {
@@ -6601,15 +4896,6 @@ rec {
         version = "0.3.22";
         edition = "2018";
         sha256 = "0y41jlflvw8niifdirgng67zdmic62cjf5m2z69hzrpn5qr50qjd";
-=======
-        resolvedDefaultFeatures = [ "v4_2" "v4_4" "v4_6" "v4_8" ];
-      };
-      "h2" = rec {
-        crateName = "h2";
-        version = "0.3.21";
-        edition = "2018";
-        sha256 = "0cq8g5bgk3fihnqicy3g8gc3dpsalzqjg4bjyip9g4my26m27z4i";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Carl Lerche <me@carllerche.com>"
           "Sean McArthur <sean@seanmonstar.com>"
@@ -6640,19 +4926,11 @@ rec {
           }
           {
             name = "http";
-<<<<<<< HEAD
             packageId = "http 0.2.11";
           }
           {
             name = "indexmap";
             packageId = "indexmap";
-=======
-            packageId = "http";
-          }
-          {
-            name = "indexmap";
-            packageId = "indexmap 1.9.3";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "std" ];
           }
           {
@@ -6667,11 +4945,7 @@ rec {
           {
             name = "tokio-util";
             packageId = "tokio-util";
-<<<<<<< HEAD
             features = [ "codec" "io" ];
-=======
-            features = [ "codec" ];
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "tracing";
@@ -6702,11 +4976,7 @@ rec {
           {
             name = "crunchy";
             packageId = "crunchy";
-<<<<<<< HEAD
             target = { target, features }: ("spirv" == target."arch");
-=======
-            target = { target, features }: ("spirv" == target."arch" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
         devDependencies = [
@@ -6725,41 +4995,11 @@ rec {
         };
         resolvedDefaultFeatures = [ "alloc" "default" "std" ];
       };
-<<<<<<< HEAD
       "hashbrown" = rec {
         crateName = "hashbrown";
         version = "0.14.3";
         edition = "2021";
         sha256 = "012nywlg0lj9kwanh69my5x67vjlfmzfi9a0rq4qvis2j8fil3r9";
-=======
-      "hashbrown 0.12.3" = rec {
-        crateName = "hashbrown";
-        version = "0.12.3";
-        edition = "2021";
-        sha256 = "1268ka4750pyg2pbgsr43f0289l5zah4arir2k4igx5a8c6fg7la";
-        authors = [
-          "Amanieu d'Antras <amanieu@gmail.com>"
-        ];
-        features = {
-          "ahash" = [ "dep:ahash" ];
-          "ahash-compile-time-rng" = [ "ahash/compile-time-rng" ];
-          "alloc" = [ "dep:alloc" ];
-          "bumpalo" = [ "dep:bumpalo" ];
-          "compiler_builtins" = [ "dep:compiler_builtins" ];
-          "core" = [ "dep:core" ];
-          "default" = [ "ahash" "inline-more" ];
-          "rayon" = [ "dep:rayon" ];
-          "rustc-dep-of-std" = [ "nightly" "core" "compiler_builtins" "alloc" "rustc-internal-api" ];
-          "serde" = [ "dep:serde" ];
-        };
-        resolvedDefaultFeatures = [ "raw" ];
-      };
-      "hashbrown 0.14.1" = rec {
-        crateName = "hashbrown";
-        version = "0.14.1";
-        edition = "2021";
-        sha256 = "04hdcir5sqgw9318c3sjnhf3jid1mq5ipy0ma2pawpgm28madzbx";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Amanieu d'Antras <amanieu@gmail.com>"
         ];
@@ -6805,11 +5045,7 @@ rec {
         dependencies = [
           {
             name = "hashbrown";
-<<<<<<< HEAD
             packageId = "hashbrown";
-=======
-            packageId = "hashbrown 0.14.1";
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
         features = {
@@ -6828,11 +5064,7 @@ rec {
         dependencies = [
           {
             name = "base64";
-<<<<<<< HEAD
             packageId = "base64 0.21.5";
-=======
-            packageId = "base64 0.21.4";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "bytes";
@@ -6844,11 +5076,7 @@ rec {
           }
           {
             name = "http";
-<<<<<<< HEAD
             packageId = "http 0.2.11";
-=======
-            packageId = "http";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "httpdate";
@@ -6877,11 +5105,7 @@ rec {
         dependencies = [
           {
             name = "http";
-<<<<<<< HEAD
             packageId = "http 0.2.11";
-=======
-            packageId = "http";
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
 
@@ -6970,19 +5194,11 @@ rec {
           }
           {
             name = "gio";
-<<<<<<< HEAD
             packageId = "gio";
           }
           {
             name = "glib";
             packageId = "glib";
-=======
-            packageId = "gio 0.17.10";
-          }
-          {
-            name = "glib";
-            packageId = "glib 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "gtk4";
@@ -6997,11 +5213,7 @@ rec {
         buildDependencies = [
           {
             name = "glib-build-tools";
-<<<<<<< HEAD
             packageId = "glib-build-tools 0.18.0";
-=======
-            packageId = "glib-build-tools 0.16.3";
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
 
@@ -7018,15 +5230,9 @@ rec {
       };
       "hkdf" = rec {
         crateName = "hkdf";
-<<<<<<< HEAD
         version = "0.12.4";
         edition = "2018";
         sha256 = "1xxxzcarz151p1b858yn5skmhyrvn8fs4ivx5km3i1kjmnr8wpvv";
-=======
-        version = "0.12.3";
-        edition = "2018";
-        sha256 = "0dyl16cf15hka32hv3l7dwgr3xj3brpfr27iyrbpdhlzdfgh46kr";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "RustCrypto Developers"
         ];
@@ -7068,47 +5274,27 @@ rec {
       };
       "home" = rec {
         crateName = "home";
-<<<<<<< HEAD
         version = "0.5.9";
         edition = "2021";
         sha256 = "19grxyg35rqfd802pcc9ys1q3lafzlcjcv2pl2s5q8xpyr5kblg3";
-=======
-        version = "0.5.5";
-        edition = "2018";
-        sha256 = "1nqx1krijvpd03d96avsdyknd12h8hs3xhxwgqghf8v9xxzc4i2l";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Brian Anderson <andersrb@gmail.com>"
         ];
         dependencies = [
           {
             name = "windows-sys";
-<<<<<<< HEAD
             packageId = "windows-sys 0.52.0";
             target = { target, features }: (target."windows" or false);
             features = [ "Win32_Foundation" "Win32_UI_Shell" "Win32_System_Com" ];
-=======
-            packageId = "windows-sys";
-            target = { target, features }: (target."windows" or false);
-            features = [ "Win32_Foundation" "Win32_UI_Shell" ];
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
 
       };
-<<<<<<< HEAD
       "http 0.2.11" = rec {
         crateName = "http";
         version = "0.2.11";
         edition = "2018";
         sha256 = "1fwz3mhh86h5kfnr5767jlx9agpdggclq7xsqx930fflzakb2iw9";
-=======
-      "http" = rec {
-        crateName = "http";
-        version = "0.2.9";
-        edition = "2018";
-        sha256 = "10j4jjpngaymxjvi92hllr2y6acr09pq61cvzxd44qzvkb4zyvmx";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Alex Crichton <alex@alexcrichton.com>"
           "Carl Lerche <me@carllerche.com>"
@@ -7130,7 +5316,6 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "http 1.0.0" = rec {
         crateName = "http";
         version = "1.0.0";
@@ -7165,13 +5350,6 @@ rec {
         version = "0.4.6";
         edition = "2018";
         sha256 = "1lmyjfk6bqk6k9gkn1dxq770sb78pqbqshga241hr5p995bb5skw";
-=======
-      "http-body" = rec {
-        crateName = "http-body";
-        version = "0.4.5";
-        edition = "2018";
-        sha256 = "1l967qwwlvhp198xdrnc0p5d7jwfcp6q2lm510j6zqw4s4b8zwym";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Carl Lerche <me@carllerche.com>"
           "Lucio Franco <luciofranco14@gmail.com>"
@@ -7184,11 +5362,7 @@ rec {
           }
           {
             name = "http";
-<<<<<<< HEAD
             packageId = "http 0.2.11";
-=======
-            packageId = "http";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "pin-project-lite";
@@ -7288,19 +5462,11 @@ rec {
         features = {
         };
       };
-<<<<<<< HEAD
       "hyper 0.14.28" = rec {
         crateName = "hyper";
         version = "0.14.28";
         edition = "2018";
         sha256 = "107gkvqx4h9bl17d602zkm2dgpfq86l2dr36yzfsi8l3xcsy35mz";
-=======
-      "hyper 0.14.27" = rec {
-        crateName = "hyper";
-        version = "0.14.27";
-        edition = "2018";
-        sha256 = "0s2l74p3harvjgb0bvaxlxgxq71vpfrzv0cqz2p9w8d8akbczcgz";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Sean McArthur <sean@seanmonstar.com>"
         ];
@@ -7330,11 +5496,7 @@ rec {
           }
           {
             name = "http";
-<<<<<<< HEAD
             packageId = "http 0.2.11";
-=======
-            packageId = "http";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "http-body";
@@ -7358,11 +5520,7 @@ rec {
           }
           {
             name = "socket2";
-<<<<<<< HEAD
             packageId = "socket2";
-=======
-            packageId = "socket2 0.4.9";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
             features = [ "all" ];
           }
@@ -7426,11 +5584,7 @@ rec {
           }
           {
             name = "hyper";
-<<<<<<< HEAD
             packageId = "hyper 0.14.28";
-=======
-            packageId = "hyper 0.14.27";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
             features = [ "tcp" "client" ];
           }
@@ -7450,11 +5604,7 @@ rec {
         devDependencies = [
           {
             name = "hyper";
-<<<<<<< HEAD
             packageId = "hyper 0.14.28";
-=======
-            packageId = "hyper 0.14.27";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
             features = [ "http1" ];
           }
@@ -7470,15 +5620,9 @@ rec {
       };
       "iana-time-zone" = rec {
         crateName = "iana-time-zone";
-<<<<<<< HEAD
         version = "0.1.58";
         edition = "2018";
         sha256 = "081vcr8z8ddhl5r1ywif6grnswk01b2ac4nks2bhn8zzdimvh9l3";
-=======
-        version = "0.1.57";
-        edition = "2018";
-        sha256 = "04yn5npa008fqd2y6qd3y3bmyqjpd4fyiwq6sa5v7lj2b215pb9g";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Andrew Straw <strawman@astraw.com>"
           "René Kijewski <rene.kijewski@fu-berlin.de>"
@@ -7488,58 +5632,32 @@ rec {
           {
             name = "android_system_properties";
             packageId = "android_system_properties";
-<<<<<<< HEAD
             target = { target, features }: ("android" == target."os");
-=======
-            target = { target, features }: ("android" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "core-foundation-sys";
             packageId = "core-foundation-sys";
-<<<<<<< HEAD
             target = { target, features }: (("macos" == target."os") || ("ios" == target."os"));
-=======
-            target = { target, features }: (("macos" == target."os" or null) || ("ios" == target."os" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "iana-time-zone-haiku";
             packageId = "iana-time-zone-haiku";
-<<<<<<< HEAD
             target = { target, features }: ("haiku" == target."os");
-=======
-            target = { target, features }: ("haiku" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "js-sys";
             packageId = "js-sys";
-<<<<<<< HEAD
             target = { target, features }: ("wasm32" == target."arch");
-=======
-            target = { target, features }: ("wasm32" == target."arch" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "wasm-bindgen";
             packageId = "wasm-bindgen";
-<<<<<<< HEAD
             target = { target, features }: ("wasm32" == target."arch");
           }
           {
             name = "windows-core";
             packageId = "windows-core";
             target = { target, features }: ("windows" == target."os");
-=======
-            target = { target, features }: ("wasm32" == target."arch" or null);
-          }
-          {
-            name = "windows";
-            packageId = "windows";
-            target = { target, features }: ("windows" == target."os" or null);
-            features = [ "Globalization" ];
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
         features = {
@@ -7586,19 +5704,11 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "idna 0.5.0" = rec {
         crateName = "idna";
         version = "0.5.0";
         edition = "2018";
         sha256 = "1xhjrcjqq0l5bpzvdgylvpkgk94panxgsirzhjnnqfdgc4a9nkb3";
-=======
-      "idna 0.4.0" = rec {
-        crateName = "idna";
-        version = "0.4.0";
-        edition = "2018";
-        sha256 = "0z4i1dhqk83bbv230pp1c31dqdlnscvqxvc85n40ihgvgfqdc83x";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The rust-url developers"
         ];
@@ -7640,11 +5750,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "derive" ];
           }
           {
@@ -7848,48 +5954,11 @@ rec {
           "default" = [ "std" ];
         };
       };
-<<<<<<< HEAD
       "indexmap" = rec {
         crateName = "indexmap";
         version = "2.1.0";
         edition = "2021";
         sha256 = "07rxrqmryr1xfnmhrjlz8ic6jw28v6h5cig3ws2c9d0wifhy2c6m";
-=======
-      "indexmap 1.9.3" = rec {
-        crateName = "indexmap";
-        version = "1.9.3";
-        edition = "2021";
-        sha256 = "16dxmy7yvk51wvnih3a3im6fp5lmx0wx76i03n06wyak6cwhw1xx";
-        dependencies = [
-          {
-            name = "hashbrown";
-            packageId = "hashbrown 0.12.3";
-            usesDefaultFeatures = false;
-            features = [ "raw" ];
-          }
-        ];
-        buildDependencies = [
-          {
-            name = "autocfg";
-            packageId = "autocfg 1.1.0";
-          }
-        ];
-        features = {
-          "arbitrary" = [ "dep:arbitrary" ];
-          "quickcheck" = [ "dep:quickcheck" ];
-          "rayon" = [ "dep:rayon" ];
-          "rustc-rayon" = [ "dep:rustc-rayon" ];
-          "serde" = [ "dep:serde" ];
-          "serde-1" = [ "serde" ];
-        };
-        resolvedDefaultFeatures = [ "std" ];
-      };
-      "indexmap 2.0.2" = rec {
-        crateName = "indexmap";
-        version = "2.0.2";
-        edition = "2021";
-        sha256 = "15q84zh8fafa3dlrnhy5yyxx14qg9v06757migmccwh2fbfkvpwa";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "equivalent";
@@ -7898,11 +5967,7 @@ rec {
           }
           {
             name = "hashbrown";
-<<<<<<< HEAD
             packageId = "hashbrown";
-=======
-            packageId = "hashbrown 0.14.1";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
             features = [ "raw" ];
           }
@@ -7964,29 +6029,18 @@ rec {
       };
       "ipnet" = rec {
         crateName = "ipnet";
-<<<<<<< HEAD
         version = "2.9.0";
         edition = "2018";
         sha256 = "1hzrcysgwf0knf83ahb3535hrkw63mil88iqc6kjaryfblrqylcg";
-=======
-        version = "2.8.0";
-        edition = "2018";
-        sha256 = "1rhlmw1cpgpba6414m05d2s0xbiblkmkmzjfjfc4a3sgswy9mci8";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Kris Price <kris@krisprice.nz>"
         ];
         features = {
           "default" = [ "std" ];
-<<<<<<< HEAD
           "heapless" = [ "dep:heapless" ];
           "json" = [ "serde" "schemars" ];
           "schemars" = [ "dep:schemars" ];
           "ser_as_str" = [ "heapless" ];
-=======
-          "json" = [ "serde" "schemars" ];
-          "schemars" = [ "dep:schemars" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "serde" = [ "dep:serde" ];
         };
         resolvedDefaultFeatures = [ "default" "std" ];
@@ -8054,29 +6108,17 @@ rec {
           {
             name = "hermit-abi";
             packageId = "hermit-abi";
-<<<<<<< HEAD
             target = { target, features }: ("hermit" == target."os");
-=======
-            target = { target, features }: ("hermit" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "rustix";
             packageId = "rustix";
-<<<<<<< HEAD
             target = { target, features }: (!((target."windows" or false) || ("hermit" == target."os") || ("unknown" == target."os")));
-=======
-            target = { target, features }: (!((target."windows" or false) || ("hermit" == target."os" or null) || ("unknown" == target."os" or null)));
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "termios" ];
           }
           {
             name = "windows-sys";
-<<<<<<< HEAD
             packageId = "windows-sys 0.48.0";
-=======
-            packageId = "windows-sys";
->>>>>>> 4366a49 (Start nixifying applications)
             target = { target, features }: (target."windows" or false);
             features = [ "Win32_Foundation" "Win32_Storage_FileSystem" "Win32_System_Console" ];
           }
@@ -8085,49 +6127,17 @@ rec {
           {
             name = "rustix";
             packageId = "rustix";
-<<<<<<< HEAD
             target = {target, features}: (!((target."windows" or false) || ("hermit" == target."os") || ("unknown" == target."os")));
-=======
-            target = {target, features}: (!((target."windows" or false) || ("hermit" == target."os" or null) || ("unknown" == target."os" or null)));
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "stdio" ];
           }
         ];
 
       };
-<<<<<<< HEAD
-      "itertools 0.10.5" = rec {
-        crateName = "itertools";
-        version = "0.10.5";
-        edition = "2018";
-        sha256 = "0ww45h7nxx5kj6z2y6chlskxd1igvs4j507anr6dzg99x1h25zdh";
-        authors = [
-          "bluss"
-        ];
-        dependencies = [
-          {
-            name = "either";
-            packageId = "either";
-            usesDefaultFeatures = false;
-          }
-        ];
-        features = {
-          "default" = [ "use_std" ];
-          "use_std" = [ "use_alloc" "either/use_std" ];
-        };
-      };
-      "itertools 0.12.0" = rec {
+      "itertools" = rec {
         crateName = "itertools";
         version = "0.12.0";
         edition = "2018";
         sha256 = "1c07gzdlc6a1c8p8jrvvw3gs52bss3y58cs2s21d9i978l36pnr5";
-=======
-      "itertools" = rec {
-        crateName = "itertools";
-        version = "0.11.0";
-        edition = "2018";
-        sha256 = "0mzyqcc59azx9g5cg6fs8k529gvh4463smmka6jvzs3cd2jp7hdi";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "bluss"
         ];
@@ -8146,15 +6156,9 @@ rec {
       };
       "itoa" = rec {
         crateName = "itoa";
-<<<<<<< HEAD
         version = "1.0.10";
         edition = "2018";
         sha256 = "0k7xjfki7mnv6yzjrbnbnjllg86acmbnk4izz2jmm1hx2wd6v95i";
-=======
-        version = "1.0.9";
-        edition = "2018";
-        sha256 = "0f6cpb4yqzhkrhhg6kqsw3wnmmhdnnffi6r2xzy248gzi2v0l5dg";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "David Tolnay <dtolnay@gmail.com>"
         ];
@@ -8206,15 +6210,9 @@ rec {
       };
       "js-sys" = rec {
         crateName = "js-sys";
-<<<<<<< HEAD
         version = "0.3.66";
         edition = "2018";
         sha256 = "1ji9la5ydg0vy17q54i7dnwc0wwb9zkx662w1583pblylm6wdsff";
-=======
-        version = "0.3.64";
-        edition = "2018";
-        sha256 = "0nlkiwpm8dyqcf1xyc6qmrankcgdd3fpzc0qyfq2sw3z97z9bwf5";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The wasm-bindgen Developers"
         ];
@@ -8254,11 +6252,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "derive" ];
           }
           {
@@ -8309,19 +6303,11 @@ rec {
           }
           {
             name = "gio";
-<<<<<<< HEAD
             packageId = "gio";
           }
           {
             name = "glib";
             packageId = "glib";
-=======
-            packageId = "gio 0.17.10";
-          }
-          {
-            name = "glib";
-            packageId = "glib 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "gtk4";
@@ -8345,11 +6331,7 @@ rec {
           }
           {
             name = "pango";
-<<<<<<< HEAD
             packageId = "pango";
-=======
-            packageId = "pango 0.18.0";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "sgf";
@@ -8418,27 +6400,14 @@ rec {
       };
       "libadwaita" = rec {
         crateName = "libadwaita";
-<<<<<<< HEAD
         version = "0.5.3";
         edition = "2021";
         sha256 = "174pzn9dwsk8ikvrhx13vkh0zrpvb3rhg9yd2q5d2zjh0q6fgrrg";
-=======
-        version = "0.4.4";
-        edition = "2021";
-        sha256 = "1gqsp1z52y08946fd451w3zzm8f3j0v79wjdccjzy8wz7y2c1f8s";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Bilal Elmoussaoui <bil.elmoussaoui@gmail.com>"
         ];
         dependencies = [
           {
-<<<<<<< HEAD
-=======
-            name = "bitflags";
-            packageId = "bitflags 1.3.2";
-          }
-          {
->>>>>>> 4366a49 (Start nixifying applications)
             name = "gdk-pixbuf";
             packageId = "gdk-pixbuf";
           }
@@ -8449,19 +6418,11 @@ rec {
           }
           {
             name = "gio";
-<<<<<<< HEAD
             packageId = "gio";
           }
           {
             name = "glib";
             packageId = "glib";
-=======
-            packageId = "gio 0.17.10";
-          }
-          {
-            name = "glib";
-            packageId = "glib 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "gtk4";
@@ -8479,18 +6440,10 @@ rec {
           }
           {
             name = "pango";
-<<<<<<< HEAD
             packageId = "pango";
           }
         ];
         features = {
-=======
-            packageId = "pango 0.17.10";
-          }
-        ];
-        features = {
-          "dox" = [ "glib/dox" "gio/dox" "gdk-pixbuf/dox" "pango/dox" "gdk/dox" "gtk/dox" "ffi/dox" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "gtk_v4_10" = [ "gtk_v4_8" ];
           "gtk_v4_4" = [ "gtk_v4_2" ];
           "gtk_v4_6" = [ "gtk_v4_4" ];
@@ -8500,7 +6453,6 @@ rec {
           "v1_3" = [ "v1_2" "ffi/v1_3" ];
           "v1_4" = [ "v1_3" "ffi/v1_4" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "gtk_v4_2" "gtk_v4_4" "gtk_v4_6" "v1_1" "v1_2" "v1_3" "v1_4" ];
       };
       "libadwaita-sys" = rec {
@@ -8508,15 +6460,6 @@ rec {
         version = "0.5.3";
         edition = "2021";
         sha256 = "16n6xsy6jhbj0jbpz8yvql6c9b89a99v9vhdz5s37mg1inisl42y";
-=======
-        resolvedDefaultFeatures = [ "gtk_v4_2" "gtk_v4_4" "gtk_v4_6" "v1_1" "v1_2" ];
-      };
-      "libadwaita-sys" = rec {
-        crateName = "libadwaita-sys";
-        version = "0.4.4";
-        edition = "2021";
-        sha256 = "0174xmbqmzxl1fy504f6rbfh36g36d5l31a8zb6w9w59k4jcnca2";
->>>>>>> 4366a49 (Start nixifying applications)
         libName = "libadwaita_sys";
         authors = [
           "Bilal Elmoussaoui <bil.elmoussaoui@gmail.com>"
@@ -8529,29 +6472,17 @@ rec {
           }
           {
             name = "gio-sys";
-<<<<<<< HEAD
             packageId = "gio-sys";
-=======
-            packageId = "gio-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "gio";
           }
           {
             name = "glib-sys";
-<<<<<<< HEAD
             packageId = "glib-sys";
-=======
-            packageId = "glib-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "glib";
           }
           {
             name = "gobject-sys";
-<<<<<<< HEAD
             packageId = "gobject-sys";
-=======
-            packageId = "gobject-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "gobject";
           }
           {
@@ -8565,11 +6496,7 @@ rec {
           }
           {
             name = "pango-sys";
-<<<<<<< HEAD
             packageId = "pango-sys";
-=======
-            packageId = "pango-sys 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "pango";
           }
         ];
@@ -8580,15 +6507,10 @@ rec {
           }
         ];
         features = {
-<<<<<<< HEAD
-=======
-          "dox" = [ "glib/dox" "gobject/dox" "gdk/dox" "gio/dox" "gtk/dox" "pango/dox" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "v1_2" = [ "v1_1" ];
           "v1_3" = [ "v1_2" ];
           "v1_4" = [ "v1_3" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "v1_1" "v1_2" "v1_3" "v1_4" ];
       };
       "libc" = rec {
@@ -8596,15 +6518,6 @@ rec {
         version = "0.2.151";
         edition = "2015";
         sha256 = "1x28f0zgp4zcwr891p8n9ag9w371sbib30vp4y6hi2052frplb9h";
-=======
-        resolvedDefaultFeatures = [ "v1_1" "v1_2" ];
-      };
-      "libc" = rec {
-        crateName = "libc";
-        version = "0.2.148";
-        edition = "2015";
-        sha256 = "16rn9l8s5sj9n2jb2pw13ghqwa5nvjggkh9q3lp6vs1jfghp3p4w";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The Rust Project Developers"
         ];
@@ -8618,15 +6531,9 @@ rec {
       };
       "libm" = rec {
         crateName = "libm";
-<<<<<<< HEAD
         version = "0.2.8";
         edition = "2018";
         sha256 = "0n4hk1rs8pzw8hdfmwn96c4568s93kfxqgcqswr7sajd2diaihjf";
-=======
-        version = "0.2.7";
-        edition = "2018";
-        sha256 = "1x1z4gayv1v0dzb78bkwb5nm932nk0w1sqa7gh4y2687pcdjn0gp";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Jorge Aparicio <jorge@japaric.io>"
         ];
@@ -8638,15 +6545,9 @@ rec {
       };
       "libsqlite3-sys" = rec {
         crateName = "libsqlite3-sys";
-<<<<<<< HEAD
         version = "0.27.0";
         edition = "2021";
         sha256 = "05pp60ncrmyjlxxjj187808jkvpxm06w5lvvdwwvxd2qrmnj4kng";
-=======
-        version = "0.26.0";
-        edition = "2018";
-        sha256 = "09j3v5nhgvjdyskgwajhg9g6v3b2ij0lxiz8qqav2cxic7zjxhmg";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The rusqlite developers"
         ];
@@ -8676,7 +6577,6 @@ rec {
           "bundled-windows" = [ "cc" "bundled_bindings" ];
           "cc" = [ "dep:cc" ];
           "default" = [ "min_sqlite_version_3_14_0" ];
-<<<<<<< HEAD
           "loadable_extension" = [ "prettyplease" "quote" "syn" ];
           "min_sqlite_version_3_14_0" = [ "pkg-config" "vcpkg" ];
           "openssl-sys" = [ "dep:openssl-sys" ];
@@ -8686,28 +6586,15 @@ rec {
           "quote" = [ "dep:quote" ];
           "session" = [ "preupdate_hook" "buildtime_bindgen" ];
           "syn" = [ "dep:syn" ];
-=======
-          "min_sqlite_version_3_14_0" = [ "pkg-config" "vcpkg" ];
-          "openssl-sys" = [ "dep:openssl-sys" ];
-          "pkg-config" = [ "dep:pkg-config" ];
-          "preupdate_hook" = [ "buildtime_bindgen" ];
-          "session" = [ "preupdate_hook" "buildtime_bindgen" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "vcpkg" = [ "dep:vcpkg" ];
         };
         resolvedDefaultFeatures = [ "bundled" "bundled_bindings" "cc" "pkg-config" "unlock_notify" "vcpkg" ];
       };
       "linux-raw-sys" = rec {
         crateName = "linux-raw-sys";
-<<<<<<< HEAD
         version = "0.4.12";
         edition = "2021";
         sha256 = "0mhlla3gk1jgn6mrq9s255rvvq8a1w3yk2vpjiwsd6hmmy1imkf4";
-=======
-        version = "0.4.8";
-        edition = "2021";
-        sha256 = "1nw8dqdhai0c7r701bicj3y6vrwc7dgbx9lbcw29ijnr7d562liq";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Dan Gohman <dev@sunfishcode.online>"
         ];
@@ -8721,15 +6608,9 @@ rec {
       };
       "lock_api" = rec {
         crateName = "lock_api";
-<<<<<<< HEAD
         version = "0.4.11";
         edition = "2018";
         sha256 = "0iggx0h4jx63xm35861106af3jkxq06fpqhpkhgw0axi2n38y5iw";
-=======
-        version = "0.4.10";
-        edition = "2018";
-        sha256 = "05nd9nzxqidg24d1k8y5vlc8lz9gscpskrikycib46qbl8brgk61";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Amanieu d'Antras <amanieu@gmail.com>"
         ];
@@ -8932,11 +6813,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "serde_derive";
@@ -9145,15 +7022,9 @@ rec {
       };
       "mio" = rec {
         crateName = "mio";
-<<<<<<< HEAD
         version = "0.8.10";
         edition = "2018";
         sha256 = "02gyaxvaia9zzi4drrw59k9s0j6pa5d1y2kv7iplwjipdqlhngcg";
-=======
-        version = "0.8.8";
-        edition = "2018";
-        sha256 = "1lhrdgcmcy8f0qy1n7357q0aprfkm5gld5mjcrp209pwsdf7cylj";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Carl Lerche <me@carllerche.com>"
           "Thomas de Zeeuw <thomasdezeeuw@gmail.com>"
@@ -9163,11 +7034,7 @@ rec {
           {
             name = "libc";
             packageId = "libc";
-<<<<<<< HEAD
             target = { target, features }: ("wasi" == target."os");
-=======
-            target = { target, features }: ("wasi" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "libc";
@@ -9177,19 +7044,11 @@ rec {
           {
             name = "wasi";
             packageId = "wasi 0.11.0+wasi-snapshot-preview1";
-<<<<<<< HEAD
             target = { target, features }: ("wasi" == target."os");
           }
           {
             name = "windows-sys";
             packageId = "windows-sys 0.48.0";
-=======
-            target = { target, features }: ("wasi" == target."os" or null);
-          }
-          {
-            name = "windows-sys";
-            packageId = "windows-sys";
->>>>>>> 4366a49 (Start nixifying applications)
             target = { target, features }: (target."windows" or false);
             features = [ "Win32_Foundation" "Win32_Networking_WinSock" "Win32_Storage_FileSystem" "Win32_System_IO" "Win32_System_WindowsProgramming" ];
           }
@@ -9235,11 +7094,7 @@ rec {
           }
           {
             name = "http";
-<<<<<<< HEAD
             packageId = "http 0.2.11";
-=======
-            packageId = "http";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "httparse";
@@ -9293,92 +7148,52 @@ rec {
           {
             name = "lazy_static";
             packageId = "lazy_static";
-<<<<<<< HEAD
             target = { target, features }: (("macos" == target."os") || ("ios" == target."os"));
-=======
-            target = { target, features }: (("macos" == target."os" or null) || ("ios" == target."os" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "libc";
             packageId = "libc";
-<<<<<<< HEAD
             target = { target, features }: (("macos" == target."os") || ("ios" == target."os"));
-=======
-            target = { target, features }: (("macos" == target."os" or null) || ("ios" == target."os" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "log";
             packageId = "log 0.4.20";
-<<<<<<< HEAD
             target = { target, features }: (!(("windows" == target."os") || ("macos" == target."os") || ("ios" == target."os")));
-=======
-            target = { target, features }: (!(("windows" == target."os" or null) || ("macos" == target."os" or null) || ("ios" == target."os" or null)));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "openssl";
             packageId = "openssl";
-<<<<<<< HEAD
             target = { target, features }: (!(("windows" == target."os") || ("macos" == target."os") || ("ios" == target."os")));
-=======
-            target = { target, features }: (!(("windows" == target."os" or null) || ("macos" == target."os" or null) || ("ios" == target."os" or null)));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "openssl-probe";
             packageId = "openssl-probe";
-<<<<<<< HEAD
             target = { target, features }: (!(("windows" == target."os") || ("macos" == target."os") || ("ios" == target."os")));
-=======
-            target = { target, features }: (!(("windows" == target."os" or null) || ("macos" == target."os" or null) || ("ios" == target."os" or null)));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "openssl-sys";
             packageId = "openssl-sys";
-<<<<<<< HEAD
             target = { target, features }: (!(("windows" == target."os") || ("macos" == target."os") || ("ios" == target."os")));
-=======
-            target = { target, features }: (!(("windows" == target."os" or null) || ("macos" == target."os" or null) || ("ios" == target."os" or null)));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "schannel";
             packageId = "schannel";
-<<<<<<< HEAD
             target = { target, features }: ("windows" == target."os");
-=======
-            target = { target, features }: ("windows" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "security-framework";
             packageId = "security-framework";
-<<<<<<< HEAD
             target = { target, features }: (("macos" == target."os") || ("ios" == target."os"));
-=======
-            target = { target, features }: (("macos" == target."os" or null) || ("ios" == target."os" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "security-framework-sys";
             packageId = "security-framework-sys";
-<<<<<<< HEAD
             target = { target, features }: (("macos" == target."os") || ("ios" == target."os"));
-=======
-            target = { target, features }: (("macos" == target."os" or null) || ("ios" == target."os" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "tempfile";
             packageId = "tempfile";
-<<<<<<< HEAD
             target = { target, features }: (("macos" == target."os") || ("ios" == target."os"));
-=======
-            target = { target, features }: (("macos" == target."os" or null) || ("ios" == target."os" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
         devDependencies = [
@@ -9392,37 +7207,6 @@ rec {
           "vendored" = [ "openssl/vendored" ];
         };
       };
-<<<<<<< HEAD
-      "nb 0.1.3" = rec {
-        crateName = "nb";
-        version = "0.1.3";
-        edition = "2015";
-        sha256 = "0vyh31pbwrg21f8hz1ipb9i20qwnfwx47gz92i9frdhk0pd327c0";
-        authors = [
-          "Jorge Aparicio <jorge@japaric.io>"
-        ];
-        dependencies = [
-          {
-            name = "nb";
-            packageId = "nb 1.1.0";
-          }
-        ];
-        features = {
-        };
-        resolvedDefaultFeatures = [ "unstable" ];
-      };
-      "nb 1.1.0" = rec {
-        crateName = "nb";
-        version = "1.1.0";
-        edition = "2018";
-        sha256 = "179kbn9l6vhshncycagis7f8mfjppz4fhvgnmcikqz30mp23jm4d";
-        authors = [
-          "Jorge Aparicio <jorge@japaric.io>"
-        ];
-        features = {
-          "defmt-0-3" = [ "dep:defmt" ];
-        };
-      };
       "nix" = rec {
         crateName = "nix";
         version = "0.27.1";
@@ -9464,8 +7248,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "feature" "fs" "user" ];
       };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "no-std-compat" = rec {
         crateName = "no-std-compat";
         version = "0.4.1";
@@ -9743,15 +7525,9 @@ rec {
       };
       "num-traits" = rec {
         crateName = "num-traits";
-<<<<<<< HEAD
         version = "0.2.17";
         edition = "2018";
         sha256 = "0z16bi5zwgfysz6765v3rd6whfbjpihx3mhsn4dg8dzj2c221qrr";
-=======
-        version = "0.2.16";
-        edition = "2018";
-        sha256 = "1hp6x4gayrib34y14gpcfx60hbqsmh7i8whjrbzy5rrvfayhl2zk";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The Rust Project Developers"
         ];
@@ -9786,11 +7562,7 @@ rec {
           {
             name = "hermit-abi";
             packageId = "hermit-abi";
-<<<<<<< HEAD
             target = { target, features }: ("hermit" == target."os");
-=======
-            target = { target, features }: ("hermit" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "libc";
@@ -9800,65 +7572,6 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
-      "num_enum" = rec {
-        crateName = "num_enum";
-        version = "0.5.11";
-        edition = "2018";
-        sha256 = "1japmqhcxwn1d3k7q8jw58y7xfby51s16nzd6dkj483cj2pnqr0z";
-        authors = [
-          "Daniel Wagner-Hall <dawagner@gmail.com>"
-          "Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>"
-          "Vincent Esche <regexident@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "num_enum_derive";
-            packageId = "num_enum_derive";
-            usesDefaultFeatures = false;
-          }
-        ];
-        features = {
-          "complex-expressions" = [ "num_enum_derive/complex-expressions" ];
-          "default" = [ "std" ];
-          "std" = [ "num_enum_derive/std" ];
-        };
-      };
-      "num_enum_derive" = rec {
-        crateName = "num_enum_derive";
-        version = "0.5.11";
-        edition = "2018";
-        sha256 = "16f7r4jila0ckcgdnfgqyhhb90w9m2pdbwayyqmwcci0j6ygkgyw";
-        procMacro = true;
-        authors = [
-          "Daniel Wagner-Hall <dawagner@gmail.com>"
-          "Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>"
-          "Vincent Esche <regexident@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "proc-macro2";
-            packageId = "proc-macro2";
-          }
-          {
-            name = "quote";
-            packageId = "quote";
-          }
-          {
-            name = "syn";
-            packageId = "syn 1.0.109";
-            features = [ "parsing" ];
-          }
-        ];
-        features = {
-          "complex-expressions" = [ "syn/full" ];
-          "default" = [ "std" ];
-          "proc-macro-crate" = [ "dep:proc-macro-crate" ];
-          "std" = [ "proc-macro-crate" ];
-        };
-      };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "object" = rec {
         crateName = "object";
         version = "0.32.1";
@@ -9893,57 +7606,35 @@ rec {
       };
       "once_cell" = rec {
         crateName = "once_cell";
-<<<<<<< HEAD
         version = "1.19.0";
         edition = "2021";
         sha256 = "14kvw7px5z96dk4dwdm1r9cqhhy2cyj1l5n5b29mynbb8yr15nrz";
-=======
-        version = "1.18.0";
-        edition = "2021";
-        sha256 = "0vapcd5ambwck95wyz3ymlim35jirgnqn9a0qmi19msymv95v2yx";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Aleksey Kladov <aleksey.kladov@gmail.com>"
         ];
         features = {
           "alloc" = [ "race" ];
           "atomic-polyfill" = [ "critical-section" ];
-<<<<<<< HEAD
           "critical-section" = [ "dep:critical-section" "portable-atomic" ];
           "default" = [ "std" ];
           "parking_lot" = [ "dep:parking_lot_core" ];
           "portable-atomic" = [ "dep:portable-atomic" ];
-=======
-          "critical-section" = [ "dep:critical-section" "dep:atomic-polyfill" ];
-          "default" = [ "std" ];
-          "parking_lot" = [ "dep:parking_lot_core" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "std" = [ "alloc" ];
         };
         resolvedDefaultFeatures = [ "alloc" "default" "race" "std" "unstable" ];
       };
       "openssl" = rec {
         crateName = "openssl";
-<<<<<<< HEAD
         version = "0.10.61";
         edition = "2018";
         sha256 = "0idv3n9n9f2sxq8cqzxvq44633vg5sx4n9q1p3g6dn66ikf1k13b";
-=======
-        version = "0.10.57";
-        edition = "2018";
-        sha256 = "0z0f8g84y0lvnbc60586ibjpf8r1q1dv672vfqan5d5bk7imxhms";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Steven Fackler <sfackler@gmail.com>"
         ];
         dependencies = [
           {
             name = "bitflags";
-<<<<<<< HEAD
             packageId = "bitflags 2.4.1";
-=======
-            packageId = "bitflags 2.4.0";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "cfg-if";
@@ -9995,11 +7686,7 @@ rec {
           }
           {
             name = "syn";
-<<<<<<< HEAD
             packageId = "syn 2.0.41";
-=======
-            packageId = "syn 2.0.37";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "full" ];
           }
         ];
@@ -10017,15 +7704,9 @@ rec {
       };
       "openssl-sys" = rec {
         crateName = "openssl-sys";
-<<<<<<< HEAD
         version = "0.9.97";
         edition = "2018";
         sha256 = "02s670ir38fsavphdna07144y41dkvrcfkwnjzg82zfrrlsavsn3";
-=======
-        version = "0.9.93";
-        edition = "2018";
-        sha256 = "078vnn4s18kj8m5sd7b684frhjnxjcjc9z7s7h4871s7q2j5ckfv";
->>>>>>> 4366a49 (Start nixifying applications)
         build = "build/main.rs";
         authors = [
           "Alex Crichton <alex@alexcrichton.com>"
@@ -10059,43 +7740,22 @@ rec {
           "vendored" = [ "openssl-src" ];
         };
       };
-<<<<<<< HEAD
       "pango" = rec {
         crateName = "pango";
         version = "0.18.3";
         edition = "2021";
         sha256 = "1r5ygq7036sv7w32kp8yxr6vgggd54iaavh3yckanmq4xg0px8kw";
-=======
-      "pango 0.17.10" = rec {
-        crateName = "pango";
-        version = "0.17.10";
-        edition = "2021";
-        sha256 = "0j0xj9yw81qivqb0y34j9c5azjsdspxp1zzpvxi1zri0qrplbgim";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The gtk-rs Project Developers"
         ];
         dependencies = [
           {
-<<<<<<< HEAD
             name = "gio";
             packageId = "gio";
           }
           {
             name = "glib";
             packageId = "glib";
-=======
-            name = "bitflags";
-            packageId = "bitflags 1.3.2";
-          }
-          {
-            name = "gio";
-            packageId = "gio 0.17.10";
-          }
-          {
-            name = "glib";
-            packageId = "glib 0.17.10";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "libc";
@@ -10107,53 +7767,7 @@ rec {
           }
           {
             name = "pango-sys";
-<<<<<<< HEAD
             packageId = "pango-sys";
-=======
-            packageId = "pango-sys 0.17.10";
-            rename = "ffi";
-          }
-        ];
-        features = {
-          "dox" = [ "ffi/dox" "glib/dox" "gio/dox" ];
-          "v1_42" = [ "ffi/v1_42" ];
-          "v1_44" = [ "v1_42" "ffi/v1_44" ];
-          "v1_46" = [ "v1_44" "ffi/v1_46" ];
-          "v1_48" = [ "v1_46" "ffi/v1_48" ];
-          "v1_50" = [ "v1_48" "ffi/v1_50" ];
-          "v1_52" = [ "v1_50" "ffi/v1_52" ];
-        };
-        resolvedDefaultFeatures = [ "v1_42" "v1_44" "v1_46" "v1_48" "v1_50" ];
-      };
-      "pango 0.18.0" = rec {
-        crateName = "pango";
-        version = "0.18.0";
-        edition = "2021";
-        sha256 = "1l82j97pg7hyq2qnflg3lzyza307y8jvi5h02q3340qxhd5yba86";
-        authors = [
-          "The gtk-rs Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "gio";
-            packageId = "gio 0.18.2";
-          }
-          {
-            name = "glib";
-            packageId = "glib 0.18.2";
-          }
-          {
-            name = "libc";
-            packageId = "libc";
-          }
-          {
-            name = "once_cell";
-            packageId = "once_cell";
-          }
-          {
-            name = "pango-sys";
-            packageId = "pango-sys 0.18.0";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "ffi";
           }
         ];
@@ -10165,55 +7779,9 @@ rec {
           "v1_50" = [ "v1_48" "ffi/v1_50" ];
           "v1_52" = [ "v1_50" "ffi/v1_52" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "v1_42" "v1_44" "v1_46" "v1_48" "v1_50" ];
       };
       "pango-sys" = rec {
-=======
-      };
-      "pango-sys 0.17.10" = rec {
-        crateName = "pango-sys";
-        version = "0.17.10";
-        edition = "2021";
-        sha256 = "15aindwdxsydzvqcvhc9ysamx5v1jmq8qbs61ncxic2h72grz9ix";
-        libName = "pango_sys";
-        authors = [
-          "The gtk-rs Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "glib-sys";
-            packageId = "glib-sys 0.17.10";
-            rename = "glib";
-          }
-          {
-            name = "gobject-sys";
-            packageId = "gobject-sys 0.17.10";
-            rename = "gobject";
-          }
-          {
-            name = "libc";
-            packageId = "libc";
-          }
-        ];
-        buildDependencies = [
-          {
-            name = "system-deps";
-            packageId = "system-deps";
-          }
-        ];
-        features = {
-          "dox" = [ "glib/dox" "gobject/dox" ];
-          "v1_44" = [ "v1_42" ];
-          "v1_46" = [ "v1_44" ];
-          "v1_48" = [ "v1_46" ];
-          "v1_50" = [ "v1_48" ];
-          "v1_52" = [ "v1_50" ];
-        };
-        resolvedDefaultFeatures = [ "v1_42" "v1_44" "v1_46" "v1_48" "v1_50" ];
-      };
-      "pango-sys 0.18.0" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "pango-sys";
         version = "0.18.0";
         edition = "2021";
@@ -10225,20 +7793,12 @@ rec {
         dependencies = [
           {
             name = "glib-sys";
-<<<<<<< HEAD
             packageId = "glib-sys";
-=======
-            packageId = "glib-sys 0.18.1";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "glib";
           }
           {
             name = "gobject-sys";
-<<<<<<< HEAD
             packageId = "gobject-sys";
-=======
-            packageId = "gobject-sys 0.18.0";
->>>>>>> 4366a49 (Start nixifying applications)
             rename = "gobject";
           }
           {
@@ -10259,19 +7819,8 @@ rec {
           "v1_50" = [ "v1_48" ];
           "v1_52" = [ "v1_50" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "v1_42" "v1_44" "v1_46" "v1_48" "v1_50" ];
       };
-      "panic-halt" = rec {
-        crateName = "panic-halt";
-        version = "0.2.0";
-        edition = "2015";
-        sha256 = "04nqaa97ph20ppyy58grwr23hrbw83pn0gf7apf73rdx1q7595ny";
-        authors = [
-          "Emil Fresk <emil.fresk@gmail.com>"
-        ];
-
-      };
       "parking" = rec {
         crateName = "parking";
         version = "2.2.0";
@@ -10284,8 +7833,6 @@ rec {
         features = {
           "loom" = [ "dep:loom" ];
         };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       };
       "parking_lot" = rec {
         crateName = "parking_lot";
@@ -10316,15 +7863,9 @@ rec {
       };
       "parking_lot_core" = rec {
         crateName = "parking_lot_core";
-<<<<<<< HEAD
         version = "0.9.9";
         edition = "2018";
         sha256 = "13h0imw1aq86wj28gxkblhkzx6z1gk8q18n0v76qmmj6cliajhjc";
-=======
-        version = "0.9.8";
-        edition = "2018";
-        sha256 = "0ixlak319bpzldq20yvyfqk0y1vi736zxbw101jvzjp7by30rw4k";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Amanieu d'Antras <amanieu@gmail.com>"
         ];
@@ -10341,11 +7882,7 @@ rec {
           {
             name = "redox_syscall";
             packageId = "redox_syscall";
-<<<<<<< HEAD
             target = { target, features }: ("redox" == target."os");
-=======
-            target = { target, features }: ("redox" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "smallvec";
@@ -10353,11 +7890,7 @@ rec {
           }
           {
             name = "windows-targets";
-<<<<<<< HEAD
             packageId = "windows-targets 0.48.5";
-=======
-            packageId = "windows-targets";
->>>>>>> 4366a49 (Start nixifying applications)
             target = { target, features }: (target."windows" or false);
           }
         ];
@@ -10428,19 +7961,11 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "percent-encoding 2.3.1" = rec {
         crateName = "percent-encoding";
         version = "2.3.1";
         edition = "2018";
         sha256 = "0gi8wgx0dcy8rnv1kywdv98lwcx67hz0a0zwpib5v2i08r88y573";
-=======
-      "percent-encoding 2.3.0" = rec {
-        crateName = "percent-encoding";
-        version = "2.3.0";
-        edition = "2018";
-        sha256 = "152slflmparkh27hprw62sph8rv77wckzhwl2dhqk6bf563lfalv";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The rust-url developers"
         ];
@@ -10628,53 +8153,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "unicase" ];
       };
-<<<<<<< HEAD
-      "pico-blink" = rec {
-        crateName = "pico-blink";
-        version = "0.1.0";
-        edition = "2021";
-        crateBin = [
-          {
-            name = "pico-blink";
-            path = "src/main.rs";
-            requiredFeatures = [ ];
-          }
-        ];
-        # 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 = ./pico-blink; }
-          else ./pico-blink;
-        dependencies = [
-          {
-            name = "cortex-m";
-            packageId = "cortex-m";
-          }
-          {
-            name = "cortex-m-rt";
-            packageId = "cortex-m-rt";
-          }
-          {
-            name = "embedded-hal";
-            packageId = "embedded-hal";
-          }
-          {
-            name = "fugit";
-            packageId = "fugit";
-          }
-          {
-            name = "panic-halt";
-            packageId = "panic-halt";
-          }
-          {
-            name = "rp-pico";
-            packageId = "rp-pico";
-          }
-        ];
-
-      };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "pin-project" = rec {
         crateName = "pin-project";
         version = "1.1.3";
@@ -10705,11 +8183,7 @@ rec {
           }
           {
             name = "syn";
-<<<<<<< HEAD
             packageId = "syn 2.0.41";
-=======
-            packageId = "syn 2.0.37";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "full" "visit-mut" ];
           }
         ];
@@ -10732,36 +8206,6 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
-      "pio" = rec {
-        crateName = "pio";
-        version = "0.2.1";
-        edition = "2018";
-        sha256 = "1qvq03nbx6vjix7spr5fcxcbxw39flm1y72kxl1g728gnna9dq3n";
-        authors = [
-          "snek"
-          "The rp-rs developers"
-        ];
-        dependencies = [
-          {
-            name = "arrayvec";
-            packageId = "arrayvec";
-            usesDefaultFeatures = false;
-          }
-          {
-            name = "num_enum";
-            packageId = "num_enum";
-            usesDefaultFeatures = false;
-          }
-          {
-            name = "paste";
-            packageId = "paste";
-          }
-        ];
-
-      };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "pkcs1" = rec {
         crateName = "pkcs1";
         version = "0.7.5";
@@ -10924,7 +8368,6 @@ rec {
         features = {
         };
       };
-<<<<<<< HEAD
       "powerfmt" = rec {
         crateName = "powerfmt";
         version = "0.2.0";
@@ -10939,8 +8382,6 @@ rec {
           "std" = [ "alloc" ];
         };
       };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "ppv-lite86" = rec {
         crateName = "ppv-lite86";
         version = "0.2.17";
@@ -10974,11 +8415,7 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "proc-macro-crate 1.3.1" = rec {
-=======
-      "proc-macro-crate" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "proc-macro-crate";
         version = "1.3.1";
         edition = "2021";
@@ -10998,7 +8435,6 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "proc-macro-crate 2.0.1" = rec {
         crateName = "proc-macro-crate";
         version = "2.0.1";
@@ -11019,8 +8455,6 @@ rec {
         ];
 
       };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "proc-macro-error" = rec {
         crateName = "proc-macro-error";
         version = "1.0.4";
@@ -11091,15 +8525,9 @@ rec {
       };
       "proc-macro2" = rec {
         crateName = "proc-macro2";
-<<<<<<< HEAD
         version = "1.0.70";
         edition = "2021";
         sha256 = "0fzxg3dkrjy101vv5b6llc8mh74xz1vhhsaiwrn68kzvynxqy9rr";
-=======
-        version = "1.0.67";
-        edition = "2021";
-        sha256 = "0a0k7adv0yswsgzsqkd7r6ng8rpcdyqrhra5v5ii531y3agkshrx";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "David Tolnay <dtolnay@gmail.com>"
           "Alex Crichton <alex@alexcrichton.com>"
@@ -11117,15 +8545,9 @@ rec {
       };
       "proptest" = rec {
         crateName = "proptest";
-<<<<<<< HEAD
         version = "1.4.0";
         edition = "2018";
         sha256 = "1gzmw40pgmwzb7x6jsyr88z5w151snv5rp1g0dlcp1iw3h9pdd1i";
-=======
-        version = "1.3.1";
-        edition = "2018";
-        sha256 = "03n213yppl8lpw94cms2bb6rns3ahg78n6az9yvppc3wqz43l03w";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Jason Lingle"
         ];
@@ -11142,11 +8564,7 @@ rec {
           }
           {
             name = "bitflags";
-<<<<<<< HEAD
             packageId = "bitflags 2.4.1";
-=======
-            packageId = "bitflags 2.4.0";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "lazy_static";
@@ -11296,11 +8714,7 @@ rec {
           {
             name = "fuchsia-cprng";
             packageId = "fuchsia-cprng";
-<<<<<<< HEAD
             target = { target, features }: ("fuchsia" == target."os");
-=======
-            target = { target, features }: ("fuchsia" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "libc";
@@ -11312,20 +8726,12 @@ rec {
             name = "rand_core";
             packageId = "rand_core 0.3.1";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             target = { target, features }: ("sgx" == target."env");
-=======
-            target = { target, features }: ("sgx" == target."env" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "rdrand";
             packageId = "rdrand";
-<<<<<<< HEAD
             target = { target, features }: ("sgx" == target."env");
-=======
-            target = { target, features }: ("sgx" == target."env" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "winapi";
@@ -11632,11 +9038,7 @@ rec {
             name = "libc";
             packageId = "libc";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             target = { target, features }: (("macos" == target."os") || ("ios" == target."os"));
-=======
-            target = { target, features }: (("macos" == target."os" or null) || ("ios" == target."os" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "rand_core";
@@ -11645,11 +9047,7 @@ rec {
           {
             name = "winapi";
             packageId = "winapi";
-<<<<<<< HEAD
             target = { target, features }: ("windows" == target."os");
-=======
-            target = { target, features }: ("windows" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "profileapi" ];
           }
         ];
@@ -11671,20 +9069,12 @@ rec {
           {
             name = "cloudabi";
             packageId = "cloudabi";
-<<<<<<< HEAD
             target = { target, features }: ("cloudabi" == target."os");
-=======
-            target = { target, features }: ("cloudabi" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "fuchsia-cprng";
             packageId = "fuchsia-cprng";
-<<<<<<< HEAD
             target = { target, features }: ("fuchsia" == target."os");
-=======
-            target = { target, features }: ("fuchsia" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "libc";
@@ -11699,11 +9089,7 @@ rec {
           {
             name = "rdrand";
             packageId = "rdrand";
-<<<<<<< HEAD
             target = { target, features }: ("sgx" == target."env");
-=======
-            target = { target, features }: ("sgx" == target."env" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "winapi";
@@ -11851,15 +9237,9 @@ rec {
       };
       "redox_syscall" = rec {
         crateName = "redox_syscall";
-<<<<<<< HEAD
         version = "0.4.1";
         edition = "2018";
         sha256 = "1aiifyz5dnybfvkk4cdab9p2kmphag1yad6iknc7aszlxxldf8j7";
-=======
-        version = "0.3.5";
-        edition = "2018";
-        sha256 = "0acgiy2lc1m2vr8cr33l5s7k9wzby8dybyab1a9p753hcbr68xjn";
->>>>>>> 4366a49 (Start nixifying applications)
         libName = "syscall";
         authors = [
           "Jeremy Soller <jackpot51@gmail.com>"
@@ -11877,15 +9257,9 @@ rec {
       };
       "regex" = rec {
         crateName = "regex";
-<<<<<<< HEAD
         version = "1.10.2";
         edition = "2021";
         sha256 = "0hxkd814n4irind8im5c9am221ri6bprx49nc7yxv02ykhd9a2rq";
-=======
-        version = "1.9.6";
-        edition = "2021";
-        sha256 = "1zs4h2swgfqsspj11jqqs7k66vbdmq222rwbid9byva00la21vpb";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The Rust Project Developers"
           "Andrew Gallant <jamslam@gmail.com>"
@@ -11939,15 +9313,9 @@ rec {
       };
       "regex-automata" = rec {
         crateName = "regex-automata";
-<<<<<<< HEAD
         version = "0.4.3";
         edition = "2021";
         sha256 = "0gs8q9yhd3kcg4pr00ag4viqxnh5l7jpyb9fsfr8hzh451w4r02z";
-=======
-        version = "0.3.9";
-        edition = "2021";
-        sha256 = "1agg6ymbgjydj3q31ay6dbzgp3i5cnrnygpylczqj623xs93xcjr";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The Rust Project Developers"
           "Andrew Gallant <jamslam@gmail.com>"
@@ -12005,15 +9373,9 @@ rec {
       };
       "regex-syntax" = rec {
         crateName = "regex-syntax";
-<<<<<<< HEAD
         version = "0.8.2";
         edition = "2021";
         sha256 = "17rd2s8xbiyf6lb4aj2nfi44zqlj98g2ays8zzj2vfs743k79360";
-=======
-        version = "0.7.5";
-        edition = "2021";
-        sha256 = "1nhjmqdlakfi4yb8lh7vbbh71dsy90jjvrjvvnrih6larldgpdfv";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The Rust Project Developers"
           "Andrew Gallant <jamslam@gmail.com>"
@@ -12045,26 +9407,16 @@ rec {
       };
       "reqwest" = rec {
         crateName = "reqwest";
-<<<<<<< HEAD
         version = "0.11.23";
         edition = "2018";
         sha256 = "0hgvzb7r46656r9vqhl5qk1kbr2xzjb91yr2cb321160ka6sxc9p";
-=======
-        version = "0.11.22";
-        edition = "2018";
-        sha256 = "0nx9mczsf11pcjicfpwad0l8drf2nn72dbpcvp42lv644s4djv04";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Sean McArthur <sean@seanmonstar.com>"
         ];
         dependencies = [
           {
             name = "base64";
-<<<<<<< HEAD
             packageId = "base64 0.21.5";
-=======
-            packageId = "base64 0.21.4";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "bytes";
@@ -12073,11 +9425,7 @@ rec {
           {
             name = "encoding_rs";
             packageId = "encoding_rs";
-<<<<<<< HEAD
             target = { target, features }: (!("wasm32" == target."arch"));
-=======
-            target = { target, features }: (!("wasm32" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "futures-core";
@@ -12092,24 +9440,15 @@ rec {
           {
             name = "h2";
             packageId = "h2";
-<<<<<<< HEAD
             target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "http";
             packageId = "http 0.2.11";
-=======
-            target = { target, features }: (!("wasm32" == target."arch" or null));
-          }
-          {
-            name = "http";
-            packageId = "http";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "http-body";
             packageId = "http-body";
-<<<<<<< HEAD
             target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
@@ -12117,109 +9456,59 @@ rec {
             packageId = "hyper 0.14.28";
             usesDefaultFeatures = false;
             target = { target, features }: (!("wasm32" == target."arch"));
-=======
-            target = { target, features }: (!("wasm32" == target."arch" or null));
-          }
-          {
-            name = "hyper";
-            packageId = "hyper 0.14.27";
-            usesDefaultFeatures = false;
-            target = { target, features }: (!("wasm32" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "tcp" "http1" "http2" "client" "runtime" ];
           }
           {
             name = "hyper-tls";
             packageId = "hyper-tls";
             optional = true;
-<<<<<<< HEAD
             target = { target, features }: (!("wasm32" == target."arch"));
-=======
-            target = { target, features }: (!("wasm32" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "ipnet";
             packageId = "ipnet";
-<<<<<<< HEAD
             target = { target, features }: (!("wasm32" == target."arch"));
-=======
-            target = { target, features }: (!("wasm32" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "js-sys";
             packageId = "js-sys";
-<<<<<<< HEAD
             target = { target, features }: ("wasm32" == target."arch");
-=======
-            target = { target, features }: ("wasm32" == target."arch" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "log";
             packageId = "log 0.4.20";
-<<<<<<< HEAD
             target = { target, features }: (!("wasm32" == target."arch"));
-=======
-            target = { target, features }: (!("wasm32" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "mime";
             packageId = "mime 0.3.17";
-<<<<<<< HEAD
             target = { target, features }: (!("wasm32" == target."arch"));
-=======
-            target = { target, features }: (!("wasm32" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "native-tls";
             packageId = "native-tls";
             rename = "native-tls-crate";
             optional = true;
-<<<<<<< HEAD
             target = { target, features }: (!("wasm32" == target."arch"));
-=======
-            target = { target, features }: (!("wasm32" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "once_cell";
             packageId = "once_cell";
-<<<<<<< HEAD
             target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "percent-encoding";
             packageId = "percent-encoding 2.3.1";
             target = { target, features }: (!("wasm32" == target."arch"));
-=======
-            target = { target, features }: (!("wasm32" == target."arch" or null));
-          }
-          {
-            name = "percent-encoding";
-            packageId = "percent-encoding 2.3.0";
-            target = { target, features }: (!("wasm32" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "pin-project-lite";
             packageId = "pin-project-lite";
-<<<<<<< HEAD
             target = { target, features }: (!("wasm32" == target."arch"));
           }
           {
             name = "serde";
             packageId = "serde 1.0.193";
-=======
-            target = { target, features }: (!("wasm32" == target."arch" or null));
-          }
-          {
-            name = "serde";
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "serde_json";
@@ -12229,11 +9518,7 @@ rec {
           {
             name = "serde_json";
             packageId = "serde_json";
-<<<<<<< HEAD
             target = { target, features }: ("wasm32" == target."arch");
-=======
-            target = { target, features }: ("wasm32" == target."arch" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "serde_urlencoded";
@@ -12242,32 +9527,20 @@ rec {
           {
             name = "system-configuration";
             packageId = "system-configuration";
-<<<<<<< HEAD
             target = { target, features }: ("macos" == target."os");
-=======
-            target = { target, features }: ("macos" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "tokio";
             packageId = "tokio";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             target = { target, features }: (!("wasm32" == target."arch"));
-=======
-            target = { target, features }: (!("wasm32" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "net" "time" ];
           }
           {
             name = "tokio-native-tls";
             packageId = "tokio-native-tls";
             optional = true;
-<<<<<<< HEAD
             target = { target, features }: (!("wasm32" == target."arch"));
-=======
-            target = { target, features }: (!("wasm32" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "tower-service";
@@ -12275,38 +9548,22 @@ rec {
           }
           {
             name = "url";
-<<<<<<< HEAD
             packageId = "url 2.5.0";
-=======
-            packageId = "url 2.4.1";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "wasm-bindgen";
             packageId = "wasm-bindgen";
-<<<<<<< HEAD
             target = { target, features }: ("wasm32" == target."arch");
-=======
-            target = { target, features }: ("wasm32" == target."arch" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "wasm-bindgen-futures";
             packageId = "wasm-bindgen-futures";
-<<<<<<< HEAD
             target = { target, features }: ("wasm32" == target."arch");
-=======
-            target = { target, features }: ("wasm32" == target."arch" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "web-sys";
             packageId = "web-sys";
-<<<<<<< HEAD
             target = { target, features }: ("wasm32" == target."arch");
-=======
-            target = { target, features }: ("wasm32" == target."arch" or null);
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "AbortController" "AbortSignal" "Headers" "Request" "RequestInit" "RequestMode" "Response" "Window" "FormData" "Blob" "BlobPropertyBag" "ServiceWorkerGlobalScope" "RequestCredentials" "File" "ReadableStream" ];
           }
           {
@@ -12318,47 +9575,28 @@ rec {
         devDependencies = [
           {
             name = "hyper";
-<<<<<<< HEAD
             packageId = "hyper 0.14.28";
             usesDefaultFeatures = false;
             target = {target, features}: (!("wasm32" == target."arch"));
-=======
-            packageId = "hyper 0.14.27";
-            usesDefaultFeatures = false;
-            target = {target, features}: (!("wasm32" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "tcp" "stream" "http1" "http2" "client" "server" "runtime" ];
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
             target = {target, features}: (!("wasm32" == target."arch"));
-=======
-            packageId = "serde 1.0.188";
-            target = {target, features}: (!("wasm32" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "derive" ];
           }
           {
             name = "tokio";
             packageId = "tokio";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             target = {target, features}: (!("wasm32" == target."arch"));
-=======
-            target = {target, features}: (!("wasm32" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "macros" "rt-multi-thread" ];
           }
           {
             name = "wasm-bindgen";
             packageId = "wasm-bindgen";
-<<<<<<< HEAD
             target = {target, features}: ("wasm32" == target."arch");
-=======
-            target = {target, features}: ("wasm32" == target."arch" or null);
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "serde-serialize" ];
           }
         ];
@@ -12426,255 +9664,17 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
-      "rp-pico" = rec {
-        crateName = "rp-pico";
-        version = "0.8.0";
-        edition = "2018";
-        sha256 = "0mmx8dyl0q1a9fgz12hrvwd7civqbd1j7g1w5c5i6pcfdwg7fhb3";
-        authors = [
-          "evan <evanmolder@gmail.com>"
-          "The rp-rs Developers"
-        ];
-        dependencies = [
-          {
-            name = "cortex-m-rt";
-            packageId = "cortex-m-rt";
-            optional = true;
-          }
-          {
-            name = "fugit";
-            packageId = "fugit";
-          }
-          {
-            name = "rp2040-boot2";
-            packageId = "rp2040-boot2";
-            optional = true;
-          }
-          {
-            name = "rp2040-hal";
-            packageId = "rp2040-hal";
-          }
-          {
-            name = "usb-device";
-            packageId = "usb-device";
-          }
-        ];
-        devDependencies = [
-          {
-            name = "rp2040-hal";
-            packageId = "rp2040-hal";
-            features = [ "defmt" ];
-          }
-        ];
-        features = {
-          "boot2" = [ "rp2040-boot2" ];
-          "cortex-m-rt" = [ "dep:cortex-m-rt" ];
-          "critical-section-impl" = [ "rp2040-hal/critical-section-impl" ];
-          "default" = [ "boot2" "rt" "critical-section-impl" "rom-func-cache" ];
-          "disable-intrinsics" = [ "rp2040-hal/disable-intrinsics" ];
-          "rom-func-cache" = [ "rp2040-hal/rom-func-cache" ];
-          "rom-v2-intrinsics" = [ "rp2040-hal/rom-v2-intrinsics" ];
-          "rp2040-boot2" = [ "dep:rp2040-boot2" ];
-          "rp2040-e5" = [ "rp2040-hal/rp2040-e5" ];
-          "rt" = [ "cortex-m-rt" "rp2040-hal/rt" ];
-        };
-        resolvedDefaultFeatures = [ "boot2" "cortex-m-rt" "critical-section-impl" "default" "rom-func-cache" "rp2040-boot2" "rt" ];
-      };
-      "rp2040-boot2" = rec {
-        crateName = "rp2040-boot2";
-        version = "0.3.0";
-        edition = "2018";
-        sha256 = "08dv9ndvdzyjz4wdlxcikf1m1s6wwi80027ldkihx59zyr2g74kw";
-        authors = [
-          "The rp-rs Team"
-        ];
-        buildDependencies = [
-          {
-            name = "crc-any";
-            packageId = "crc-any";
-          }
-        ];
-        features = {
-        };
-      };
-      "rp2040-hal" = rec {
-        crateName = "rp2040-hal";
-        version = "0.9.1";
-        edition = "2021";
-        sha256 = "0lqlyx0s0n2nk565fdrlxp38aqvdkjf08rg6x5dz0aazvgm1vwh8";
-        authors = [
-          "The rp-rs Developers"
-        ];
-        dependencies = [
-          {
-            name = "cortex-m";
-            packageId = "cortex-m";
-          }
-          {
-            name = "critical-section";
-            packageId = "critical-section";
-          }
-          {
-            name = "embedded-dma";
-            packageId = "embedded-dma";
-          }
-          {
-            name = "embedded-hal";
-            packageId = "embedded-hal";
-            features = [ "unproven" ];
-          }
-          {
-            name = "frunk";
-            packageId = "frunk";
-            usesDefaultFeatures = false;
-          }
-          {
-            name = "fugit";
-            packageId = "fugit";
-          }
-          {
-            name = "itertools";
-            packageId = "itertools 0.10.5";
-            usesDefaultFeatures = false;
-          }
-          {
-            name = "nb";
-            packageId = "nb 1.1.0";
-          }
-          {
-            name = "paste";
-            packageId = "paste";
-          }
-          {
-            name = "pio";
-            packageId = "pio";
-          }
-          {
-            name = "rand_core";
-            packageId = "rand_core 0.6.4";
-          }
-          {
-            name = "rp2040-hal-macros";
-            packageId = "rp2040-hal-macros";
-          }
-          {
-            name = "rp2040-pac";
-            packageId = "rp2040-pac";
-            features = [ "critical-section" ];
-          }
-          {
-            name = "usb-device";
-            packageId = "usb-device";
-          }
-          {
-            name = "vcell";
-            packageId = "vcell";
-          }
-          {
-            name = "void";
-            packageId = "void";
-            usesDefaultFeatures = false;
-          }
-        ];
-        features = {
-          "chrono" = [ "dep:chrono" ];
-          "critical-section-impl" = [ "critical-section/restore-state-u8" ];
-          "defmt" = [ "dep:defmt" ];
-          "eh1_0_alpha" = [ "dep:eh1_0_alpha" "dep:eh_nb_1_0_alpha" ];
-          "rt" = [ "rp2040-pac/rt" ];
-          "rtic-monotonic" = [ "dep:rtic-monotonic" ];
-        };
-        resolvedDefaultFeatures = [ "critical-section-impl" "rom-func-cache" "rt" ];
-      };
-      "rp2040-hal-macros" = rec {
-        crateName = "rp2040-hal-macros";
-        version = "0.1.0";
-        edition = "2021";
-        sha256 = "0piaczzlbrfdhidnqkg04xs1rzal3w3zjplrh6pf3vwpwiir0iw6";
-        procMacro = true;
-        dependencies = [
-          {
-            name = "cortex-m-rt";
-            packageId = "cortex-m-rt";
-          }
-          {
-            name = "proc-macro2";
-            packageId = "proc-macro2";
-          }
-          {
-            name = "quote";
-            packageId = "quote";
-          }
-          {
-            name = "syn";
-            packageId = "syn 1.0.109";
-            features = [ "extra-traits" "full" ];
-          }
-        ];
-
-      };
-      "rp2040-pac" = rec {
-        crateName = "rp2040-pac";
-        version = "0.5.0";
-        edition = "2018";
-        sha256 = "0k3fm4fww6gcy7w7zwbmmqn9wzz4sih13l1m93sl7x8mb0vxin8j";
-        authors = [
-          "The RP-RS team"
-        ];
-        dependencies = [
-          {
-            name = "cortex-m";
-            packageId = "cortex-m";
-          }
-          {
-            name = "cortex-m-rt";
-            packageId = "cortex-m-rt";
-            optional = true;
-          }
-          {
-            name = "critical-section";
-            packageId = "critical-section";
-            optional = true;
-          }
-          {
-            name = "vcell";
-            packageId = "vcell";
-          }
-        ];
-        features = {
-          "cortex-m-rt" = [ "dep:cortex-m-rt" ];
-          "critical-section" = [ "dep:critical-section" ];
-          "rt" = [ "cortex-m-rt/device" ];
-        };
-        resolvedDefaultFeatures = [ "cortex-m-rt" "critical-section" "rt" ];
-      };
       "rsa" = rec {
         crateName = "rsa";
         version = "0.9.6";
         edition = "2021";
         sha256 = "1z0d1aavfm0v4pv8jqmqhhvvhvblla1ydzlvwykpc3mkzhj523jx";
-=======
-      "rsa" = rec {
-        crateName = "rsa";
-        version = "0.9.2";
-        edition = "2021";
-        sha256 = "1a762gzj9xl14n8gmclsz8kcwp958nd1k05nnhqsdh93gns3pd3a";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "RustCrypto Developers"
           "dignifiedquire <dignifiedquire@gmail.com>"
         ];
         dependencies = [
           {
-<<<<<<< HEAD
-=======
-            name = "byteorder";
-            packageId = "byteorder";
-            usesDefaultFeatures = false;
-          }
-          {
->>>>>>> 4366a49 (Start nixifying applications)
             name = "const-oid";
             packageId = "const-oid";
             usesDefaultFeatures = false;
@@ -12698,14 +9698,6 @@ rec {
             usesDefaultFeatures = false;
           }
           {
-<<<<<<< HEAD
-=======
-            name = "num-iter";
-            packageId = "num-iter";
-            usesDefaultFeatures = false;
-          }
-          {
->>>>>>> 4366a49 (Start nixifying applications)
             name = "num-traits";
             packageId = "num-traits";
             usesDefaultFeatures = false;
@@ -12799,27 +9791,7 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "std" ];
       };
-<<<<<<< HEAD
-      "rustc_version 0.2.3" = rec {
-        crateName = "rustc_version";
-        version = "0.2.3";
-        edition = "2015";
-        sha256 = "02h3x57lcr8l2pm0a645s9whdh33pn5cnrwvn5cb57vcrc53x3hk";
-        authors = [
-          "Marvin Löbel <loebel.marvin@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "semver";
-            packageId = "semver 0.9.0";
-          }
-        ];
-
-      };
-      "rustc_version 0.4.0" = rec {
-=======
       "rustc_version" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "rustc_version";
         version = "0.4.0";
         edition = "2018";
@@ -12831,26 +9803,16 @@ rec {
         dependencies = [
           {
             name = "semver";
-<<<<<<< HEAD
-            packageId = "semver 1.0.20";
-=======
             packageId = "semver";
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
 
       };
       "rustix" = rec {
         crateName = "rustix";
-<<<<<<< HEAD
         version = "0.38.28";
         edition = "2021";
         sha256 = "05m3vacvbqbg6r6ksmx9k5afpi0lppjdv712crrpsrfax2jp5rbj";
-=======
-        version = "0.38.15";
-        edition = "2021";
-        sha256 = "0cg5jsfx8lf5npjf2v5ac8fca5443hq8iqqlg2gg1yc8pl6dmyfj";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Dan Gohman <dev@sunfishcode.online>"
           "Jakub Konka <kubkon@jakubkonka.com>"
@@ -12858,11 +9820,7 @@ rec {
         dependencies = [
           {
             name = "bitflags";
-<<<<<<< HEAD
             packageId = "bitflags 2.4.1";
-=======
-            packageId = "bitflags 2.4.0";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
           }
           {
@@ -12871,22 +9829,14 @@ rec {
             rename = "libc_errno";
             optional = true;
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             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"))));
-=======
-            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && ("linux" == target."os" or null) && ("little" == target."endian" or null) && (("arm" == target."arch" or null) || (("aarch64" == target."arch" or null) && ("64" == target."pointer_width" or null)) || ("riscv64" == target."arch" or null) || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch" or null)) || ("x86" == target."arch" or null) || (("x86_64" == target."arch" or null) && ("64" == target."pointer_width" or null))));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "errno";
             packageId = "errno";
             rename = "libc_errno";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             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")))))));
-=======
-            target = { target, features }: ((!(target."windows" or false)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!(("linux" == target."os" or null) && ("little" == target."endian" or null) && (("arm" == target."arch" or null) || (("aarch64" == target."arch" or null) && ("64" == target."pointer_width" or null)) || ("riscv64" == target."arch" or null) || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch" or null)) || ("x86" == target."arch" or null) || (("x86_64" == target."arch" or null) && ("64" == target."pointer_width" or null)))))));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "errno";
@@ -12900,53 +9850,33 @@ rec {
             packageId = "libc";
             optional = true;
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             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"))));
-=======
-            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && ("linux" == target."os" or null) && ("little" == target."endian" or null) && (("arm" == target."arch" or null) || (("aarch64" == target."arch" or null) && ("64" == target."pointer_width" or null)) || ("riscv64" == target."arch" or null) || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch" or null)) || ("x86" == target."arch" or null) || (("x86_64" == target."arch" or null) && ("64" == target."pointer_width" or null))));
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "extra_traits" ];
           }
           {
             name = "libc";
             packageId = "libc";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             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")))))));
-=======
-            target = { target, features }: ((!(target."windows" or false)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!(("linux" == target."os" or null) && ("little" == target."endian" or null) && (("arm" == target."arch" or null) || (("aarch64" == target."arch" or null) && ("64" == target."pointer_width" or null)) || ("riscv64" == target."arch" or null) || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch" or null)) || ("x86" == target."arch" or null) || (("x86_64" == target."arch" or null) && ("64" == target."pointer_width" or null)))))));
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "extra_traits" ];
           }
           {
             name = "linux-raw-sys";
             packageId = "linux-raw-sys";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             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")))))));
-=======
-            target = { target, features }: ((("android" == target."os" or null) || ("linux" == target."os" or null)) && ((target."rustix_use_libc" or false) || (target."miri" or false) || (!(("linux" == target."os" or null) && ("little" == target."endian" or null) && (("arm" == target."arch" or null) || (("aarch64" == target."arch" or null) && ("64" == target."pointer_width" or null)) || ("riscv64" == target."arch" or null) || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch" or null)) || ("x86" == target."arch" or null) || (("x86_64" == target."arch" or null) && ("64" == target."pointer_width" or null)))))));
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "general" "ioctl" "no_std" ];
           }
           {
             name = "linux-raw-sys";
             packageId = "linux-raw-sys";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             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"))));
-=======
-            target = { target, features }: ((!(target."rustix_use_libc" or false)) && (!(target."miri" or false)) && ("linux" == target."os" or null) && ("little" == target."endian" or null) && (("arm" == target."arch" or null) || (("aarch64" == target."arch" or null) && ("64" == target."pointer_width" or null)) || ("riscv64" == target."arch" or null) || ((target."rustix_use_experimental_asm" or false) && ("powerpc64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips32r6" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64" == target."arch" or null)) || ((target."rustix_use_experimental_asm" or false) && ("mips64r6" == target."arch" or null)) || ("x86" == target."arch" or null) || (("x86_64" == target."arch" or null) && ("64" == target."pointer_width" or null))));
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "general" "errno" "ioctl" "no_std" "elf" ];
           }
           {
             name = "windows-sys";
-<<<<<<< HEAD
             packageId = "windows-sys 0.52.0";
-=======
-            packageId = "windows-sys";
->>>>>>> 4366a49 (Start nixifying applications)
             target = { target, features }: (target."windows" or false);
             features = [ "Win32_Foundation" "Win32_Networking_WinSock" "Win32_NetworkManagement_IpHelper" "Win32_System_Threading" ];
           }
@@ -12966,11 +9896,7 @@ rec {
         features = {
           "all-apis" = [ "event" "fs" "io_uring" "mm" "mount" "net" "param" "pipe" "process" "procfs" "pty" "rand" "runtime" "shm" "stdio" "system" "termios" "thread" "time" ];
           "default" = [ "std" "use-libc-auxv" ];
-<<<<<<< HEAD
           "io_uring" = [ "event" "fs" "net" "linux-raw-sys/io_uring" ];
-=======
-          "io_uring" = [ "fs" "net" "linux-raw-sys/io_uring" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "itoa" = [ "dep:itoa" ];
           "libc" = [ "dep:libc" ];
           "libc_errno" = [ "dep:libc_errno" ];
@@ -12993,7 +9919,6 @@ rec {
       };
       "rustls-pemfile" = rec {
         crateName = "rustls-pemfile";
-<<<<<<< HEAD
         version = "1.0.4";
         edition = "2018";
         sha256 = "1324n5bcns0rnw6vywr5agff3rwfvzphi7rmbyzwnv6glkhclx0w";
@@ -13001,15 +9926,6 @@ rec {
           {
             name = "base64";
             packageId = "base64 0.21.5";
-=======
-        version = "1.0.3";
-        edition = "2018";
-        sha256 = "1cplx6hgkr32nq31p3613b2sj7csrrq3zp6znx9vc1qx9c4qff9d";
-        dependencies = [
-          {
-            name = "base64";
-            packageId = "base64 0.21.4";
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
 
@@ -13050,15 +9966,9 @@ rec {
       };
       "ryu" = rec {
         crateName = "ryu";
-<<<<<<< HEAD
         version = "1.0.16";
         edition = "2018";
         sha256 = "0k7b90xr48ag5bzmfjp82rljasw2fx28xr3bg1lrpx7b5sljm3gr";
-=======
-        version = "1.0.15";
-        edition = "2018";
-        sha256 = "0hfphpn1xnpzxwj8qg916ga1lyc33lc03lnf1gb3wwpglj6wrm0s";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "David Tolnay <dtolnay@gmail.com>"
         ];
@@ -13091,22 +10001,14 @@ rec {
         dependencies = [
           {
             name = "windows-sys";
-<<<<<<< HEAD
             packageId = "windows-sys 0.48.0";
-=======
-            packageId = "windows-sys";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "Win32_Foundation" "Win32_Security_Cryptography" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_System_Memory" ];
           }
         ];
         devDependencies = [
           {
             name = "windows-sys";
-<<<<<<< HEAD
             packageId = "windows-sys 0.48.0";
-=======
-            packageId = "windows-sys";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "Win32_System_SystemInformation" "Win32_System_Time" ];
           }
         ];
@@ -13156,13 +10058,10 @@ rec {
           else ./screenplay;
         dependencies = [
           {
-<<<<<<< HEAD
             name = "glib";
             packageId = "glib";
           }
           {
-=======
->>>>>>> 4366a49 (Start nixifying applications)
             name = "gtk4";
             packageId = "gtk4";
             rename = "gtk";
@@ -13246,7 +10145,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "OSX_10_9" "default" ];
       };
-<<<<<<< HEAD
       "self_cell 0.10.3" = rec {
         crateName = "self_cell";
         version = "0.10.3";
@@ -13271,13 +10169,6 @@ rec {
         version = "1.0.2";
         edition = "2018";
         sha256 = "1rmdglwnd77wcw2gv76finpgzjhkynx422d0jpahrf2fsqn37273";
-=======
-      "self_cell" = rec {
-        crateName = "self_cell";
-        version = "0.10.2";
-        edition = "2018";
-        sha256 = "1by8h3axgpbiph5nbq80z6a41hd4cqlqc66hgnngs57y42j6by8y";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Lukas Bergdoll <lukas.bergdoll@gmail.com>"
         ];
@@ -13286,40 +10177,11 @@ rec {
           "rustversion" = [ "dep:rustversion" ];
         };
       };
-<<<<<<< HEAD
-      "semver 0.9.0" = rec {
-        crateName = "semver";
-        version = "0.9.0";
-        edition = "2015";
-        sha256 = "00q4lkcj0rrgbhviv9sd4p6qmdsipkwkbra7rh11jrhq5kpvjzhx";
-        authors = [
-          "Steve Klabnik <steve@steveklabnik.com>"
-          "The Rust Project Developers"
-        ];
-        dependencies = [
-          {
-            name = "semver-parser";
-            packageId = "semver-parser";
-          }
-        ];
-        features = {
-          "ci" = [ "serde" ];
-          "serde" = [ "dep:serde" ];
-        };
-        resolvedDefaultFeatures = [ "default" ];
-      };
-      "semver 1.0.20" = rec {
+      "semver" = rec {
         crateName = "semver";
         version = "1.0.20";
         edition = "2018";
         sha256 = "140hmbfa743hbmah1zjf07s8apavhvn04204qjigjiz5w6iscvw3";
-=======
-      "semver" = rec {
-        crateName = "semver";
-        version = "1.0.19";
-        edition = "2018";
-        sha256 = "1c2gg8k8sij0vbbd2dv30mx228xxqiw37apjiqdf0v8w419715xd";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "David Tolnay <dtolnay@gmail.com>"
         ];
@@ -13329,19 +10191,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "std" ];
       };
-<<<<<<< HEAD
-      "semver-parser" = rec {
-        crateName = "semver-parser";
-        version = "0.7.0";
-        edition = "2015";
-        sha256 = "18vhypw6zgccnrlm5ps1pwa0khz7ry927iznpr88b87cagr1v2iq";
-        authors = [
-          "Steve Klabnik <steve@steveklabnik.com>"
-        ];
-
-      };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "serde 0.9.15" = rec {
         crateName = "serde";
         version = "0.9.15";
@@ -13361,19 +10210,11 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "std" ];
       };
-<<<<<<< HEAD
       "serde 1.0.193" = rec {
         crateName = "serde";
         version = "1.0.193";
         edition = "2018";
         sha256 = "129b0j67594f8qg5cbyi3nyk31y97wrqihi026mba34dwrsrkp95";
-=======
-      "serde 1.0.188" = rec {
-        crateName = "serde";
-        version = "1.0.188";
-        edition = "2018";
-        sha256 = "17jlqzfhimsk8w37ifjwnm86nwjzawlbgwmwc7nhwdwslv5hz7ng";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Erick Tryzelaar <erick.tryzelaar@gmail.com>"
           "David Tolnay <dtolnay@gmail.com>"
@@ -13405,15 +10246,9 @@ rec {
       };
       "serde_derive" = rec {
         crateName = "serde_derive";
-<<<<<<< HEAD
         version = "1.0.193";
         edition = "2015";
         sha256 = "1lwlx2k7wxr1v160kpyqjfabs37gm1yxqg65383rnyrm06jnqms3";
-=======
-        version = "1.0.188";
-        edition = "2015";
-        sha256 = "1wjaclvsfxgqnnnykllvb5gffsxynk66x6h4c1ds6anq8b37mjjf";
->>>>>>> 4366a49 (Start nixifying applications)
         procMacro = true;
         authors = [
           "Erick Tryzelaar <erick.tryzelaar@gmail.com>"
@@ -13430,11 +10265,7 @@ rec {
           }
           {
             name = "syn";
-<<<<<<< HEAD
             packageId = "syn 2.0.41";
-=======
-            packageId = "syn 2.0.37";
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
         features = {
@@ -13443,15 +10274,9 @@ rec {
       };
       "serde_json" = rec {
         crateName = "serde_json";
-<<<<<<< HEAD
         version = "1.0.108";
         edition = "2021";
         sha256 = "0ssj59s7lpzqh1m50kfzlnrip0p0jg9lmhn4098i33a0mhz7w71x";
-=======
-        version = "1.0.107";
-        edition = "2021";
-        sha256 = "0r8cyb8nh3afb15yfscp1h8sdjfv6pnnwg14kcp8igfqwgk0qhkb";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Erick Tryzelaar <erick.tryzelaar@gmail.com>"
           "David Tolnay <dtolnay@gmail.com>"
@@ -13467,22 +10292,14 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
           }
         ];
         devDependencies = [
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "derive" ];
           }
         ];
@@ -13497,7 +10314,6 @@ rec {
       };
       "serde_spanned" = rec {
         crateName = "serde_spanned";
-<<<<<<< HEAD
         version = "0.6.5";
         edition = "2021";
         sha256 = "1hgh6s3jjwyzhfk3xwb6pnnr1misq9nflwq0f026jafi37s24dpb";
@@ -13514,18 +10330,6 @@ rec {
             packageId = "serde 1.0.193";
           }
         ];
-=======
-        version = "0.6.3";
-        edition = "2021";
-        sha256 = "11p1l83r5g3k18pi88cqri2r9ai03pm8b4azj4j02ypx6scnqhln";
-        dependencies = [
-          {
-            name = "serde";
-            packageId = "serde 1.0.188";
-            optional = true;
-          }
-        ];
->>>>>>> 4366a49 (Start nixifying applications)
         features = {
           "serde" = [ "dep:serde" ];
         };
@@ -13554,11 +10358,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
 
@@ -13584,11 +10384,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "derive" ];
           }
           {
@@ -13624,11 +10420,7 @@ rec {
           {
             name = "cpufeatures";
             packageId = "cpufeatures";
-<<<<<<< HEAD
             target = { target, features }: (("aarch64" == target."arch") || ("x86" == target."arch") || ("x86_64" == target."arch"));
-=======
-            target = { target, features }: (("aarch64" == target."arch" or null) || ("x86" == target."arch" or null) || ("x86_64" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "digest";
@@ -13667,11 +10459,7 @@ rec {
           {
             name = "cpufeatures";
             packageId = "cpufeatures";
-<<<<<<< HEAD
             target = { target, features }: (("aarch64" == target."arch") || ("x86_64" == target."arch") || ("x86" == target."arch"));
-=======
-            target = { target, features }: (("aarch64" == target."arch" or null) || ("x86_64" == target."arch" or null) || ("x86" == target."arch" or null));
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "digest";
@@ -13714,15 +10502,9 @@ rec {
       };
       "signature" = rec {
         crateName = "signature";
-<<<<<<< HEAD
         version = "2.2.0";
         edition = "2021";
         sha256 = "1pi9hd5vqfr3q3k49k37z06p7gs5si0in32qia4mmr1dancr6m3p";
-=======
-        version = "2.1.0";
-        edition = "2021";
-        sha256 = "00457czdia5gvll3a1vzf2ffsdpgcz2dz0h56z7zk28nsbp8h5sy";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "RustCrypto Developers"
         ];
@@ -13744,11 +10526,7 @@ rec {
           "derive" = [ "dep:derive" ];
           "digest" = [ "dep:digest" ];
           "rand_core" = [ "dep:rand_core" ];
-<<<<<<< HEAD
           "std" = [ "alloc" "rand_core?/std" ];
-=======
-          "std" = [ "alloc" ];
->>>>>>> 4366a49 (Start nixifying applications)
         };
         resolvedDefaultFeatures = [ "alloc" "digest" "rand_core" "std" ];
       };
@@ -13814,15 +10592,9 @@ rec {
       };
       "smallvec" = rec {
         crateName = "smallvec";
-<<<<<<< HEAD
         version = "1.11.2";
         edition = "2018";
         sha256 = "0w79x38f7c0np7hqfmzrif9zmn0avjvvm31b166zdk9d1aad1k2d";
-=======
-        version = "1.11.1";
-        edition = "2018";
-        sha256 = "0nmx8aw3v4jglqdcjv4hhn10d6g52c4bhjlzwf952885is04lawl";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The Servo Project Developers"
         ];
@@ -13834,45 +10606,11 @@ rec {
         };
         resolvedDefaultFeatures = [ "const_generics" "const_new" "union" ];
       };
-<<<<<<< HEAD
       "socket2" = rec {
         crateName = "socket2";
         version = "0.5.5";
         edition = "2021";
         sha256 = "1sgq315f1njky114ip7wcy83qlphv9qclprfjwvxcpfblmcsqpvv";
-=======
-      "socket2 0.4.9" = rec {
-        crateName = "socket2";
-        version = "0.4.9";
-        edition = "2018";
-        sha256 = "0qnn1r41jqj20m0a2nzzjgzndlmpg5maiyjchccaypfqxq8sk934";
-        authors = [
-          "Alex Crichton <alex@alexcrichton.com>"
-          "Thomas de Zeeuw <thomasdezeeuw@gmail.com>"
-        ];
-        dependencies = [
-          {
-            name = "libc";
-            packageId = "libc";
-            target = { target, features }: (target."unix" or false);
-          }
-          {
-            name = "winapi";
-            packageId = "winapi";
-            target = { target, features }: (target."windows" or false);
-            features = [ "handleapi" "ws2ipdef" "ws2tcpip" ];
-          }
-        ];
-        features = {
-        };
-        resolvedDefaultFeatures = [ "all" ];
-      };
-      "socket2 0.5.4" = rec {
-        crateName = "socket2";
-        version = "0.5.4";
-        edition = "2021";
-        sha256 = "17lqx8w2b3nysrkdbdz8y7fkikz5v77c052q57lxwajmxchfhca0";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Alex Crichton <alex@alexcrichton.com>"
           "Thomas de Zeeuw <thomasdezeeuw@gmail.com>"
@@ -13885,11 +10623,7 @@ rec {
           }
           {
             name = "windows-sys";
-<<<<<<< HEAD
             packageId = "windows-sys 0.48.0";
-=======
-            packageId = "windows-sys";
->>>>>>> 4366a49 (Start nixifying applications)
             target = { target, features }: (target."windows" or false);
             features = [ "Win32_Foundation" "Win32_Networking_WinSock" "Win32_System_IO" "Win32_System_Threading" "Win32_System_WindowsProgramming" ];
           }
@@ -13944,15 +10678,9 @@ rec {
       };
       "spki" = rec {
         crateName = "spki";
-<<<<<<< HEAD
         version = "0.7.3";
         edition = "2021";
         sha256 = "17fj8k5fmx4w9mp27l970clrh5qa7r5sjdvbsln987xhb34dc7nr";
-=======
-        version = "0.7.2";
-        edition = "2021";
-        sha256 = "0jhq00sv4w3psdi6li3vjjmspc6z2d9b1wc1srbljircy1p9j7lx";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "RustCrypto Developers"
         ];
@@ -13982,26 +10710,16 @@ rec {
       };
       "sqlformat" = rec {
         crateName = "sqlformat";
-<<<<<<< HEAD
         version = "0.2.3";
         edition = "2021";
         sha256 = "0v0p70wjdshj18zgjjac9xlx8hmpx33xhq7g8x9rg4s4gjyvg0ff";
-=======
-        version = "0.2.2";
-        edition = "2021";
-        sha256 = "11cymbg6xr7xyy5hvry8pfkgpwzfl2br9wy0546lvgp7i23jfyvb";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Josh Holmer <jholmer.in@gmail.com>"
         ];
         dependencies = [
           {
             name = "itertools";
-<<<<<<< HEAD
-            packageId = "itertools 0.12.0";
-=======
             packageId = "itertools";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "nom";
@@ -14016,15 +10734,9 @@ rec {
       };
       "sqlx" = rec {
         crateName = "sqlx";
-<<<<<<< HEAD
         version = "0.7.3";
         edition = "2021";
         sha256 = "1kv3hyx7izmmsjqh3l47zrfhjlcblpg20cvnk7pr8dm7klkkr86v";
-=======
-        version = "0.7.2";
-        edition = "2021";
-        sha256 = "0czdybpfwqji1frkmz4cbppddakhcdm6lk6ixkkwhkk2wcbc4l0f";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Ryan Leckey <leckey.ryan@gmail.com>"
           "Austin Bonander <austin.bonander@gmail.com>"
@@ -14095,15 +10807,9 @@ rec {
       };
       "sqlx-core" = rec {
         crateName = "sqlx-core";
-<<<<<<< HEAD
         version = "0.7.3";
         edition = "2021";
         sha256 = "1gdz44yb9qwxv4xl4hv6w4vbqx0zzdlzsf9j9gcj1qir6wy0ljyq";
-=======
-        version = "0.7.2";
-        edition = "2021";
-        sha256 = "178nsb2m3hzxa9gfgmi30z5gqij3lvchwvwcrpabp669c3j56rwd";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Ryan Leckey <leckey.ryan@gmail.com>"
           "Austin Bonander <austin.bonander@gmail.com>"
@@ -14148,11 +10854,7 @@ rec {
           }
           {
             name = "event-listener";
-<<<<<<< HEAD
             packageId = "event-listener 2.5.3";
-=======
-            packageId = "event-listener";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "futures-channel";
@@ -14189,11 +10891,7 @@ rec {
           }
           {
             name = "indexmap";
-<<<<<<< HEAD
             packageId = "indexmap";
-=======
-            packageId = "indexmap 2.0.2";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "log";
@@ -14215,19 +10913,11 @@ rec {
           }
           {
             name = "percent-encoding";
-<<<<<<< HEAD
             packageId = "percent-encoding 2.3.1";
           }
           {
             name = "serde";
             packageId = "serde 1.0.193";
-=======
-            packageId = "percent-encoding 2.3.0";
-          }
-          {
-            name = "serde";
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
             features = [ "derive" "rc" ];
           }
@@ -14275,11 +10965,7 @@ rec {
           }
           {
             name = "url";
-<<<<<<< HEAD
             packageId = "url 2.5.0";
-=======
-            packageId = "url 2.4.1";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
           }
         ];
@@ -14304,10 +10990,6 @@ rec {
           "crc" = [ "dep:crc" ];
           "digest" = [ "dep:digest" ];
           "encoding_rs" = [ "dep:encoding_rs" ];
-<<<<<<< HEAD
-=======
-          "generic-array" = [ "dep:generic-array" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "ipnetwork" = [ "dep:ipnetwork" ];
           "json" = [ "serde" "serde_json" ];
           "mac_address" = [ "dep:mac_address" ];
@@ -14333,15 +11015,9 @@ rec {
       };
       "sqlx-macros" = rec {
         crateName = "sqlx-macros";
-<<<<<<< HEAD
         version = "0.7.3";
         edition = "2021";
         sha256 = "19gjwisiym07q7ibkp9nkvvbywjh0r5rc572msvzyzadvh01r5l9";
-=======
-        version = "0.7.2";
-        edition = "2021";
-        sha256 = "1v49266pwan9yp63ab7jm9xxsb6kxqwvslqqkhswh7ikparknycs";
->>>>>>> 4366a49 (Start nixifying applications)
         procMacro = true;
         authors = [
           "Ryan Leckey <leckey.ryan@gmail.com>"
@@ -14399,15 +11075,9 @@ rec {
       };
       "sqlx-macros-core" = rec {
         crateName = "sqlx-macros-core";
-<<<<<<< HEAD
         version = "0.7.3";
         edition = "2021";
         sha256 = "0h88wahkxa6nam536lhwr1y0yxlr6la8b1x0hs0n88v790clbgfh";
-=======
-        version = "0.7.2";
-        edition = "2021";
-        sha256 = "1z4n5mw79k771qr88al65rqa9c0764sd3zazmavfs3g00khy2kha";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Ryan Leckey <leckey.ryan@gmail.com>"
           "Austin Bonander <austin.bonander@gmail.com>"
@@ -14416,13 +11086,10 @@ rec {
         ];
         dependencies = [
           {
-<<<<<<< HEAD
             name = "atomic-write-file";
             packageId = "atomic-write-file";
           }
           {
-=======
->>>>>>> 4366a49 (Start nixifying applications)
             name = "dotenvy";
             packageId = "dotenvy";
             usesDefaultFeatures = false;
@@ -14456,11 +11123,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "derive" ];
           }
           {
@@ -14507,11 +11170,7 @@ rec {
           }
           {
             name = "url";
-<<<<<<< HEAD
             packageId = "url 2.5.0";
-=======
-            packageId = "url 2.4.1";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
           }
         ];
@@ -14543,15 +11202,9 @@ rec {
       };
       "sqlx-mysql" = rec {
         crateName = "sqlx-mysql";
-<<<<<<< HEAD
         version = "0.7.3";
         edition = "2021";
         sha256 = "190ygz5a3pqcd9vvqjv2i4r1xh8vi53j4272yrld07zpblwrawg3";
-=======
-        version = "0.7.2";
-        edition = "2021";
-        sha256 = "1nvhm63pq756ax6pngiykw7k9bx03qcq6m64jm63y9jnvygqcjw6";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Ryan Leckey <leckey.ryan@gmail.com>"
           "Austin Bonander <austin.bonander@gmail.com>"
@@ -14565,21 +11218,13 @@ rec {
           }
           {
             name = "base64";
-<<<<<<< HEAD
             packageId = "base64 0.21.5";
-=======
-            packageId = "base64 0.21.4";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
             features = [ "std" ];
           }
           {
             name = "bitflags";
-<<<<<<< HEAD
             packageId = "bitflags 2.4.1";
-=======
-            packageId = "bitflags 2.4.0";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
             features = [ "serde" ];
           }
@@ -14674,11 +11319,7 @@ rec {
           }
           {
             name = "percent-encoding";
-<<<<<<< HEAD
             packageId = "percent-encoding 2.3.1";
-=======
-            packageId = "percent-encoding 2.3.0";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "rand";
@@ -14692,11 +11333,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
           }
           {
@@ -14752,15 +11389,9 @@ rec {
       };
       "sqlx-postgres" = rec {
         crateName = "sqlx-postgres";
-<<<<<<< HEAD
         version = "0.7.3";
         edition = "2021";
         sha256 = "090wm9s6mm53ggn1xwr183cnn8yxly8rgcksdk4hrlfcnz1hmb6n";
-=======
-        version = "0.7.2";
-        edition = "2021";
-        sha256 = "092njwfrbrsnbayili9z02zcmqz6bhd6ghisn8rvmcvzm7kf0ypb";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Ryan Leckey <leckey.ryan@gmail.com>"
           "Austin Bonander <austin.bonander@gmail.com>"
@@ -14774,21 +11405,13 @@ rec {
           }
           {
             name = "base64";
-<<<<<<< HEAD
             packageId = "base64 0.21.5";
-=======
-            packageId = "base64 0.21.4";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
             features = [ "std" ];
           }
           {
             name = "bitflags";
-<<<<<<< HEAD
             packageId = "bitflags 2.4.1";
-=======
-            packageId = "bitflags 2.4.0";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
           }
           {
@@ -14809,11 +11432,7 @@ rec {
           {
             name = "etcetera";
             packageId = "etcetera";
-<<<<<<< HEAD
             target = { target, features }: ("windows" == target."os");
-=======
-            target = { target, features }: ("windows" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "futures-channel";
@@ -14883,11 +11502,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "derive" ];
           }
           {
@@ -14943,11 +11558,7 @@ rec {
           "mac_address" = [ "dep:mac_address" ];
           "migrate" = [ "sqlx-core/migrate" ];
           "offline" = [ "sqlx-core/offline" ];
-<<<<<<< HEAD
           "rust_decimal" = [ "dep:rust_decimal" "rust_decimal/maths" ];
-=======
-          "rust_decimal" = [ "dep:rust_decimal" "dep:num-bigint" ];
->>>>>>> 4366a49 (Start nixifying applications)
           "time" = [ "dep:time" ];
           "uuid" = [ "dep:uuid" ];
         };
@@ -14955,15 +11566,9 @@ rec {
       };
       "sqlx-sqlite" = rec {
         crateName = "sqlx-sqlite";
-<<<<<<< HEAD
         version = "0.7.3";
         edition = "2021";
         sha256 = "143laha7wf8dmi0xwycwqmvxdcnb25dq7jnqrsgvmis8v6vpc291";
-=======
-        version = "0.7.2";
-        edition = "2021";
-        sha256 = "0gsgdbjvn80zwmn82v41b9a5rdfizhs4asbplmawb2axyhyci7fm";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Ryan Leckey <leckey.ryan@gmail.com>"
           "Austin Bonander <austin.bonander@gmail.com>"
@@ -15018,19 +11623,11 @@ rec {
           }
           {
             name = "percent-encoding";
-<<<<<<< HEAD
             packageId = "percent-encoding 2.3.1";
           }
           {
             name = "serde";
             packageId = "serde 1.0.193";
-=======
-            packageId = "percent-encoding 2.3.0";
-          }
-          {
-            name = "serde";
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
             features = [ "derive" ];
           }
@@ -15045,7 +11642,6 @@ rec {
           }
           {
             name = "url";
-<<<<<<< HEAD
             packageId = "url 2.5.0";
             usesDefaultFeatures = false;
           }
@@ -15053,11 +11649,6 @@ rec {
             name = "urlencoding";
             packageId = "urlencoding";
           }
-=======
-            packageId = "url 2.4.1";
-            usesDefaultFeatures = false;
-          }
->>>>>>> 4366a49 (Start nixifying applications)
         ];
         features = {
           "any" = [ "sqlx-core/any" ];
@@ -15072,22 +11663,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "any" "json" "migrate" "offline" "serde" ];
       };
-<<<<<<< HEAD
-      "stable_deref_trait" = rec {
-        crateName = "stable_deref_trait";
-        version = "1.2.0";
-        edition = "2015";
-        sha256 = "1lxjr8q2n534b2lhkxd6l6wcddzjvnksi58zv11f9y0jjmr15wd8";
-        authors = [
-          "Robert Grosse <n210241048576@gmail.com>"
-        ];
-        features = {
-          "default" = [ "std" ];
-          "std" = [ "alloc" ];
-        };
-      };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "stringprep" = rec {
         crateName = "stringprep";
         version = "0.1.4";
@@ -15169,19 +11744,11 @@ rec {
         };
         resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "quote" ];
       };
-<<<<<<< HEAD
       "syn 2.0.41" = rec {
         crateName = "syn";
         version = "2.0.41";
         edition = "2021";
         sha256 = "0sg2lzkwbwbm229p3kx1yxai43hkc0s1wmk6g47bzhvw8y6b5j24";
-=======
-      "syn 2.0.37" = rec {
-        crateName = "syn";
-        version = "2.0.37";
-        edition = "2021";
-        sha256 = "1s42ypidkj410dfc4ir7bni0r114k822j395rf342rfd0lnfy0vk";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "David Tolnay <dtolnay@gmail.com>"
         ];
@@ -15257,15 +11824,9 @@ rec {
       };
       "system-deps" = rec {
         crateName = "system-deps";
-<<<<<<< HEAD
         version = "6.2.0";
         edition = "2018";
         sha256 = "0c836abhh3k8yn5ymg8wx383ay7n731gkrbbp3gma352yq7mhb9a";
-=======
-        version = "6.1.2";
-        edition = "2018";
-        sha256 = "1mlpx2vzgcp39lfgr7ndwsf8vgjr6fs1h9cajk2am51g83wm5bwl";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Guillaume Desmottes <guillaume.desmottes@collabora.com>"
           "Josh Triplett <josh@joshtriplett.org>"
@@ -15299,15 +11860,9 @@ rec {
       };
       "target-lexicon" = rec {
         crateName = "target-lexicon";
-<<<<<<< HEAD
         version = "0.12.12";
         edition = "2018";
         sha256 = "02lk65ik5ffb8vl9qzq02v0df8kxrp16zih78a33mji49789zhql";
-=======
-        version = "0.12.11";
-        edition = "2018";
-        sha256 = "12nwfd1ylqysn1mqf967hc33wcvg0jyvq7hfhmiy5j2825mr23lx";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Dan Gohman <sunfish@mozilla.com>"
         ];
@@ -15339,15 +11894,9 @@ rec {
       };
       "tempfile" = rec {
         crateName = "tempfile";
-<<<<<<< HEAD
         version = "3.8.1";
         edition = "2018";
         sha256 = "1r88v07zdafzf46y63vs39rmzwl4vqd4g2c5qarz9mqa8nnavwby";
-=======
-        version = "3.8.0";
-        edition = "2018";
-        sha256 = "1vsl2193w3gpx3mwj36fwx3v6q2qyvmzrdn6m8fgfsjkrkrx556b";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Steven Allen <steven@stebalien.com>"
           "The Rust Project Developers"
@@ -15366,29 +11915,17 @@ rec {
           {
             name = "redox_syscall";
             packageId = "redox_syscall";
-<<<<<<< HEAD
             target = { target, features }: ("redox" == target."os");
-=======
-            target = { target, features }: ("redox" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "rustix";
             packageId = "rustix";
-<<<<<<< HEAD
             target = { target, features }: ((target."unix" or false) || ("wasi" == target."os"));
-=======
-            target = { target, features }: ((target."unix" or false) || ("wasi" == target."os" or null));
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "fs" ];
           }
           {
             name = "windows-sys";
-<<<<<<< HEAD
             packageId = "windows-sys 0.48.0";
-=======
-            packageId = "windows-sys";
->>>>>>> 4366a49 (Start nixifying applications)
             target = { target, features }: (target."windows" or false);
             features = [ "Win32_Storage_FileSystem" "Win32_Foundation" ];
           }
@@ -15398,15 +11935,9 @@ rec {
       };
       "termcolor" = rec {
         crateName = "termcolor";
-<<<<<<< HEAD
         version = "1.4.0";
         edition = "2018";
         sha256 = "0jfllflbxxffghlq6gx4csv0bv0qv77943dcx01h9zssy39w66zz";
-=======
-        version = "1.3.0";
-        edition = "2018";
-        sha256 = "0r1byqaq6f97qd0wc7k09lza190apvj9301s2afsp6m6gp9vm4v0";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Andrew Gallant <jamslam@gmail.com>"
         ];
@@ -15421,15 +11952,9 @@ rec {
       };
       "thiserror" = rec {
         crateName = "thiserror";
-<<<<<<< HEAD
         version = "1.0.51";
         edition = "2021";
         sha256 = "1drvyim21w5sga3izvnvivrdp06l2c24xwbhp0vg1mhn2iz2277i";
-=======
-        version = "1.0.49";
-        edition = "2021";
-        sha256 = "1m3yalbcx89bx397igc1ckypw8hiwq9jbzc56pgazrzdsz3fhxqi";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "David Tolnay <dtolnay@gmail.com>"
         ];
@@ -15443,15 +11968,9 @@ rec {
       };
       "thiserror-impl" = rec {
         crateName = "thiserror-impl";
-<<<<<<< HEAD
         version = "1.0.51";
         edition = "2021";
         sha256 = "1ps9ylhlk2vn19fv3cxp40j3wcg1xmb117g2z2fbf4vmg2bj4x01";
-=======
-        version = "1.0.49";
-        edition = "2021";
-        sha256 = "1k643ga9sbqpcb873n299n3zjzc4srfakyv98xwqi4ly0412yw8h";
->>>>>>> 4366a49 (Start nixifying applications)
         procMacro = true;
         authors = [
           "David Tolnay <dtolnay@gmail.com>"
@@ -15467,11 +11986,7 @@ rec {
           }
           {
             name = "syn";
-<<<<<<< HEAD
             packageId = "syn 2.0.41";
-=======
-            packageId = "syn 2.0.37";
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
 
@@ -15553,11 +12068,7 @@ rec {
           {
             name = "wasi";
             packageId = "wasi 0.10.0+wasi-snapshot-preview1";
-<<<<<<< HEAD
             target = { target, features }: ("wasi" == target."os");
-=======
-            target = { target, features }: ("wasi" == target."os" or null);
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "winapi";
@@ -15577,19 +12088,11 @@ rec {
           "rustc-serialize" = [ "dep:rustc-serialize" ];
         };
       };
-<<<<<<< HEAD
       "time 0.3.31" = rec {
         crateName = "time";
         version = "0.3.31";
         edition = "2021";
         sha256 = "0gjqcdsdbh0r5vi4c2vrj5a6prdviapx731wwn07cvpqqd1blmzn";
-=======
-      "time 0.3.29" = rec {
-        crateName = "time";
-        version = "0.3.29";
-        edition = "2021";
-        sha256 = "1zhq1ch3vs1pxqbbgw9hispqphz206fc490dmkf97i4981pq0vs2";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Jacob Pratt <open-source@jhpratt.dev>"
           "Time contributors"
@@ -15599,10 +12102,7 @@ rec {
             name = "deranged";
             packageId = "deranged";
             usesDefaultFeatures = false;
-<<<<<<< HEAD
             features = [ "powerfmt" ];
-=======
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "itoa";
@@ -15610,7 +12110,6 @@ rec {
             optional = true;
           }
           {
-<<<<<<< HEAD
             name = "powerfmt";
             packageId = "powerfmt";
             usesDefaultFeatures = false;
@@ -15618,10 +12117,6 @@ rec {
           {
             name = "serde";
             packageId = "serde 1.0.193";
-=======
-            name = "serde";
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
             usesDefaultFeatures = false;
           }
@@ -15638,11 +12133,7 @@ rec {
         devDependencies = [
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
             features = [ "derive" ];
           }
@@ -15682,15 +12173,9 @@ rec {
       };
       "time-macros" = rec {
         crateName = "time-macros";
-<<<<<<< HEAD
         version = "0.2.16";
         edition = "2021";
         sha256 = "0gx4ngf5g7ydqa8lf7kh9sy72rd4dhvpi31y1jvswi0288rpw696";
-=======
-        version = "0.2.15";
-        edition = "2021";
-        sha256 = "086frcn3m2yh3fji3wv9r35c3zjxjq8ngam7xnngiqd9vdl0vmsa";
->>>>>>> 4366a49 (Start nixifying applications)
         procMacro = true;
         authors = [
           "Jacob Pratt <open-source@jhpratt.dev>"
@@ -15706,7 +12191,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "formatting" "parsing" ];
       };
-<<<<<<< HEAD
       "timezone-testing" = rec {
         crateName = "timezone-testing";
         version = "0.1.0";
@@ -15733,13 +12217,6 @@ rec {
         version = "0.7.5";
         edition = "2021";
         sha256 = "1khf3j95bwwksj2hw76nlvwlwpwi4d1j421lj6x35arqqprjph43";
-=======
-      "tinystr" = rec {
-        crateName = "tinystr";
-        version = "0.7.4";
-        edition = "2021";
-        sha256 = "06d2ym0963i72psh69lrc4wbraw446klbz2nad79pp0bx12y5l6m";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The ICU4X Project Developers"
         ];
@@ -15797,15 +12274,9 @@ rec {
       };
       "tokio" = rec {
         crateName = "tokio";
-<<<<<<< HEAD
         version = "1.35.1";
         edition = "2021";
         sha256 = "01613rkziqp812a288ga65aqygs254wgajdi57v8brivjkx4x6y8";
-=======
-        version = "1.32.0";
-        edition = "2021";
-        sha256 = "1yck1349q23l22bgxcbqd3wkaffw2vmkf7z26m3wgmkcxmvn1v8p";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Tokio Contributors <team@tokio.rs>"
         ];
@@ -15854,11 +12325,7 @@ rec {
           }
           {
             name = "socket2";
-<<<<<<< HEAD
             packageId = "socket2";
-=======
-            packageId = "socket2 0.5.4";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
             target = { target, features }: (!(builtins.elem "wasm" target."family"));
             features = [ "all" ];
@@ -15870,11 +12337,7 @@ rec {
           }
           {
             name = "windows-sys";
-<<<<<<< HEAD
             packageId = "windows-sys 0.48.0";
-=======
-            packageId = "windows-sys";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
             target = { target, features }: (target."windows" or false);
           }
@@ -15887,20 +12350,12 @@ rec {
           }
           {
             name = "socket2";
-<<<<<<< HEAD
             packageId = "socket2";
-=======
-            packageId = "socket2 0.5.4";
->>>>>>> 4366a49 (Start nixifying applications)
             target = {target, features}: (!(builtins.elem "wasm" target."family"));
           }
           {
             name = "windows-sys";
-<<<<<<< HEAD
             packageId = "windows-sys 0.48.0";
-=======
-            packageId = "windows-sys";
->>>>>>> 4366a49 (Start nixifying applications)
             target = {target, features}: (target."windows" or false);
             features = [ "Win32_Foundation" "Win32_Security_Authorization" ];
           }
@@ -15929,15 +12384,9 @@ rec {
       };
       "tokio-macros" = rec {
         crateName = "tokio-macros";
-<<<<<<< HEAD
         version = "2.2.0";
         edition = "2021";
         sha256 = "0fwjy4vdx1h9pi4g2nml72wi0fr27b5m954p13ji9anyy8l1x2jv";
-=======
-        version = "2.1.0";
-        edition = "2018";
-        sha256 = "0pk7y9dfanab886iaqwcbri39jkw33kgl7y07v0kg1pp8prdq2v3";
->>>>>>> 4366a49 (Start nixifying applications)
         procMacro = true;
         authors = [
           "Tokio Contributors <team@tokio.rs>"
@@ -15953,11 +12402,7 @@ rec {
           }
           {
             name = "syn";
-<<<<<<< HEAD
             packageId = "syn 2.0.41";
-=======
-            packageId = "syn 2.0.37";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "full" ];
           }
         ];
@@ -16095,15 +12540,9 @@ rec {
       };
       "tokio-util" = rec {
         crateName = "tokio-util";
-<<<<<<< HEAD
         version = "0.7.10";
         edition = "2021";
         sha256 = "058y6x4mf0fsqji9rfyb77qbfyc50y4pk2spqgj6xsyr693z66al";
-=======
-        version = "0.7.9";
-        edition = "2021";
-        sha256 = "03d63ivnd8pwi6qzrlw0gyqkiawq5vmkb5sdb4hhnypm4130fs0x";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Tokio Contributors <team@tokio.rs>"
         ];
@@ -16172,11 +12611,7 @@ rec {
         dependencies = [
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "serde_spanned";
@@ -16198,11 +12633,7 @@ rec {
         devDependencies = [
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "derive" ];
           }
         ];
@@ -16226,11 +12657,7 @@ rec {
         dependencies = [
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
           }
         ];
@@ -16251,11 +12678,7 @@ rec {
         dependencies = [
           {
             name = "indexmap";
-<<<<<<< HEAD
             packageId = "indexmap";
-=======
-            packageId = "indexmap 2.0.2";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "std" ];
           }
           {
@@ -16285,20 +12708,12 @@ rec {
         dependencies = [
           {
             name = "indexmap";
-<<<<<<< HEAD
             packageId = "indexmap";
-=======
-            packageId = "indexmap 2.0.2";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "std" ];
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
           }
           {
@@ -16334,28 +12749,15 @@ rec {
       };
       "tracing" = rec {
         crateName = "tracing";
-<<<<<<< HEAD
         version = "0.1.40";
         edition = "2018";
         sha256 = "1vv48dac9zgj9650pg2b4d0j3w6f3x9gbggf43scq5hrlysklln3";
-=======
-        version = "0.1.37";
-        edition = "2018";
-        sha256 = "1f2fylc79xmbh7v53kak6qyw27njbx227rd64kb4bga8ilxc7s4c";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Eliza Weisman <eliza@buoyant.io>"
           "Tokio Contributors <team@tokio.rs>"
         ];
         dependencies = [
           {
-<<<<<<< HEAD
-=======
-            name = "cfg-if";
-            packageId = "cfg-if";
-          }
-          {
->>>>>>> 4366a49 (Start nixifying applications)
             name = "log";
             packageId = "log 0.4.20";
             optional = true;
@@ -16394,15 +12796,9 @@ rec {
       };
       "tracing-attributes" = rec {
         crateName = "tracing-attributes";
-<<<<<<< HEAD
         version = "0.1.27";
         edition = "2018";
         sha256 = "1rvb5dn9z6d0xdj14r403z0af0bbaqhg02hq4jc97g5wds6lqw1l";
-=======
-        version = "0.1.26";
-        edition = "2018";
-        sha256 = "1ax44ldpbcb7dsvpljiv2krnx6xp0hs85zcyv8385sarc7sk2ksz";
->>>>>>> 4366a49 (Start nixifying applications)
         procMacro = true;
         authors = [
           "Tokio Contributors <team@tokio.rs>"
@@ -16420,11 +12816,7 @@ rec {
           }
           {
             name = "syn";
-<<<<<<< HEAD
             packageId = "syn 2.0.41";
-=======
-            packageId = "syn 2.0.37";
->>>>>>> 4366a49 (Start nixifying applications)
             usesDefaultFeatures = false;
             features = [ "full" "parsing" "printing" "visit-mut" "clone-impls" "extra-traits" "proc-macro" ];
           }
@@ -16434,15 +12826,9 @@ rec {
       };
       "tracing-core" = rec {
         crateName = "tracing-core";
-<<<<<<< HEAD
         version = "0.1.32";
         edition = "2018";
         sha256 = "0m5aglin3cdwxpvbg6kz0r9r0k31j48n0kcfwsp6l49z26k3svf0";
-=======
-        version = "0.1.31";
-        edition = "2018";
-        sha256 = "16pp28izw9c41m7c55qsghlz07r9ark8lzd3x6ig3xhxg89vhm89";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Tokio Contributors <team@tokio.rs>"
         ];
@@ -16484,15 +12870,9 @@ rec {
       };
       "try-lock" = rec {
         crateName = "try-lock";
-<<<<<<< HEAD
         version = "0.2.5";
         edition = "2015";
         sha256 = "0jqijrrvm1pyq34zn1jmy2vihd4jcrjlvsh4alkjahhssjnsn8g4";
-=======
-        version = "0.2.4";
-        edition = "2015";
-        sha256 = "1vc15paa4zi06ixsxihwbvfn24d708nsyg1ncgqwcrn42byyqa1m";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Sean McArthur <sean@seanmonstar.com>"
         ];
@@ -16523,11 +12903,7 @@ rec {
           }
           {
             name = "http";
-<<<<<<< HEAD
             packageId = "http 0.2.11";
-=======
-            packageId = "http";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
           }
           {
@@ -16554,11 +12930,7 @@ rec {
           }
           {
             name = "url";
-<<<<<<< HEAD
             packageId = "url 2.5.0";
-=======
-            packageId = "url 2.4.1";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
           }
           {
@@ -16663,11 +13035,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "derive" ];
           }
           {
@@ -16709,15 +13077,9 @@ rec {
       };
       "unic-langid" = rec {
         crateName = "unic-langid";
-<<<<<<< HEAD
         version = "0.9.4";
         edition = "2021";
         sha256 = "05pm5p3j29c9jw9a4dr3v64g3x6g3zh37splj47i7vclszk251r3";
-=======
-        version = "0.9.1";
-        edition = "2018";
-        sha256 = "0byg9pqm4vywfx82lcw080sphbgj5z8niq0gz384zd4x4gbrm3rr";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Zibi Braniecki <gandalf@mozilla.com>"
         ];
@@ -16737,17 +13099,10 @@ rec {
       };
       "unic-langid-impl" = rec {
         crateName = "unic-langid-impl";
-<<<<<<< HEAD
         version = "0.9.4";
         edition = "2021";
         crateBin = [];
         sha256 = "1ijvqmsrg6qw3b1h9bh537pvwk2jn2kl6ck3z3qlxspxcch5mmab";
-=======
-        version = "0.9.1";
-        edition = "2018";
-        crateBin = [];
-        sha256 = "1zrm390npybzrclbrj6il1l3yqd0i4zgvlypamdm95l75cpzsnz3";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Zibi Braniecki <gandalf@mozilla.com>"
         ];
@@ -16802,15 +13157,9 @@ rec {
       };
       "unicode-bidi" = rec {
         crateName = "unicode-bidi";
-<<<<<<< HEAD
         version = "0.3.14";
         edition = "2018";
         sha256 = "05i4ps31vskq1wdp8yf315fxivyh1frijly9d4gb5clygbr2h9bg";
-=======
-        version = "0.3.13";
-        edition = "2018";
-        sha256 = "0q0l7rdkiq54pan7a4ama39dgynaf1mnjj1nddrq1w1zayjqp24j";
->>>>>>> 4366a49 (Start nixifying applications)
         libName = "unicode_bidi";
         authors = [
           "The Servo Project Developers"
@@ -16925,19 +13274,11 @@ rec {
           "serde" = [ "dep:serde" ];
         };
       };
-<<<<<<< HEAD
       "url 2.5.0" = rec {
         crateName = "url";
         version = "2.5.0";
         edition = "2018";
         sha256 = "0cs65961miawncdg2z20171w0vqrmraswv2ihdpd8lxp7cp31rii";
-=======
-      "url 2.4.1" = rec {
-        crateName = "url";
-        version = "2.4.1";
-        edition = "2018";
-        sha256 = "1rbsx1nvz5ardf0x815639z1bxbbgjjjhj0mmnfaqzr5327m6fql";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The rust-url developers"
         ];
@@ -16948,19 +13289,11 @@ rec {
           }
           {
             name = "idna";
-<<<<<<< HEAD
             packageId = "idna 0.5.0";
           }
           {
             name = "percent-encoding";
             packageId = "percent-encoding 2.3.1";
-=======
-            packageId = "idna 0.4.0";
-          }
-          {
-            name = "percent-encoding";
-            packageId = "percent-encoding 2.3.0";
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
         features = {
@@ -16968,7 +13301,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" ];
       };
-<<<<<<< HEAD
       "urlencoding" = rec {
         crateName = "urlencoding";
         version = "2.1.3";
@@ -16980,20 +13312,6 @@ rec {
         ];
 
       };
-      "usb-device" = rec {
-        crateName = "usb-device";
-        version = "0.2.9";
-        edition = "2018";
-        sha256 = "0205a850jhw9gb96scwfx1k4iwpjvighvz3m80mjkda9r2nw6v0z";
-        authors = [
-          "Matti Virkkunen <mvirkkunen@gmail.com>"
-        ];
-        features = {
-          "defmt" = [ "dep:defmt" ];
-        };
-      };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "utf-8" = rec {
         crateName = "utf-8";
         version = "0.7.6";
@@ -17067,11 +13385,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
             optional = true;
             usesDefaultFeatures = false;
           }
@@ -17093,19 +13407,11 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "getrandom" "serde" "std" "v4" ];
       };
-<<<<<<< HEAD
       "uuid 1.6.1" = rec {
         crateName = "uuid";
         version = "1.6.1";
         edition = "2018";
         sha256 = "0q45jxahvysldn3iy04m8xmr8hgig80855y9gq9di8x72v7myfay";
-=======
-      "uuid 1.4.1" = rec {
-        crateName = "uuid";
-        version = "1.4.1";
-        edition = "2018";
-        sha256 = "17c68cmn8mgn3ll3zlyc7zsnvj5r281ybic9nd05r0j0aznsbnkr";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Ashley Mannix<ashleymannix@live.com.au>"
           "Christopher Armstrong"
@@ -17124,10 +13430,7 @@ rec {
           "arbitrary" = [ "dep:arbitrary" ];
           "atomic" = [ "dep:atomic" ];
           "borsh" = [ "dep:borsh" ];
-<<<<<<< HEAD
           "bytemuck" = [ "dep:bytemuck" ];
-=======
->>>>>>> 4366a49 (Start nixifying applications)
           "default" = [ "std" ];
           "fast-rng" = [ "rng" "rand" ];
           "getrandom" = [ "dep:getrandom" ];
@@ -17153,20 +13456,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "getrandom" "rng" "std" "v4" ];
       };
-<<<<<<< HEAD
-      "vcell" = rec {
-        crateName = "vcell";
-        version = "0.1.3";
-        edition = "2015";
-        sha256 = "00n0ss2z3rh0ihig6d4w7xp72g58f7g1m6s5v4h3nc6jacdrqhvp";
-        authors = [
-          "Jorge Aparicio <japaricious@gmail.com>"
-        ];
-        features = {
-        };
-      };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "vcpkg" = rec {
         crateName = "vcpkg";
         version = "0.2.15";
@@ -17207,7 +13496,6 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "visions" = rec {
         crateName = "visions";
         version = "0.1.0";
@@ -17253,37 +13541,6 @@ rec {
         ];
 
       };
-      "void" = rec {
-        crateName = "void";
-        version = "1.0.2";
-        edition = "2015";
-        sha256 = "0zc8f0ksxvmhvgx4fdg0zyn6vdnbxd2xv9hfx4nhzg6kbs4f80ka";
-        authors = [
-          "Jonathan Reem <jonathan.reem@gmail.com>"
-        ];
-        features = {
-          "default" = [ "std" ];
-        };
-      };
-      "volatile-register" = rec {
-        crateName = "volatile-register";
-        version = "0.2.2";
-        edition = "2015";
-        sha256 = "1k0rkm81qyhn4r8f03z0sch2kyikkgjjfalpaami9c08c8m7whyy";
-        authors = [
-          "Jorge Aparicio <japaricious@gmail.com>"
-          "Jonathan 'theJPster' Pallant <github@thejpster.org.uk>"
-        ];
-        dependencies = [
-          {
-            name = "vcell";
-            packageId = "vcell";
-          }
-        ];
-
-      };
-=======
->>>>>>> 4366a49 (Start nixifying applications)
       "wait-timeout" = rec {
         crateName = "wait-timeout";
         version = "0.2.0";
@@ -17348,19 +13605,11 @@ rec {
           }
           {
             name = "http";
-<<<<<<< HEAD
             packageId = "http 0.2.11";
           }
           {
             name = "hyper";
             packageId = "hyper 0.14.28";
-=======
-            packageId = "http";
-          }
-          {
-            name = "hyper";
-            packageId = "hyper 0.14.27";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "stream" "server" "http1" "http2" "tcp" "client" ];
           }
           {
@@ -17382,11 +13631,7 @@ rec {
           }
           {
             name = "percent-encoding";
-<<<<<<< HEAD
             packageId = "percent-encoding 2.3.1";
-=======
-            packageId = "percent-encoding 2.3.0";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "pin-project";
@@ -17402,11 +13647,7 @@ rec {
           }
           {
             name = "serde";
-<<<<<<< HEAD
             packageId = "serde 1.0.193";
-=======
-            packageId = "serde 1.0.188";
->>>>>>> 4366a49 (Start nixifying applications)
           }
           {
             name = "serde_json";
@@ -17509,15 +13750,9 @@ rec {
       };
       "wasm-bindgen" = rec {
         crateName = "wasm-bindgen";
-<<<<<<< HEAD
         version = "0.2.89";
         edition = "2018";
         sha256 = "0kh6akdldy13z9xqj0skz6b4npq1d98bjkgzb8ccq59hibvd9l0f";
-=======
-        version = "0.2.87";
-        edition = "2018";
-        sha256 = "0hm3k42gcnrps2jh339h186scx1radqy1w7v1zwb333dncmaf1kp";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The wasm-bindgen Developers"
         ];
@@ -17546,15 +13781,9 @@ rec {
       };
       "wasm-bindgen-backend" = rec {
         crateName = "wasm-bindgen-backend";
-<<<<<<< HEAD
         version = "0.2.89";
         edition = "2018";
         sha256 = "09l8lyylsdssz993h4fzja69zpvpykaw84fivs210fjgwqjzcmhv";
-=======
-        version = "0.2.87";
-        edition = "2018";
-        sha256 = "1gcsh3bjxhw3cirmin45107pcsnn0ymhkxg6bxg65s8hqp9vdwjy";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The wasm-bindgen Developers"
         ];
@@ -17581,11 +13810,7 @@ rec {
           }
           {
             name = "syn";
-<<<<<<< HEAD
             packageId = "syn 2.0.41";
-=======
-            packageId = "syn 2.0.37";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "full" ];
           }
           {
@@ -17600,15 +13825,9 @@ rec {
       };
       "wasm-bindgen-futures" = rec {
         crateName = "wasm-bindgen-futures";
-<<<<<<< HEAD
         version = "0.4.39";
         edition = "2018";
         sha256 = "04lsxpw4jqfwh7c0crzx0smj52nvwp1w3bh4098sq90149da2dmc";
-=======
-        version = "0.4.37";
-        edition = "2018";
-        sha256 = "00zagjk39g4jjjnvfh35s7w6s0p6sy88i5c7y421z7vga4hvqbf0";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The wasm-bindgen Developers"
         ];
@@ -17639,15 +13858,9 @@ rec {
       };
       "wasm-bindgen-macro" = rec {
         crateName = "wasm-bindgen-macro";
-<<<<<<< HEAD
         version = "0.2.89";
         edition = "2018";
         sha256 = "1cl2w7k5jn2jbd5kx613c8k8vjvda22hfgcgx7y2mk93fbrxnqh1";
-=======
-        version = "0.2.87";
-        edition = "2018";
-        sha256 = "07cg0b6zkcxa1yg1n10h62paid59s9zr8yss214bv8w2b7jrbr6y";
->>>>>>> 4366a49 (Start nixifying applications)
         procMacro = true;
         authors = [
           "The wasm-bindgen Developers"
@@ -17670,15 +13883,9 @@ rec {
       };
       "wasm-bindgen-macro-support" = rec {
         crateName = "wasm-bindgen-macro-support";
-<<<<<<< HEAD
         version = "0.2.89";
         edition = "2018";
         sha256 = "10sj1gr2naxv5q116yjb929hhpvz45dxbkvyk8hyc2lknzy85szh";
-=======
-        version = "0.2.87";
-        edition = "2018";
-        sha256 = "0yqc46pr6mlgb9bsnfdnd50qvsqnrz8g5243fnaz0rb7lhc1ns2l";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The wasm-bindgen Developers"
         ];
@@ -17693,11 +13900,7 @@ rec {
           }
           {
             name = "syn";
-<<<<<<< HEAD
             packageId = "syn 2.0.41";
-=======
-            packageId = "syn 2.0.37";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "visit" "full" ];
           }
           {
@@ -17717,15 +13920,9 @@ rec {
       };
       "wasm-bindgen-shared" = rec {
         crateName = "wasm-bindgen-shared";
-<<<<<<< HEAD
         version = "0.2.89";
         edition = "2018";
         sha256 = "17s5rppad113c6ggkaq8c3cg7a3zz15i78wxcg6mcl1n15iv7fbs";
-=======
-        version = "0.2.87";
-        edition = "2018";
-        sha256 = "18bmjwvfyhvlq49nzw6mgiyx4ys350vps4cmx5gvzckh91dd0sna";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The wasm-bindgen Developers"
         ];
@@ -17733,15 +13930,9 @@ rec {
       };
       "web-sys" = rec {
         crateName = "web-sys";
-<<<<<<< HEAD
         version = "0.3.66";
         edition = "2018";
         sha256 = "03q1z22djv5ncqkyydcvnchmdsl5gvnyzcyixkxnifw6xi24mhjh";
-=======
-        version = "0.3.64";
-        edition = "2018";
-        sha256 = "16r4fww3l99kxhb66hka3kxkmhhgzhnqkzdf0ay6l2i2ikpwp1cv";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The wasm-bindgen Developers"
         ];
@@ -17858,10 +14049,7 @@ rec {
           "GpuDevice" = [ "EventTarget" ];
           "GpuInternalError" = [ "GpuError" ];
           "GpuOutOfMemoryError" = [ "GpuError" ];
-<<<<<<< HEAD
           "GpuPipelineError" = [ "DomException" ];
-=======
->>>>>>> 4366a49 (Start nixifying applications)
           "GpuUncapturedErrorEvent" = [ "Event" ];
           "GpuValidationError" = [ "GpuError" ];
           "HashChangeEvent" = [ "Event" ];
@@ -18147,12 +14335,9 @@ rec {
           "SvgmPathElement" = [ "Element" "EventTarget" "Node" "SvgElement" ];
           "SvgsvgElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" ];
           "SvgtSpanElement" = [ "Element" "EventTarget" "Node" "SvgElement" "SvgGraphicsElement" "SvgTextContentElement" "SvgTextPositioningElement" ];
-<<<<<<< HEAD
           "TaskController" = [ "AbortController" ];
           "TaskPriorityChangeEvent" = [ "Event" ];
           "TaskSignal" = [ "AbortSignal" "EventTarget" ];
-=======
->>>>>>> 4366a49 (Start nixifying applications)
           "TcpServerSocket" = [ "EventTarget" ];
           "TcpServerSocketEvent" = [ "Event" ];
           "TcpSocket" = [ "EventTarget" ];
@@ -18264,11 +14449,7 @@ rec {
         features = {
           "debug" = [ "impl-debug" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "consoleapi" "errhandlingapi" "fileapi" "minwinbase" "minwindef" "ntdef" "ntsecapi" "processenv" "profileapi" "std" "sysinfoapi" "timezoneapi" "winbase" "wincon" "winerror" "winnt" "winsock2" "ws2def" ];
-=======
-        resolvedDefaultFeatures = [ "consoleapi" "errhandlingapi" "fileapi" "handleapi" "minwinbase" "minwindef" "ntdef" "ntsecapi" "processenv" "profileapi" "std" "sysinfoapi" "timezoneapi" "winbase" "wincon" "winerror" "winnt" "winsock2" "ws2def" "ws2ipdef" "ws2tcpip" ];
->>>>>>> 4366a49 (Start nixifying applications)
       };
       "winapi-i686-pc-windows-gnu" = rec {
         crateName = "winapi-i686-pc-windows-gnu";
@@ -18308,26 +14489,17 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "windows-core" = rec {
         crateName = "windows-core";
         version = "0.51.1";
         edition = "2021";
         sha256 = "0r1f57hsshsghjyc7ypp2s0i78f7b1vr93w68sdb8baxyf2czy7i";
-=======
-      "windows" = rec {
-        crateName = "windows";
-        version = "0.48.0";
-        edition = "2018";
-        sha256 = "03vh89ilnxdxdh0n9np4ns4m10fvm93h3b0cc05ipg3qq1mqi1p6";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "Microsoft"
         ];
         dependencies = [
           {
             name = "windows-targets";
-<<<<<<< HEAD
             packageId = "windows-targets 0.48.5";
           }
         ];
@@ -18336,661 +14508,6 @@ rec {
         resolvedDefaultFeatures = [ "default" ];
       };
       "windows-sys 0.48.0" = rec {
-=======
-            packageId = "windows-targets";
-          }
-        ];
-        features = {
-          "AI_MachineLearning" = [ "AI" ];
-          "ApplicationModel_Activation" = [ "ApplicationModel" ];
-          "ApplicationModel_AppExtensions" = [ "ApplicationModel" ];
-          "ApplicationModel_AppService" = [ "ApplicationModel" ];
-          "ApplicationModel_Appointments" = [ "ApplicationModel" ];
-          "ApplicationModel_Appointments_AppointmentsProvider" = [ "ApplicationModel_Appointments" ];
-          "ApplicationModel_Appointments_DataProvider" = [ "ApplicationModel_Appointments" ];
-          "ApplicationModel_Background" = [ "ApplicationModel" ];
-          "ApplicationModel_Calls" = [ "ApplicationModel" ];
-          "ApplicationModel_Calls_Background" = [ "ApplicationModel_Calls" ];
-          "ApplicationModel_Calls_Provider" = [ "ApplicationModel_Calls" ];
-          "ApplicationModel_Chat" = [ "ApplicationModel" ];
-          "ApplicationModel_CommunicationBlocking" = [ "ApplicationModel" ];
-          "ApplicationModel_Contacts" = [ "ApplicationModel" ];
-          "ApplicationModel_Contacts_DataProvider" = [ "ApplicationModel_Contacts" ];
-          "ApplicationModel_Contacts_Provider" = [ "ApplicationModel_Contacts" ];
-          "ApplicationModel_ConversationalAgent" = [ "ApplicationModel" ];
-          "ApplicationModel_Core" = [ "ApplicationModel" ];
-          "ApplicationModel_DataTransfer" = [ "ApplicationModel" ];
-          "ApplicationModel_DataTransfer_DragDrop" = [ "ApplicationModel_DataTransfer" ];
-          "ApplicationModel_DataTransfer_DragDrop_Core" = [ "ApplicationModel_DataTransfer_DragDrop" ];
-          "ApplicationModel_DataTransfer_ShareTarget" = [ "ApplicationModel_DataTransfer" ];
-          "ApplicationModel_Email" = [ "ApplicationModel" ];
-          "ApplicationModel_Email_DataProvider" = [ "ApplicationModel_Email" ];
-          "ApplicationModel_ExtendedExecution" = [ "ApplicationModel" ];
-          "ApplicationModel_ExtendedExecution_Foreground" = [ "ApplicationModel_ExtendedExecution" ];
-          "ApplicationModel_Holographic" = [ "ApplicationModel" ];
-          "ApplicationModel_LockScreen" = [ "ApplicationModel" ];
-          "ApplicationModel_Payments" = [ "ApplicationModel" ];
-          "ApplicationModel_Payments_Provider" = [ "ApplicationModel_Payments" ];
-          "ApplicationModel_Preview" = [ "ApplicationModel" ];
-          "ApplicationModel_Preview_Holographic" = [ "ApplicationModel_Preview" ];
-          "ApplicationModel_Preview_InkWorkspace" = [ "ApplicationModel_Preview" ];
-          "ApplicationModel_Preview_Notes" = [ "ApplicationModel_Preview" ];
-          "ApplicationModel_Resources" = [ "ApplicationModel" ];
-          "ApplicationModel_Resources_Core" = [ "ApplicationModel_Resources" ];
-          "ApplicationModel_Resources_Management" = [ "ApplicationModel_Resources" ];
-          "ApplicationModel_Search" = [ "ApplicationModel" ];
-          "ApplicationModel_Search_Core" = [ "ApplicationModel_Search" ];
-          "ApplicationModel_Store" = [ "ApplicationModel" ];
-          "ApplicationModel_Store_LicenseManagement" = [ "ApplicationModel_Store" ];
-          "ApplicationModel_Store_Preview" = [ "ApplicationModel_Store" ];
-          "ApplicationModel_Store_Preview_InstallControl" = [ "ApplicationModel_Store_Preview" ];
-          "ApplicationModel_UserActivities" = [ "ApplicationModel" ];
-          "ApplicationModel_UserActivities_Core" = [ "ApplicationModel_UserActivities" ];
-          "ApplicationModel_UserDataAccounts" = [ "ApplicationModel" ];
-          "ApplicationModel_UserDataAccounts_Provider" = [ "ApplicationModel_UserDataAccounts" ];
-          "ApplicationModel_UserDataAccounts_SystemAccess" = [ "ApplicationModel_UserDataAccounts" ];
-          "ApplicationModel_UserDataTasks" = [ "ApplicationModel" ];
-          "ApplicationModel_UserDataTasks_DataProvider" = [ "ApplicationModel_UserDataTasks" ];
-          "ApplicationModel_VoiceCommands" = [ "ApplicationModel" ];
-          "ApplicationModel_Wallet" = [ "ApplicationModel" ];
-          "ApplicationModel_Wallet_System" = [ "ApplicationModel_Wallet" ];
-          "Data_Html" = [ "Data" ];
-          "Data_Json" = [ "Data" ];
-          "Data_Pdf" = [ "Data" ];
-          "Data_Text" = [ "Data" ];
-          "Data_Xml" = [ "Data" ];
-          "Data_Xml_Dom" = [ "Data_Xml" ];
-          "Data_Xml_Xsl" = [ "Data_Xml" ];
-          "Devices_Adc" = [ "Devices" ];
-          "Devices_Adc_Provider" = [ "Devices_Adc" ];
-          "Devices_Background" = [ "Devices" ];
-          "Devices_Bluetooth" = [ "Devices" ];
-          "Devices_Bluetooth_Advertisement" = [ "Devices_Bluetooth" ];
-          "Devices_Bluetooth_Background" = [ "Devices_Bluetooth" ];
-          "Devices_Bluetooth_GenericAttributeProfile" = [ "Devices_Bluetooth" ];
-          "Devices_Bluetooth_Rfcomm" = [ "Devices_Bluetooth" ];
-          "Devices_Custom" = [ "Devices" ];
-          "Devices_Display" = [ "Devices" ];
-          "Devices_Display_Core" = [ "Devices_Display" ];
-          "Devices_Enumeration" = [ "Devices" ];
-          "Devices_Enumeration_Pnp" = [ "Devices_Enumeration" ];
-          "Devices_Geolocation" = [ "Devices" ];
-          "Devices_Geolocation_Geofencing" = [ "Devices_Geolocation" ];
-          "Devices_Geolocation_Provider" = [ "Devices_Geolocation" ];
-          "Devices_Gpio" = [ "Devices" ];
-          "Devices_Gpio_Provider" = [ "Devices_Gpio" ];
-          "Devices_Haptics" = [ "Devices" ];
-          "Devices_HumanInterfaceDevice" = [ "Devices" ];
-          "Devices_I2c" = [ "Devices" ];
-          "Devices_I2c_Provider" = [ "Devices_I2c" ];
-          "Devices_Input" = [ "Devices" ];
-          "Devices_Input_Preview" = [ "Devices_Input" ];
-          "Devices_Lights" = [ "Devices" ];
-          "Devices_Lights_Effects" = [ "Devices_Lights" ];
-          "Devices_Midi" = [ "Devices" ];
-          "Devices_PointOfService" = [ "Devices" ];
-          "Devices_PointOfService_Provider" = [ "Devices_PointOfService" ];
-          "Devices_Portable" = [ "Devices" ];
-          "Devices_Power" = [ "Devices" ];
-          "Devices_Printers" = [ "Devices" ];
-          "Devices_Printers_Extensions" = [ "Devices_Printers" ];
-          "Devices_Pwm" = [ "Devices" ];
-          "Devices_Pwm_Provider" = [ "Devices_Pwm" ];
-          "Devices_Radios" = [ "Devices" ];
-          "Devices_Scanners" = [ "Devices" ];
-          "Devices_Sensors" = [ "Devices" ];
-          "Devices_Sensors_Custom" = [ "Devices_Sensors" ];
-          "Devices_SerialCommunication" = [ "Devices" ];
-          "Devices_SmartCards" = [ "Devices" ];
-          "Devices_Sms" = [ "Devices" ];
-          "Devices_Spi" = [ "Devices" ];
-          "Devices_Spi_Provider" = [ "Devices_Spi" ];
-          "Devices_Usb" = [ "Devices" ];
-          "Devices_WiFi" = [ "Devices" ];
-          "Devices_WiFiDirect" = [ "Devices" ];
-          "Devices_WiFiDirect_Services" = [ "Devices_WiFiDirect" ];
-          "Embedded_DeviceLockdown" = [ "Embedded" ];
-          "Foundation_Collections" = [ "Foundation" ];
-          "Foundation_Diagnostics" = [ "Foundation" ];
-          "Foundation_Metadata" = [ "Foundation" ];
-          "Foundation_Numerics" = [ "Foundation" ];
-          "Gaming_Input" = [ "Gaming" ];
-          "Gaming_Input_Custom" = [ "Gaming_Input" ];
-          "Gaming_Input_ForceFeedback" = [ "Gaming_Input" ];
-          "Gaming_Input_Preview" = [ "Gaming_Input" ];
-          "Gaming_Preview" = [ "Gaming" ];
-          "Gaming_Preview_GamesEnumeration" = [ "Gaming_Preview" ];
-          "Gaming_UI" = [ "Gaming" ];
-          "Gaming_XboxLive" = [ "Gaming" ];
-          "Gaming_XboxLive_Storage" = [ "Gaming_XboxLive" ];
-          "Globalization_Collation" = [ "Globalization" ];
-          "Globalization_DateTimeFormatting" = [ "Globalization" ];
-          "Globalization_Fonts" = [ "Globalization" ];
-          "Globalization_NumberFormatting" = [ "Globalization" ];
-          "Globalization_PhoneNumberFormatting" = [ "Globalization" ];
-          "Graphics_Capture" = [ "Graphics" ];
-          "Graphics_DirectX" = [ "Graphics" ];
-          "Graphics_DirectX_Direct3D11" = [ "Graphics_DirectX" ];
-          "Graphics_Display" = [ "Graphics" ];
-          "Graphics_Display_Core" = [ "Graphics_Display" ];
-          "Graphics_Effects" = [ "Graphics" ];
-          "Graphics_Holographic" = [ "Graphics" ];
-          "Graphics_Imaging" = [ "Graphics" ];
-          "Graphics_Printing" = [ "Graphics" ];
-          "Graphics_Printing3D" = [ "Graphics" ];
-          "Graphics_Printing_OptionDetails" = [ "Graphics_Printing" ];
-          "Graphics_Printing_PrintSupport" = [ "Graphics_Printing" ];
-          "Graphics_Printing_PrintTicket" = [ "Graphics_Printing" ];
-          "Graphics_Printing_Workflow" = [ "Graphics_Printing" ];
-          "Management_Core" = [ "Management" ];
-          "Management_Deployment" = [ "Management" ];
-          "Management_Deployment_Preview" = [ "Management_Deployment" ];
-          "Management_Policies" = [ "Management" ];
-          "Management_Update" = [ "Management" ];
-          "Management_Workplace" = [ "Management" ];
-          "Media_AppBroadcasting" = [ "Media" ];
-          "Media_AppRecording" = [ "Media" ];
-          "Media_Audio" = [ "Media" ];
-          "Media_Capture" = [ "Media" ];
-          "Media_Capture_Core" = [ "Media_Capture" ];
-          "Media_Capture_Frames" = [ "Media_Capture" ];
-          "Media_Casting" = [ "Media" ];
-          "Media_ClosedCaptioning" = [ "Media" ];
-          "Media_ContentRestrictions" = [ "Media" ];
-          "Media_Control" = [ "Media" ];
-          "Media_Core" = [ "Media" ];
-          "Media_Core_Preview" = [ "Media_Core" ];
-          "Media_Devices" = [ "Media" ];
-          "Media_Devices_Core" = [ "Media_Devices" ];
-          "Media_DialProtocol" = [ "Media" ];
-          "Media_Editing" = [ "Media" ];
-          "Media_Effects" = [ "Media" ];
-          "Media_FaceAnalysis" = [ "Media" ];
-          "Media_Import" = [ "Media" ];
-          "Media_MediaProperties" = [ "Media" ];
-          "Media_Miracast" = [ "Media" ];
-          "Media_Ocr" = [ "Media" ];
-          "Media_PlayTo" = [ "Media" ];
-          "Media_Playback" = [ "Media" ];
-          "Media_Playlists" = [ "Media" ];
-          "Media_Protection" = [ "Media" ];
-          "Media_Protection_PlayReady" = [ "Media_Protection" ];
-          "Media_Render" = [ "Media" ];
-          "Media_SpeechRecognition" = [ "Media" ];
-          "Media_SpeechSynthesis" = [ "Media" ];
-          "Media_Streaming" = [ "Media" ];
-          "Media_Streaming_Adaptive" = [ "Media_Streaming" ];
-          "Media_Transcoding" = [ "Media" ];
-          "Networking_BackgroundTransfer" = [ "Networking" ];
-          "Networking_Connectivity" = [ "Networking" ];
-          "Networking_NetworkOperators" = [ "Networking" ];
-          "Networking_Proximity" = [ "Networking" ];
-          "Networking_PushNotifications" = [ "Networking" ];
-          "Networking_ServiceDiscovery" = [ "Networking" ];
-          "Networking_ServiceDiscovery_Dnssd" = [ "Networking_ServiceDiscovery" ];
-          "Networking_Sockets" = [ "Networking" ];
-          "Networking_Vpn" = [ "Networking" ];
-          "Networking_XboxLive" = [ "Networking" ];
-          "Perception_Automation" = [ "Perception" ];
-          "Perception_Automation_Core" = [ "Perception_Automation" ];
-          "Perception_People" = [ "Perception" ];
-          "Perception_Spatial" = [ "Perception" ];
-          "Perception_Spatial_Preview" = [ "Perception_Spatial" ];
-          "Perception_Spatial_Surfaces" = [ "Perception_Spatial" ];
-          "Phone_ApplicationModel" = [ "Phone" ];
-          "Phone_Devices" = [ "Phone" ];
-          "Phone_Devices_Notification" = [ "Phone_Devices" ];
-          "Phone_Devices_Power" = [ "Phone_Devices" ];
-          "Phone_Management" = [ "Phone" ];
-          "Phone_Management_Deployment" = [ "Phone_Management" ];
-          "Phone_Media" = [ "Phone" ];
-          "Phone_Media_Devices" = [ "Phone_Media" ];
-          "Phone_Notification" = [ "Phone" ];
-          "Phone_Notification_Management" = [ "Phone_Notification" ];
-          "Phone_PersonalInformation" = [ "Phone" ];
-          "Phone_PersonalInformation_Provisioning" = [ "Phone_PersonalInformation" ];
-          "Phone_Speech" = [ "Phone" ];
-          "Phone_Speech_Recognition" = [ "Phone_Speech" ];
-          "Phone_StartScreen" = [ "Phone" ];
-          "Phone_System" = [ "Phone" ];
-          "Phone_System_Power" = [ "Phone_System" ];
-          "Phone_System_Profile" = [ "Phone_System" ];
-          "Phone_System_UserProfile" = [ "Phone_System" ];
-          "Phone_System_UserProfile_GameServices" = [ "Phone_System_UserProfile" ];
-          "Phone_System_UserProfile_GameServices_Core" = [ "Phone_System_UserProfile_GameServices" ];
-          "Phone_UI" = [ "Phone" ];
-          "Phone_UI_Input" = [ "Phone_UI" ];
-          "Security_Authentication" = [ "Security" ];
-          "Security_Authentication_Identity" = [ "Security_Authentication" ];
-          "Security_Authentication_Identity_Core" = [ "Security_Authentication_Identity" ];
-          "Security_Authentication_OnlineId" = [ "Security_Authentication" ];
-          "Security_Authentication_Web" = [ "Security_Authentication" ];
-          "Security_Authentication_Web_Core" = [ "Security_Authentication_Web" ];
-          "Security_Authentication_Web_Provider" = [ "Security_Authentication_Web" ];
-          "Security_Authorization" = [ "Security" ];
-          "Security_Authorization_AppCapabilityAccess" = [ "Security_Authorization" ];
-          "Security_Credentials" = [ "Security" ];
-          "Security_Credentials_UI" = [ "Security_Credentials" ];
-          "Security_Cryptography" = [ "Security" ];
-          "Security_Cryptography_Certificates" = [ "Security_Cryptography" ];
-          "Security_Cryptography_Core" = [ "Security_Cryptography" ];
-          "Security_Cryptography_DataProtection" = [ "Security_Cryptography" ];
-          "Security_DataProtection" = [ "Security" ];
-          "Security_EnterpriseData" = [ "Security" ];
-          "Security_ExchangeActiveSyncProvisioning" = [ "Security" ];
-          "Security_Isolation" = [ "Security" ];
-          "Services_Maps" = [ "Services" ];
-          "Services_Maps_Guidance" = [ "Services_Maps" ];
-          "Services_Maps_LocalSearch" = [ "Services_Maps" ];
-          "Services_Maps_OfflineMaps" = [ "Services_Maps" ];
-          "Services_Store" = [ "Services" ];
-          "Services_TargetedContent" = [ "Services" ];
-          "Storage_AccessCache" = [ "Storage" ];
-          "Storage_BulkAccess" = [ "Storage" ];
-          "Storage_Compression" = [ "Storage" ];
-          "Storage_FileProperties" = [ "Storage" ];
-          "Storage_Pickers" = [ "Storage" ];
-          "Storage_Pickers_Provider" = [ "Storage_Pickers" ];
-          "Storage_Provider" = [ "Storage" ];
-          "Storage_Search" = [ "Storage" ];
-          "Storage_Streams" = [ "Storage" ];
-          "System_Diagnostics" = [ "System" ];
-          "System_Diagnostics_DevicePortal" = [ "System_Diagnostics" ];
-          "System_Diagnostics_Telemetry" = [ "System_Diagnostics" ];
-          "System_Diagnostics_TraceReporting" = [ "System_Diagnostics" ];
-          "System_Display" = [ "System" ];
-          "System_Implementation" = [ "System" ];
-          "System_Implementation_FileExplorer" = [ "System_Implementation" ];
-          "System_Inventory" = [ "System" ];
-          "System_Power" = [ "System" ];
-          "System_Profile" = [ "System" ];
-          "System_Profile_SystemManufacturers" = [ "System_Profile" ];
-          "System_RemoteDesktop" = [ "System" ];
-          "System_RemoteDesktop_Input" = [ "System_RemoteDesktop" ];
-          "System_RemoteSystems" = [ "System" ];
-          "System_Threading" = [ "System" ];
-          "System_Threading_Core" = [ "System_Threading" ];
-          "System_Update" = [ "System" ];
-          "System_UserProfile" = [ "System" ];
-          "UI_Accessibility" = [ "UI" ];
-          "UI_ApplicationSettings" = [ "UI" ];
-          "UI_Composition" = [ "UI" ];
-          "UI_Composition_Core" = [ "UI_Composition" ];
-          "UI_Composition_Desktop" = [ "UI_Composition" ];
-          "UI_Composition_Diagnostics" = [ "UI_Composition" ];
-          "UI_Composition_Effects" = [ "UI_Composition" ];
-          "UI_Composition_Interactions" = [ "UI_Composition" ];
-          "UI_Composition_Scenes" = [ "UI_Composition" ];
-          "UI_Core" = [ "UI" ];
-          "UI_Core_AnimationMetrics" = [ "UI_Core" ];
-          "UI_Core_Preview" = [ "UI_Core" ];
-          "UI_Input" = [ "UI" ];
-          "UI_Input_Core" = [ "UI_Input" ];
-          "UI_Input_Inking" = [ "UI_Input" ];
-          "UI_Input_Inking_Analysis" = [ "UI_Input_Inking" ];
-          "UI_Input_Inking_Core" = [ "UI_Input_Inking" ];
-          "UI_Input_Inking_Preview" = [ "UI_Input_Inking" ];
-          "UI_Input_Preview" = [ "UI_Input" ];
-          "UI_Input_Preview_Injection" = [ "UI_Input_Preview" ];
-          "UI_Input_Spatial" = [ "UI_Input" ];
-          "UI_Notifications" = [ "UI" ];
-          "UI_Notifications_Management" = [ "UI_Notifications" ];
-          "UI_Popups" = [ "UI" ];
-          "UI_Shell" = [ "UI" ];
-          "UI_StartScreen" = [ "UI" ];
-          "UI_Text" = [ "UI" ];
-          "UI_Text_Core" = [ "UI_Text" ];
-          "UI_UIAutomation" = [ "UI" ];
-          "UI_UIAutomation_Core" = [ "UI_UIAutomation" ];
-          "UI_ViewManagement" = [ "UI" ];
-          "UI_ViewManagement_Core" = [ "UI_ViewManagement" ];
-          "UI_WebUI" = [ "UI" ];
-          "UI_WebUI_Core" = [ "UI_WebUI" ];
-          "UI_WindowManagement" = [ "UI" ];
-          "UI_WindowManagement_Preview" = [ "UI_WindowManagement" ];
-          "Wdk_System" = [ "Wdk" ];
-          "Wdk_System_OfflineRegistry" = [ "Wdk_System" ];
-          "Web_AtomPub" = [ "Web" ];
-          "Web_Http" = [ "Web" ];
-          "Web_Http_Diagnostics" = [ "Web_Http" ];
-          "Web_Http_Filters" = [ "Web_Http" ];
-          "Web_Http_Headers" = [ "Web_Http" ];
-          "Web_Syndication" = [ "Web" ];
-          "Web_UI" = [ "Web" ];
-          "Web_UI_Interop" = [ "Web_UI" ];
-          "Win32_AI" = [ "Win32" ];
-          "Win32_AI_MachineLearning" = [ "Win32_AI" ];
-          "Win32_AI_MachineLearning_DirectML" = [ "Win32_AI_MachineLearning" ];
-          "Win32_AI_MachineLearning_WinML" = [ "Win32_AI_MachineLearning" ];
-          "Win32_Data" = [ "Win32" ];
-          "Win32_Data_HtmlHelp" = [ "Win32_Data" ];
-          "Win32_Data_RightsManagement" = [ "Win32_Data" ];
-          "Win32_Data_Xml" = [ "Win32_Data" ];
-          "Win32_Data_Xml_MsXml" = [ "Win32_Data_Xml" ];
-          "Win32_Data_Xml_XmlLite" = [ "Win32_Data_Xml" ];
-          "Win32_Devices" = [ "Win32" ];
-          "Win32_Devices_AllJoyn" = [ "Win32_Devices" ];
-          "Win32_Devices_BiometricFramework" = [ "Win32_Devices" ];
-          "Win32_Devices_Bluetooth" = [ "Win32_Devices" ];
-          "Win32_Devices_Communication" = [ "Win32_Devices" ];
-          "Win32_Devices_DeviceAccess" = [ "Win32_Devices" ];
-          "Win32_Devices_DeviceAndDriverInstallation" = [ "Win32_Devices" ];
-          "Win32_Devices_DeviceQuery" = [ "Win32_Devices" ];
-          "Win32_Devices_Display" = [ "Win32_Devices" ];
-          "Win32_Devices_Enumeration" = [ "Win32_Devices" ];
-          "Win32_Devices_Enumeration_Pnp" = [ "Win32_Devices_Enumeration" ];
-          "Win32_Devices_Fax" = [ "Win32_Devices" ];
-          "Win32_Devices_FunctionDiscovery" = [ "Win32_Devices" ];
-          "Win32_Devices_Geolocation" = [ "Win32_Devices" ];
-          "Win32_Devices_HumanInterfaceDevice" = [ "Win32_Devices" ];
-          "Win32_Devices_ImageAcquisition" = [ "Win32_Devices" ];
-          "Win32_Devices_PortableDevices" = [ "Win32_Devices" ];
-          "Win32_Devices_Properties" = [ "Win32_Devices" ];
-          "Win32_Devices_Pwm" = [ "Win32_Devices" ];
-          "Win32_Devices_Sensors" = [ "Win32_Devices" ];
-          "Win32_Devices_SerialCommunication" = [ "Win32_Devices" ];
-          "Win32_Devices_Tapi" = [ "Win32_Devices" ];
-          "Win32_Devices_Usb" = [ "Win32_Devices" ];
-          "Win32_Devices_WebServicesOnDevices" = [ "Win32_Devices" ];
-          "Win32_Foundation" = [ "Win32" ];
-          "Win32_Gaming" = [ "Win32" ];
-          "Win32_Globalization" = [ "Win32" ];
-          "Win32_Graphics" = [ "Win32" ];
-          "Win32_Graphics_CompositionSwapchain" = [ "Win32_Graphics" ];
-          "Win32_Graphics_DXCore" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Direct2D" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Direct2D_Common" = [ "Win32_Graphics_Direct2D" ];
-          "Win32_Graphics_Direct3D" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Direct3D10" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Direct3D11" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Direct3D11on12" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Direct3D12" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Direct3D9" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Direct3D9on12" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Direct3D_Dxc" = [ "Win32_Graphics_Direct3D" ];
-          "Win32_Graphics_Direct3D_Fxc" = [ "Win32_Graphics_Direct3D" ];
-          "Win32_Graphics_DirectComposition" = [ "Win32_Graphics" ];
-          "Win32_Graphics_DirectDraw" = [ "Win32_Graphics" ];
-          "Win32_Graphics_DirectManipulation" = [ "Win32_Graphics" ];
-          "Win32_Graphics_DirectWrite" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Dwm" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Dxgi" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Dxgi_Common" = [ "Win32_Graphics_Dxgi" ];
-          "Win32_Graphics_Gdi" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Hlsl" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Imaging" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Imaging_D2D" = [ "Win32_Graphics_Imaging" ];
-          "Win32_Graphics_OpenGL" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Printing" = [ "Win32_Graphics" ];
-          "Win32_Graphics_Printing_PrintTicket" = [ "Win32_Graphics_Printing" ];
-          "Win32_Management" = [ "Win32" ];
-          "Win32_Management_MobileDeviceManagementRegistration" = [ "Win32_Management" ];
-          "Win32_Media" = [ "Win32" ];
-          "Win32_Media_Audio" = [ "Win32_Media" ];
-          "Win32_Media_Audio_Apo" = [ "Win32_Media_Audio" ];
-          "Win32_Media_Audio_DirectMusic" = [ "Win32_Media_Audio" ];
-          "Win32_Media_Audio_DirectSound" = [ "Win32_Media_Audio" ];
-          "Win32_Media_Audio_Endpoints" = [ "Win32_Media_Audio" ];
-          "Win32_Media_Audio_XAudio2" = [ "Win32_Media_Audio" ];
-          "Win32_Media_DeviceManager" = [ "Win32_Media" ];
-          "Win32_Media_DirectShow" = [ "Win32_Media" ];
-          "Win32_Media_DirectShow_Tv" = [ "Win32_Media_DirectShow" ];
-          "Win32_Media_DirectShow_Xml" = [ "Win32_Media_DirectShow" ];
-          "Win32_Media_DxMediaObjects" = [ "Win32_Media" ];
-          "Win32_Media_KernelStreaming" = [ "Win32_Media" ];
-          "Win32_Media_LibrarySharingServices" = [ "Win32_Media" ];
-          "Win32_Media_MediaFoundation" = [ "Win32_Media" ];
-          "Win32_Media_MediaPlayer" = [ "Win32_Media" ];
-          "Win32_Media_Multimedia" = [ "Win32_Media" ];
-          "Win32_Media_PictureAcquisition" = [ "Win32_Media" ];
-          "Win32_Media_Speech" = [ "Win32_Media" ];
-          "Win32_Media_Streaming" = [ "Win32_Media" ];
-          "Win32_Media_WindowsMediaFormat" = [ "Win32_Media" ];
-          "Win32_NetworkManagement" = [ "Win32" ];
-          "Win32_NetworkManagement_Dhcp" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_Dns" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_InternetConnectionWizard" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_IpHelper" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_MobileBroadband" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_Multicast" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_Ndis" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_NetBios" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_NetManagement" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_NetShell" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_NetworkDiagnosticsFramework" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_NetworkPolicyServer" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_P2P" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_QoS" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_Rras" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_Snmp" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_WNet" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_WebDav" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_WiFi" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_WindowsConnectNow" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_WindowsConnectionManager" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_WindowsFilteringPlatform" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_WindowsFirewall" = [ "Win32_NetworkManagement" ];
-          "Win32_NetworkManagement_WindowsNetworkVirtualization" = [ "Win32_NetworkManagement" ];
-          "Win32_Networking" = [ "Win32" ];
-          "Win32_Networking_ActiveDirectory" = [ "Win32_Networking" ];
-          "Win32_Networking_BackgroundIntelligentTransferService" = [ "Win32_Networking" ];
-          "Win32_Networking_Clustering" = [ "Win32_Networking" ];
-          "Win32_Networking_HttpServer" = [ "Win32_Networking" ];
-          "Win32_Networking_Ldap" = [ "Win32_Networking" ];
-          "Win32_Networking_NetworkListManager" = [ "Win32_Networking" ];
-          "Win32_Networking_RemoteDifferentialCompression" = [ "Win32_Networking" ];
-          "Win32_Networking_WebSocket" = [ "Win32_Networking" ];
-          "Win32_Networking_WinHttp" = [ "Win32_Networking" ];
-          "Win32_Networking_WinInet" = [ "Win32_Networking" ];
-          "Win32_Networking_WinSock" = [ "Win32_Networking" ];
-          "Win32_Networking_WindowsWebServices" = [ "Win32_Networking" ];
-          "Win32_Security" = [ "Win32" ];
-          "Win32_Security_AppLocker" = [ "Win32_Security" ];
-          "Win32_Security_Authentication" = [ "Win32_Security" ];
-          "Win32_Security_Authentication_Identity" = [ "Win32_Security_Authentication" ];
-          "Win32_Security_Authentication_Identity_Provider" = [ "Win32_Security_Authentication_Identity" ];
-          "Win32_Security_Authorization" = [ "Win32_Security" ];
-          "Win32_Security_Authorization_UI" = [ "Win32_Security_Authorization" ];
-          "Win32_Security_ConfigurationSnapin" = [ "Win32_Security" ];
-          "Win32_Security_Credentials" = [ "Win32_Security" ];
-          "Win32_Security_Cryptography" = [ "Win32_Security" ];
-          "Win32_Security_Cryptography_Catalog" = [ "Win32_Security_Cryptography" ];
-          "Win32_Security_Cryptography_Certificates" = [ "Win32_Security_Cryptography" ];
-          "Win32_Security_Cryptography_Sip" = [ "Win32_Security_Cryptography" ];
-          "Win32_Security_Cryptography_UI" = [ "Win32_Security_Cryptography" ];
-          "Win32_Security_DiagnosticDataQuery" = [ "Win32_Security" ];
-          "Win32_Security_DirectoryServices" = [ "Win32_Security" ];
-          "Win32_Security_EnterpriseData" = [ "Win32_Security" ];
-          "Win32_Security_ExtensibleAuthenticationProtocol" = [ "Win32_Security" ];
-          "Win32_Security_Isolation" = [ "Win32_Security" ];
-          "Win32_Security_LicenseProtection" = [ "Win32_Security" ];
-          "Win32_Security_NetworkAccessProtection" = [ "Win32_Security" ];
-          "Win32_Security_Tpm" = [ "Win32_Security" ];
-          "Win32_Security_WinTrust" = [ "Win32_Security" ];
-          "Win32_Security_WinWlx" = [ "Win32_Security" ];
-          "Win32_Storage" = [ "Win32" ];
-          "Win32_Storage_Cabinets" = [ "Win32_Storage" ];
-          "Win32_Storage_CloudFilters" = [ "Win32_Storage" ];
-          "Win32_Storage_Compression" = [ "Win32_Storage" ];
-          "Win32_Storage_DataDeduplication" = [ "Win32_Storage" ];
-          "Win32_Storage_DistributedFileSystem" = [ "Win32_Storage" ];
-          "Win32_Storage_EnhancedStorage" = [ "Win32_Storage" ];
-          "Win32_Storage_FileHistory" = [ "Win32_Storage" ];
-          "Win32_Storage_FileServerResourceManager" = [ "Win32_Storage" ];
-          "Win32_Storage_FileSystem" = [ "Win32_Storage" ];
-          "Win32_Storage_Imapi" = [ "Win32_Storage" ];
-          "Win32_Storage_IndexServer" = [ "Win32_Storage" ];
-          "Win32_Storage_InstallableFileSystems" = [ "Win32_Storage" ];
-          "Win32_Storage_IscsiDisc" = [ "Win32_Storage" ];
-          "Win32_Storage_Jet" = [ "Win32_Storage" ];
-          "Win32_Storage_OfflineFiles" = [ "Win32_Storage" ];
-          "Win32_Storage_OperationRecorder" = [ "Win32_Storage" ];
-          "Win32_Storage_Packaging" = [ "Win32_Storage" ];
-          "Win32_Storage_Packaging_Appx" = [ "Win32_Storage_Packaging" ];
-          "Win32_Storage_Packaging_Opc" = [ "Win32_Storage_Packaging" ];
-          "Win32_Storage_ProjectedFileSystem" = [ "Win32_Storage" ];
-          "Win32_Storage_StructuredStorage" = [ "Win32_Storage" ];
-          "Win32_Storage_Vhd" = [ "Win32_Storage" ];
-          "Win32_Storage_VirtualDiskService" = [ "Win32_Storage" ];
-          "Win32_Storage_Vss" = [ "Win32_Storage" ];
-          "Win32_Storage_Xps" = [ "Win32_Storage" ];
-          "Win32_Storage_Xps_Printing" = [ "Win32_Storage_Xps" ];
-          "Win32_System" = [ "Win32" ];
-          "Win32_System_AddressBook" = [ "Win32_System" ];
-          "Win32_System_Antimalware" = [ "Win32_System" ];
-          "Win32_System_ApplicationInstallationAndServicing" = [ "Win32_System" ];
-          "Win32_System_ApplicationVerifier" = [ "Win32_System" ];
-          "Win32_System_AssessmentTool" = [ "Win32_System" ];
-          "Win32_System_ClrHosting" = [ "Win32_System" ];
-          "Win32_System_Com" = [ "Win32_System" ];
-          "Win32_System_Com_CallObj" = [ "Win32_System_Com" ];
-          "Win32_System_Com_ChannelCredentials" = [ "Win32_System_Com" ];
-          "Win32_System_Com_Events" = [ "Win32_System_Com" ];
-          "Win32_System_Com_Marshal" = [ "Win32_System_Com" ];
-          "Win32_System_Com_StructuredStorage" = [ "Win32_System_Com" ];
-          "Win32_System_Com_UI" = [ "Win32_System_Com" ];
-          "Win32_System_Com_Urlmon" = [ "Win32_System_Com" ];
-          "Win32_System_ComponentServices" = [ "Win32_System" ];
-          "Win32_System_Console" = [ "Win32_System" ];
-          "Win32_System_Contacts" = [ "Win32_System" ];
-          "Win32_System_CorrelationVector" = [ "Win32_System" ];
-          "Win32_System_DataExchange" = [ "Win32_System" ];
-          "Win32_System_DeploymentServices" = [ "Win32_System" ];
-          "Win32_System_DesktopSharing" = [ "Win32_System" ];
-          "Win32_System_DeveloperLicensing" = [ "Win32_System" ];
-          "Win32_System_Diagnostics" = [ "Win32_System" ];
-          "Win32_System_Diagnostics_Ceip" = [ "Win32_System_Diagnostics" ];
-          "Win32_System_Diagnostics_ClrProfiling" = [ "Win32_System_Diagnostics" ];
-          "Win32_System_Diagnostics_Debug" = [ "Win32_System_Diagnostics" ];
-          "Win32_System_Diagnostics_Debug_ActiveScript" = [ "Win32_System_Diagnostics_Debug" ];
-          "Win32_System_Diagnostics_Debug_Extensions" = [ "Win32_System_Diagnostics_Debug" ];
-          "Win32_System_Diagnostics_Etw" = [ "Win32_System_Diagnostics" ];
-          "Win32_System_Diagnostics_ProcessSnapshotting" = [ "Win32_System_Diagnostics" ];
-          "Win32_System_Diagnostics_ToolHelp" = [ "Win32_System_Diagnostics" ];
-          "Win32_System_DistributedTransactionCoordinator" = [ "Win32_System" ];
-          "Win32_System_Environment" = [ "Win32_System" ];
-          "Win32_System_ErrorReporting" = [ "Win32_System" ];
-          "Win32_System_EventCollector" = [ "Win32_System" ];
-          "Win32_System_EventLog" = [ "Win32_System" ];
-          "Win32_System_EventNotificationService" = [ "Win32_System" ];
-          "Win32_System_GroupPolicy" = [ "Win32_System" ];
-          "Win32_System_HostCompute" = [ "Win32_System" ];
-          "Win32_System_HostComputeNetwork" = [ "Win32_System" ];
-          "Win32_System_HostComputeSystem" = [ "Win32_System" ];
-          "Win32_System_Hypervisor" = [ "Win32_System" ];
-          "Win32_System_IO" = [ "Win32_System" ];
-          "Win32_System_Iis" = [ "Win32_System" ];
-          "Win32_System_Ioctl" = [ "Win32_System" ];
-          "Win32_System_JobObjects" = [ "Win32_System" ];
-          "Win32_System_Js" = [ "Win32_System" ];
-          "Win32_System_Kernel" = [ "Win32_System" ];
-          "Win32_System_LibraryLoader" = [ "Win32_System" ];
-          "Win32_System_Mailslots" = [ "Win32_System" ];
-          "Win32_System_Mapi" = [ "Win32_System" ];
-          "Win32_System_Memory" = [ "Win32_System" ];
-          "Win32_System_Memory_NonVolatile" = [ "Win32_System_Memory" ];
-          "Win32_System_MessageQueuing" = [ "Win32_System" ];
-          "Win32_System_MixedReality" = [ "Win32_System" ];
-          "Win32_System_Mmc" = [ "Win32_System" ];
-          "Win32_System_Ole" = [ "Win32_System" ];
-          "Win32_System_ParentalControls" = [ "Win32_System" ];
-          "Win32_System_PasswordManagement" = [ "Win32_System" ];
-          "Win32_System_Performance" = [ "Win32_System" ];
-          "Win32_System_Performance_HardwareCounterProfiling" = [ "Win32_System_Performance" ];
-          "Win32_System_Pipes" = [ "Win32_System" ];
-          "Win32_System_Power" = [ "Win32_System" ];
-          "Win32_System_ProcessStatus" = [ "Win32_System" ];
-          "Win32_System_RealTimeCommunications" = [ "Win32_System" ];
-          "Win32_System_Recovery" = [ "Win32_System" ];
-          "Win32_System_Registry" = [ "Win32_System" ];
-          "Win32_System_RemoteAssistance" = [ "Win32_System" ];
-          "Win32_System_RemoteDesktop" = [ "Win32_System" ];
-          "Win32_System_RemoteManagement" = [ "Win32_System" ];
-          "Win32_System_RestartManager" = [ "Win32_System" ];
-          "Win32_System_Restore" = [ "Win32_System" ];
-          "Win32_System_Rpc" = [ "Win32_System" ];
-          "Win32_System_Search" = [ "Win32_System" ];
-          "Win32_System_Search_Common" = [ "Win32_System_Search" ];
-          "Win32_System_SecurityCenter" = [ "Win32_System" ];
-          "Win32_System_ServerBackup" = [ "Win32_System" ];
-          "Win32_System_Services" = [ "Win32_System" ];
-          "Win32_System_SettingsManagementInfrastructure" = [ "Win32_System" ];
-          "Win32_System_SetupAndMigration" = [ "Win32_System" ];
-          "Win32_System_Shutdown" = [ "Win32_System" ];
-          "Win32_System_SideShow" = [ "Win32_System" ];
-          "Win32_System_StationsAndDesktops" = [ "Win32_System" ];
-          "Win32_System_SubsystemForLinux" = [ "Win32_System" ];
-          "Win32_System_SystemInformation" = [ "Win32_System" ];
-          "Win32_System_SystemServices" = [ "Win32_System" ];
-          "Win32_System_TaskScheduler" = [ "Win32_System" ];
-          "Win32_System_Threading" = [ "Win32_System" ];
-          "Win32_System_Time" = [ "Win32_System" ];
-          "Win32_System_TpmBaseServices" = [ "Win32_System" ];
-          "Win32_System_TransactionServer" = [ "Win32_System" ];
-          "Win32_System_UpdateAgent" = [ "Win32_System" ];
-          "Win32_System_UpdateAssessment" = [ "Win32_System" ];
-          "Win32_System_UserAccessLogging" = [ "Win32_System" ];
-          "Win32_System_VirtualDosMachines" = [ "Win32_System" ];
-          "Win32_System_WinRT" = [ "Win32_System" ];
-          "Win32_System_WinRT_AllJoyn" = [ "Win32_System_WinRT" ];
-          "Win32_System_WinRT_Composition" = [ "Win32_System_WinRT" ];
-          "Win32_System_WinRT_CoreInputView" = [ "Win32_System_WinRT" ];
-          "Win32_System_WinRT_Direct3D11" = [ "Win32_System_WinRT" ];
-          "Win32_System_WinRT_Display" = [ "Win32_System_WinRT" ];
-          "Win32_System_WinRT_Graphics" = [ "Win32_System_WinRT" ];
-          "Win32_System_WinRT_Graphics_Capture" = [ "Win32_System_WinRT_Graphics" ];
-          "Win32_System_WinRT_Graphics_Direct2D" = [ "Win32_System_WinRT_Graphics" ];
-          "Win32_System_WinRT_Graphics_Imaging" = [ "Win32_System_WinRT_Graphics" ];
-          "Win32_System_WinRT_Holographic" = [ "Win32_System_WinRT" ];
-          "Win32_System_WinRT_Isolation" = [ "Win32_System_WinRT" ];
-          "Win32_System_WinRT_ML" = [ "Win32_System_WinRT" ];
-          "Win32_System_WinRT_Media" = [ "Win32_System_WinRT" ];
-          "Win32_System_WinRT_Metadata" = [ "Win32_System_WinRT" ];
-          "Win32_System_WinRT_Pdf" = [ "Win32_System_WinRT" ];
-          "Win32_System_WinRT_Printing" = [ "Win32_System_WinRT" ];
-          "Win32_System_WinRT_Shell" = [ "Win32_System_WinRT" ];
-          "Win32_System_WinRT_Storage" = [ "Win32_System_WinRT" ];
-          "Win32_System_WindowsProgramming" = [ "Win32_System" ];
-          "Win32_System_WindowsSync" = [ "Win32_System" ];
-          "Win32_System_Wmi" = [ "Win32_System" ];
-          "Win32_UI" = [ "Win32" ];
-          "Win32_UI_Accessibility" = [ "Win32_UI" ];
-          "Win32_UI_Animation" = [ "Win32_UI" ];
-          "Win32_UI_ColorSystem" = [ "Win32_UI" ];
-          "Win32_UI_Controls" = [ "Win32_UI" ];
-          "Win32_UI_Controls_Dialogs" = [ "Win32_UI_Controls" ];
-          "Win32_UI_Controls_RichEdit" = [ "Win32_UI_Controls" ];
-          "Win32_UI_HiDpi" = [ "Win32_UI" ];
-          "Win32_UI_Input" = [ "Win32_UI" ];
-          "Win32_UI_Input_Ime" = [ "Win32_UI_Input" ];
-          "Win32_UI_Input_Ink" = [ "Win32_UI_Input" ];
-          "Win32_UI_Input_KeyboardAndMouse" = [ "Win32_UI_Input" ];
-          "Win32_UI_Input_Pointer" = [ "Win32_UI_Input" ];
-          "Win32_UI_Input_Radial" = [ "Win32_UI_Input" ];
-          "Win32_UI_Input_Touch" = [ "Win32_UI_Input" ];
-          "Win32_UI_Input_XboxController" = [ "Win32_UI_Input" ];
-          "Win32_UI_InteractionContext" = [ "Win32_UI" ];
-          "Win32_UI_LegacyWindowsEnvironmentFeatures" = [ "Win32_UI" ];
-          "Win32_UI_Magnification" = [ "Win32_UI" ];
-          "Win32_UI_Notifications" = [ "Win32_UI" ];
-          "Win32_UI_Ribbon" = [ "Win32_UI" ];
-          "Win32_UI_Shell" = [ "Win32_UI" ];
-          "Win32_UI_Shell_Common" = [ "Win32_UI_Shell" ];
-          "Win32_UI_Shell_PropertiesSystem" = [ "Win32_UI_Shell" ];
-          "Win32_UI_TabletPC" = [ "Win32_UI" ];
-          "Win32_UI_TextServices" = [ "Win32_UI" ];
-          "Win32_UI_WindowsAndMessaging" = [ "Win32_UI" ];
-          "Win32_UI_Wpf" = [ "Win32_UI" ];
-          "Win32_Web" = [ "Win32" ];
-          "Win32_Web_InternetExplorer" = [ "Win32_Web" ];
-          "implement" = [ "windows-implement" "windows-interface" ];
-          "windows-implement" = [ "dep:windows-implement" ];
-          "windows-interface" = [ "dep:windows-interface" ];
-        };
-        resolvedDefaultFeatures = [ "Globalization" "default" ];
-      };
-      "windows-sys" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "windows-sys";
         version = "0.48.0";
         edition = "2018";
@@ -19001,11 +14518,7 @@ rec {
         dependencies = [
           {
             name = "windows-targets";
-<<<<<<< HEAD
             packageId = "windows-targets 0.48.5";
-=======
-            packageId = "windows-targets";
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
         features = {
@@ -19285,7 +14798,6 @@ rec {
           "Win32_Web" = [ "Win32" ];
           "Win32_Web_InternetExplorer" = [ "Win32_Web" ];
         };
-<<<<<<< HEAD
         resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_IO" "Win32_System_Memory" "Win32_System_Pipes" "Win32_System_Registry" "Win32_System_SystemServices" "Win32_System_Threading" "Win32_System_Time" "Win32_System_WindowsProgramming" "Win32_UI" "Win32_UI_Shell" "default" ];
       };
       "windows-sys 0.52.0" = rec {
@@ -19536,11 +15048,6 @@ rec {
         resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_NetworkManagement" "Win32_NetworkManagement_IpHelper" "Win32_Networking" "Win32_Networking_WinSock" "Win32_System" "Win32_System_Com" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_Threading" "Win32_UI" "Win32_UI_Shell" "default" ];
       };
       "windows-targets 0.48.5" = rec {
-=======
-        resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_NetworkManagement" "Win32_NetworkManagement_IpHelper" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_IO" "Win32_System_Memory" "Win32_System_Pipes" "Win32_System_Registry" "Win32_System_SystemServices" "Win32_System_Threading" "Win32_System_Time" "Win32_System_WindowsProgramming" "Win32_UI" "Win32_UI_Shell" "default" ];
-      };
-      "windows-targets" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "windows-targets";
         version = "0.48.5";
         edition = "2018";
@@ -19551,16 +15058,11 @@ rec {
         dependencies = [
           {
             name = "windows_aarch64_gnullvm";
-<<<<<<< HEAD
             packageId = "windows_aarch64_gnullvm 0.48.5";
-=======
-            packageId = "windows_aarch64_gnullvm";
->>>>>>> 4366a49 (Start nixifying applications)
             target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "aarch64-pc-windows-gnullvm");
           }
           {
             name = "windows_aarch64_msvc";
-<<<<<<< HEAD
             packageId = "windows_aarch64_msvc 0.48.5";
             target = { target, features }: (("aarch64" == target."arch") && ("msvc" == target."env") && (!(target."windows_raw_dylib" or false)));
           }
@@ -19582,45 +15084,16 @@ rec {
           {
             name = "windows_x86_64_gnullvm";
             packageId = "windows_x86_64_gnullvm 0.48.5";
-=======
-            packageId = "windows_aarch64_msvc";
-            target = { target, features }: (("aarch64" == target."arch" or null) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false)));
-          }
-          {
-            name = "windows_i686_gnu";
-            packageId = "windows_i686_gnu";
-            target = { target, features }: (("x86" == target."arch" or null) && ("gnu" == target."env" or null) && (!(target."windows_raw_dylib" or false)));
-          }
-          {
-            name = "windows_i686_msvc";
-            packageId = "windows_i686_msvc";
-            target = { target, features }: (("x86" == target."arch" or null) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false)));
-          }
-          {
-            name = "windows_x86_64_gnu";
-            packageId = "windows_x86_64_gnu";
-            target = { target, features }: (("x86_64" == target."arch" or null) && ("gnu" == target."env" or null) && (!("llvm" == target."abi" or null)) && (!(target."windows_raw_dylib" or false)));
-          }
-          {
-            name = "windows_x86_64_gnullvm";
-            packageId = "windows_x86_64_gnullvm";
->>>>>>> 4366a49 (Start nixifying applications)
             target = { target, features }: (pkgs.rust.lib.toRustTarget stdenv.hostPlatform == "x86_64-pc-windows-gnullvm");
           }
           {
             name = "windows_x86_64_msvc";
-<<<<<<< HEAD
             packageId = "windows_x86_64_msvc 0.48.5";
             target = { target, features }: (("x86_64" == target."arch") && ("msvc" == target."env") && (!(target."windows_raw_dylib" or false)));
-=======
-            packageId = "windows_x86_64_msvc";
-            target = { target, features }: (("x86_64" == target."arch" or null) && ("msvc" == target."env" or null) && (!(target."windows_raw_dylib" or false)));
->>>>>>> 4366a49 (Start nixifying applications)
           }
         ];
 
       };
-<<<<<<< HEAD
       "windows-targets 0.52.0" = rec {
         crateName = "windows-targets";
         version = "0.52.0";
@@ -19669,9 +15142,6 @@ rec {
 
       };
       "windows_aarch64_gnullvm 0.48.5" = rec {
-=======
-      "windows_aarch64_gnullvm" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "windows_aarch64_gnullvm";
         version = "0.48.5";
         edition = "2018";
@@ -19681,7 +15151,6 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "windows_aarch64_gnullvm 0.52.0" = rec {
         crateName = "windows_aarch64_gnullvm";
         version = "0.52.0";
@@ -19693,9 +15162,6 @@ rec {
 
       };
       "windows_aarch64_msvc 0.48.5" = rec {
-=======
-      "windows_aarch64_msvc" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "windows_aarch64_msvc";
         version = "0.48.5";
         edition = "2018";
@@ -19705,7 +15171,6 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "windows_aarch64_msvc 0.52.0" = rec {
         crateName = "windows_aarch64_msvc";
         version = "0.52.0";
@@ -19717,9 +15182,6 @@ rec {
 
       };
       "windows_i686_gnu 0.48.5" = rec {
-=======
-      "windows_i686_gnu" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "windows_i686_gnu";
         version = "0.48.5";
         edition = "2018";
@@ -19729,7 +15191,6 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "windows_i686_gnu 0.52.0" = rec {
         crateName = "windows_i686_gnu";
         version = "0.52.0";
@@ -19741,9 +15202,6 @@ rec {
 
       };
       "windows_i686_msvc 0.48.5" = rec {
-=======
-      "windows_i686_msvc" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "windows_i686_msvc";
         version = "0.48.5";
         edition = "2018";
@@ -19753,7 +15211,6 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "windows_i686_msvc 0.52.0" = rec {
         crateName = "windows_i686_msvc";
         version = "0.52.0";
@@ -19765,9 +15222,6 @@ rec {
 
       };
       "windows_x86_64_gnu 0.48.5" = rec {
-=======
-      "windows_x86_64_gnu" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "windows_x86_64_gnu";
         version = "0.48.5";
         edition = "2018";
@@ -19777,7 +15231,6 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "windows_x86_64_gnu 0.52.0" = rec {
         crateName = "windows_x86_64_gnu";
         version = "0.52.0";
@@ -19789,9 +15242,6 @@ rec {
 
       };
       "windows_x86_64_gnullvm 0.48.5" = rec {
-=======
-      "windows_x86_64_gnullvm" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "windows_x86_64_gnullvm";
         version = "0.48.5";
         edition = "2018";
@@ -19801,7 +15251,6 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "windows_x86_64_gnullvm 0.52.0" = rec {
         crateName = "windows_x86_64_gnullvm";
         version = "0.52.0";
@@ -19813,9 +15262,6 @@ rec {
 
       };
       "windows_x86_64_msvc 0.48.5" = rec {
-=======
-      "windows_x86_64_msvc" = rec {
->>>>>>> 4366a49 (Start nixifying applications)
         crateName = "windows_x86_64_msvc";
         version = "0.48.5";
         edition = "2018";
@@ -19825,7 +15271,6 @@ rec {
         ];
 
       };
-<<<<<<< HEAD
       "windows_x86_64_msvc 0.52.0" = rec {
         crateName = "windows_x86_64_msvc";
         version = "0.52.0";
@@ -19841,13 +15286,6 @@ rec {
         version = "0.5.30";
         edition = "2021";
         sha256 = "1ifj9vnqna5qp0d7nb9mrinzf8j7zi1m0gv75870vm91jyw3sp4v";
-=======
-      "winnow" = rec {
-        crateName = "winnow";
-        version = "0.5.15";
-        edition = "2021";
-        sha256 = "1z6fikri2xa8qkzf40xn58q7c964s0wk19vw2vajmsf4p6232bkw";
->>>>>>> 4366a49 (Start nixifying applications)
         dependencies = [
           {
             name = "memchr";
@@ -19880,11 +15318,7 @@ rec {
           }
           {
             name = "windows-sys";
-<<<<<<< HEAD
             packageId = "windows-sys 0.48.0";
-=======
-            packageId = "windows-sys";
->>>>>>> 4366a49 (Start nixifying applications)
             features = [ "Win32_Foundation" "Win32_System_Time" "Win32_System_Registry" "Win32_Security" "Win32_Storage_FileSystem" "Win32_System_Diagnostics_Debug" ];
           }
         ];
@@ -19894,7 +15328,6 @@ rec {
           "serialization-serde" = [ "transactions" "serde" ];
         };
       };
-<<<<<<< HEAD
       "zerocopy" = rec {
         crateName = "zerocopy";
         version = "0.7.31";
@@ -19961,13 +15394,6 @@ rec {
         version = "1.7.0";
         edition = "2021";
         sha256 = "0bfvby7k9pdp6623p98yz2irqnamcyzpn7zh20nqmdn68b0lwnsj";
-=======
-      "zeroize" = rec {
-        crateName = "zeroize";
-        version = "1.6.0";
-        edition = "2021";
-        sha256 = "1ndar43r58zbmasjhrhgas168vxb4i0rwbkcnszhjybwpbqmc29a";
->>>>>>> 4366a49 (Start nixifying applications)
         authors = [
           "The RustCrypto Project Developers"
         ];
@@ -20023,19 +15449,12 @@ rec {
     os = pkgs.rust.lib.toTargetOs platform;
     arch = pkgs.rust.lib.toTargetArch platform;
     family = pkgs.rust.lib.toTargetFamily platform;
-<<<<<<< HEAD
-=======
-    vendor = pkgs.rust.lib.toTargetVendor platform;
->>>>>>> 4366a49 (Start nixifying applications)
     env = "gnu";
     endian =
       if platform.parsed.cpu.significantByte.name == "littleEndian"
       then "little" else "big";
     pointer_width = toString platform.parsed.cpu.bits;
-<<<<<<< HEAD
     vendor = platform.parsed.vendor.name;
-=======
->>>>>>> 4366a49 (Start nixifying applications)
     debug_assertions = false;
   };
 
@@ -20131,11 +15550,7 @@ rec {
           # recreate a file hierarchy as when running tests with cargo
 
           # the source for test data
-<<<<<<< HEAD
           ${pkgs.xorg.lndir}/bin/lndir ${crate.src}
-=======
-          ${pkgs.buildPackages.xorg.lndir}/bin/lndir ${crate.src}
->>>>>>> 4366a49 (Start nixifying applications)
 
           # build outputs
           testRoot=target/debug
@@ -20165,19 +15580,10 @@ rec {
         passthru = (crate.passthru or { }) // {
           inherit test;
         };
-<<<<<<< HEAD
       } ''
       echo tested by ${test}
       ${lib.concatMapStringsSep "\n" (output: "ln -s ${crate.${output}} ${"$"}${output}") crate.outputs}
     '';
-=======
-      }
-      (lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-        echo tested by ${test}
-      '' + ''
-        ${lib.concatMapStringsSep "\n" (output: "ln -s ${crate.${output}} ${"$"}${output}") crate.outputs}
-      '');
->>>>>>> 4366a49 (Start nixifying applications)
 
   /* A restricted overridable version of builtRustCratesWithFeatures. */
   buildRustCrateWithFeatures =
@@ -20341,15 +15747,9 @@ rec {
                   let
                     package = crateConfigs."${dep.packageId}";
                   in
-<<<<<<< HEAD
                   { inherit (dep) rename; version = package.version; };
               in
               lib.mapAttrs (name: choices: builtins.map versionAndRename choices) grouped;
-=======
-                  { inherit (dep) rename; inherit (package) version; };
-              in
-              lib.mapAttrs (name: builtins.map versionAndRename) grouped;
->>>>>>> 4366a49 (Start nixifying applications)
           in
           buildRustCrateForPkgsFunc pkgs
             (
@@ -20397,11 +15797,7 @@ rec {
   */
   sanitizeForJson = val:
     if builtins.isAttrs val
-<<<<<<< HEAD
     then lib.mapAttrs (n: v: sanitizeForJson v) val
-=======
-    then lib.mapAttrs (n: sanitizeForJson) val
->>>>>>> 4366a49 (Start nixifying applications)
     else if builtins.isList val
     then builtins.map sanitizeForJson val
     else if builtins.isFunction val
@@ -20510,11 +15906,7 @@ rec {
         enabledFeatures = enableFeatures (crateConfig.dependencies or [ ]) expandedFeatures;
         depWithResolvedFeatures = dependency:
           let
-<<<<<<< HEAD
             packageId = dependency.packageId;
-=======
-            inherit (dependency) packageId;
->>>>>>> 4366a49 (Start nixifying applications)
             features = dependencyFeatures enabledFeatures dependency;
           in
           { inherit packageId features; };
diff --git a/Cargo.toml b/Cargo.toml
index af6549d..bf860b2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,6 @@ members = [
     "kifu/gtk",
     "memorycache",
     "nom-training",
-    "pico-blink",
     "result-extended",
     "screenplay",
     "sgf",
diff --git a/flake.nix b/flake.nix
index 5d16bfa..69b757d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,8 +24,6 @@
             pkgs.cargo-nextest
             pkgs.clang
             pkgs.crate2nix
-            pkgs.entr
-            pkgs.glade
             pkgs.glib
             pkgs.gst_all_1.gst-plugins-bad
             pkgs.gst_all_1.gst-plugins-base
@@ -54,10 +52,39 @@
       packages."x86_64-linux" =
         let
           pkgs = import nixpkgs { system = "x86_64-linux"; };
-          cargo_nix = pkgs.callPackage ./Cargo.nix { nixpkgs = nixpkgs; };
+
+          gtkNativeInputs = [
+            pkgs.pkg-config
+            pkgs.gtk4
+            pkgs.libadwaita
+          ];
+
+          cargoOverrides = pkgs: pkgs.buildRustCrate.override {
+            defaultCrateOverrides = pkgs.defaultCrateOverrides // {
+              gobject-sys = attrs: { nativeBuildInputs = gtkNativeInputs; };
+              gio-sys = attrs: { nativeBuildInputs = gtkNativeInputs; };
+              gdk-pixbuf-sys = attrs: { nativeBuildInputs = gtkNativeInputs; };
+              libadwaita-sys = attrs: { nativeBuildInputs = gtkNativeInputs; };
+              # fitnesstrax = attrs: {
+              #     buildInputs = [
+              #         pkgs.pkg-config
+              #         pkgs.glib
+              #         pkgs.gtk4
+              #         pkgs.libadwaita
+              #     ];
+              # };
+            };
+          };
+
+          cargo_nix = pkgs.callPackage ./Cargo.nix {
+            nixpkgs = nixpkgs;
+            buildRustCrateForPkgs = cargoOverrides;
+          };
         in {
-          file-service = cargo_nix.workspaceMembers.file-service.build;
           cyberpunk-splash = cargo_nix.workspaceMembers.cyberpunk-splash.build;
+          dashboard = cargo_nix.workspaceMembers.dashboard.build;
+          file-service = cargo_nix.workspaceMembers.file-service.build;
+          fitnesstrax = cargo_nix.workspaceMembers.fitnesstrax.build;
         };
     };
 }