Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NuschtOS/ixx
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.0.7
Choose a base ref
...
head repository: NuschtOS/ixx
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 5 commits
  • 6 files changed
  • 2 contributors

Commits on Jan 26, 2025

  1. Update Rust crate clap to v4.5.27 (#47)

    @SuperSandroBot
    SuperSandroBot authored Jan 26, 2025
    Copy the full SHA
    4ddefa9 View commit details

Commits on Feb 1, 2025

  1. Update DeterminateSystems/magic-nix-cache-action action to v9 (#49)

    @SuperSandroBot
    SuperSandroBot authored Feb 1, 2025
    Copy the full SHA
    4b863c0 View commit details

Commits on Feb 2, 2025

  1. Update nixpkgs digest to 4694fa6 (#54) 

    Co-authored-by: Renovate Bot <renovate@whitesourcesoftware.com>
    @SuperSandroBot @renovate-bot
    SuperSandroBot and renovate-bot authored Feb 2, 2025
    Copy the full SHA
    da0cab4 View commit details

  2. Update crates (#48)

    @SuperSandroBot
    SuperSandroBot authored Feb 2, 2025
    Copy the full SHA
    5455646 View commit details

Commits on Feb 3, 2025

  1. Update Rust crate tree-sitter-highlight to v0.25.1 (#56) 

    Co-authored-by: Renovate Bot <renovate@whitesourcesoftware.com>
    @SuperSandroBot @renovate-bot
    SuperSandroBot and renovate-bot authored Feb 3, 2025
    Copy the full SHA
    794ef55 View commit details
Showing with 66 additions and 54 deletions.
  1. +1 −1 .github/workflows/ci.yaml
  2. +39 −42 Cargo.lock
  3. +20 −5 fixx/derivation.nix
  4. +3 −3 flake.lock
  5. +1 −1 ixx/Cargo.toml
  6. +2 −2 ixx/src/utils/highlight.rs
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ jobs:
sed -i'' "s/0\\.0\\.0-git/${{ steps.meta.outputs.version }}/" Cargo.lock
- uses: cachix/install-nix-action@v30
- uses: DeterminateSystems/magic-nix-cache-action@v8
- uses: DeterminateSystems/magic-nix-cache-action@v9

Check warning on line 42 in .github/workflows/ci.yaml

GitHub Actions / build (libixx)

Magic Nix Cache is deprecated 

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025.
To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead.

Replace...
      - uses: DeterminateSystems/magic-nix-cache-action@v9

...with...
      - uses: DeterminateSystems/flakehub-cache-action@v9

For more details: https://dtr.mn/magic-nix-cache-eol

Check warning on line 42 in .github/workflows/ci.yaml

GitHub Actions / build (ixx)

Magic Nix Cache is deprecated 

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025.
To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead.

Replace...
      - uses: DeterminateSystems/magic-nix-cache-action@v9

...with...
      - uses: DeterminateSystems/flakehub-cache-action@v9

For more details: https://dtr.mn/magic-nix-cache-eol

Check warning on line 42 in .github/workflows/ci.yaml

GitHub Actions / build (fixx)

Magic Nix Cache is deprecated 

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025.
To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead.

Replace...
      - uses: DeterminateSystems/magic-nix-cache-action@v9

...with...
      - uses: DeterminateSystems/flakehub-cache-action@v9

For more details: https://dtr.mn/magic-nix-cache-eol
with:
diagnostic-endpoint: false
use-flakehub: false
81 changes: 39 additions & 42 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 20 additions & 5 deletions fixx/derivation.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,25 @@
{ lib, rustPlatform, binaryen, rustc, wasm-pack, wasm-bindgen-cli }:
{ lib
, buildWasmBindgenCli
, rustPlatform
, binaryen
, fetchCrate
, rustc
, wasm-pack
}:

let
wasm-bindgen-100 = wasm-bindgen-cli.override {
version = "0.2.100";
hash = "sha256-3RJzK7mkYFrs7C/WkhW9Rr4LdP5ofb2FdYGz1P7Uxog=";
cargoHash = "sha256-tD0OY2PounRqsRiFh8Js5nyknQ809ZcHMvCOLrvYHRE=";
wasm-bindgen-100 = buildWasmBindgenCli rec {
src = fetchCrate {
pname = "wasm-bindgen-cli";
version = "0.2.100";
hash = "sha256-3RJzK7mkYFrs7C/WkhW9Rr4LdP5ofb2FdYGz1P7Uxog=";
};

cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
inherit (src) pname version;
hash = "sha256-qsO12332HSjWCVKtf1cUePWWb9IdYUmT+8OPj/XP2WE=";
};
};
manifest = (lib.importTOML ./Cargo.toml).package;
in
6 changes: 3 additions & 3 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ixx/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,6 @@ markdown = "1.0.0-alpha.21"
serde_json = "1.0"
anyhow = "1.0"

tree-sitter-highlight = "0.24"
tree-sitter-highlight = "0.25"
# when updating commit, also update HIGHLIGHT_NAMES in highlight.rs
tree-sitter-nix = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "4b952d99ce6fc795ff3cfa48b05637f2b1751d3b" }
4 changes: 2 additions & 2 deletions ixx/src/utils/highlight.rs
View file
Original file line number Diff line number Diff line change
@@ -58,8 +58,8 @@ pub(crate) fn highlight(code: &str) -> String {

let mut renderer = HtmlRenderer::new();
renderer
.render(highlight_event, code.as_bytes(), &|Highlight(idx)| {
HIGHLIGHT_NAME_CLASSES[idx].as_bytes()
.render(highlight_event, code.as_bytes(), &|Highlight(idx), out| {
out.extend(HIGHLIGHT_NAME_CLASSES[idx].as_bytes());
})
.expect("Failed to render HTML");