Skip to content

Commit

Permalink
Bump cargo versions
Browse files Browse the repository at this point in the history
  • Loading branch information
expede committed Aug 6, 2024
1 parent d33c1f5 commit 7e6e743
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 161 deletions.
96 changes: 12 additions & 84 deletions flake.lock

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

15 changes: 4 additions & 11 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
description = "ucan";

inputs = {
nixpkgs.url = "nixpkgs/nixos-23.11";
nixpkgs.url = "nixpkgs/nixos-24.05";
nixos-unstable.url = "nixpkgs/nixos-unstable-small";

command-utils.url = "github:expede/nix-command-utils";

flake-utils.url = "github:numtide/flake-utils";
devshell.url = "github:numtide/devshell";

rust-overlay = {
url = "github:oxalica/rust-overlay";
Expand All @@ -19,7 +17,6 @@

outputs = {
self,
devshell,
flake-utils,
nixos-unstable,
nixpkgs,
Expand All @@ -29,7 +26,6 @@
flake-utils.lib.eachDefaultSystem (
system: let
overlays = [
devshell.overlays.default
(import rust-overlay)
];

Expand Down Expand Up @@ -102,7 +98,7 @@
"release:host" = cmd "Build release for ${system}"
"${cargo} build --release";

"release:wasm:web" = cmd "Build release for wasm32-unknown-unknown with web bindings"
"release:wasm:web" = cmd "Build release for wasm32-unknown-unknown with web bindings"
"${wasm-pack} build --release --target=web";

"release:wasm:nodejs" = cmd "Build release for wasm32-unknown-unknown with Node.js bindgings"
Expand All @@ -115,7 +111,7 @@

"build:wasm:web" = cmd "Build for wasm32-unknown-unknown with web bindings"
"${wasm-pack} build --dev --target=web";

"build:wasm:nodejs" = cmd "Build for wasm32-unknown-unknown with Node.js bindgings"
"${wasm-pack} build --dev --target=nodejs";

Expand Down Expand Up @@ -174,7 +170,7 @@
"test:host && test:docs && test:wasm";

"test:host" = cmd "Run Cargo tests for host target"
"${cargo} test --features=test_utils";
"${cargo} test --features=mermaid_docs,test_utils";

"test:wasm" = cmd "Run wasm-pack tests on all targets"
"test:wasm:node && test:wasm:chrome";
Expand Down Expand Up @@ -220,7 +216,6 @@
self.packages.${system}.irust
(pkgs.hiPrio pkgs.rust-bin.nightly.latest.rustfmt)

pre-commit
pkgs.wasm-pack
chromedriver
protobuf
Expand All @@ -234,8 +229,6 @@
++ lib.optionals stdenv.isDarwin darwin-installs;

shellHook = ''
[ -e .git/hooks/pre-commit ] || pre-commit install --install-hooks && pre-commit install --hook-type commit-msg
export RUSTC_WRAPPER="${pkgs.sccache}/bin/sccache"
unset SOURCE_DATE_EPOCH
''
Expand Down
Loading

0 comments on commit 7e6e743

Please sign in to comment.