Merge pull request #217611 from figsoda/netease

netease-music-tui: replace patch with Cargo.lock
This commit is contained in:
Weijia Wang 2023-02-22 07:59:02 +02:00 committed by GitHub
commit 37ec5d119a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2792 additions and 2795 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -11,7 +11,13 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-+zRXihWg65DtyX3yD04CsW8aXIvNph36PW2veeg36lg=";
};
cargoPatches = [ ./cargo-lock.patch ];
cargoLock = {
lockFile = ./Cargo.lock;
};
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsa-lib openssl ];

View file

@ -1,20 +1,17 @@
#!nix-shell
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p coreutils gnugrep git cargo
# This updates cargo-lock.patch for the netease-music-tui version listed in
# default.nix.
set -eu -o verbose
set -euo pipefail
here=$PWD
version=$(cat default.nix | grep '^ version = "' | cut -d '"' -f 2)
here=$(dirname "$0")
version=$(grep '^ version = "' "$here/default.nix" | cut -d '"' -f 2)
checkout=$(mktemp -d)
git clone -b "$version" --depth=1 https://github.com/betta-cyber/netease-music-tui "$checkout"
cd "$checkout"
git clone -b "v$version" --depth=1 https://github.com/betta-cyber/netease-music-tui "$checkout"
cargo generate-lockfile
git add -f Cargo.lock
git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch
cargo generate-lockfile --manifest-path "$checkout/Cargo.toml"
cp "$checkout/Cargo.lock" "$here"
cd "$here"
rm -rf "$checkout"