Skip to content

Commit

Permalink
Merge pull request cargo2nix#333 from cargo2nix/release-branch-mainte…
Browse files Browse the repository at this point in the history
…nance

Support Workspace Metadata
  • Loading branch information
psionic-k authored Oct 17, 2023
2 parents c720c96 + de0f50b commit f4fecb2
Show file tree
Hide file tree
Showing 20 changed files with 2,572 additions and 1,631 deletions.
24 changes: 12 additions & 12 deletions Cargo.lock

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

46 changes: 23 additions & 23 deletions Cargo.nix

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# cargo2nix

[![all builds & CI](https://github.com/cargo2nix/cargo2nix/actions/workflows/ci.yml/badge.svg)](https://github.com/cargo2nix/cargo2nix/actions/?workflow=CI)
[![build on Linux](https://badgen.net/github/checks/cargo2nix/cargo2nix/release-0.11.0/ubuntu)](https://github.com/cargo2nix/cargo2nix/actions/?workflow=CI)
[![build on Darwin](https://badgen.net/github/checks/cargo2nix/cargo2nix/release-0.11.0/mac)](https://github.com/cargo2nix/cargo2nix/actions/?workflow=CI)
[![darwin & linux CI](https://github.com/cargo2nix/cargo2nix/actions/workflows/ci.yml/badge.svg)](https://github.com/cargo2nix/cargo2nix/actions/?workflow=CI)
[![flakes supported](https://img.shields.io/badge/flake-supported-green)](https://nixos.wiki/wiki/Flakes)
[![latest release](https://img.shields.io/github/v/tag/cargo2nix/cargo2nix?color=%23009922&label=release)](https://github.com/cargo2nix/cargo2nix/releases)

Expand Down
44 changes: 31 additions & 13 deletions examples/1-hello-world/flake.lock

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

2 changes: 1 addition & 1 deletion examples/1-hello-world/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

# create the workspace & dependencies package set
rustPkgs = pkgs.rustBuilder.makePackageSet {
rustVersion = "1.70.0";
rustVersion = "1.73.0";
packageFun = import ./Cargo.nix;
};

Expand Down
Loading

0 comments on commit f4fecb2

Please sign in to comment.