diff --git a/pkgs/by-name/pw/pw-viz/0001-fix-regenerate-Cargo.lock.patch b/pkgs/by-name/pw/pw-viz/0001-fix-regenerate-Cargo.lock.patch new file mode 100644 index 000000000000..1e927052c1f0 --- /dev/null +++ b/pkgs/by-name/pw/pw-viz/0001-fix-regenerate-Cargo.lock.patch @@ -0,0 +1,615 @@ +From 395bb10d470f1f225a8559cfc07e90c1d6b2a3a4 Mon Sep 17 00:00:00 2001 +From: Petr Portnov +Date: Fri, 24 Apr 2026 23:02:24 +0300 +Subject: [PATCH] fix: regenerate Cargo.lock + +--- + Cargo.lock | 272 ++++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 195 insertions(+), 77 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 3582359..8e2c3bd 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "ab_glyph" +@@ -100,14 +100,20 @@ dependencies = [ + + [[package]] + name = "annotate-snippets" +-version = "0.9.2" ++version = "0.11.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" ++checksum = "710e8eae58854cdc1790fcb56cca04d712a17be849eeb81da2a724bf4bae2bc4" + dependencies = [ ++ "anstyle", + "unicode-width", +- "yansi-term", + ] + ++[[package]] ++name = "anstyle" ++version = "1.0.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" ++ + [[package]] + name = "anyhow" + version = "1.0.68" +@@ -127,7 +133,7 @@ dependencies = [ + "objc_id", + "once_cell", + "parking_lot", +- "thiserror", ++ "thiserror 1.0.38", + "winapi", + "x11rb", + ] +@@ -181,23 +187,21 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + + [[package]] + name = "bindgen" +-version = "0.69.4" ++version = "0.72.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" ++checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" + dependencies = [ + "annotate-snippets", + "bitflags 2.5.0", + "cexpr", + "clang-sys", + "itertools", +- "lazy_static", +- "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", +- "syn 2.0.66", ++ "syn 2.0.87", + ] + + [[package]] +@@ -278,7 +282,7 @@ dependencies = [ + "log", + "nix 0.25.1", + "slotmap", +- "thiserror", ++ "thiserror 1.0.38", + "vec_map", + ] + +@@ -300,16 +304,17 @@ version = "0.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" + dependencies = [ +- "nom", ++ "nom 7.1.2", + ] + + [[package]] + name = "cfg-expr" +-version = "0.11.0" ++version = "0.20.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" ++checksum = "3c6b04e07d8080154ed4ac03546d9a2b303cc2fe1901ba0b35b301516e289368" + dependencies = [ + "smallvec", ++ "target-lexicon", + ] + + [[package]] +@@ -324,6 +329,12 @@ version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + ++[[package]] ++name = "cfg_aliases" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" ++ + [[package]] + name = "cgl" + version = "0.3.2" +@@ -418,18 +429,18 @@ dependencies = [ + + [[package]] + name = "convert_case" +-version = "0.6.0" ++version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" ++checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f" + dependencies = [ + "unicode-segmentation", + ] + + [[package]] + name = "cookie-factory" +-version = "0.3.2" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" ++checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" + + [[package]] + name = "core-foundation" +@@ -824,6 +835,12 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "equivalent" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" ++ + [[package]] + name = "error-code" + version = "2.3.1" +@@ -990,7 +1007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "524d807cd49a0c56a53ef9a6738cd15e7c8c4e9d37a3b7fdb3c250c1cd5bf7a3" + dependencies = [ + "bitflags 1.3.2", +- "cfg_aliases", ++ "cfg_aliases 0.1.1", + "cgl", + "cocoa", + "core-foundation", +@@ -1035,11 +1052,17 @@ dependencies = [ + "gl_generator", + ] + ++[[package]] ++name = "hashbrown" ++version = "0.17.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" ++ + [[package]] + name = "heck" +-version = "0.4.0" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" ++checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + + [[package]] + name = "hermit-abi" +@@ -1066,6 +1089,16 @@ dependencies = [ + "unicode-normalization", + ] + ++[[package]] ++name = "indexmap" ++version = "2.14.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" ++dependencies = [ ++ "equivalent", ++ "hashbrown", ++] ++ + [[package]] + name = "instant" + version = "0.1.12" +@@ -1103,7 +1136,7 @@ dependencies = [ + "combine", + "jni-sys", + "log", +- "thiserror", ++ "thiserror 1.0.38", + "walkdir", + ] + +@@ -1144,17 +1177,11 @@ version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +-[[package]] +-name = "lazycell" +-version = "1.3.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" +- + [[package]] + name = "libc" +-version = "0.2.155" ++version = "0.2.186" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" ++checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" + + [[package]] + name = "libloading" +@@ -1168,9 +1195,9 @@ dependencies = [ + + [[package]] + name = "libspa" +-version = "0.8.0" ++version = "0.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" ++checksum = "b6b8cfa2a7656627b4c92c6b9ef929433acd673d5ab3708cda1b18478ac00df4" + dependencies = [ + "bitflags 2.5.0", + "cc", +@@ -1178,16 +1205,16 @@ dependencies = [ + "cookie-factory", + "libc", + "libspa-sys", +- "nix 0.27.1", +- "nom", ++ "nix 0.30.1", ++ "nom 8.0.0", + "system-deps", + ] + + [[package]] + name = "libspa-sys" +-version = "0.8.0" ++version = "0.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" ++checksum = "901049455d2eb6decf9058235d745237952f4804bc584c5fcb41412e6adcc6e0" + dependencies = [ + "bindgen", + "cc", +@@ -1290,7 +1317,7 @@ dependencies = [ + "ndk-sys", + "num_enum", + "raw-window-handle 0.5.0", +- "thiserror", ++ "thiserror 1.0.38", + ] + + [[package]] +@@ -1364,12 +1391,13 @@ dependencies = [ + + [[package]] + name = "nix" +-version = "0.27.1" ++version = "0.30.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" ++checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" + dependencies = [ + "bitflags 2.5.0", + "cfg-if", ++ "cfg_aliases 0.2.1", + "libc", + ] + +@@ -1389,6 +1417,15 @@ dependencies = [ + "minimal-lexical", + ] + ++[[package]] ++name = "nom" ++version = "8.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" ++dependencies = [ ++ "memchr", ++] ++ + [[package]] + name = "num_enum" + version = "0.5.7" +@@ -1532,26 +1569,26 @@ checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + + [[package]] + name = "pipewire" +-version = "0.8.0" ++version = "0.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" ++checksum = "9688b89abf11d756499f7c6190711d6dbe5a3acdb30c8fbf001d6596d06a8d44" + dependencies = [ + "anyhow", + "bitflags 2.5.0", + "libc", + "libspa", + "libspa-sys", +- "nix 0.27.1", ++ "nix 0.30.1", + "once_cell", + "pipewire-sys", +- "thiserror", ++ "thiserror 2.0.18", + ] + + [[package]] + name = "pipewire-sys" +-version = "0.8.0" ++version = "0.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" ++checksum = "cb028afee0d6ca17020b090e3b8fa2d7de23305aef975c7e5192a5050246ea36" + dependencies = [ + "bindgen", + "libspa-sys", +@@ -1589,8 +1626,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" + dependencies = [ + "once_cell", +- "thiserror", +- "toml", ++ "thiserror 1.0.38", ++ "toml 0.5.10", + ] + + [[package]] +@@ -1691,7 +1728,7 @@ checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" + dependencies = [ + "getrandom", + "redox_syscall", +- "thiserror", ++ "thiserror 1.0.38", + ] + + [[package]] +@@ -1722,9 +1759,9 @@ dependencies = [ + + [[package]] + name = "rustc-hash" +-version = "1.1.0" ++version = "2.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" ++checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" + + [[package]] + name = "safe_arch" +@@ -1770,22 +1807,41 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.152" ++version = "1.0.228" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" ++checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" ++dependencies = [ ++ "serde_core", ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_core" ++version = "1.0.228" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.152" ++version = "1.0.228" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" ++checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.107", ++ "syn 2.0.87", ++] ++ ++[[package]] ++name = "serde_spanned" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26" ++dependencies = [ ++ "serde_core", + ] + + [[package]] +@@ -1839,9 +1895,9 @@ dependencies = [ + + [[package]] + name = "smallvec" +-version = "1.10.0" ++version = "1.15.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" ++checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + + [[package]] + name = "smithay-client-toolkit" +@@ -1897,9 +1953,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.66" ++version = "2.0.87" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" ++checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" + dependencies = [ + "proc-macro2", + "quote", +@@ -1908,24 +1964,39 @@ dependencies = [ + + [[package]] + name = "system-deps" +-version = "6.0.3" ++version = "7.0.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" ++checksum = "396a35feb67335377e0251fcbc1092fc85c484bd4e3a7a54319399da127796e7" + dependencies = [ + "cfg-expr", + "heck", + "pkg-config", +- "toml", ++ "toml 1.1.2+spec-1.1.0", + "version-compare", + ] + ++[[package]] ++name = "target-lexicon" ++version = "0.13.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c" ++ + [[package]] + name = "thiserror" + version = "1.0.38" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" + dependencies = [ +- "thiserror-impl", ++ "thiserror-impl 1.0.38", ++] ++ ++[[package]] ++name = "thiserror" ++version = "2.0.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" ++dependencies = [ ++ "thiserror-impl 2.0.18", + ] + + [[package]] +@@ -1939,6 +2010,17 @@ dependencies = [ + "syn 1.0.107", + ] + ++[[package]] ++name = "thiserror-impl" ++version = "2.0.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.87", ++] ++ + [[package]] + name = "time" + version = "0.3.17" +@@ -2017,6 +2099,45 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "toml" ++version = "1.1.2+spec-1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee" ++dependencies = [ ++ "indexmap", ++ "serde_core", ++ "serde_spanned", ++ "toml_datetime", ++ "toml_parser", ++ "toml_writer", ++ "winnow", ++] ++ ++[[package]] ++name = "toml_datetime" ++version = "1.1.1+spec-1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" ++dependencies = [ ++ "serde_core", ++] ++ ++[[package]] ++name = "toml_parser" ++version = "1.1.2+spec-1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" ++dependencies = [ ++ "winnow", ++] ++ ++[[package]] ++name = "toml_writer" ++version = "1.1.1+spec-1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db" ++ + [[package]] + name = "tracing" + version = "0.1.37" +@@ -2072,9 +2193,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + + [[package]] + name = "unicode-width" +-version = "0.1.10" ++version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" ++checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" + + [[package]] + name = "url" +@@ -2095,9 +2216,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + + [[package]] + name = "version-compare" +-version = "0.1.1" ++version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" ++checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e" + + [[package]] + name = "version_check" +@@ -2516,6 +2637,12 @@ dependencies = [ + "x11-dl", + ] + ++[[package]] ++name = "winnow" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ee1708bef14716a11bae175f579062d4554d95be2c6829f518df847b7b3fdd0" ++ + [[package]] + name = "wio" + version = "0.2.2" +@@ -2564,7 +2691,7 @@ version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" + dependencies = [ +- "nom", ++ "nom 7.1.2", + ] + + [[package]] +@@ -2572,12 +2699,3 @@ name = "xml-rs" + version = "0.8.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +- +-[[package]] +-name = "yansi-term" +-version = "0.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +-dependencies = [ +- "winapi", +-] +-- +2.53.0 + diff --git a/pkgs/by-name/pw/pw-viz/package.nix b/pkgs/by-name/pw/pw-viz/package.nix index c2ea026a3714..38a292c6d20b 100644 --- a/pkgs/by-name/pw/pw-viz/package.nix +++ b/pkgs/by-name/pw/pw-viz/package.nix @@ -18,16 +18,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pw-viz"; - version = "0.3.0"; + version = "0.3.0-2025-12-12"; src = fetchFromGitHub { owner = "ax9d"; repo = "pw-viz"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-fB7PnWWahCMKhGREg6neLmOZjh2OWLu61Vpmfsl03wA="; + rev = "b3fb0fb05059ba12f58d2a998842e13f0636cfed"; + hash = "sha256-TQJcIvCyWaDtJYcjZwclG5NtaUpDBugQQQc1txNzu88="; }; - cargoHash = "sha256-jsaWrdJRKfu75Gw8qGHxx0FHK7rOEK8IEDiQ6ktZsM0="; + cargoPatches = [ + ./0001-fix-regenerate-Cargo.lock.patch + ]; + + cargoHash = "sha256-q1rgoEGQjzlXYcsfRUhrJi4w716a8D0x5SGl5fWM3ig="; nativeBuildInputs = [ pkg-config ]; @@ -57,15 +61,11 @@ rustPlatform.buildRustPackage (finalAttrs: { } ''; - # enables pipewire API deprecated in 0.3.64 - # fixes error caused by https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 - env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ]; - meta = { description = "Simple and elegant pipewire graph editor"; homepage = "https://github.com/ax9d/pw-viz"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; platforms = lib.platforms.linux; }; })