From 814d3b903ead874c6bcd71e5412888d3a80b6700 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Fri, 13 Jun 2025 03:45:34 +0000 Subject: [PATCH] Update NixOS related. [ci skip] Signed-off-by: Jason Volk --- flake.lock | 125 +++++++++----------- flake.nix | 64 +++++----- nix/pkgs/book/default.nix | 8 +- nix/pkgs/complement/bin/complement | 8 +- nix/pkgs/complement/bin/nix-build-and-cache | 14 +-- nix/pkgs/complement/default.nix | 12 +- nix/pkgs/main/default.nix | 6 +- 7 files changed, 111 insertions(+), 126 deletions(-) diff --git a/flake.lock b/flake.lock index 1f87b9b6..5f2ebc6b 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1738524606, - "narHash": "sha256-hPYEJ4juK3ph7kbjbvv7PlU1D9pAkkhl+pwx8fZY53U=", + "lastModified": 1748532342, + "narHash": "sha256-CvaKOUq8G10sghKpZhEB2UYjJoWhEkrDFggDgi7piUI=", "owner": "zhaofengli", "repo": "attic", - "rev": "ff8a897d1f4408ebbf4d45fa9049c06b3e1e3f4e", + "rev": "ce9373715fe3fac7a174a65a7e6d6baeba8cb4f9", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1737621947, - "narHash": "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=", + "lastModified": 1748883665, + "narHash": "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=", "owner": "cachix", "repo": "cachix", - "rev": "f65a3cd5e339c223471e64c051434616e18cc4f5", + "rev": "f707778d902af4d62d8dd92c269f8e70de09acbe", "type": "github" }, "original": { @@ -63,11 +63,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1728672398, - "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", + "lastModified": 1744206633, + "narHash": "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g=", "owner": "cachix", "repo": "cachix", - "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", + "rev": "8a60090640b96f9df95d1ab99e5763a586be1404", "type": "github" }, "original": { @@ -82,13 +82,13 @@ "locked": { "lastModified": 1741891349, "narHash": "sha256-YvrzOWcX7DH1drp5SGa+E/fc7wN3hqFtPbqPjZpOu1Q=", - "owner": "girlbossceo", + "owner": "matrix-construct", "repo": "complement", "rev": "e587b3df569cba411aeac7c20b6366d03c143745", "type": "github" }, "original": { - "owner": "girlbossceo", + "owner": "matrix-construct", "ref": "main", "repo": "complement", "type": "github" @@ -117,11 +117,11 @@ }, "crane_2": { "locked": { - "lastModified": 1739936662, - "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=", + "lastModified": 1748970125, + "narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=", "owner": "ipetkov", "repo": "crane", - "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7", + "rev": "323b5746d89e04b22554b061522dfce9e4c49b18", "type": "github" }, "original": { @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1733323168, - "narHash": "sha256-d5DwB4MZvlaQpN6OQ4SLYxb5jA4UH5EtV5t5WOtjLPU=", + "lastModified": 1748273445, + "narHash": "sha256-5V0dzpNgQM0CHDsMzh+ludYeu1S+Y+IMjbaskSSdFh0=", "owner": "cachix", "repo": "devenv", - "rev": "efa9010b8b1cfd5dd3c7ed1e172a470c3b84a064", + "rev": "668a50d8b7bdb19a0131f53c9f6c25c9071e1ffb", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1740724364, - "narHash": "sha256-D1jLIueJx1dPrP09ZZwTrPf4cubV+TsFMYbpYYTVj6A=", + "lastModified": 1749710537, + "narHash": "sha256-Jte1NonRzaKF6UpPL5FujKHVTVvc8CAIj8fK+X/0qVM=", "owner": "nix-community", "repo": "fenix", - "rev": "edf7d9e431cda8782e729253835f178a356d3aab", + "rev": "b8fda10da7629d856086bbc1e21164c2d55691e3", "type": "github" }, "original": { @@ -203,11 +203,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -219,11 +219,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -306,15 +306,14 @@ "nixpkgs": [ "cachix", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" + ] }, "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -364,11 +363,11 @@ "liburing": { "flake": false, "locked": { - "lastModified": 1740613216, - "narHash": "sha256-NpPOBqNND3Qe9IwqYs0mJLGTmIx7e6FgUEBAnJ+1ZLA=", + "lastModified": 1749679056, + "narHash": "sha256-wU1Cx7ctShGHqRTaZx6Vfr5dWVLPYGqcdy4eX2/qyrQ=", "owner": "axboe", "repo": "liburing", - "rev": "e1003e496e66f9b0ae06674869795edf772d5500", + "rev": "4bb1b84dbea5055246d1cd0583890644dd9345bc", "type": "github" }, "original": { @@ -401,11 +400,11 @@ ] }, "locked": { - "lastModified": 1727438425, - "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "lastModified": 1745930071, + "narHash": "sha256-bYyjarS3qSNqxfgc89IoVz8cAFDkF9yPE63EJr+h50s=", "owner": "domenkozar", "repo": "nix", - "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "rev": "b455edf3505f1bf0172b39a735caef94687d0d9c", "type": "github" }, "original": { @@ -484,29 +483,13 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -534,11 +517,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -550,11 +533,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1740547748, - "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=", + "lastModified": 1749743618, + "narHash": "sha256-ibsz06u1jlWyH7YURnRhLQn38Tuc5zwknr00suFjvfA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a05eebede89661660945da1f151959900903b6a", + "rev": "8d6cdc7756817e0c4b24567271634a44bcf80752", "type": "github" }, "original": { @@ -567,16 +550,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1741308171, - "narHash": "sha256-YdBvdQ75UJg5ffwNjxizpviCVwVDJnBkM8ZtGIduMgY=", - "owner": "girlbossceo", + "lastModified": 1749358049, + "narHash": "sha256-ZSjvAZBfZkJrBIpw8ANZMbJVb8AeuogvuAipGVE4Qe4=", + "owner": "matrix-construct", "repo": "rocksdb", - "rev": "3ce04794bcfbbb0d2e6f81ae35fc4acf688b6986", + "rev": "cf7f65d0b377af019661c240f9165b3ef60640c3", "type": "github" }, "original": { - "owner": "girlbossceo", - "ref": "v9.11.1", + "owner": "matrix-construct", + "ref": "tuwunel-changes", "repo": "rocksdb", "type": "github" } @@ -599,11 +582,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1740691488, - "narHash": "sha256-Fs6vBrByuiOf2WO77qeMDMTXcTGzrIMqLBv+lNeywwM=", + "lastModified": 1749671345, + "narHash": "sha256-ewwoJOGE6sMnfXQkydmmjT6ixo1JetBZO0tDEENjOb8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "fe3eda77d3a7ce212388bda7b6cec8bffcc077e5", + "rev": "5b2c8bc9ae90b4ad92dbeb7e52a7f5cbf5ba4d53", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 49e860ed..5c26a5a0 100644 --- a/flake.nix +++ b/flake.nix @@ -2,14 +2,14 @@ inputs = { attic.url = "github:zhaofengli/attic?ref=main"; cachix.url = "github:cachix/cachix?ref=master"; - complement = { url = "github:girlbossceo/complement?ref=main"; flake = false; }; + complement = { url = "github:matrix-construct/complement?ref=main"; flake = false; }; crane = { url = "github:ipetkov/crane?ref=master"; }; fenix = { url = "github:nix-community/fenix?ref=main"; inputs.nixpkgs.follows = "nixpkgs"; }; flake-compat = { url = "github:edolstra/flake-compat?ref=master"; flake = false; }; flake-utils.url = "github:numtide/flake-utils?ref=main"; nix-filter.url = "github:numtide/nix-filter?ref=main"; nixpkgs.url = "github:NixOS/nixpkgs?ref=nixpkgs-unstable"; - rocksdb = { url = "github:girlbossceo/rocksdb?ref=v9.11.1"; flake = false; }; + rocksdb = { url = "github:matrix-construct/rocksdb?ref=tuwunel-changes"; flake = false; }; liburing = { url = "github:axboe/liburing?ref=master"; flake = false; }; }; @@ -197,8 +197,8 @@ "jemalloc_stats" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; }; default-debug = scopeHost.main.override { @@ -210,8 +210,8 @@ "experimental" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; }; # just a test profile used for things like CI and complement @@ -223,8 +223,8 @@ "experimental" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; }; all-features = scopeHost.main.override { @@ -238,8 +238,8 @@ "jemalloc_stats" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; }; all-features-debug = scopeHost.main.override { @@ -252,8 +252,8 @@ "experimental" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; }; hmalloc = scopeHost.main.override { features = ["hardened_malloc"]; }; @@ -271,8 +271,8 @@ "jemalloc_stats" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; }; }; @@ -287,8 +287,8 @@ "experimental" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; }; }; @@ -352,8 +352,8 @@ "experimental" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; }; } @@ -372,8 +372,8 @@ "jemalloc_stats" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; }; } @@ -393,8 +393,8 @@ "jemalloc_stats" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; x86_64_haswell_target_optimised = (if (crossSystem == "x86_64-linux-gnu" || crossSystem == "x86_64-linux-musl") then true else false); }; @@ -413,8 +413,8 @@ "experimental" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; }; } @@ -471,8 +471,8 @@ "jemalloc_stats" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; }; }; @@ -494,8 +494,8 @@ "jemalloc_stats" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; x86_64_haswell_target_optimised = (if (crossSystem == "x86_64-linux-gnu" || crossSystem == "x86_64-linux-musl") then true else false); }; @@ -516,8 +516,8 @@ "experimental" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; }; }; @@ -564,8 +564,8 @@ "jemalloc_stats" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ]; }; })); diff --git a/nix/pkgs/book/default.nix b/nix/pkgs/book/default.nix index 3995ab79..1c70a75c 100644 --- a/nix/pkgs/book/default.nix +++ b/nix/pkgs/book/default.nix @@ -13,14 +13,16 @@ stdenv.mkDerivation { root = inputs.self; include = [ "book.toml" - "conduwuit-example.toml" + "tuwunel-example.toml" "CODE_OF_CONDUCT.md" "CONTRIBUTING.md" "README.md" "development.md" - "debian/conduwuit.service" + "debian/tuwunel.service" "debian/README.md" - "arch/conduwuit.service" + "arch/tuwunel.service" + "rpm/tuwunel.service" + "rpm/README.md" "docs" "theme" ]; diff --git a/nix/pkgs/complement/bin/complement b/nix/pkgs/complement/bin/complement index c437503e..d67af144 100644 --- a/nix/pkgs/complement/bin/complement +++ b/nix/pkgs/complement/bin/complement @@ -15,7 +15,7 @@ LOG_FILE="${2:-complement_test_logs.jsonl}" # A `.jsonl` file to write test results to RESULTS_FILE="${3:-complement_test_results.jsonl}" -COMPLEMENT_BASE_IMAGE="${COMPLEMENT_BASE_IMAGE:-complement-conduwuit:main}" +COMPLEMENT_BASE_IMAGE="${COMPLEMENT_BASE_IMAGE:-complement-tuwunel:main}" # Complement tests that are skipped due to flakiness/reliability issues or we don't implement such features and won't for a long time SKIPPED_COMPLEMENT_TESTS='TestPartialStateJoin.*|TestRoomDeleteAlias/Parallel/Regular_users_can_add_and_delete_aliases_when_m.*|TestRoomDeleteAlias/Parallel/Can_delete_canonical_alias|TestUnbanViaInvite.*|TestRoomState/Parallel/GET_/publicRooms_lists.*"|TestRoomDeleteAlias/Parallel/Users_with_sufficient_power-level_can_delete_other.*' @@ -35,20 +35,20 @@ toplevel="$(git rev-parse --show-toplevel)" pushd "$toplevel" > /dev/null if [ ! -f "complement_oci_image.tar.gz" ]; then - echo "building complement conduwuit image" + echo "building complement tuwunel image" # if using macOS, use linux-complement #bin/nix-build-and-cache just .#linux-complement bin/nix-build-and-cache just .#complement #nix build -L .#complement - echo "complement conduwuit image tar.gz built at \"result\"" + echo "complement tuwunel image tar.gz built at \"result\"" echo "loading into docker" docker load < result popd > /dev/null else - echo "skipping building a complement conduwuit image as complement_oci_image.tar.gz was already found, loading this" + echo "skipping building a complement tuwunel image as complement_oci_image.tar.gz was already found, loading this" docker load < complement_oci_image.tar.gz popd > /dev/null diff --git a/nix/pkgs/complement/bin/nix-build-and-cache b/nix/pkgs/complement/bin/nix-build-and-cache index ac64ff23..9059239c 100644 --- a/nix/pkgs/complement/bin/nix-build-and-cache +++ b/nix/pkgs/complement/bin/nix-build-and-cache @@ -18,7 +18,7 @@ just() { return fi - # historical "conduit" store for compatibility purposes, same as conduwuit + # historical "conduit" store for compatibility purposes, same as tuwunel nix run --inputs-from "$toplevel" attic -- \ login \ conduit \ @@ -52,26 +52,26 @@ just() { withattic conduit || withattic conduit || withattic conduit || true ) - # main "conduwuit" store + # main "tuwunel" store nix run --inputs-from "$toplevel" attic -- \ login \ - conduwuit \ - "${ATTIC_ENDPOINT:-https://attic.kennel.juneis.dog/conduwuit}" \ + tuwunel \ + "${ATTIC_ENDPOINT:-https://attic.kennel.juneis.dog/tuwunel}" \ "$ATTIC_TOKEN" - # Upload them to Attic (conduwuit store) and Cachix + # Upload them to Attic (tuwunel store) and Cachix # # Use `xargs` and a here-string because something would probably explode if # several thousand arguments got passed to a command at once. Hopefully no # store paths include a newline in them. ( IFS=$'\n' - withattic conduwuit || withattic conduwuit || withattic conduwuit || true + withattic tuwunel || withattic tuwunel || withattic tuwunel || true # push to cachix if available if [ "$CACHIX_AUTH_TOKEN" ]; then nix shell --inputs-from "$toplevel" cachix -c xargs \ - cachix push conduwuit <<< "${cache[*]}" + cachix push tuwunel <<< "${cache[*]}" fi ) } diff --git a/nix/pkgs/complement/default.nix b/nix/pkgs/complement/default.nix index a2d57152..6b8fa38a 100644 --- a/nix/pkgs/complement/default.nix +++ b/nix/pkgs/complement/default.nix @@ -31,7 +31,7 @@ let "gzip_compression" "zstd_compression" # complement doesn't need hot reloading - "conduwuit_mods" + "tuwunel_mods" # complement doesn't have URL preview media tests "url_preview" ]; @@ -41,13 +41,13 @@ let set -euxo pipefail ${lib.getExe' coreutils "env"} \ - CONDUWUIT_SERVER_NAME="$SERVER_NAME" \ + TUWUNEL_SERVER_NAME="$SERVER_NAME" \ ${lib.getExe main'} ''; in dockerTools.buildImage { - name = "complement-conduwuit"; + name = "complement-tuwunel"; tag = "main"; copyToRoot = buildEnv { @@ -75,9 +75,9 @@ dockerTools.buildImage { else []; Env = [ - "CONDUWUIT_TLS__KEY=${./private_key.key}" - "CONDUWUIT_TLS__CERTS=${./certificate.crt}" - "CONDUWUIT_CONFIG=${./config.toml}" + "TUWUNEL_TLS__KEY=${./private_key.key}" + "TUWUNEL_TLS__CERTS=${./certificate.crt}" + "TUWUNEL_CONFIG=${./config.toml}" "RUST_BACKTRACE=full" ]; diff --git a/nix/pkgs/main/default.nix b/nix/pkgs/main/default.nix index 9c8038a7..efeba0d5 100644 --- a/nix/pkgs/main/default.nix +++ b/nix/pkgs/main/default.nix @@ -25,8 +25,8 @@ "jemalloc_stats" # this is non-functional on nix for some reason "hardened_malloc" - # conduwuit_mods is a development-only hot reload feature - "conduwuit_mods" + # tuwunel_mods is a development-only hot reload feature + "tuwunel_mods" ] , disable_release_max_log_level ? false , features ? [] @@ -130,7 +130,7 @@ buildDepsOnlyEnv = }); buildPackageEnv = { - CONDUWUIT_VERSION_EXTRA = inputs.self.shortRev or inputs.self.dirtyShortRev or ""; + TUWUNEL_VERSION_EXTRA = inputs.self.shortRev or inputs.self.dirtyShortRev or ""; } // buildDepsOnlyEnv // { # Only needed in static stdenv because these are transitive dependencies of rocksdb CARGO_BUILD_RUSTFLAGS = buildDepsOnlyEnv.CARGO_BUILD_RUSTFLAGS