diff --git a/.github/workflows/build-and-cache.yml b/.github/workflows/build-and-cache.yml index 0e2e1df..520c77e 100644 --- a/.github/workflows/build-and-cache.yml +++ b/.github/workflows/build-and-cache.yml @@ -7,10 +7,10 @@ jobs: strategy: matrix: package: - - github:cything/nixpkgs#hello + - github:cything/nixpkgs/fd06e41125350bc3db5628df49d3b84e4652a59d#lact os: - ubuntu-latest - - macos-latest + # - macos-latest runs-on: ${{ matrix.os }} continue-on-error: true steps: diff --git a/flake.lock b/flake.lock index b093702..6b93a04 100644 --- a/flake.lock +++ b/flake.lock @@ -573,7 +573,6 @@ "nixpkgs": "nixpkgs", "nixpkgs-garage": "nixpkgs-garage", "nixvim": "nixvim", - "rust-overlay": "rust-overlay_2", "sops-nix": "sops-nix", "treefmt": "treefmt" } @@ -599,26 +598,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737340068, - "narHash": "sha256-5UciRckNV+YOZ6y6ASBIb01cySB12whDxgFUK+EqT8g=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "275c824ed9e90e7fd4f96d187bde3670062e721f", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index f75fe1e..ce47e6b 100644 --- a/flake.nix +++ b/flake.nix @@ -28,14 +28,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; flake-parts.url = "github:hercules-ci/flake-parts"; - niri = { - url = "github:sodiboo/niri-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + niri.url = "github:sodiboo/niri-flake"; + niri.inputs.nixpkgs.follows = "nixpkgs"; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR }; @@ -107,10 +101,7 @@ pkgs = import nixpkgs { config.allowUnfree = true; system = "x86_64-linux"; - overlays = [ - inputs.niri.overlays.niri - inputs.rust-overlay.overlays.default - ] ++ import ./overlay; + overlays = [ inputs.niri.overlays.niri ] ++ import ./overlay; }; in { diff --git a/overlay/conduwuit/default.nix b/overlay/conduwuit/default.nix index 1222c83..6ce6e72 100644 --- a/overlay/conduwuit/default.nix +++ b/overlay/conduwuit/default.nix @@ -1,28 +1,23 @@ -final: prev: -let - newRust = final.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; - newRustPlatform = final.makeRustPlatform { - cargo = newRust; - rustc = newRust; - }; -in -{ +final: prev: { conduwuit = prev.conduwuit.override (old: { - rustPlatform = newRustPlatform // { + rustPlatform = old.rustPlatform // { buildRustPackage = args: - newRustPlatform.buildRustPackage ( + old.rustPlatform.buildRustPackage ( args // { version = "0.5.0-rc2"; src = final.fetchFromGitHub { owner = "girlbossceo"; repo = "conduwuit"; - rev = "5b8464252c2c03edf65e43153be026dbb768a12a"; - hash = "sha256-yNdxoVZX13QUDJYM6zTMY9ExvacTqB+f0MLvDreSW8U="; + rev = "8c74e35e7640a041c1f3496d82585e5240294352"; + hash = "sha256-/2YD3TXT9pQ7oPEm9wDrq35afU88qukMIWqrBX5JyXg="; }; doCheck = false; - cargoHash = "sha256-g19UujLI9d4aw+1273gfC17LDLOciqBvuLhe/VCsh80="; + cargoHash = "sha256-ZenMTCEJrALKQnW7/eXqrhFj+BedE9i/rQZMsPHl8K0="; + cargoPatches = [ + ./fix-lint.patch + ]; # unstable has this set to "conduit" meta.mainProgram = "conduwuit"; diff --git a/overlay/conduwuit/fix-lint.patch b/overlay/conduwuit/fix-lint.patch new file mode 100644 index 0000000..120ec8a --- /dev/null +++ b/overlay/conduwuit/fix-lint.patch @@ -0,0 +1,74 @@ +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 diff --git a/overlay/conduwuit/rust-toolchain.toml b/overlay/conduwuit/rust-toolchain.toml deleted file mode 100644 index 97e33c9..0000000 --- a/overlay/conduwuit/rust-toolchain.toml +++ /dev/null @@ -1,28 +0,0 @@ -# This is the authoritiative configuration of this project's Rust toolchain. -# -# Other files that need upkeep when this changes: -# -# * `Cargo.toml` -# * `flake.nix` -# -# Search in those files for `rust-toolchain.toml` to find the relevant places. -# If you're having trouble making the relevant changes, bug a maintainer. - -[toolchain] -channel = "1.84.0" -profile = "minimal" -components = [ - # For rust-analyzer - "rust-src", - "rust-analyzer", - # For CI and editors - "rustfmt", - "clippy", -] -targets = [ - #"x86_64-apple-darwin", - "x86_64-unknown-linux-gnu", - "x86_64-unknown-linux-musl", - "aarch64-unknown-linux-musl", - #"aarch64-apple-darwin", -]