Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump cargo-bundle and cargo-about version in nix (#27803)

Browse source 
We updated our cargo-bundle fork, and this adds to our override to make
sure we have the latest version.

cargo-about also released a new version upstream which was picked up in
nixpkgs, so I've `nix flake update`'d and changed that version as well.
Thanks to @niklaskorz for [pinging
me](https://github.com/NixOS/nixpkgs/pull/392319#issuecomment-2746122094)
about this. You should be able to drop the patch next time you update.

Release Notes:

- N/A
This commit is contained in:
Julia Ryan 2025-03-31 13:33:00 -07:00 • committed by GitHub
parent 76c46c5bab
commit 50ad71a630
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1741481578, "lastModified": 1742394900,
"narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -32,11 +32,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1741379970, "lastModified": 1743095683,
"narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -61,11 +61,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741573199, "lastModified": 1743215516,
"narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=", "narHash": "sha256-52qbrkG65U1hyrQWltgHTgH4nm0SJL+9TWv2UDCEPNI=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a", "rev": "524463199fdee49338006b049bc376b965a2cfed",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
nix/build.nix
View file

@ -95,15 +95,23 @@ let
++ lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
# TODO: move to overlay so it's usable in the shell # TODO: move to overlay so it's usable in the shell
(cargo-bundle.overrideAttrs (old: { (cargo-bundle.overrideAttrs (
version = "0.6.0-zed"; new: old: {
version = "0.6.1-zed";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zed-industries"; owner = "zed-industries";
repo = "cargo-bundle"; repo = "cargo-bundle";
rev = "zed-deploy"; rev = "2be2669972dff3ddd4daf89a2cb29d2d06cad7c7";
hash = "sha256-OxYdTSiR9ueCvtt7Y2OJkvzwxxnxu453cMS+l/Bi5hM="; hash = "sha256-cSvW0ND148AGdIGWg/ku0yIacVgW+9f1Nsi+kAQxVrI=";
}; };
})) # https://nixos.asia/en/buildRustPackage
cargoDeps = old.cargoDeps.overrideAttrs ({
inherit src;
name = "${new.pname}-${new.version}-vendor.tar.gz";
outputHash = "sha256-Q49FnXNHWhvbH1LtMUpXFcvGKu9VHwqOXXd+MjswO64=";
});
}
))
]; ];
buildInputs = buildInputs =

2
script/generate-licenses
View file

@ -2,7 +2,7 @@
set -euo pipefail set -euo pipefail
CARGO_ABOUT_VERSION="0.6" CARGO_ABOUT_VERSION="0.7"
OUTPUT_FILE="${1:-$(pwd)/assets/licenses.md}" OUTPUT_FILE="${1:-$(pwd)/assets/licenses.md}"
TEMPLATE_FILE="script/licenses/template.md.hbs" TEMPLATE_FILE="script/licenses/template.md.hbs"