From aa3fd6a47ee8d607ce4fd83f8a802a51fdf9012b Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Sat, 27 Jan 2024 16:41:27 -0500
Subject: [PATCH] switch cargo.toml pkg name back to conduit

we already make it clear this is a fork with
our version and such

Signed-off-by: strawberry <strawberry@puppygock.gay>
---
 Cargo.lock              |  2 +-
 Cargo.toml              |  2 +-
 bin/nix-build-and-cache |  2 +-
 flake.lock              | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e2234ff6..eea78728 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -382,7 +382,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
-name = "conduwuit"
+name = "conduit"
 version = "0.7.0-alpha+conduwuit-0.1.2"
 dependencies = [
  "argon2",
diff --git a/Cargo.toml b/Cargo.toml
index 4e87e4d7..f9d2cbc9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "conduwuit"
+name = "conduit"
 description = "a cool fork of Conduit, a Matrix homeserver written in Rust"
 license = "Apache-2.0"
 authors = ["strawberry <strawberry@puppygock.gay>", "timokoesters <timo@koesters.xyz>"]
diff --git a/bin/nix-build-and-cache b/bin/nix-build-and-cache
index b37ebd85..2122e892 100755
--- a/bin/nix-build-and-cache
+++ b/bin/nix-build-and-cache
@@ -12,7 +12,7 @@ if [ ! -z ${ATTIC_TOKEN+x} ]; then
 
 nix run --inputs-from . attic -- login \
     conduit \
-        https://nix.computer.surgery/conduit \
+        https://attic.kennel.girlcock.ceo/conduit \
         "$ATTIC_TOKEN"
 
     push_args=(
diff --git a/flake.lock b/flake.lock
index 07fdacc6..a6df214e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -73,11 +73,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1706250153,
-        "narHash": "sha256-OwEZ4UMLuz9fpH9ZbN7SSQvtDvUoj3RV32icp+8SIIc=",
+        "lastModified": 1706336364,
+        "narHash": "sha256-mJ5i2YIVKv6jTN2+l3oOUUej2NUVjJX/H3bAq6019ks=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "6d85102211fa954ece0a8a898ed91b4866b62ce7",
+        "rev": "eb683549b7d76b12d1a009f888b91b70ed34485f",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1706158176,
-        "narHash": "sha256-qPiPcLBXU05j+Z2hCrtClJQfmrfSN/bUq2aODiCzde0=",
+        "lastModified": 1706295183,
+        "narHash": "sha256-VSyMaUsXfjb31B8/uT5cM5qXC1VOHLVsCi/bQuo3O/g=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "38f7a3498e0d5f0113294bbdc08f867cd527e65f",
+        "rev": "596e5c77cf5b2b660b3ac2ce732fa0596c246d9b",
         "type": "github"
       },
       "original": {