diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index 520c77e..c5d5c71 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: package: - - github:cything/nixpkgs/fd06e41125350bc3db5628df49d3b84e4652a59d#lact + # - github:cything/nixpkgs/fd06e41125350bc3db5628df49d3b84e4652a59d#lact os: - ubuntu-latest # - macos-latest diff --git a/overlay/conduwuit/default.nix b/overlay/conduwuit/default.nix index 6ce6e72..e08101c 100644 --- a/overlay/conduwuit/default.nix +++ b/overlay/conduwuit/default.nix @@ -10,14 +10,11 @@ final: prev: { src = final.fetchFromGitHub { owner = "girlbossceo"; repo = "conduwuit"; - rev = "8c74e35e7640a041c1f3496d82585e5240294352"; - hash = "sha256-/2YD3TXT9pQ7oPEm9wDrq35afU88qukMIWqrBX5JyXg="; + rev = "5b8464252c2c03edf65e43153be026dbb768a12a"; + hash = "sha256-yNdxoVZX13QUDJYM6zTMY9ExvacTqB+f0MLvDreSW8U="; }; doCheck = false; - cargoHash = "sha256-ZenMTCEJrALKQnW7/eXqrhFj+BedE9i/rQZMsPHl8K0="; - cargoPatches = [ - ./fix-lint.patch - ]; + cargoHash = "sha256-g19UujLI9d4aw+1273gfC17LDLOciqBvuLhe/VCsh80="; # unstable has this set to "conduit" meta.mainProgram = "conduwuit"; diff --git a/overlay/conduwuit/fix-lint.patch b/overlay/conduwuit/fix-lint.patch deleted file mode 100644 index 120ec8a..0000000 --- a/overlay/conduwuit/fix-lint.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 3f900a114..0d30a3fec 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -4493,7 +4493,7 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - [[package]] - name = "tracing" - version = "0.1.41" --source = "git+https://github.com/girlbossceo/tracing?rev=ccc4fbd8238c2d5ba354e61ec17ac610af11401d#ccc4fbd8238c2d5ba354e61ec17ac610af11401d" -+source = "git+https://github.com/girlbossceo/tracing?rev=3cf1c991e3660785d3855a34245949557db33209#3cf1c991e3660785d3855a34245949557db33209" - dependencies = [ - "log", - "pin-project-lite", -@@ -4504,7 +4504,7 @@ dependencies = [ - [[package]] - name = "tracing-attributes" - version = "0.1.28" --source = "git+https://github.com/girlbossceo/tracing?rev=ccc4fbd8238c2d5ba354e61ec17ac610af11401d#ccc4fbd8238c2d5ba354e61ec17ac610af11401d" -+source = "git+https://github.com/girlbossceo/tracing?rev=3cf1c991e3660785d3855a34245949557db33209#3cf1c991e3660785d3855a34245949557db33209" - dependencies = [ - "proc-macro2", - "quote", -@@ -4514,7 +4514,7 @@ dependencies = [ - [[package]] - name = "tracing-core" - version = "0.1.33" --source = "git+https://github.com/girlbossceo/tracing?rev=ccc4fbd8238c2d5ba354e61ec17ac610af11401d#ccc4fbd8238c2d5ba354e61ec17ac610af11401d" -+source = "git+https://github.com/girlbossceo/tracing?rev=3cf1c991e3660785d3855a34245949557db33209#3cf1c991e3660785d3855a34245949557db33209" - dependencies = [ - "once_cell", - "valuable", -@@ -4534,7 +4534,7 @@ dependencies = [ - [[package]] - name = "tracing-log" - version = "0.2.0" --source = "git+https://github.com/girlbossceo/tracing?rev=ccc4fbd8238c2d5ba354e61ec17ac610af11401d#ccc4fbd8238c2d5ba354e61ec17ac610af11401d" -+source = "git+https://github.com/girlbossceo/tracing?rev=3cf1c991e3660785d3855a34245949557db33209#3cf1c991e3660785d3855a34245949557db33209" - dependencies = [ - "log", - "once_cell", -@@ -4562,7 +4562,7 @@ dependencies = [ - [[package]] - name = "tracing-subscriber" - version = "0.3.18" --source = "git+https://github.com/girlbossceo/tracing?rev=ccc4fbd8238c2d5ba354e61ec17ac610af11401d#ccc4fbd8238c2d5ba354e61ec17ac610af11401d" -+source = "git+https://github.com/girlbossceo/tracing?rev=3cf1c991e3660785d3855a34245949557db33209#3cf1c991e3660785d3855a34245949557db33209" - dependencies = [ - "matchers", - "nu-ansi-term", -diff --git a/Cargo.toml b/Cargo.toml -index 76acda807..a2916a6aa 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -513,16 +513,16 @@ version = "0.2" - # https://github.com/girlbossceo/tracing/commit/b348dca742af641c47bc390261f60711c2af573c - [patch.crates-io.tracing-subscriber] - git = "https://github.com/girlbossceo/tracing" --rev = "ccc4fbd8238c2d5ba354e61ec17ac610af11401d" -+rev = "3cf1c991e3660785d3855a34245949557db33209" - [patch.crates-io.tracing] - git = "https://github.com/girlbossceo/tracing" --rev = "ccc4fbd8238c2d5ba354e61ec17ac610af11401d" -+rev = "3cf1c991e3660785d3855a34245949557db33209" - [patch.crates-io.tracing-core] - git = "https://github.com/girlbossceo/tracing" --rev = "ccc4fbd8238c2d5ba354e61ec17ac610af11401d" -+rev = "3cf1c991e3660785d3855a34245949557db33209" - [patch.crates-io.tracing-log] - git = "https://github.com/girlbossceo/tracing" --rev = "ccc4fbd8238c2d5ba354e61ec17ac610af11401d" -+rev = "3cf1c991e3660785d3855a34245949557db33209" - - # adds a tab completion callback: https://github.com/girlbossceo/rustyline-async/commit/de26100b0db03e419a3d8e1dd26895d170d1fe50 - # adds event for CTRL+\: https://github.com/girlbossceo/rustyline-async/commit/67d8c49aeac03a5ef4e818f663eaa94dd7bf339b