diff --git a/modules/programs/waybar/default.nix b/modules/programs/waybar/default.nix index 24976a9..346b582 100644 --- a/modules/programs/waybar/default.nix +++ b/modules/programs/waybar/default.nix @@ -57,7 +57,7 @@ in { tooltip = "false"; }; "pulseaudio" = { - #on-click = "${pkgs.stable.myxer}/bin/myxer"; + #on-click = "${pkgs.myxer}/bin/myxer"; }; }; } diff --git a/overlays/simple.nix b/overlays/simple.nix index 5264292..182a63d 100644 --- a/overlays/simple.nix +++ b/overlays/simple.nix @@ -55,4 +55,8 @@ in { sha256 = "05aih05z5dybbv67qjmn90yjrk1k2l0v83hhglqqdin18k5xhq21"; }; }); + + myxer = prev.myxer.overrideAttrs (old: { + cargoPatches = [ ../patches/myxer/0000-1.2.1-set-gio-version.patch ]; + }); } diff --git a/packages/default.nix b/packages/default.nix index ea4e5e5..0417c1b 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -122,8 +122,4 @@ in { }; swaync = prev.callPackage ./tools/desktop/swaync {}; - - myxer = prev.myxer.overrideAttrs (old: { - cargoPatches = [ ./0000-1.2.1-set-gio-version.patch ]; - }); } diff --git a/patches/myxer/0000-1.2.1-set-gio-version.patch b/patches/myxer/0000-1.2.1-set-gio-version.patch new file mode 100644 index 0000000..82a7498 --- /dev/null +++ b/patches/myxer/0000-1.2.1-set-gio-version.patch @@ -0,0 +1,359 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 7a6dfd9..93a271a 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,10 +1,12 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "anyhow" +-version = "1.0.38" ++version = "1.0.44" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1" ++checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" + + [[package]] + name = "atk" +@@ -40,9 +42,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + + [[package]] + name = "bitflags" +-version = "1.2.1" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] + name = "cairo-rs" +@@ -72,15 +74,15 @@ dependencies = [ + + [[package]] + name = "cc" +-version = "1.0.67" ++version = "1.0.71" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" ++checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" + + [[package]] + name = "colorsys" +-version = "0.6.3" ++version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f002e5b764d885ca647fc2ae36abfec4263d900470dc25c3320ca911b1b83e75" ++checksum = "4dfdf9179d546b55ff3f88c9d93ecfaa3e9760163da5a1080af5243230dbbb70" + + [[package]] + name = "either" +@@ -90,9 +92,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + + [[package]] + name = "futures" +-version = "0.3.13" ++version = "0.3.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1" ++checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" + dependencies = [ + "futures-channel", + "futures-core", +@@ -105,9 +107,9 @@ dependencies = [ + + [[package]] + name = "futures-channel" +-version = "0.3.13" ++version = "0.3.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939" ++checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" + dependencies = [ + "futures-core", + "futures-sink", +@@ -115,15 +117,15 @@ dependencies = [ + + [[package]] + name = "futures-core" +-version = "0.3.13" ++version = "0.3.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" ++checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" + + [[package]] + name = "futures-executor" +-version = "0.3.13" ++version = "0.3.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1" ++checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" + dependencies = [ + "futures-core", + "futures-task", +@@ -132,16 +134,17 @@ dependencies = [ + + [[package]] + name = "futures-io" +-version = "0.3.13" ++version = "0.3.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59" ++checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" + + [[package]] + name = "futures-macro" +-version = "0.3.13" ++version = "0.3.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7" ++checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" + dependencies = [ ++ "autocfg", + "proc-macro-hack", + "proc-macro2", + "quote", +@@ -150,22 +153,23 @@ dependencies = [ + + [[package]] + name = "futures-sink" +-version = "0.3.13" ++version = "0.3.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3" ++checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" + + [[package]] + name = "futures-task" +-version = "0.3.13" ++version = "0.3.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80" ++checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" + + [[package]] + name = "futures-util" +-version = "0.3.13" ++version = "0.3.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1" ++checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" + dependencies = [ ++ "autocfg", + "futures-channel", + "futures-core", + "futures-io", +@@ -383,9 +387,9 @@ dependencies = [ + + [[package]] + name = "heck" +-version = "0.3.2" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" ++checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" + dependencies = [ + "unicode-segmentation", + ] +@@ -401,15 +405,15 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.86" ++version = "0.2.105" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" ++checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013" + + [[package]] + name = "libpulse-binding" +-version = "2.23.0" ++version = "2.25.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b2405f806801527dfb3d2b6d48a282cdebe9a1b41b0652e0d7b5bad81dbc700e" ++checksum = "86835d7763ded6bc16b6c0061ec60214da7550dfcd4ef93745f6f0096129676a" + dependencies = [ + "bitflags", + "libc", +@@ -421,9 +425,9 @@ dependencies = [ + + [[package]] + name = "libpulse-sys" +-version = "1.18.0" ++version = "1.19.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf17e9832643c4f320c42b7d78b2c0510f45aa5e823af094413b94e45076ba82" ++checksum = "f12950b69c1b66233a900414befde36c8d4ea49deec1e1f34e4cd2f586e00c7d" + dependencies = [ + "libc", + "num-derive", +@@ -434,9 +438,9 @@ dependencies = [ + + [[package]] + name = "memchr" +-version = "2.3.4" ++version = "2.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + + [[package]] + name = "myxer" +@@ -474,9 +478,9 @@ dependencies = [ + + [[package]] + name = "once_cell" +-version = "1.6.0" ++version = "1.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ad167a2f54e832b82dbe003a046280dceffe5227b5f79e08e363a29638cfddd" ++checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" + + [[package]] + name = "pango" +@@ -507,9 +511,9 @@ dependencies = [ + + [[package]] + name = "pin-project-lite" +-version = "0.2.4" ++version = "0.2.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827" ++checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" + + [[package]] + name = "pin-utils" +@@ -519,9 +523,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + + [[package]] + name = "pkg-config" +-version = "0.3.19" ++version = "0.3.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" ++checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" + + [[package]] + name = "proc-macro-crate" +@@ -570,33 +574,33 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" + + [[package]] + name = "proc-macro2" +-version = "1.0.24" ++version = "1.0.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" ++checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" + dependencies = [ + "unicode-xid", + ] + + [[package]] + name = "quote" +-version = "1.0.9" ++version = "1.0.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" + dependencies = [ + "proc-macro2", + ] + + [[package]] + name = "serde" +-version = "1.0.123" ++version = "1.0.130" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" ++checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" + + [[package]] + name = "slab" +-version = "0.4.2" ++version = "0.4.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" + + [[package]] + name = "slice_as_array" +@@ -624,9 +628,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "1.0.60" ++version = "1.0.81" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" ++checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" + dependencies = [ + "proc-macro2", + "quote", +@@ -650,18 +654,18 @@ dependencies = [ + + [[package]] + name = "thiserror" +-version = "1.0.24" ++version = "1.0.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" ++checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.24" ++version = "1.0.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" ++checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" + dependencies = [ + "proc-macro2", + "quote", +@@ -679,15 +683,15 @@ dependencies = [ + + [[package]] + name = "unicode-segmentation" +-version = "1.7.1" ++version = "1.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" ++checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" + + [[package]] + name = "unicode-xid" +-version = "0.2.1" ++version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + + [[package]] + name = "version-compare" +@@ -697,9 +701,9 @@ checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" + + [[package]] + name = "version_check" +-version = "0.9.2" ++version = "0.9.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" ++checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" + + [[package]] + name = "winapi" +diff --git a/Cargo.toml b/Cargo.toml +index 0b1cb09..d059fbe 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -36,5 +36,5 @@ version = "0.9.0" + features = [ "v3_22" ] + + [dependencies.gio] +-version = "" ++version = "*" + features = [ "v2_44" ]