misc: update deps

.github/workflows/ci.yaml

@@ -15,8 +15,10 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         module: [ libixx, ixx, fixx ]
+        target: [ "25.05", "unstable" ]
 
     steps:
       - uses: actions/checkout@v4
@@ -46,10 +48,18 @@ jobs:
           primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix', '**/flake.lock') }}
           restore-prefixes-first-match: nix-${{ runner.os }}-
 
-      - name: build ${{ matrix.module }}
+      - name: build stable ${{ matrix.module }}
+        if: matrix.target != 'unstable'
+        run: |
+          nix build -L .#${{ matrix.module }} \
+            --override-input nixpkgs github:NixOS/nixpkgs/nixos-${{ matrix.target }}
+
+      - name: build unstable ${{ matrix.module }}
+        if: matrix.target == 'unstable'
         run: nix build -L .#${{ matrix.module }}
 
       - uses: actions/upload-artifact@v4
+        if: matrix.target != 'unstable'
         with:
           name: ${{ matrix.module }}
           path: result

Cargo.toml

@@ -12,3 +12,4 @@ strip = true
 # https://docs.rust-embedded.org/book/unsorted/speed-vs-size.html#optimizing-dependencies
 [profile.release.package."*"]
 codegen-units = 1
+

fixx/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "fixx"
 version = "0.0.0-git"
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/NuschtOS/ixx/"
 license = "MIT OR Apache-2.0"
 
@@ -11,3 +11,7 @@ crate-type = ["cdylib"]
 [dependencies]
 libixx = { path = "../libixx" }
 wasm-bindgen = "0.2"
+
+# untill wasm-opt fixes it's stuff (caused by llvm update and new wasm features which was caused by rustc update)
+[package.metadata.wasm-pack.profile.release]
+wasm-opt = ['-O', '--enable-bulk-memory']

fixx/derivation.nix

@@ -1,40 +1,26 @@
 { lib
-, buildWasmBindgenCli
 , rustPlatform
 , binaryen
-, fetchCrate
 , rustc
 , wasm-pack
+, wasm-bindgen-cli_0_2_100
 }:
 
 let
-  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
 rustPlatform.buildRustPackage rec {
   pname = "fixx";
   inherit (manifest) version;
 
   src = lib.cleanSource ../.;
-  cargoLock = import ../lockfile.nix;
+  cargoLock.lockFile = ../Cargo.lock;
 
   nativeBuildInputs = [
     binaryen
     rustc.llvmPackages.lld
     wasm-pack
-    wasm-bindgen-100
+    wasm-bindgen-cli_0_2_100
   ];
 
   buildPhase = ''

ixx/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ixx"
 version = "0.0.0-git"
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/NuschtOS/ixx/"
 license = "MIT OR Apache-2.0"
 
@@ -10,10 +10,10 @@ serde = { version = "1.0", features = ["derive"] }
 clap = { version = "4.5", features = ["derive"] }
 url = { version = "2.5", features = ["serde"] }
 libixx = { path = "../libixx" }
-markdown = "1.0.0-alpha.21"
+markdown = "1.0"
 serde_json = "1.0"
 anyhow = "1.0"
 
 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 = "refs/tags/v0.0.2" }
+tree-sitter-nix = "0.3.0"