diff --git a/pkgs/by-name/ma/matrix-continuwuity/cargolock.patch b/pkgs/by-name/ma/matrix-continuwuity/cargolock.patch deleted file mode 100644 index aca29fdf6602..000000000000 --- a/pkgs/by-name/ma/matrix-continuwuity/cargolock.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 5d7192b6..ce9b1302 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -3900,8 +3900,9 @@ dependencies = [ - - [[package]] - name = "resolv-conf" --version = "0.7.4" --source = "git+https://forgejo.ellis.link/continuwuation/resolv-conf?rev=56251316cc4127bcbf36e68ce5e2093f4d33e227#56251316cc4127bcbf36e68ce5e2093f4d33e227" -+version = "0.7.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6b3789b30bd25ba102de4beabd95d21ac45b69b1be7d14522bab988c526d6799" - - [[package]] - name = "rgb" -diff --git a/Cargo.toml b/Cargo.toml -index c656e183..2942ad07 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -592,9 +592,8 @@ rev = "e4ae7628fe4fcdacef9788c4c8415317a4489941" - - # Allows no-aaaa option in resolv.conf - # Use 1-indexed line numbers when displaying parse error messages --[patch.crates-io.resolv-conf] --git = "https://forgejo.ellis.link/continuwuation/resolv-conf" --rev = "56251316cc4127bcbf36e68ce5e2093f4d33e227" -+[workspace.dependencies.resolv-conf] -+version = "0.7.5" - - # - # Our crates diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix index 5af8647fb9d9..a7c21310e492 100644 --- a/pkgs/by-name/ma/matrix-continuwuity/package.nix +++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix @@ -28,13 +28,13 @@ let }).overrideAttrs ( final: old: { - version = "10.4.2"; + version = "10.5.1"; src = fetchFromGitea { domain = "forgejo.ellis.link"; owner = "continuwuation"; repo = "rocksdb"; - rev = "10.4.fb"; - hash = "sha256-/Hvy1yTH/0D5aa7bc+/uqFugCQq4InTdwlRw88vA5IY="; + rev = "10.5.fb"; + hash = "sha256-X4ApGLkHF9ceBtBg77dimEpu720I79ffLoyPa8JMHaU="; }; patches = [ ]; @@ -77,22 +77,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-continuwuity"; - version = "0.5.0-rc.7"; + version = "0.5.0-rc.8"; - # Switch back to fetchFromGitea once archive download errors are fixed src = fetchFromGitea { domain = "forgejo.ellis.link"; owner = "continuwuation"; repo = "continuwuity"; tag = "v${finalAttrs.version}"; - hash = "sha256-u1k1r95qBoEizeILR5rrM5lDFz2a2NjUwM9TTi0HNjw="; + hash = "sha256-5XjEwEYzWANm2k0GKFuHV3no65ReWPbCq+xMUH13zuI="; }; - # Patch to fix linking issue caused by resolv-conf which needs to be incorporated - # into continuwuity upstream. - cargoPatches = [ ./cargolock.patch ]; - - cargoHash = "sha256-1ECD8RZ918TM1IX3jkTDNhCR5Zye0a3ii0zeIPy8jlI="; + cargoHash = "sha256-uMr1DLwiMwIKN5IeALwQfh2xmAGPyQtxvT/uM0gfPvA="; nativeBuildInputs = [ pkg-config