dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #168613 from marsam/update-ncspot

Browse Source 
ncspot: 0.9.5 -> 0.9.7
This commit is contained in:
Mario Rodas 2022-04-14 06:29:37 -05:00 committed by GitHub
commit 5d58ff2013
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/audio/ncspot/default.nix
View File

@ -7,20 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "0.9.5";
version = "0.9.7";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
sha256 = "sha256-HnP0dXKkMssDAhrsA99bTCVGdov9t5+1y8fJ+BWTM80=";
sha256 = "sha256-s2rWn6EK+io/yxQiWsWuXpqLOGd0F6ehWqVqgHBGZd0=";
};
# Upstream now only supports rust 1.58+, but this version is not yet available in nixpkgs.
# See https://github.com/hrkfdn/ncspot/issues/714
patches = [ ./rust_1_57_support.patch ];
cargoSha256 = "sha256-g6UMwirsSV+/NtFIfEZrz5h/OitPQcDeSawh7wq4TLI=";
cargoSha256 = "sha256-aorRy5j3VaOIibuHc6gf6HuB3g739T59vzbybehPirc=";
nativeBuildInputs = [ pkg-config ];

21
pkgs/applications/audio/ncspot/rust_1_57_support.patch
View File

@ -1,21 +0,0 @@
diff --git a/src/ui/listview.rs b/src/ui/listview.rs
index 17fead7..e6c72b6 100644
--- a/src/ui/listview.rs
+++ b/src/ui/listview.rs
@@ -85,7 +85,7 @@ impl<I: ListItem> ListView<I> {
pub fn content_height_with_paginator(&self) -> usize {
let content_len = self.content.read().unwrap().len();
- log::info!("content len: {content_len}");
+ log::info!("content len: {}", content_len);
// add 1 more row for paginator if we can paginate
if self.can_paginate() {
@@ -97,7 +97,7 @@ impl<I: ListItem> ListView<I> {
fn can_paginate(&self) -> bool {
let loaded = self.get_pagination().loaded_content();
- log::info!("can paginate: {loaded}");
+ log::info!("can paginate: {}", loaded);
self.get_pagination().max_content().unwrap_or(0) > self.get_pagination().loaded_content()
}