diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-10 12:01:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-10 12:01:57 +0000 |
| commit | 96189869554ac1f3cca278216955e07a81c68526 (patch) | |
| tree | 41f48fca287901c0b88e6793c57cdd357d1b5845 | |
| parent | 23e4049dcd871d5ec4331df3a805c715ad711647 (diff) | |
| parent | 84d856a651004949bacd679bdbbb66a1191a5586 (diff) | |
| download | nixlib-96189869554ac1f3cca278216955e07a81c68526.tar nixlib-96189869554ac1f3cca278216955e07a81c68526.tar.gz nixlib-96189869554ac1f3cca278216955e07a81c68526.tar.bz2 nixlib-96189869554ac1f3cca278216955e07a81c68526.tar.lz nixlib-96189869554ac1f3cca278216955e07a81c68526.tar.xz nixlib-96189869554ac1f3cca278216955e07a81c68526.tar.zst nixlib-96189869554ac1f3cca278216955e07a81c68526.zip | |
Merge staging-next into staging
86 files changed, 2528 insertions, 248 deletions
diff --git a/nixos/modules/services/web-apps/hledger-web.nix b/nixos/modules/services/web-apps/hledger-web.nix index 9c66589dffd1..4f6a34e6d2fe 100644 --- a/nixos/modules/services/web-apps/hledger-web.nix +++ b/nixos/modules/services/web-apps/hledger-web.nix @@ -118,7 +118,7 @@ in { ++ extraOptions); in { description = "hledger-web - web-app for the hledger accounting tool."; - documentation = [ https://hledger.org/hledger-web.html ]; + documentation = [ "https://hledger.org/hledger-web.html" ]; wantedBy = [ "multi-user.target" ]; after = [ "networking.target" ]; serviceConfig = mkMerge [ diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index fb19b7060562..0587912c9a22 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -50,17 +50,18 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { def get_path_info(path): - result = machine.succeed(f"nix path-info --json {path}") + result = machine.succeed(f"nix --option experimental-features nix-command path-info --json {path}") parsed = json.loads(result) return parsed with subtest("nix-db"): info = get_path_info("${foo}") + print(info) if ( info[0]["narHash"] - != "sha256:0afw0d9j1hvwiz066z93jiddc33nxg6i6qyp26vnqyglpyfivlq5" + != "sha256-BdMdnb/0eWy3EddjE83rdgzWWpQjfWPAj3zDIFMD3Ck=" ): raise Exception("narHash not set") diff --git a/pkgs/applications/audio/freqtweak/default.nix b/pkgs/applications/audio/freqtweak/default.nix index 113894a9357d..71bb0f6f05c8 100644 --- a/pkgs/applications/audio/freqtweak/default.nix +++ b/pkgs/applications/audio/freqtweak/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = http://essej.net/freqtweak/; + homepage = "http://essej.net/freqtweak/"; description = "Realtime audio frequency spectral manipulation"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix index 6e5cc0d51916..655fc6a9608c 100644 --- a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix +++ b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Set of LADSPA and LV2 plugins for guitar sound processing"; - homepage = https://github.com/olegkapitonov/Kapitonov-Plugins-Pack; + homepage = "https://github.com/olegkapitonov/Kapitonov-Plugins-Pack"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ magnetophon ]; diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch b/pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch new file mode 100644 index 000000000000..7fc21c11ff7c --- /dev/null +++ b/pkgs/applications/audio/netease-cloud-music-gtk/cargo-lock.patch @@ -0,0 +1,2007 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..41d41a5 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,2001 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.45" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee10e43ae4a853c0a3591d4e2ada1719e553be18199d9da9d4a83f5927c2f5c7" ++ ++[[package]] ++name = "async-channel" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" ++dependencies = [ ++ "concurrent-queue", ++ "event-listener", ++ "futures-core", ++] ++ ++[[package]] ++name = "async-executor" ++version = "1.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" ++dependencies = [ ++ "async-task", ++ "concurrent-queue", ++ "fastrand", ++ "futures-lite", ++ "once_cell", ++ "slab", ++] ++ ++[[package]] ++name = "async-global-executor" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6" ++dependencies = [ ++ "async-channel", ++ "async-executor", ++ "async-io", ++ "async-mutex", ++ "blocking", ++ "futures-lite", ++ "num_cpus", ++ "once_cell", ++] ++ ++[[package]] ++name = "async-io" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" ++dependencies = [ ++ "concurrent-queue", ++ "futures-lite", ++ "libc", ++ "log", ++ "once_cell", ++ "parking", ++ "polling", ++ "slab", ++ "socket2", ++ "waker-fn", ++ "winapi", ++] ++ ++[[package]] ++name = "async-lock" ++version = "2.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" ++dependencies = [ ++ "event-listener", ++] ++ ++[[package]] ++name = "async-mutex" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" ++dependencies = [ ++ "event-listener", ++] ++ ++[[package]] ++name = "async-std" ++version = "1.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952" ++dependencies = [ ++ "async-channel", ++ "async-global-executor", ++ "async-io", ++ "async-lock", ++ "crossbeam-utils", ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-lite", ++ "gloo-timers", ++ "kv-log-macro", ++ "log", ++ "memchr", ++ "num_cpus", ++ "once_cell", ++ "pin-project-lite", ++ "pin-utils", ++ "slab", ++ "wasm-bindgen-futures", ++] ++ ++[[package]] ++name = "async-task" ++version = "4.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" ++ ++[[package]] ++name = "atk" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "812b4911e210bd51b24596244523c856ca749e6223c50a7fbbba3f89ee37c426" ++dependencies = [ ++ "atk-sys", ++ "bitflags", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++] ++ ++[[package]] ++name = "atk-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f530e4af131d94cc4fa15c5c9d0348f0ef28bac64ba660b6b2a1cf2605dedfce" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "atomic-waker" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "base64" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++ ++[[package]] ++name = "bincode" ++version = "1.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "blocking" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9" ++dependencies = [ ++ "async-channel", ++ "async-task", ++ "atomic-waker", ++ "fastrand", ++ "futures-lite", ++ "once_cell", ++] ++ ++[[package]] ++name = "bumpalo" ++version = "3.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" ++ ++[[package]] ++name = "bytes" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" ++ ++[[package]] ++name = "cache-padded" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" ++ ++[[package]] ++name = "cairo-rs" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c5c0f2e047e8ca53d0ff249c54ae047931d7a6ebe05d00af73e0ffeb6e34bdb8" ++dependencies = [ ++ "bitflags", ++ "cairo-sys-rs", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "thiserror", ++] ++ ++[[package]] ++name = "cairo-sys-rs" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ed2639b9ad5f1d6efa76de95558e11339e7318426d84ac4890b86c03e828ca7" ++dependencies = [ ++ "glib-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "castaway" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ed247d1586918e46f2bbe0f13b06498db8dab5a8c1093f156652e9f2e0a73fc3" ++ ++[[package]] ++name = "cc" ++version = "1.0.71" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "chrono" ++version = "0.4.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" ++dependencies = [ ++ "libc", ++ "num-integer", ++ "num-traits", ++ "time", ++ "winapi", ++] ++ ++[[package]] ++name = "concurrent-queue" ++version = "1.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" ++dependencies = [ ++ "cache-padded", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" ++dependencies = [ ++ "cfg-if", ++ "lazy_static", ++] ++ ++[[package]] ++name = "ctor" ++version = "0.1.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" ++dependencies = [ ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "curl" ++version = "0.4.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "877cc2f9b8367e32b6dabb9d581557e651cb3aa693a37f8679091bbf42687d5d" ++dependencies = [ ++ "curl-sys", ++ "libc", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "socket2", ++ "winapi", ++] ++ ++[[package]] ++name = "curl-sys" ++version = "0.4.50+curl-7.79.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4856b76919dd599f31236bb18db5f5bd36e2ce131e64f857ca5c259665b76171" ++dependencies = [ ++ "cc", ++ "libc", ++ "libnghttp2-sys", ++ "libz-sys", ++ "openssl-sys", ++ "pkg-config", ++ "vcpkg", ++ "winapi", ++] ++ ++[[package]] ++name = "custom_error" ++version = "1.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4f8a51dd197fa6ba5b4dc98a990a43cc13693c23eb0089ebb0fcc1f04152bca6" ++ ++[[package]] ++name = "dbus" ++version = "0.6.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819" ++dependencies = [ ++ "libc", ++ "libdbus-sys", ++] ++ ++[[package]] ++name = "dirs" ++version = "3.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" ++dependencies = [ ++ "dirs-sys", ++] ++ ++[[package]] ++name = "dirs" ++version = "4.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" ++dependencies = [ ++ "dirs-sys", ++] ++ ++[[package]] ++name = "dirs-sys" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" ++dependencies = [ ++ "libc", ++ "redox_users", ++ "winapi", ++] ++ ++[[package]] ++name = "either" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++ ++[[package]] ++name = "encoding_rs" ++version = "0.8.29" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "event-listener" ++version = "2.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" ++ ++[[package]] ++name = "fastrand" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e" ++dependencies = [ ++ "instant", ++] ++ ++[[package]] ++name = "fnv" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" ++ ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++dependencies = [ ++ "foreign-types-shared", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++ ++[[package]] ++name = "form_urlencoded" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" ++dependencies = [ ++ "matches", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "fragile" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2" ++ ++[[package]] ++name = "futures" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-executor", ++ "futures-io", ++ "futures-sink", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-channel" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" ++dependencies = [ ++ "futures-core", ++ "futures-sink", ++] ++ ++[[package]] ++name = "futures-core" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" ++ ++[[package]] ++name = "futures-executor" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" ++dependencies = [ ++ "futures-core", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-io" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" ++ ++[[package]] ++name = "futures-lite" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" ++dependencies = [ ++ "fastrand", ++ "futures-core", ++ "futures-io", ++ "memchr", ++ "parking", ++ "pin-project-lite", ++ "waker-fn", ++] ++ ++[[package]] ++name = "futures-macro" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" ++dependencies = [ ++ "autocfg", ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "futures-sink" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" ++ ++[[package]] ++name = "futures-task" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" ++ ++[[package]] ++name = "futures-util" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" ++dependencies = [ ++ "autocfg", ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-macro", ++ "futures-sink", ++ "futures-task", ++ "memchr", ++ "pin-project-lite", ++ "pin-utils", ++ "proc-macro-hack", ++ "proc-macro-nested", ++ "slab", ++] ++ ++[[package]] ++name = "gdk" ++version = "0.13.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db00839b2a68a7a10af3fa28dfb3febaba3a20c3a9ac2425a33b7df1f84a6b7d" ++dependencies = [ ++ "bitflags", ++ "cairo-rs", ++ "cairo-sys-rs", ++ "gdk-pixbuf", ++ "gdk-sys", ++ "gio", ++ "gio-sys", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "pango", ++] ++ ++[[package]] ++name = "gdk-pixbuf" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f6dae3cb99dd49b758b88f0132f8d401108e63ae8edd45f432d42cdff99998a" ++dependencies = [ ++ "gdk-pixbuf-sys", ++ "gio", ++ "gio-sys", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++] ++ ++[[package]] ++name = "gdk-pixbuf-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3bfe468a7f43e97b8d193a762b6c5cf67a7d36cacbc0b9291dbcae24bfea1e8f" ++dependencies = [ ++ "gio-sys", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gdk-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a9653cfc500fd268015b1ac055ddbc3df7a5c9ea3f4ccef147b3957bd140d69" ++dependencies = [ ++ "cairo-sys-rs", ++ "gdk-pixbuf-sys", ++ "gio-sys", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "pango-sys", ++ "pkg-config", ++ "system-deps", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "gio" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1fb60242bfff700772dae5d9e3a1f7aa2e4ebccf18b89662a16acb2822568561" ++dependencies = [ ++ "bitflags", ++ "futures", ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-util", ++ "gio-sys", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "once_cell", ++ "thiserror", ++] ++ ++[[package]] ++name = "gio-sys" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e24fb752f8f5d2cf6bbc2c606fd2bc989c81c5e2fe321ab974d54f8b6344eac" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++ "winapi", ++] ++ ++[[package]] ++name = "glib" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5" ++dependencies = [ ++ "bitflags", ++ "futures-channel", ++ "futures-core", ++ "futures-executor", ++ "futures-task", ++ "futures-util", ++ "glib-macros", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "once_cell", ++] ++ ++[[package]] ++name = "glib-macros" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" ++dependencies = [ ++ "anyhow", ++ "heck", ++ "itertools", ++ "proc-macro-crate", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "glib-sys" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1" ++dependencies = [ ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gloo-timers" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", ++] ++ ++[[package]] ++name = "gobject-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c" ++dependencies = [ ++ "glib-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gstreamer" ++version = "0.16.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ff5d0f7ff308ae37e6eb47b6ded17785bdea06e438a708cd09e0288c1862f33" ++dependencies = [ ++ "bitflags", ++ "cfg-if", ++ "futures-channel", ++ "futures-core", ++ "futures-util", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer-sys", ++ "libc", ++ "muldiv", ++ "num-rational 0.3.2", ++ "once_cell", ++ "paste", ++ "pretty-hex", ++ "thiserror", ++] ++ ++[[package]] ++name = "gstreamer-base" ++version = "0.16.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bafd01c56f59cb10f4b5a10f97bb4bdf8c2b2784ae5b04da7e2d400cf6e6afcf" ++dependencies = [ ++ "bitflags", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer", ++ "gstreamer-base-sys", ++ "gstreamer-sys", ++ "libc", ++] ++ ++[[package]] ++name = "gstreamer-base-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4b7b6dc2d6e160a1ae28612f602bd500b3fa474ce90bf6bb2f08072682beef5" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gstreamer-player" ++version = "0.16.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34edf65e48e0d29c18101d77a2e004488a61f81a852a75e19d9c73e03d35cb77" ++dependencies = [ ++ "bitflags", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer", ++ "gstreamer-player-sys", ++ "gstreamer-sys", ++ "gstreamer-video", ++ "libc", ++] ++ ++[[package]] ++name = "gstreamer-player-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "53aaf79503e691a32266670bc631edb6c52bdb854984da76a0ce2756f49584a2" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer-sys", ++ "gstreamer-video-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gstreamer-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc1f154082d01af5718c5f8a8eb4f565a4ea5586ad8833a8fc2c2aa6844b601d" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gstreamer-video" ++version = "0.16.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7bbb1485d87469849ec45c08e03c2f280d3ea20ff3c439d03185be54e3ce98e" ++dependencies = [ ++ "bitflags", ++ "futures-channel", ++ "futures-util", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer", ++ "gstreamer-base", ++ "gstreamer-base-sys", ++ "gstreamer-sys", ++ "gstreamer-video-sys", ++ "libc", ++ "once_cell", ++] ++ ++[[package]] ++name = "gstreamer-video-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92347e46438007d6a2386302125f62cb9df6769cdacb931af5c0f12c1ee21de4" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "gstreamer-base-sys", ++ "gstreamer-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "gtk" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2f022f2054072b3af07666341984562c8e626a79daa8be27b955d12d06a5ad6a" ++dependencies = [ ++ "atk", ++ "bitflags", ++ "cairo-rs", ++ "cairo-sys-rs", ++ "cc", ++ "gdk", ++ "gdk-pixbuf", ++ "gdk-pixbuf-sys", ++ "gdk-sys", ++ "gio", ++ "gio-sys", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "gtk-sys", ++ "libc", ++ "once_cell", ++ "pango", ++ "pango-sys", ++ "pkg-config", ++] ++ ++[[package]] ++name = "gtk-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "89acda6f084863307d948ba64a4b1ef674e8527dddab147ee4cdcc194c880457" ++dependencies = [ ++ "atk-sys", ++ "cairo-sys-rs", ++ "gdk-pixbuf-sys", ++ "gdk-sys", ++ "gio-sys", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "pango-sys", ++ "system-deps", ++] ++ ++[[package]] ++name = "heck" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" ++dependencies = [ ++ "unicode-segmentation", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "hex" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" ++ ++[[package]] ++name = "http" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" ++dependencies = [ ++ "bytes", ++ "fnv", ++ "itoa", ++] ++ ++[[package]] ++name = "idna" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" ++dependencies = [ ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "isahc" ++version = "1.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "40ef5402b1791c9fc479ef9871601a2f10e4cc0f14414a5c9c6e043fb51e5a56" ++dependencies = [ ++ "async-channel", ++ "castaway", ++ "chrono", ++ "crossbeam-utils", ++ "curl", ++ "curl-sys", ++ "encoding_rs", ++ "event-listener", ++ "futures-lite", ++ "http", ++ "log", ++ "mime", ++ "once_cell", ++ "polling", ++ "slab", ++ "sluice", ++ "tracing", ++ "tracing-futures", ++ "url", ++ "waker-fn", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" ++ ++[[package]] ++name = "js-sys" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" ++dependencies = [ ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "kv-log-macro" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" ++dependencies = [ ++ "log", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "libc" ++version = "0.2.107" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" ++ ++[[package]] ++name = "libdbus-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" ++dependencies = [ ++ "pkg-config", ++] ++ ++[[package]] ++name = "libnghttp2-sys" ++version = "0.1.7+1.45.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" ++dependencies = [ ++ "cc", ++ "libc", ++] ++ ++[[package]] ++name = "libz-sys" ++version = "1.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" ++dependencies = [ ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "log" ++version = "0.4.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" ++dependencies = [ ++ "cfg-if", ++ "value-bag", ++] ++ ++[[package]] ++name = "loggerv" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60d8de15ae71e760bce7f05447f85f73624fe0d3b1e4c5a63ba5d4cb0748d374" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "log", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" ++ ++[[package]] ++name = "memchr" ++version = "2.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" ++ ++[[package]] ++name = "mime" ++version = "0.3.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" ++ ++[[package]] ++name = "mp4ameta" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "619f6fe86b8690efad1c53d2cc8b9c1af2a5f8b93247e0ba05ece1b7639b4e66" ++dependencies = [ ++ "lazy_static", ++ "mp4ameta_proc", ++] ++ ++[[package]] ++name = "mp4ameta_proc" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4975ce203cd69e96a89f803d87b7b53d1950a6e93668a666d177c28aebd15c8a" ++ ++[[package]] ++name = "mpris-player" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4f6badd6ebe31be46eb2e2975cf3b34b183bace5f8a8db1d609fefc4d46fbb07" ++dependencies = [ ++ "dbus", ++ "glib", ++] ++ ++[[package]] ++name = "muldiv" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" ++ ++[[package]] ++name = "netease-cloud-music-gtk" ++version = "1.2.2" ++dependencies = [ ++ "async-std", ++ "base64", ++ "bincode", ++ "cairo-rs", ++ "chrono", ++ "custom_error", ++ "dirs 4.0.0", ++ "fragile", ++ "futures", ++ "gdk", ++ "gdk-pixbuf", ++ "gio", ++ "glib", ++ "gstreamer", ++ "gstreamer-player", ++ "gtk", ++ "hex", ++ "isahc", ++ "lazy_static", ++ "log", ++ "loggerv", ++ "mp4ameta", ++ "mpris-player", ++ "num", ++ "openssl", ++ "pango", ++ "rand", ++ "regex", ++ "serde", ++ "serde_json", ++ "urlqstring", ++ "xdg", ++] ++ ++[[package]] ++name = "num" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" ++dependencies = [ ++ "num-bigint", ++ "num-complex", ++ "num-integer", ++ "num-iter", ++ "num-rational 0.4.0", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-bigint" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-complex" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" ++dependencies = [ ++ "num-traits", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" ++dependencies = [ ++ "autocfg", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-iter" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-rational" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-rational" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" ++dependencies = [ ++ "autocfg", ++ "num-bigint", ++ "num-integer", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" ++ ++[[package]] ++name = "openssl" ++version = "0.10.38" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" ++dependencies = [ ++ "bitflags", ++ "cfg-if", ++ "foreign-types", ++ "libc", ++ "once_cell", ++ "openssl-sys", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.70" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6517987b3f8226b5da3661dad65ff7f300cc59fb5ea8333ca191fc65fde3edf" ++dependencies = [ ++ "autocfg", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "pango" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9937068580bebd8ced19975938573803273ccbcbd598c58d4906efd4ac87c438" ++dependencies = [ ++ "bitflags", ++ "glib", ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "once_cell", ++ "pango-sys", ++] ++ ++[[package]] ++name = "pango-sys" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "24d2650c8b62d116c020abd0cea26a4ed96526afda89b1c4ea567131fdefc890" ++dependencies = [ ++ "glib-sys", ++ "gobject-sys", ++ "libc", ++ "system-deps", ++] ++ ++[[package]] ++name = "parking" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" ++ ++[[package]] ++name = "paste" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" ++ ++[[package]] ++name = "percent-encoding" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++ ++[[package]] ++name = "pin-project" ++version = "1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" ++dependencies = [ ++ "pin-project-internal", ++] ++ ++[[package]] ++name = "pin-project-internal" ++version = "1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pin-project-lite" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" ++ ++[[package]] ++name = "pin-utils" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" ++ ++[[package]] ++name = "polling" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92341d779fa34ea8437ef4d82d440d5e1ce3f3ff7f824aa64424cd481f9a1f25" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "log", ++ "wepoll-ffi", ++ "winapi", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" ++ ++[[package]] ++name = "pretty-hex" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" ++ ++[[package]] ++name = "proc-macro-crate" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" ++dependencies = [ ++ "toml", ++] ++ ++[[package]] ++name = "proc-macro-error" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" ++dependencies = [ ++ "proc-macro-error-attr", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-error-attr" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-hack" ++version = "0.5.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" ++ ++[[package]] ++name = "proc-macro-nested" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" ++dependencies = [ ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "redox_users" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" ++dependencies = [ ++ "getrandom", ++ "redox_syscall", ++] ++ ++[[package]] ++name = "regex" ++version = "1.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" ++ ++[[package]] ++name = "ryu" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++ ++[[package]] ++name = "schannel" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" ++dependencies = [ ++ "lazy_static", ++ "winapi", ++] ++ ++[[package]] ++name = "serde" ++version = "1.0.130" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.130" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e466864e431129c7e0d3476b92f20458e5879919a0596c6472738d9fa2d342f8" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "slab" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" ++ ++[[package]] ++name = "sluice" ++version = "0.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" ++dependencies = [ ++ "async-channel", ++ "futures-core", ++ "futures-io", ++] ++ ++[[package]] ++name = "socket2" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "strum" ++version = "0.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" ++ ++[[package]] ++name = "strum_macros" ++version = "0.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" ++dependencies = [ ++ "heck", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.81" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "system-deps" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" ++dependencies = [ ++ "heck", ++ "pkg-config", ++ "strum", ++ "strum_macros", ++ "thiserror", ++ "toml", ++ "version-compare", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "tinyvec" ++version = "1.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" ++dependencies = [ ++ "tinyvec_macros", ++] ++ ++[[package]] ++name = "tinyvec_macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" ++ ++[[package]] ++name = "toml" ++version = "0.5.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "tracing" ++version = "0.1.29" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" ++dependencies = [ ++ "cfg-if", ++ "log", ++ "pin-project-lite", ++ "tracing-attributes", ++ "tracing-core", ++] ++ ++[[package]] ++name = "tracing-attributes" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tracing-core" ++version = "0.1.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" ++dependencies = [ ++ "lazy_static", ++] ++ ++[[package]] ++name = "tracing-futures" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" ++dependencies = [ ++ "pin-project", ++ "tracing", ++] ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" ++dependencies = [ ++ "tinyvec", ++] ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" ++ ++[[package]] ++name = "url" ++version = "2.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" ++dependencies = [ ++ "form_urlencoded", ++ "idna", ++ "matches", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "urlqstring" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "25ef3473a06a065718d8ec7cd7acc6a35fc20f836dee7661ad3b64ea3cc2e0cc" ++ ++[[package]] ++name = "value-bag" ++version = "1.0.0-alpha.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f" ++dependencies = [ ++ "ctor", ++ "version_check", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" ++ ++[[package]] ++name = "version-compare" ++version = "0.0.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" ++ ++[[package]] ++name = "version_check" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" ++ ++[[package]] ++name = "waker-fn" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" ++ ++[[package]] ++name = "wasi" ++version = "0.10.2+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" ++dependencies = [ ++ "cfg-if", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" ++dependencies = [ ++ "bumpalo", ++ "lazy_static", ++ "log", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-futures" ++version = "0.4.28" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" ++dependencies = [ ++ "cfg-if", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.78" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" ++ ++[[package]] ++name = "web-sys" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "wepoll-ffi" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "xdg" ++version = "2.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3a23fe958c70412687039c86f578938b4a0bb50ec788e96bce4d6ab00ddd5803" ++dependencies = [ ++ "dirs 3.0.2", ++] diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix new file mode 100644 index 000000000000..76e1bc3923a8 --- /dev/null +++ b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, glib +, gtk3 +, curl +, dbus +, openssl +, gst_all_1 +, pkg-config +, rustPlatform +, wrapGAppsHook +, fetchurl +, fetchFromGitHub +, makeDesktopItem +}: +rustPlatform.buildRustPackage rec { + pname = "netease-cloud-music-gtk"; + version = "1.2.2"; + src = fetchFromGitHub { + owner = "gmg137"; + repo = "netease-cloud-music-gtk"; + rev = version; + sha256 = "sha256-42MaylfG5LY+TiYHWQMoh9CiVLShKXSBpMrxdWhujow="; + }; + cargoSha256 = "sha256-A9wIcESdaJwLY4g/QlOxMU5PBB9wjvIzaXBSqeiRJBM="; + cargoPatches = [ ./cargo-lock.patch ]; + + nativeBuildInputs = [ + glib + gtk3 + dbus + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + curl + dbus + openssl + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]); + + postPatch = '' + install -D netease-cloud-music-gtk.desktop $out/share/applications/netease-cloud-music-gtk.desktop + install -D icons/netease-cloud-music-gtk.svg $out/share/icons/hicolor/scalable/apps/netease-cloud-music-gtk.svg + ''; + + meta = with lib; { + description = "netease-cloud-music-gtk is a Rust + GTK based netease cloud music player"; + homepage = "https://github.com/gmg137/netease-cloud-music-gtk"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ diffumist ]; + }; +} diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh b/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh new file mode 100755 index 000000000000..75b04d1e77ca --- /dev/null +++ b/pkgs/applications/audio/netease-cloud-music-gtk/update-cargo-lock.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils ripgrep git cargo + +# Ref: https://github.com/NixOS/nixpkgs/blob/nixos-21.05/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh + +set -eu -vx + +here=$PWD +version=$(cat default.nix | rg '^ version = "' | cut -d '"' -f 2) +checkout=$(mktemp -d) + +git clone -b "$version" --depth=1 https://github.com/gmg137/netease-cloud-music-gtk "$checkout" +cd "$checkout" + +cargo generate-lockfile +git add -f Cargo.lock +git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch + +cd "$here" +rm -rf "$checkout" diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 83d9cee9ec6c..a62d7f95d606 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -20,7 +20,7 @@ let chia = python3Packages.buildPythonApplication rec { substituteInPlace setup.py \ --replace "==" ">=" - ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem + cp ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem ''; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/whirlpool-gui/default.nix b/pkgs/applications/blockchains/whirlpool-gui/default.nix index 62c7c3b3da47..d36715bd3066 100644 --- a/pkgs/applications/blockchains/whirlpool-gui/default.nix +++ b/pkgs/applications/blockchains/whirlpool-gui/default.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Desktop GUI for Whirlpool by Samourai-Wallet"; - homepage = https://www.samouraiwallet.com/whirlpool; + homepage = "https://www.samouraiwallet.com/whirlpool"; license = licenses.unlicense; maintainers = [ maintainers.offline ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix index 64a8402650b2..afc51e8fcc2a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, emacs }: +{ stdenv, fetchurl, emacs, lib }: stdenv.mkDerivation rec { pname = "session-management-for-emacs"; diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index a191943c3fd6..dd3bde160c37 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1203"; + version = "1206"; src = fetchFromGitHub { owner = "kammerdienerb"; repo = "yed"; - rev = "608418f2037dc4ef5647e69fcef45302c50f138c"; - sha256 = "KqK2lcDTn91aCFJIDg+h+QsTrl7745So5aiKCxPkeh4="; + rev = "6cdd99fe1359899b26d8967bd376fd5caa5451eb"; + sha256 = "0XECSolW/xPXd1v3sv9HbJMWuHGnwCOwmHoPNCUsE+w="; }; installPhase = '' diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 3cda6d0a3181..888c7892514b 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, readline, ncurses +{ lib, stdenv, fetchFromGitHub, fetchpatch, readline, ncurses , autoreconfHook, pkg-config, gettext }: stdenv.mkDerivation rec { @@ -12,6 +12,16 @@ stdenv.mkDerivation rec { sha256 = "1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y"; }; + patches = [ + # pull pending upstream inclusion fix for ncurses-6.3: + # https://github.com/dvorka/hstr/pull/435 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/dvorka/hstr/commit/7fbd852c464ae3cfcd2f4fed9c62a21fb84c5439.patch"; + sha256 = "15f0ja4bsh4jnchcg0ray8ijpdraag7k07ss87a6ymfs1rg6i0jr"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ readline ncurses gettext ]; diff --git a/pkgs/applications/misc/smos/default.nix b/pkgs/applications/misc/smos/default.nix index aa2f53b5a2c7..1039deb43a11 100644 --- a/pkgs/applications/misc/smos/default.nix +++ b/pkgs/applications/misc/smos/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A comprehensive self-management system"; - homepage = https://smos.online; + homepage = "https://smos.online"; license = licenses.mit; maintainers = with maintainers; [ norfair ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index ce69121c6cac..a60f9da39bc6 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -93,11 +93,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.31.87"; + version = "1.31.91"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "lfkTB8oXxZqgbO7d8cdktSd6ivQc3g5kiAYZKyrrLpw="; + sha256 = "LuzflA96UQehLHUVYdPDTXs+YuFLEkpzTdO2liGrWtE="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 9eabf0ac1b5d..87c4c2d6b2c8 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -23,7 +23,7 @@ let ''; meta = old.meta // { - homepage = https://github.com/NixOS/nixops; + homepage = "https://github.com/NixOS/nixops"; description = "NixOS cloud provisioning and deployment tool"; maintainers = with lib.maintainers; [ adisbladis aminechikhaoui eelco rob domenkozar ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/applications/networking/nali/default.nix new file mode 100644 index 000000000000..9e0978c80d6e --- /dev/null +++ b/pkgs/applications/networking/nali/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "nali"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "zu1k"; + repo = "nali"; + rev = "v${version}"; + sha256 = "sha256-iRLoUBA+Kzv1/LZQ8HCvR79K1riYErxEWhB0OmvFy2g="; + }; + + vendorSha256 = "sha256-Kb2T+zDUuH+Rx8amYsTIhR5L3DIx5nGcDGqxHOn90NU="; + subPackages = [ "." ]; + runVend = true; + + meta = with lib; { + description = "An offline tool for querying IP geographic information and CDN provider"; + homepage = "https://github.com/zu1k/nali"; + license = licenses.mit; + maintainers = with maintainers; [ diffumist ]; + }; +} diff --git a/pkgs/applications/networking/tmpmail/default.nix b/pkgs/applications/networking/tmpmail/default.nix index 433c6cf6fc24..70e144cb05ca 100644 --- a/pkgs/applications/networking/tmpmail/default.nix +++ b/pkgs/applications/networking/tmpmail/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "tmpmail"; - version = "unstable-2021-02-10"; + version = "1.1.4"; src = fetchFromGitHub { owner = "sdushantha"; repo = "tmpmail"; - rev = "150b32083d36006cf7f496e112715ae12ee87727"; - sha256 = "sha256-yQ9/UUxBTEXK5z3f+tvVRUzIGrAnrqurQ0x56Ad7RKE="; + rev = "v${version}"; + sha256 = "sha256-Rcu1qNmUZhMRvPiaWrDlzLtGksv09XBiF2GJUxXKs1Y="; }; dontConfigure = true; diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/applications/radio/dsd/default.nix index 35a3e9f44bb2..46b851ec704e 100644 --- a/pkgs/applications/radio/dsd/default.nix +++ b/pkgs/applications/radio/dsd/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { tap audio and synthesize the decoded speech. Speech synthesis requires mbelib, which is a separate package. ''; - homepage = https://github.com/szechyjs/dsd; + homepage = "https://github.com/szechyjs/dsd"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ andrew-d ]; diff --git a/pkgs/applications/science/machine-learning/starspace/default.nix b/pkgs/applications/science/machine-learning/starspace/default.nix index ca7500cd5c35..81e0ccc71d66 100644 --- a/pkgs/applications/science/machine-learning/starspace/default.nix +++ b/pkgs/applications/science/machine-learning/starspace/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "General-purpose neural model for efficient learning of entity embeddings"; - homepage = https://ai.facebook.com/tools/starspace/; + homepage = "https://ai.facebook.com/tools/starspace/"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.mausch ]; diff --git a/pkgs/applications/science/physics/xflr5/default.nix b/pkgs/applications/science/physics/xflr5/default.nix index 85e20f38b668..dd3fef5bf26c 100644 --- a/pkgs/applications/science/physics/xflr5/default.nix +++ b/pkgs/applications/science/physics/xflr5/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { meta = with lib; { description = "An analysis tool for airfoils, wings and planes"; - homepage = https://sourceforge.net/projects/xflr5/; + homepage = "https://sourceforge.net/projects/xflr5/"; license = licenses.gpl3; maintainers = [ maintainers.esclear ]; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/commitizen/node-packages.nix b/pkgs/applications/version-management/commitizen/node-packages.nix index 396dedf56fd9..bee45d1727ce 100644 --- a/pkgs/applications/version-management/commitizen/node-packages.nix +++ b/pkgs/applications/version-management/commitizen/node-packages.nix @@ -9061,7 +9061,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Git commit, but play nice with conventions."; - homepage = https://github.com/commitizen/cz-cli; + homepage = "https://github.com/commitizen/cz-cli"; license = "MIT"; }; production = false; diff --git a/pkgs/data/fonts/vista-fonts-cht/default.nix b/pkgs/data/fonts/vista-fonts-cht/default.nix index 264d5a41bf48..78271e2f1e93 100644 --- a/pkgs/data/fonts/vista-fonts-cht/default.nix +++ b/pkgs/data/fonts/vista-fonts-cht/default.nix @@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation { version = "1"; src = fetchurl { - url = https://download.microsoft.com/download/7/6/b/76bd7a77-be02-47f3-8472-fa1de7eda62f/VistaFont_CHT.EXE; + url = "https://download.microsoft.com/download/7/6/b/76bd7a77-be02-47f3-8472-fa1de7eda62f/VistaFont_CHT.EXE"; sha256 = "sha256-fSnbbxlMPzbhFSQyKxQaS5paiWji8njK7tS8Eppsj6g="; }; diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index ec5e594542c7..4e5ba348cd86 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -34,7 +34,7 @@ mkDerivation { plasma-framework libqaccessibilityclient ]; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; patches = [ ./0001-follow-symlinks.patch ./0002-xwayland.patch diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index c68c4fd4ba03..a23398d2e19d 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation { src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = mirror://gentoo/distfiles/gnatboot-4.1-i386.tar.bz2; + url = "mirror://gentoo/distfiles/gnatboot-4.1-i386.tar.bz2"; sha256 = "0665zk71598204bf521vw68i5y6ccqarq9fcxsqp7ccgycb4lysr"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = mirror://gentoo/distfiles/gnatboot-4.1-amd64.tar.bz2; + url = "mirror://gentoo/distfiles/gnatboot-4.1-amd64.tar.bz2"; sha256 = "1li4d52lmbnfs6llcshlbqyik2q2q4bvpir0f7n38nagp0h6j0d4"; } else diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index 01954dff6554..f70cdcc9322a 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -57,7 +57,7 @@ in ''; meta = with lib; { - homepage = https://github.com/ejgallego/coq-serapi; + homepage = "https://github.com/ejgallego/coq-serapi"; description = "SerAPI is a library for machine-to-machine interaction with the Coq proof assistant"; license = licenses.lgpl21Plus; maintainers = [ maintainers.Zimmi48 ]; diff --git a/pkgs/development/interpreters/jelly/default.nix b/pkgs/development/interpreters/jelly/default.nix index a317f35d2a78..46c27e91a02a 100644 --- a/pkgs/development/interpreters/jelly/default.nix +++ b/pkgs/development/interpreters/jelly/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication { meta = with lib; { description = "A recreational programming language inspired by J"; - homepage = https://github.com/DennisMitchell/jellylanguage; + homepage = "https://github.com/DennisMitchell/jellylanguage"; license = licenses.mit; maintainers = [ maintainers.tckmn ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/development/libraries/LAStools/default.nix index 61a39aa8e76d..f9f3b09ba0ac 100644 --- a/pkgs/development/libraries/LAStools/default.nix +++ b/pkgs/development/libraries/LAStools/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Software for rapid LiDAR processing"; - homepage = http://lastools.org/; + homepage = "http://lastools.org/"; license = licenses.unfree; maintainers = with maintainers; [ stephenwithph ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/audio/mbelib/default.nix b/pkgs/development/libraries/audio/mbelib/default.nix index f13f6d7063cb..dc01027c4693 100644 --- a/pkgs/development/libraries/audio/mbelib/default.nix +++ b/pkgs/development/libraries/audio/mbelib/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "P25 Phase 1 and ProVoice vocoder"; - homepage = https://github.com/szechyjs/mbelib; + homepage = "https://github.com/szechyjs/mbelib"; license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ andrew-d ]; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index f47b051caadf..0b06bfd64834 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast multi-dimensional array library for C++"; - homepage = https://sourceforge.net/projects/blitz/; + homepage = "https://sourceforge.net/projects/blitz/"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = with maintainers; [ ToxicFrog ]; diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index 141be2092a50..8f5512e94db5 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, zlib}: +{ lib, stdenv, fetchurl, libiconv, zlib }: stdenv.mkDerivation rec { pname = "id3lib"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { ./patch_id3lib_3.8.3_UTF16_writing_bug.diff ]; - buildInputs = [ zlib ]; + buildInputs = [ libiconv zlib ]; src = fetchurl { url = "mirror://sourceforge/id3lib/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 7b092653a327..0c8f181a188a 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -12,6 +12,6 @@ mkDerivation { kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative solid ]; - outputs = [ "dev" "out" ]; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ]; } diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix index 93927807af85..549ed0c29e86 100644 --- a/pkgs/development/libraries/libbacktrace/default.nix +++ b/pkgs/development/libraries/libbacktrace/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { ]; meta = with lib; { description = "A C library that may be linked into a C/C++ program to produce symbolic backtraces"; - homepage = https://github.com/ianlancetaylor/libbacktrace; + homepage = "https://github.com/ianlancetaylor/libbacktrace"; maintainers = with maintainers; [ twey ]; license = with licenses; [ bsd3 ]; }; diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/development/libraries/libieee1284/default.nix index 7c20d1b4947c..a2cbd6e4096f 100644 --- a/pkgs/development/libraries/libieee1284/default.nix +++ b/pkgs/development/libraries/libieee1284/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch +, autoconf, automake, libtool, xmlto, docbook_xml_dtd_412, docbook_xsl +}: stdenv.mkDerivation rec { pname = "libieee1284"; @@ -11,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0wfv1prmhhpyll9l4g1ij3im7hk9mm96ydw3l9fvhjp3993cdn2x"; }; + patches = [ + # Fix build on Musl. + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libieee1284/patches/musl.patch"; + sha256 = "03xivd6z7m51i5brlmzs60pjrlqyr4561qlnh182wa7rrm01x5y6"; + }) + ]; + nativeBuildInputs = [ autoconf automake @@ -24,7 +34,7 @@ stdenv.mkDerivation rec { "--without-python" ]; - preConfigure = '' + prePatch = '' ./bootstrap ''; diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix index 3ef1f3148994..bcd1573e2038 100644 --- a/pkgs/development/libraries/libsmartcols/default.nix +++ b/pkgs/development/libraries/libsmartcols/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "smart column output alignment library"; - homepage = https://github.com/karelzak/util-linux/tree/master/libsmartcols; + homepage = "https://github.com/karelzak/util-linux/tree/master/libsmartcols"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ rb2k ]; diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index 81303a3653ec..88560e0cd983 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions"; - homepage = http://itpp.sourceforge.net/; + homepage = "http://itpp.sourceforge.net/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ andrew-d ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 6d60321a3044..352577fd2dae 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -20,7 +20,7 @@ let meta = with lib; { inherit description homepage; - downloadPage = http://sqlite.org/download.html; + downloadPage = "http://sqlite.org/download.html"; license = licenses.publicDomain; maintainers = with maintainers; [ johnazoidberg ]; platforms = platforms.unix; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index b9054baab1d1..e9cdf50b15ab 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -298,7 +298,7 @@ $out/lib/common-lisp/query-fs" patch -p1 < ${ pkgs.fetchurl { # https://github.com/sabracrolleton/uax-15/pull/12 - url = https://github.com/nuddyco/uax-15/commit/d553181669f488636df03d60ad7f5bec64d566bf.diff; + url = "https://github.com/nuddyco/uax-15/commit/d553181669f488636df03d60ad7f5bec64d566bf.diff"; sha256 = "sha256:1608jzw7giy18vlw7pz4pl8prwlprgif8zcl9hwa0wf5gdxwd7gn"; }} ''; diff --git a/pkgs/development/misc/msp430/mspds/binary.nix b/pkgs/development/misc/msp430/mspds/binary.nix index 690ed3e45e71..2fc306f8e5ff 100644 --- a/pkgs/development/misc/msp430/mspds/binary.nix +++ b/pkgs/development/misc/msp430/mspds/binary.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { meta = { description = "Unfree binary release of the TI MSP430 FET debug driver"; - homepage = https://www.ti.com/tool/MSPDS; + homepage = "https://www.ti.com/tool/MSPDS"; license = licenses.unfree; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ aerialx ]; diff --git a/pkgs/development/misc/msp430/mspds/default.nix b/pkgs/development/misc/msp430/mspds/default.nix index 2481b50bfbef..891e7d980b4a 100644 --- a/pkgs/development/misc/msp430/mspds/default.nix +++ b/pkgs/development/misc/msp430/mspds/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { meta = { description = "TI MSP430 FET debug driver"; - homepage = https://www.ti.com/tool/MSPDS; + homepage = "https://www.ti.com/tool/MSPDS"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ aerialx ]; diff --git a/pkgs/development/ocaml-modules/genspio/default.nix b/pkgs/development/ocaml-modules/genspio/default.nix index 7e7b3a0b9aee..db3c42bca36c 100644 --- a/pkgs/development/ocaml-modules/genspio/default.nix +++ b/pkgs/development/ocaml-modules/genspio/default.nix @@ -24,7 +24,7 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - homepage = https://smondet.gitlab.io/genspio-doc/; + homepage = "https://smondet.gitlab.io/genspio-doc/"; description = "Typed EDSL to generate POSIX Shell scripts"; license = licenses.asl20; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix index 0de997881c2c..2caa25654e39 100644 --- a/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/pkgs/development/ocaml-modules/hidapi/default.nix @@ -21,7 +21,7 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - homepage = https://github.com/vbmithr/ocaml-hidapi; + homepage = "https://github.com/vbmithr/ocaml-hidapi"; description = "Bindings to Signal11's hidapi library"; license = licenses.isc; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/nonstd/default.nix b/pkgs/development/ocaml-modules/nonstd/default.nix index a584f7bc9ed1..9de535154eeb 100644 --- a/pkgs/development/ocaml-modules/nonstd/default.nix +++ b/pkgs/development/ocaml-modules/nonstd/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - homepage = https://bitbucket.org/smondet/nonstd; + homepage = "https://bitbucket.org/smondet/nonstd"; description = "Non-standard mini-library"; license = licenses.isc; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index 6ad6c4cd8985..935d67f70845 100644 --- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -15,6 +15,8 @@ buildDunePackage rec { pname = "ppx_cstubs"; version = "0.6.1.2"; + minimalOCamlVersion = "4.08"; + useDune2 = true; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/sosa/default.nix b/pkgs/development/ocaml-modules/sosa/default.nix index 3687f2be9974..f244ad550bf1 100644 --- a/pkgs/development/ocaml-modules/sosa/default.nix +++ b/pkgs/development/ocaml-modules/sosa/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = http://www.hammerlab.org/docs/sosa/master/index.html; + homepage = "http://www.hammerlab.org/docs/sosa/master/index.html"; description = "Sane OCaml String API"; license = licenses.isc; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/uecc/default.nix b/pkgs/development/ocaml-modules/uecc/default.nix index a9ba880531c4..f67980db2ff4 100644 --- a/pkgs/development/ocaml-modules/uecc/default.nix +++ b/pkgs/development/ocaml-modules/uecc/default.nix @@ -27,7 +27,7 @@ buildDunePackage rec { meta = { description = "Bindings for ECDH and ECDSA for 8-bit, 32-bit, and 64-bit processors"; - homepage = https://gitlab.com/nomadic-labs/ocaml-uecc; + homepage = "https://gitlab.com/nomadic-labs/ocaml-uecc"; license = lib.licenses.isc; maintainers = [ lib.maintainers.ulrikstrid ]; }; diff --git a/pkgs/development/ocaml-modules/yuscii/default.nix b/pkgs/development/ocaml-modules/yuscii/default.nix index 6e1fbd9a8747..9d7b5d3c4d6b 100644 --- a/pkgs/development/ocaml-modules/yuscii/default.nix +++ b/pkgs/development/ocaml-modules/yuscii/default.nix @@ -1,6 +1,7 @@ { alcotest , buildDunePackage , fetchzip +, gcc , fmt , lib , uutf @@ -18,6 +19,7 @@ buildDunePackage rec { useDune2 = true; checkInputs = [ + gcc alcotest fmt uutf diff --git a/pkgs/development/python-modules/android-backup/default.nix b/pkgs/development/python-modules/android-backup/default.nix index 319c9514183e..df2096582ccd 100644 --- a/pkgs/development/python-modules/android-backup/default.nix +++ b/pkgs/development/python-modules/android-backup/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unpack and repack android backups"; - homepage = https://github.com/bluec0re/android-backup-tools; + homepage = "https://github.com/bluec0re/android-backup-tools"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/crownstone-cloud/default.nix b/pkgs/development/python-modules/crownstone-cloud/default.nix index 882f7d95df57..8b02eaa58961 100644 --- a/pkgs/development/python-modules/crownstone-cloud/default.nix +++ b/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "crownstone-cloud"; - version = "1.4.8"; + version = "1.4.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "crownstone"; repo = "crownstone-lib-python-cloud"; rev = version; - sha256 = "sha256-iHn4g52/QM0TS/flKkcFrX6IFrCjiXUxcjVLHNg6tVo="; + sha256 = "sha256-CS1zeQiWPnsGCWixCsN9sz08mPORW5sVqIpSFPh0Qt0="; }; propagatedBuildInputs = [ @@ -32,11 +32,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # https://github.com/crownstone/crownstone-lib-python-cloud/issues/1 - "test_data_structure" - ]; - postPatch = '' sed -i '/codecov/d' requirements.txt ''; diff --git a/pkgs/development/python-modules/gviz-api/default.nix b/pkgs/development/python-modules/gviz-api/default.nix index 92f33abb594a..3ec69d686952 100644 --- a/pkgs/development/python-modules/gviz-api/default.nix +++ b/pkgs/development/python-modules/gviz-api/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for Google Visualization"; - homepage = https://developers.google.com/chart/interactive/docs/dev/gviz_api_lib; + homepage = "https://developers.google.com/chart/interactive/docs/dev/gviz_api_lib"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; }; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index eb335d886e2c..926f84798ad0 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "identify"; - version = "2.3.3"; + version = "2.3.5"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mGTSl/aOPQpqFq5dqVDia/7NofO9Tz0N8nYXU2Pyi0c="; + sha256 = "sha256-XEwZ6OUEocE4dSDLCLagKqmJruvb9beC0u93SScrOho="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 33816631584e..8448e273b01d 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open source IFC library and geometry engine"; - homepage = http://ifcopenshell.org/; + homepage = "http://ifcopenshell.org/"; license = licenses.lgpl3; maintainers = with maintainers; [ fehnomenal ]; }; diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index d38c4a557876..c45ccaca013d 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.20.0"; + version = "1.20.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lCl3euh9o1MLQV1+DZiAh0h26CHauzjNNJPvtaRtHl8="; + sha256 = "sha256-RnWlDiXol074gikg8i449rx4ENG7Ac7kz9lMi12rkuw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 3f6a86928bc3..6a682f448104 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -1,30 +1,32 @@ { lib , buildPythonPackage +, cmake , fetchPypi , isPy27 -, cmake -, protobuf +, nbval , numpy -, six -, typing-extensions +, protobuf , pytestCheckHook -, nbval +, six , tabulate +, typing-extensions }: buildPythonPackage rec { pname = "onnx"; - version = "1.10.1"; + version = "1.10.2"; + format = "setuptools"; - # Python 2 is not supported as of Onnx v1.8 disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9d941ba76cab55db8913ecad9dc50cefeb368460f6338a91783a5d7643f3a044"; + sha256 = "sha256-JNc8p9/X5sczmUT4lVS0AQcZiZM3kk/KFEfY8bXbUNY="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; propagatedBuildInputs = [ protobuf @@ -34,8 +36,8 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestCheckHook nbval + pytestCheckHook tabulate ]; @@ -59,10 +61,14 @@ buildPythonPackage rec { # The setup.py does all the configuration dontUseCmakeConfigure = true; - meta = { - homepage = "http://onnx.ai"; + pythonImportsCheck = [ + "onnx" + ]; + + meta = with lib; { description = "Open Neural Network Exchange"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.acairncross ]; + homepage = "http://onnx.ai"; + license = licenses.asl20; + maintainers = with maintainers; [ acairncross ]; }; } diff --git a/pkgs/development/python-modules/python-csxcad/default.nix b/pkgs/development/python-modules/python-csxcad/default.nix index 885208e0e61c..e6f22d37b55d 100644 --- a/pkgs/development/python-modules/python-csxcad/default.nix +++ b/pkgs/development/python-modules/python-csxcad/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to CSXCAD"; - homepage = http://openems.de/index.php/Main_Page.html; + homepage = "http://openems.de/index.php/Main_Page.html"; license = licenses.gpl3; maintainers = with maintainers; [ matthuszagh ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/pyworld/default.nix b/pkgs/development/python-modules/pyworld/default.nix index bbe5a4c135e6..9833a29593e8 100644 --- a/pkgs/development/python-modules/pyworld/default.nix +++ b/pkgs/development/python-modules/pyworld/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "PyWorld is a Python wrapper for WORLD vocoder"; - homepage = https://github.com/JeremyCCHsu/Python-Wrapper-for-World-Vocoder; + homepage = "https://github.com/JeremyCCHsu/Python-Wrapper-for-World-Vocoder"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix index 843b9d6c3199..f31c42e774b7 100644 --- a/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix +++ b/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Profile Tensorboard Plugin."; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; }; diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index 1542a447a1bc..fcd2c2452fe6 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,8 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.7.6"; + version = "0.8.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-Gf3hNCXioaLiQ0fZWPe9PO2YQeId4ZLmWsSZ5WvjSk0="; + sha256 = "sha256-j9TlZDzl9sWFPt8TeuyoJi01JhyPBVXs1w3YJMoVvLw="; }; propagatedBuildInputs = [ @@ -36,7 +37,9 @@ buildPythonPackage rec { --replace "'pytest-runner'" "" ''; - pythonImportsCheck = [ "vt" ]; + pythonImportsCheck = [ + "vt" + ]; meta = with lib; { description = "Python client library for VirusTotal"; diff --git a/pkgs/development/tools/checkmake/default.nix b/pkgs/development/tools/checkmake/default.nix index 3c21af8ff38d..78d193a12925 100644 --- a/pkgs/development/tools/checkmake/default.nix +++ b/pkgs/development/tools/checkmake/default.nix @@ -37,7 +37,7 @@ buildGoPackage rec { meta = with lib; { description = "Experimental tool for linting and checking Makefiles"; - homepage = https://github.com/mrtazz/checkmake; + homepage = "https://github.com/mrtazz/checkmake"; license = licenses.mit; maintainers = with maintainers; [ vidbina ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/java/dex2jar/default.nix b/pkgs/development/tools/java/dex2jar/default.nix index b20a80355a02..6ac1d0dbb1ca 100644 --- a/pkgs/development/tools/java/dex2jar/default.nix +++ b/pkgs/development/tools/java/dex2jar/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://sourceforge.net/projects/dex2jar/; + homepage = "https://sourceforge.net/projects/dex2jar/"; description = "Tools to work with android .dex and java .class files"; maintainers = with maintainers; [ makefu ]; license = licenses.asl20; diff --git a/pkgs/development/tools/kubepug/default.nix b/pkgs/development/tools/kubepug/default.nix index df619086861d..4795d35e7e6c 100644 --- a/pkgs/development/tools/kubepug/default.nix +++ b/pkgs/development/tools/kubepug/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubepug"; - version = "1.1.3"; + version = "1.2.2"; src = fetchFromGitHub { owner = "rikatz"; repo = "kubepug"; rev = "v${version}"; - sha256 = "094c1qfmsdmy963bxs6lq3xh1zpfdfh16vlhfwi9yywmgcynb3b6"; + sha256 = "sha256-jQ/LzwxYxfCKiu+2VhjQ3YWwLEqZkYrH7+olBOMUA1A="; }; - vendorSha256 = "0jzry4znq4kcl6i9jcawilyjm8av1zxbml6nlr96v8x47ijxav5j"; + vendorSha256 = "sha256-P5HoU9AAGFrSrp9iymjW+r8w5L90KUOrmaXM8p+Wn44="; ldflags = [ "-s" "-w" "-X=github.com/rikatz/kubepug/version.Version=${src.rev}" diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/misc/cliscord/default.nix new file mode 100644 index 000000000000..7307fc607009 --- /dev/null +++ b/pkgs/misc/cliscord/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, openssl, pkg-config, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cliscord"; + version = "unstable-2020-12-08"; + + src = fetchFromGitHub { + owner = "somebody1234"; + repo = pname; + rev = "b02fbe5516fd7f153d0b0e3c7d5d11e2ab651b43"; + sha256 = "sha256-hzZozgOkw8kFppuHiX9TQxHhxKRv8utWWbhEOIzKDLo="; + }; + + buildInputs = [ openssl ]; + + nativeBuildInputs = [ pkg-config ]; + + cargoSha256 = "12zfwdssyv0j83bff6s4376d99pv7z8ya8q8adwmf5ayvgmj4xz4"; + + meta = with lib; { + description = "Simple command-line tool to send text and files to discord"; + homepage = "https://github.com/somebody1234/cliscord"; + license = licenses.mit; + maintainers = with maintainers; [ legendofmiracles ]; + mainProgram = "cliscord"; + }; +} diff --git a/pkgs/misc/present/default.nix b/pkgs/misc/present/default.nix new file mode 100644 index 000000000000..e087db6f8d2e --- /dev/null +++ b/pkgs/misc/present/default.nix @@ -0,0 +1,31 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "present"; + version = "0.6.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-l9W5L4LD9qRo3rLBkgd2I/aDaj+ucib5UYg+X4RYg6c="; + }; + + propagatedBuildInputs = with python3Packages; [ + click + pyyaml + pyfiglet + asciimatics + mistune_2_0 + ]; + + pythonImportsCheck = [ "present" ]; + + # TypeError: don't know how to make test from: 0.6.0 + doCheck = false; + + meta = with lib; { + description = "A terminal-based presentation tool with colors and effects."; + homepage = "https://github.com/vinayak-mehta/present"; + license = licenses.asl20; + maintainers = with maintainers; [ legendofmiracles ]; + }; +} diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 10fe88c06f11..2da7d23e0af0 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,6 +1,7 @@ { config , lib , buildEnv +, fetchurl , callPackage , vscode-utils , asciidoctor @@ -1609,6 +1610,34 @@ let vadimcn.vscode-lldb = callPackage ./vscode-lldb { }; + valentjn.vscode-ltex = vscode-utils.buildVscodeMarketplaceExtension rec { + mktplcRef = { + name = "vscode-ltex"; + publisher = "valentjn"; + version = "13.0.0"; + }; + + vsix = fetchurl { + name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; + url = "https://github.com/valentjn/vscode-ltex/releases/download/${mktplcRef.version}/vscode-ltex-${mktplcRef.version}-offline-linux-x64.vsix"; + sha256 = "6db4846dee4e394f7bcfb7e29520d45d6bc1534482ba73cf40cd5edf3f6ec266"; + }; + + nativeBuildInputs = [ jq moreutils ]; + + buildInputs = [ jdk ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."ltex.java.path".default = "${jdk}"' package.json | sponge package.json + ''; + + meta = with lib; { + license = licenses.mpl20; + maintainers = [ maintainers._0xbe7a ]; + }; + }; + viktorqvarfordt.vscode-pitch-black-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pitch-black-theme"; diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 4b7a4527e2c7..b11be3f27353 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, ncurses, libcap_ng }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, glib, ncurses, libcap_ng }: stdenv.mkDerivation rec { pname = "irqbalance"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-K+Nv6HqBZb0pwfNV127QDq+suaUD7TTV413S6j8NdUU="; }; + patches = [ + # pull pending upstream inclusion fix for ncurses-6.3: + # https://github.com/Irqbalance/irqbalance/pull/194 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/Irqbalance/irqbalance/commit/f8bdd0e64284d841544fd3ebe22f4652902ba8d2.patch"; + sha256 = "sha256-QJIXr8BiKmn/81suuhNJsBRhY2as19/e480lsp2wd6g="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib ncurses libcap_ng ]; diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 21d65b40aace..f8092419215d 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -204,7 +204,7 @@ beamPackages.mixRelease rec { meta = with lib; { description = "ActivityPub microblogging server"; - homepage = https://git.pleroma.social/pleroma/pleroma; + homepage = "https://git.pleroma.social/pleroma/pleroma"; license = licenses.agpl3; maintainers = with maintainers; [ petabyteboy ninjatrappeur yuka ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 16a47795d3e7..edf89b78398d 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - propagatedBuildInputs = [ alsa-utils cifs-utils ffmpeg ]; - installPhase = let # NB: While this might seem like odd behavior, it's what Roon expects. The @@ -57,6 +55,7 @@ stdenv.mkDerivation rec { --argv0 "$binName" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ icu66 openssl ]}" \ --prefix PATH : "$dotnetDir" \ + --prefix PATH : "${lib.makeBinPath [ alsa-utils cifs-utils ffmpeg ]}" \ --run "cd $binDir" \ --set DOTNET_ROOT "$dotnetDir" ) diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 03af810cbed0..9165a4713d4e 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { buildInputs = lib.optionals stdenv.isDarwin [ Security DiskArbitration Foundation ]; meta = with lib; { description = "Powerful, fast, and an easy to use search engine "; - homepage = https://docs.meilisearch.com/; + homepage = "https://docs.meilisearch.com/"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index 2841ff2a5f9d..a17c84f5b5e5 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -7,7 +7,7 @@ let src = composerEnv.buildZipPackage { name = "aws-aws-crt-php-3942776a8c99209908ee0b287746263725685732"; src = fetchurl { - url = https://api.github.com/repos/awslabs/aws-crt-php/zipball/3942776a8c99209908ee0b287746263725685732; + url = "https://api.github.com/repos/awslabs/aws-crt-php/zipball/3942776a8c99209908ee0b287746263725685732"; sha256 = "0g4vjln6s1419ydljn5m64kzid0b7cplbc0nwn3y4cj72408fyiz"; }; }; @@ -17,7 +17,7 @@ let src = composerEnv.buildZipPackage { name = "aws-aws-sdk-php-fda176884d2952cffc7e67209470bff49609339c"; src = fetchurl { - url = https://api.github.com/repos/aws/aws-sdk-php/zipball/fda176884d2952cffc7e67209470bff49609339c; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/fda176884d2952cffc7e67209470bff49609339c"; sha256 = "07cjzhbw4qv7jvi7lly5zg15dcvpgd1py604pas68al7k1lg4343"; }; }; @@ -27,7 +27,7 @@ let src = composerEnv.buildZipPackage { name = "bacon-bacon-qr-code-f73543ac4e1def05f1a70bcd1525c8a157a1ad09"; src = fetchurl { - url = https://api.github.com/repos/Bacon/BaconQrCode/zipball/f73543ac4e1def05f1a70bcd1525c8a157a1ad09; + url = "https://api.github.com/repos/Bacon/BaconQrCode/zipball/f73543ac4e1def05f1a70bcd1525c8a157a1ad09"; sha256 = "1df22bfrc8q62qz8brrs8p2rmmv5gsaxdyjrd2ln6d6j7i4jkjpk"; }; }; @@ -37,7 +37,7 @@ let src = composerEnv.buildZipPackage { name = "barryvdh-laravel-dompdf-5b99e1f94157d74e450f4c97e8444fcaffa2144b"; src = fetchurl { - url = https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/5b99e1f94157d74e450f4c97e8444fcaffa2144b; + url = "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/5b99e1f94157d74e450f4c97e8444fcaffa2144b"; sha256 = "1r82fzrnjrjy5jgpyc071miiw1rwhwys9ccj81gs3yydq9hi4crw"; }; }; @@ -47,7 +47,7 @@ let src = composerEnv.buildZipPackage { name = "barryvdh-laravel-snappy-1903ab84171072b6bff8d98eb58d38b2c9aaf645"; src = fetchurl { - url = https://api.github.com/repos/barryvdh/laravel-snappy/zipball/1903ab84171072b6bff8d98eb58d38b2c9aaf645; + url = "https://api.github.com/repos/barryvdh/laravel-snappy/zipball/1903ab84171072b6bff8d98eb58d38b2c9aaf645"; sha256 = "1awr5kwj482qsh5wpg0q44fjqi7a9q26ghcc9wp1n9zm97y0rx7a"; }; }; @@ -57,7 +57,7 @@ let src = composerEnv.buildZipPackage { name = "dasprid-enum-5abf82f213618696dda8e3bf6f64dd042d8542b2"; src = fetchurl { - url = https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2; + url = "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2"; sha256 = "0rs7i1xiwhssy88s7bwnp5ri5fi2xy3fl7pw6l5k27xf2f1hv7q6"; }; }; @@ -67,7 +67,7 @@ let src = composerEnv.buildZipPackage { name = "doctrine-cache-331b4d5dbaeab3827976273e9356b3b453c300ce"; src = fetchurl { - url = https://api.github.com/repos/doctrine/cache/zipball/331b4d5dbaeab3827976273e9356b3b453c300ce; + url = "https://api.github.com/repos/doctrine/cache/zipball/331b4d5dbaeab3827976273e9356b3b453c300ce"; sha256 = "1ksr3460a5dpqgq5kgy2l7kdz7fairpvmip8nwaz9y833r5hnnyz"; }; }; @@ -77,7 +77,7 @@ let src = composerEnv.buildZipPackage { name = "doctrine-dbal-2411a55a2a628e6d8dd598388ab13474802c7b6e"; src = fetchurl { - url = https://api.github.com/repos/doctrine/dbal/zipball/2411a55a2a628e6d8dd598388ab13474802c7b6e; + url = "https://api.github.com/repos/doctrine/dbal/zipball/2411a55a2a628e6d8dd598388ab13474802c7b6e"; sha256 = "19vyv64ikbzk0pm9nn67a2kidhfvfcm9s5d91h0hk6kbq85f292v"; }; }; @@ -87,7 +87,7 @@ let src = composerEnv.buildZipPackage { name = "doctrine-deprecations-9504165960a1f83cc1480e2be1dd0a0478561314"; src = fetchurl { - url = https://api.github.com/repos/doctrine/deprecations/zipball/9504165960a1f83cc1480e2be1dd0a0478561314; + url = "https://api.github.com/repos/doctrine/deprecations/zipball/9504165960a1f83cc1480e2be1dd0a0478561314"; sha256 = "04kpbzk5iw86imspkg7dgs54xx877k9b5q0dfg2h119mlfkvxil6"; }; }; @@ -97,7 +97,7 @@ let src = composerEnv.buildZipPackage { name = "doctrine-event-manager-41370af6a30faa9dc0368c4a6814d596e81aba7f"; src = fetchurl { - url = https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f; + url = "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f"; sha256 = "0pn2aiwl4fvv6fcwar9alng2yrqy8bzc58n4bkp6y2jnpw5gp4m8"; }; }; @@ -107,7 +107,7 @@ let src = composerEnv.buildZipPackage { name = "doctrine-inflector-8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89"; src = fetchurl { - url = https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89; + url = "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89"; sha256 = "1l83jbj4k59m1agi041gzx1rxix1wzxw9mvnivmg1hqr158149n7"; }; }; @@ -117,7 +117,7 @@ let src = composerEnv.buildZipPackage { name = "doctrine-lexer-e864bbf5904cb8f5bb334f99209b48018522f042"; src = fetchurl { - url = https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042; + url = "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042"; sha256 = "11lg9fcy0crb8inklajhx3kyffdbx7xzdj8kwl21xsgq9nm9iwvv"; }; }; @@ -127,7 +127,7 @@ let src = composerEnv.buildZipPackage { name = "dompdf-dompdf-8768448244967a46d6e67b891d30878e0e15d25c"; src = fetchurl { - url = https://api.github.com/repos/dompdf/dompdf/zipball/8768448244967a46d6e67b891d30878e0e15d25c; + url = "https://api.github.com/repos/dompdf/dompdf/zipball/8768448244967a46d6e67b891d30878e0e15d25c"; sha256 = "0mgsry4mq5bx6b74h3akay1bp03rnsl8ppcjxjkfjlq4svq7m5yf"; }; }; @@ -137,7 +137,7 @@ let src = composerEnv.buildZipPackage { name = "dragonmantank-cron-expression-65b2d8ee1f10915efb3b55597da3404f096acba2"; src = fetchurl { - url = https://api.github.com/repos/dragonmantank/cron-expression/zipball/65b2d8ee1f10915efb3b55597da3404f096acba2; + url = "https://api.github.com/repos/dragonmantank/cron-expression/zipball/65b2d8ee1f10915efb3b55597da3404f096acba2"; sha256 = "07yqbhf6n4d818gvla60mgg23gichwiafd5ypd70w4b4dlbcxcpl"; }; }; @@ -147,7 +147,7 @@ let src = composerEnv.buildZipPackage { name = "egulias-email-validator-0dbf5d78455d4d6a41d186da50adc1122ec066f4"; src = fetchurl { - url = https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4; + url = "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4"; sha256 = "00kwb8rhk1fq3a1i152xniipk3y907q1v5r3szqbkq5rz82dwbck"; }; }; @@ -157,7 +157,7 @@ let src = composerEnv.buildZipPackage { name = "fideloper-proxy-c073b2bd04d1c90e04dc1b787662b558dd65ade0"; src = fetchurl { - url = https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0; + url = "https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0"; sha256 = "05jzgjj4fy5p1smqj41b5qxj42zn0mnczvsaacni4fmq174mz4gy"; }; }; @@ -167,7 +167,7 @@ let src = composerEnv.buildZipPackage { name = "filp-whoops-f056f1fe935d9ed86e698905a957334029899895"; src = fetchurl { - url = https://api.github.com/repos/filp/whoops/zipball/f056f1fe935d9ed86e698905a957334029899895; + url = "https://api.github.com/repos/filp/whoops/zipball/f056f1fe935d9ed86e698905a957334029899895"; sha256 = "1qqznxsrlvjlnxlnr786a39igvq3pslxrvm5ks1v09ni88w44g7g"; }; }; @@ -177,7 +177,7 @@ let src = composerEnv.buildZipPackage { name = "guzzlehttp-guzzle-868b3571a039f0ebc11ac8f344f4080babe2cb94"; src = fetchurl { - url = https://api.github.com/repos/guzzle/guzzle/zipball/868b3571a039f0ebc11ac8f344f4080babe2cb94; + url = "https://api.github.com/repos/guzzle/guzzle/zipball/868b3571a039f0ebc11ac8f344f4080babe2cb94"; sha256 = "1n8kng76v4gb51z1qq7wx63pwlyiz3pa44shfla4mcxl2js0r6r0"; }; }; @@ -187,7 +187,7 @@ let src = composerEnv.buildZipPackage { name = "guzzlehttp-promises-fe752aedc9fd8fcca3fe7ad05d419d32998a06da"; src = fetchurl { - url = https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da; + url = "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da"; sha256 = "09ivi77y49bpc2sy3xhvgq22rfh2fhv921mn8402dv0a8bdprf56"; }; }; @@ -197,7 +197,7 @@ let src = composerEnv.buildZipPackage { name = "guzzlehttp-psr7-089edd38f5b8abba6cb01567c2a8aaa47cec4c72"; src = fetchurl { - url = https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72; + url = "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72"; sha256 = "1k29gax82rf82sbw2cbcp4qn3s3096csvmw9848l94q6ryc4j2rb"; }; }; @@ -207,7 +207,7 @@ let src = composerEnv.buildZipPackage { name = "intervention-image-9a8cc99d30415ec0b3f7649e1647d03a55698545"; src = fetchurl { - url = https://api.github.com/repos/Intervention/image/zipball/9a8cc99d30415ec0b3f7649e1647d03a55698545; + url = "https://api.github.com/repos/Intervention/image/zipball/9a8cc99d30415ec0b3f7649e1647d03a55698545"; sha256 = "1fvfhxr8jyh6jjg3imacgvddgn222g822fq5p9yz8lqlw2ymcfnz"; }; }; @@ -217,7 +217,7 @@ let src = composerEnv.buildZipPackage { name = "knplabs-knp-snappy-349c2e872bbeb15dff825a17dd92ea9c6ae4120e"; src = fetchurl { - url = https://api.github.com/repos/KnpLabs/snappy/zipball/349c2e872bbeb15dff825a17dd92ea9c6ae4120e; + url = "https://api.github.com/repos/KnpLabs/snappy/zipball/349c2e872bbeb15dff825a17dd92ea9c6ae4120e"; sha256 = "12fsslr3k1zn7rw9xnma3pvlmm4qvrapizhn4il4zqcmw51lgnl7"; }; }; @@ -227,7 +227,7 @@ let src = composerEnv.buildZipPackage { name = "laravel-framework-10f6bfaec9efb68aa88d7196b8b1b162d83040ae"; src = fetchurl { - url = https://api.github.com/repos/laravel/framework/zipball/10f6bfaec9efb68aa88d7196b8b1b162d83040ae; + url = "https://api.github.com/repos/laravel/framework/zipball/10f6bfaec9efb68aa88d7196b8b1b162d83040ae"; sha256 = "1r04396755jixbhbw1zzmyz74ng8np0ysv7g7mgcvv01s6wxw66l"; }; }; @@ -237,7 +237,7 @@ let src = composerEnv.buildZipPackage { name = "laravel-socialite-fd0f6a3dd963ca480b598649b54f92d81a43617f"; src = fetchurl { - url = https://api.github.com/repos/laravel/socialite/zipball/fd0f6a3dd963ca480b598649b54f92d81a43617f; + url = "https://api.github.com/repos/laravel/socialite/zipball/fd0f6a3dd963ca480b598649b54f92d81a43617f"; sha256 = "08x0pn4ib5nhh9jkkb5brf8yj0fq6v6gn1qg97hss3mvnhazk5wx"; }; }; @@ -247,7 +247,7 @@ let src = composerEnv.buildZipPackage { name = "league-commonmark-c4228d11e30d7493c6836d20872f9582d8ba6dcf"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/commonmark/zipball/c4228d11e30d7493c6836d20872f9582d8ba6dcf; + url = "https://api.github.com/repos/thephpleague/commonmark/zipball/c4228d11e30d7493c6836d20872f9582d8ba6dcf"; sha256 = "0x18k1qmvskd5x1b3jkkmig6l734sxffj5xyfb82yrzgpw9lrld5"; }; }; @@ -257,7 +257,7 @@ let src = composerEnv.buildZipPackage { name = "league-flysystem-18634df356bfd4119fe3d6156bdb990c414c14ea"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/flysystem/zipball/18634df356bfd4119fe3d6156bdb990c414c14ea; + url = "https://api.github.com/repos/thephpleague/flysystem/zipball/18634df356bfd4119fe3d6156bdb990c414c14ea"; sha256 = "1cy0xmnl3ck7cb6ibl9jjw5pmbw15mww5q06vacgq5lnx8r5w700"; }; }; @@ -267,7 +267,7 @@ let src = composerEnv.buildZipPackage { name = "league-flysystem-aws-s3-v3-4e25cc0582a36a786c31115e419c6e40498f6972"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972; + url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/4e25cc0582a36a786c31115e419c6e40498f6972"; sha256 = "1q2vkgyaz7h6z3q0z3v3l5rsvhv4xc45prgzr214cgm656i2h1ab"; }; }; @@ -277,7 +277,7 @@ let src = composerEnv.buildZipPackage { name = "league-html-to-markdown-e5600a2c5ce7b7571b16732c7086940f56f7abec"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/html-to-markdown/zipball/e5600a2c5ce7b7571b16732c7086940f56f7abec; + url = "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/e5600a2c5ce7b7571b16732c7086940f56f7abec"; sha256 = "1a46ki1lbhnc9gqddrka2hypw0h8zcd8dhi8gc1jf5bflhb1wmqk"; }; }; @@ -287,7 +287,7 @@ let src = composerEnv.buildZipPackage { name = "league-mime-type-detection-b38b25d7b372e9fddb00335400467b223349fd7e"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b38b25d7b372e9fddb00335400467b223349fd7e; + url = "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b38b25d7b372e9fddb00335400467b223349fd7e"; sha256 = "02ywmarr58z5w9pf5qvk6hyrnykdh6v7n5jdkgb4ykdn2plinmlz"; }; }; @@ -297,7 +297,7 @@ let src = composerEnv.buildZipPackage { name = "league-oauth1-client-88dd16b0cff68eb9167bfc849707d2c40ad91ddc"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/oauth1-client/zipball/88dd16b0cff68eb9167bfc849707d2c40ad91ddc; + url = "https://api.github.com/repos/thephpleague/oauth1-client/zipball/88dd16b0cff68eb9167bfc849707d2c40ad91ddc"; sha256 = "1b0zza3qxqgn57105wbfw2fzphj3l3f7iqh7v3w98pdvaiapaf5d"; }; }; @@ -307,7 +307,7 @@ let src = composerEnv.buildZipPackage { name = "league-oauth2-client-badb01e62383430706433191b82506b6df24ad98"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/oauth2-client/zipball/badb01e62383430706433191b82506b6df24ad98; + url = "https://api.github.com/repos/thephpleague/oauth2-client/zipball/badb01e62383430706433191b82506b6df24ad98"; sha256 = "1j2bmvy39k8wafisxdc0xn58gga5w9jpwp5hqjy51sk1s2ssws8i"; }; }; @@ -317,7 +317,7 @@ let src = composerEnv.buildZipPackage { name = "monolog-monolog-fd4380d6fc37626e2f799f29d91195040137eba9"; src = fetchurl { - url = https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9; + url = "https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9"; sha256 = "1k56si01sjl93mxq1pk599yqqqhldqz34qi73y5jaga0m9iq07wk"; }; }; @@ -327,7 +327,7 @@ let src = composerEnv.buildZipPackage { name = "mtdowling-jmespath.php-9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; src = fetchurl { - url = https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb; + url = "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; sha256 = "1ig3gi6f8gisagcn876598ps48s86s6m0c82diyksylarg3yn0yd"; }; }; @@ -337,7 +337,7 @@ let src = composerEnv.buildZipPackage { name = "nesbot-carbon-f4655858a784988f880c1b8c7feabbf02dfdf045"; src = fetchurl { - url = https://api.github.com/repos/briannesbitt/Carbon/zipball/f4655858a784988f880c1b8c7feabbf02dfdf045; + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/f4655858a784988f880c1b8c7feabbf02dfdf045"; sha256 = "18px9mynqabrhgss5nyhadncdcf7aq1mzbbyrxfqbvyv54zq4zjh"; }; }; @@ -347,7 +347,7 @@ let src = composerEnv.buildZipPackage { name = "nunomaduro-collision-f7c45764dfe4ba5f2618d265a6f1f9c72732e01d"; src = fetchurl { - url = https://api.github.com/repos/nunomaduro/collision/zipball/f7c45764dfe4ba5f2618d265a6f1f9c72732e01d; + url = "https://api.github.com/repos/nunomaduro/collision/zipball/f7c45764dfe4ba5f2618d265a6f1f9c72732e01d"; sha256 = "1cazbjxl5rqw4cl783nrymhcvjhvwwwjswr5w0si1wfhmpvr349q"; }; }; @@ -357,7 +357,7 @@ let src = composerEnv.buildZipPackage { name = "onelogin-php-saml-f30f5062f3653c4d2082892d207f4dc3e577d979"; src = fetchurl { - url = https://api.github.com/repos/onelogin/php-saml/zipball/f30f5062f3653c4d2082892d207f4dc3e577d979; + url = "https://api.github.com/repos/onelogin/php-saml/zipball/f30f5062f3653c4d2082892d207f4dc3e577d979"; sha256 = "0nl431rx1gngc2g92w4hjf2y26vjvscgbrwhq0m6kzm9kq043qzh"; }; }; @@ -367,7 +367,7 @@ let src = composerEnv.buildZipPackage { name = "opis-closure-06e2ebd25f2869e54a306dda991f7db58066f7f6"; src = fetchurl { - url = https://api.github.com/repos/opis/closure/zipball/06e2ebd25f2869e54a306dda991f7db58066f7f6; + url = "https://api.github.com/repos/opis/closure/zipball/06e2ebd25f2869e54a306dda991f7db58066f7f6"; sha256 = "0fpa1w0rmwywj67jgaldmw563p7gycahs8gpkpjvrra9zhhj4yyc"; }; }; @@ -377,7 +377,7 @@ let src = composerEnv.buildZipPackage { name = "paragonie-constant_time_encoding-f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c"; src = fetchurl { - url = https://api.github.com/repos/paragonie/constant_time_encoding/zipball/f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c; + url = "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/f34c2b11eb9d2c9318e13540a1dbc2a3afbd939c"; sha256 = "1r1xj3j7s5mskw5gh3ars4dfhvcn7d252gdqgpif80026kj5fvrp"; }; }; @@ -387,7 +387,7 @@ let src = composerEnv.buildZipPackage { name = "paragonie-random_compat-996434e5492cb4c3edcb9168db6fbb1359ef965a"; src = fetchurl { - url = https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a; + url = "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a"; sha256 = "0ky7lal59dihf969r1k3pb96ql8zzdc5062jdbg69j6rj0scgkyx"; }; }; @@ -397,7 +397,7 @@ let src = composerEnv.buildZipPackage { name = "phenx-php-font-lib-ca6ad461f032145fff5971b5985e5af9e7fa88d8"; src = fetchurl { - url = https://api.github.com/repos/PhenX/php-font-lib/zipball/ca6ad461f032145fff5971b5985e5af9e7fa88d8; + url = "https://api.github.com/repos/PhenX/php-font-lib/zipball/ca6ad461f032145fff5971b5985e5af9e7fa88d8"; sha256 = "0kl9lks1kpniby8dn8racjcjp6xjnhl3065y7ivarbl6ni6hyyxw"; }; }; @@ -407,7 +407,7 @@ let src = composerEnv.buildZipPackage { name = "phenx-php-svg-lib-5fa61b65e612ce1ae15f69b3d223cb14ecc60e32"; src = fetchurl { - url = https://api.github.com/repos/PhenX/php-svg-lib/zipball/5fa61b65e612ce1ae15f69b3d223cb14ecc60e32; + url = "https://api.github.com/repos/PhenX/php-svg-lib/zipball/5fa61b65e612ce1ae15f69b3d223cb14ecc60e32"; sha256 = "1ppi3hs2r4cbd6b2xwf4znci6hpbs8469kqxk3msf7vi6vfnybbj"; }; }; @@ -417,7 +417,7 @@ let src = composerEnv.buildZipPackage { name = "php-parallel-lint-php-console-color-b6af326b2088f1ad3b264696c9fd590ec395b49e"; src = fetchurl { - url = https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/b6af326b2088f1ad3b264696c9fd590ec395b49e; + url = "https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/b6af326b2088f1ad3b264696c9fd590ec395b49e"; sha256 = "030449mkpxs35y8dk336ls3bfdq3zjnxswnk5khlg45z5147cr3k"; }; }; @@ -427,7 +427,7 @@ let src = composerEnv.buildZipPackage { name = "php-parallel-lint-php-console-highlighter-21bf002f077b177f056d8cb455c5ed573adfdbb8"; src = fetchurl { - url = https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/21bf002f077b177f056d8cb455c5ed573adfdbb8; + url = "https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/21bf002f077b177f056d8cb455c5ed573adfdbb8"; sha256 = "013phmp5n6hp6mvlpbqbrih0zd8h7xc152dpzxxf49b0jczxh8y4"; }; }; @@ -437,7 +437,7 @@ let src = composerEnv.buildZipPackage { name = "phpoption-phpoption-5455cb38aed4523f99977c4a12ef19da4bfe2a28"; src = fetchurl { - url = https://api.github.com/repos/schmittjoh/php-option/zipball/5455cb38aed4523f99977c4a12ef19da4bfe2a28; + url = "https://api.github.com/repos/schmittjoh/php-option/zipball/5455cb38aed4523f99977c4a12ef19da4bfe2a28"; sha256 = "009q2afjkjl8psisr8jsw9k08qnkb0f4hgd6izrjmm06bd7bk9ah"; }; }; @@ -447,7 +447,7 @@ let src = composerEnv.buildZipPackage { name = "phpseclib-phpseclib-6e794226a35159eb06f355efe59a0075a16551dd"; src = fetchurl { - url = https://api.github.com/repos/phpseclib/phpseclib/zipball/6e794226a35159eb06f355efe59a0075a16551dd; + url = "https://api.github.com/repos/phpseclib/phpseclib/zipball/6e794226a35159eb06f355efe59a0075a16551dd"; sha256 = "1jjgzckgpr6myf4lcngsgmmqib5x2rv93yj7syg1xyawls4qj3yb"; }; }; @@ -457,7 +457,7 @@ let src = composerEnv.buildZipPackage { name = "pragmarx-google2fa-26c4c5cf30a2844ba121760fd7301f8ad240100b"; src = fetchurl { - url = https://api.github.com/repos/antonioribeiro/google2fa/zipball/26c4c5cf30a2844ba121760fd7301f8ad240100b; + url = "https://api.github.com/repos/antonioribeiro/google2fa/zipball/26c4c5cf30a2844ba121760fd7301f8ad240100b"; sha256 = "1jmc7s3hbczvb0h4kfmya67l969nfww3lmc4slvzsz0zd769434h"; }; }; @@ -467,7 +467,7 @@ let src = composerEnv.buildZipPackage { name = "predis-predis-c50c3393bb9f47fa012d0cdfb727a266b0818259"; src = fetchurl { - url = https://api.github.com/repos/predis/predis/zipball/c50c3393bb9f47fa012d0cdfb727a266b0818259; + url = "https://api.github.com/repos/predis/predis/zipball/c50c3393bb9f47fa012d0cdfb727a266b0818259"; sha256 = "09riabf99jmxydrqn8cm6nsw3fbp307fqcpc9iw4ag2qfhwm2v73"; }; }; @@ -477,7 +477,7 @@ let src = composerEnv.buildZipPackage { name = "psr-container-8622567409010282b7aeebe4bb841fe98b58dcaf"; src = fetchurl { - url = https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf; + url = "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf"; sha256 = "0qfvyfp3mli776kb9zda5cpc8cazj3prk0bg0gm254kwxyfkfrwn"; }; }; @@ -487,7 +487,7 @@ let src = composerEnv.buildZipPackage { name = "psr-http-client-2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"; src = fetchurl { - url = https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621; + url = "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"; sha256 = "0cmkifa3ji1r8kn3y1rwg81rh8g2crvnhbv2am6d688dzsbw967v"; }; }; @@ -497,7 +497,7 @@ let src = composerEnv.buildZipPackage { name = "psr-http-factory-12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; src = fetchurl { - url = https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be; + url = "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; sha256 = "0inbnqpc5bfhbbda9dwazsrw9xscfnc8rdx82q1qm3r446mc1vds"; }; }; @@ -507,7 +507,7 @@ let src = composerEnv.buildZipPackage { name = "psr-http-message-f6561bf28d520154e4b0ec72be95418abe6d9363"; src = fetchurl { - url = https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363; + url = "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363"; sha256 = "195dd67hva9bmr52iadr4kyp2gw2f5l51lplfiay2pv6l9y4cf45"; }; }; @@ -517,7 +517,7 @@ let src = composerEnv.buildZipPackage { name = "psr-log-d49695b909c3b7628b6289db5479a1c204601f11"; src = fetchurl { - url = https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11; + url = "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11"; sha256 = "0sb0mq30dvmzdgsnqvw3xh4fb4bqjncx72kf8n622f94dd48amln"; }; }; @@ -527,7 +527,7 @@ let src = composerEnv.buildZipPackage { name = "psr-simple-cache-408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"; src = fetchurl { - url = https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b; + url = "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"; sha256 = "1djgzclkamjxi9jy4m9ggfzgq1vqxaga2ip7l3cj88p7rwkzjxgw"; }; }; @@ -537,7 +537,7 @@ let src = composerEnv.buildZipPackage { name = "ralouphie-getallheaders-120b605dfeb996808c31b6477290a714d356e822"; src = fetchurl { - url = https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822; + url = "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822"; sha256 = "1bv7ndkkankrqlr2b4kw7qp3fl0dxi6bp26bnim6dnlhavd6a0gg"; }; }; @@ -547,7 +547,7 @@ let src = composerEnv.buildZipPackage { name = "ramsey-uuid-ffa80ab953edd85d5b6c004f96181a538aad35a3"; src = fetchurl { - url = https://api.github.com/repos/ramsey/uuid/zipball/ffa80ab953edd85d5b6c004f96181a538aad35a3; + url = "https://api.github.com/repos/ramsey/uuid/zipball/ffa80ab953edd85d5b6c004f96181a538aad35a3"; sha256 = "043g1nwpbvqrvq6ri2517254d72538h5jfzv9miafnws4ajwfpzg"; }; }; @@ -557,7 +557,7 @@ let src = composerEnv.buildZipPackage { name = "robrichards-xmlseclibs-f8f19e58f26cdb42c54b214ff8a820760292f8df"; src = fetchurl { - url = https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df; + url = "https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df"; sha256 = "01zlpm36rrdj310cfmiz2fnabszxd3fq80fa8x8j3f9ki7dvhh5y"; }; }; @@ -567,7 +567,7 @@ let src = composerEnv.buildZipPackage { name = "sabberworm-php-css-parser-d217848e1396ef962fb1997cf3e2421acba7f796"; src = fetchurl { - url = https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/d217848e1396ef962fb1997cf3e2421acba7f796; + url = "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/d217848e1396ef962fb1997cf3e2421acba7f796"; sha256 = "17jkly8k02p54qa004spikakxis8syjw3vhwgrsi9g1cb4wsg3g9"; }; }; @@ -577,7 +577,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-discord-c6eddeb07ace7473e82d02d4db852dfacf5ef574"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/Discord/zipball/c6eddeb07ace7473e82d02d4db852dfacf5ef574; + url = "https://api.github.com/repos/SocialiteProviders/Discord/zipball/c6eddeb07ace7473e82d02d4db852dfacf5ef574"; sha256 = "1w8m7jmlsdk94cqckgd75mwblh3jj6j16w3g4hzysyms25g091xc"; }; }; @@ -587,7 +587,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-gitlab-a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/GitLab/zipball/a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d; + url = "https://api.github.com/repos/SocialiteProviders/GitLab/zipball/a8f67d3b02c9ee8c70c25c6728417c0eddcbbb9d"; sha256 = "1blv2h69dmm0r0djz3h0l0cxkxmzd1fzgg13r3npxx7c80xjpw3a"; }; }; @@ -597,7 +597,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-manager-0f5e82af0404df0080bdc5c105cef936c1711524"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/Manager/zipball/0f5e82af0404df0080bdc5c105cef936c1711524; + url = "https://api.github.com/repos/SocialiteProviders/Manager/zipball/0f5e82af0404df0080bdc5c105cef936c1711524"; sha256 = "0ppmln72khli94ylnsjarnhzkqzpkc32pn3zf3ljahm1yghccczx"; }; }; @@ -607,7 +607,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-microsoft-azure-9b23e02ff711de42e513aa55f768a4f1c67c0e41"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/9b23e02ff711de42e513aa55f768a4f1c67c0e41; + url = "https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/9b23e02ff711de42e513aa55f768a4f1c67c0e41"; sha256 = "01i53v1pcr3nfpydpy0ka5jrdyygpi4vc5w24022913nfjqg3bqm"; }; }; @@ -617,7 +617,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-okta-e3ef9f23c7d2f86b3b16a174b82333cf4e2459e8"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/Okta/zipball/e3ef9f23c7d2f86b3b16a174b82333cf4e2459e8; + url = "https://api.github.com/repos/SocialiteProviders/Okta/zipball/e3ef9f23c7d2f86b3b16a174b82333cf4e2459e8"; sha256 = "1a3anw5di5nqiabvqpmsjv5x0jasmsn4y876qsv77gazxja880ng"; }; }; @@ -627,7 +627,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-slack-2b781c95daf06ec87a8f3deba2ab613d6bea5e8d"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/Slack/zipball/2b781c95daf06ec87a8f3deba2ab613d6bea5e8d; + url = "https://api.github.com/repos/SocialiteProviders/Slack/zipball/2b781c95daf06ec87a8f3deba2ab613d6bea5e8d"; sha256 = "1xilg7l1wc1vgwyakhfl8dpvgkjqx90g4khvzi411j9xa2wvpprh"; }; }; @@ -637,7 +637,7 @@ let src = composerEnv.buildZipPackage { name = "socialiteproviders-twitch-7accf30ae7a3139b757b4ca8f34989c09a3dbee7"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/Twitch/zipball/7accf30ae7a3139b757b4ca8f34989c09a3dbee7; + url = "https://api.github.com/repos/SocialiteProviders/Twitch/zipball/7accf30ae7a3139b757b4ca8f34989c09a3dbee7"; sha256 = "089i4fwxb32zmbxib0544jfs48wzjyp7bsqss2bf2xx89dsrx4ah"; }; }; @@ -647,7 +647,7 @@ let src = composerEnv.buildZipPackage { name = "ssddanbrown-htmldiff-f60d5cc278b60305ab980a6665f46117c5b589c0"; src = fetchurl { - url = https://api.github.com/repos/ssddanbrown/HtmlDiff/zipball/f60d5cc278b60305ab980a6665f46117c5b589c0; + url = "https://api.github.com/repos/ssddanbrown/HtmlDiff/zipball/f60d5cc278b60305ab980a6665f46117c5b589c0"; sha256 = "12h3swr8rjf5w78kfgwzkf0zb59b4a8mjwf65fgcgvjg115wha9x"; }; }; @@ -657,7 +657,7 @@ let src = composerEnv.buildZipPackage { name = "swiftmailer-swiftmailer-8a5d5072dca8f48460fce2f4131fcc495eec654c"; src = fetchurl { - url = https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c; + url = "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c"; sha256 = "1p9m4fw9y9md9a7msbmnc0hpdrky8dwrllnyg1qf1cdyp9d70x1d"; }; }; @@ -667,7 +667,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-console-8dbd23ef7a8884051482183ddee8d9061b5feed0"; src = fetchurl { - url = https://api.github.com/repos/symfony/console/zipball/8dbd23ef7a8884051482183ddee8d9061b5feed0; + url = "https://api.github.com/repos/symfony/console/zipball/8dbd23ef7a8884051482183ddee8d9061b5feed0"; sha256 = "1p03ls8djpyhplf1irbg5ym3rjqviknwvg1mz9v6kdvnr694vzxn"; }; }; @@ -677,7 +677,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-css-selector-7fb120adc7f600a59027775b224c13a33530dd90"; src = fetchurl { - url = https://api.github.com/repos/symfony/css-selector/zipball/7fb120adc7f600a59027775b224c13a33530dd90; + url = "https://api.github.com/repos/symfony/css-selector/zipball/7fb120adc7f600a59027775b224c13a33530dd90"; sha256 = "03jblgg300imj7s731ynxm579a6qj87lhd4lnhahbf4m7y65vj7w"; }; }; @@ -687,7 +687,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-debug-43ede438d4cb52cd589ae5dc070e9323866ba8e0"; src = fetchurl { - url = https://api.github.com/repos/symfony/debug/zipball/43ede438d4cb52cd589ae5dc070e9323866ba8e0; + url = "https://api.github.com/repos/symfony/debug/zipball/43ede438d4cb52cd589ae5dc070e9323866ba8e0"; sha256 = "1min1v940rrv83w4fan9ypw4zj62wmi5nwn76pq618pdi8z00kpn"; }; }; @@ -697,7 +697,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-deprecation-contracts-5f38c8804a9e97d23e0c8d63341088cd8a22d627"; src = fetchurl { - url = https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627; + url = "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627"; sha256 = "11k6a8v9b6p0j788fgykq6s55baba29lg37fwvmn4igxxkfwmbp3"; }; }; @@ -707,7 +707,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-error-handler-51f98f7aa99f00f3b1da6bafe934e67ae6ba6dc5"; src = fetchurl { - url = https://api.github.com/repos/symfony/error-handler/zipball/51f98f7aa99f00f3b1da6bafe934e67ae6ba6dc5; + url = "https://api.github.com/repos/symfony/error-handler/zipball/51f98f7aa99f00f3b1da6bafe934e67ae6ba6dc5"; sha256 = "1qy8j16crb271pz6frjxyy2b41f1ap8w2mwb2n5zr3gmg0iqm487"; }; }; @@ -717,7 +717,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-event-dispatcher-2fe81680070043c4c80e7cedceb797e34f377bac"; src = fetchurl { - url = https://api.github.com/repos/symfony/event-dispatcher/zipball/2fe81680070043c4c80e7cedceb797e34f377bac; + url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/2fe81680070043c4c80e7cedceb797e34f377bac"; sha256 = "0qf59l1a1h25hl6bp1wwfl5s825f8ybw2jiwhalw7gfnrx8x68fb"; }; }; @@ -727,7 +727,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-event-dispatcher-contracts-84e23fdcd2517bf37aecbd16967e83f0caee25a7"; src = fetchurl { - url = https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7; + url = "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7"; sha256 = "1pcfrlc0rg8vdnp23y3y1p5qzng5nxf5i2c36g9x9f480xrnc1fw"; }; }; @@ -737,7 +737,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-finder-70362f1e112280d75b30087c7598b837c1b468b6"; src = fetchurl { - url = https://api.github.com/repos/symfony/finder/zipball/70362f1e112280d75b30087c7598b837c1b468b6; + url = "https://api.github.com/repos/symfony/finder/zipball/70362f1e112280d75b30087c7598b837c1b468b6"; sha256 = "0f75c5mjig5ypigb4s1av3w67xizx6pl15wrqbyxa39a9qq58x6v"; }; }; @@ -747,7 +747,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-http-client-contracts-7e82f6084d7cae521a75ef2cb5c9457bbda785f4"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-client-contracts/zipball/7e82f6084d7cae521a75ef2cb5c9457bbda785f4; + url = "https://api.github.com/repos/symfony/http-client-contracts/zipball/7e82f6084d7cae521a75ef2cb5c9457bbda785f4"; sha256 = "04mszmb94y0xjs0cwqxzhpf65kfqhhqznldifbxvrrlxb9nn23qc"; }; }; @@ -757,7 +757,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-http-foundation-b9a91102f548e0111f4996e8c622fb1d1d479850"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-foundation/zipball/b9a91102f548e0111f4996e8c622fb1d1d479850; + url = "https://api.github.com/repos/symfony/http-foundation/zipball/b9a91102f548e0111f4996e8c622fb1d1d479850"; sha256 = "0f6hxzrcijpjiwfjlw0bgn17a6d7bdfr7bc8nlmhfig7v945rbwq"; }; }; @@ -767,7 +767,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-http-kernel-6f1fcca1154f782796549f4f4e5090bae9525c0e"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-kernel/zipball/6f1fcca1154f782796549f4f4e5090bae9525c0e; + url = "https://api.github.com/repos/symfony/http-kernel/zipball/6f1fcca1154f782796549f4f4e5090bae9525c0e"; sha256 = "1i9bd9kp1yz55922hf95chdnzxbaavx87hxjzy6dysg81sjw89fw"; }; }; @@ -777,7 +777,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-mime-a756033d0a7e53db389618653ae991eba5a19a11"; src = fetchurl { - url = https://api.github.com/repos/symfony/mime/zipball/a756033d0a7e53db389618653ae991eba5a19a11; + url = "https://api.github.com/repos/symfony/mime/zipball/a756033d0a7e53db389618653ae991eba5a19a11"; sha256 = "06awwbkbg6fkkbls4rk4qkdzrigik3zm68cwa8bazsy7izqrh3nj"; }; }; @@ -787,7 +787,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-ctype-46cd95797e9df938fdd2b03693b5fca5e64b01ce"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce; + url = "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce"; sha256 = "0z4iiznxxs4r72xs4irqqb6c0wnwpwf0hklwn2imls67haq330zn"; }; }; @@ -797,7 +797,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-iconv-63b5bb7db83e5673936d6e3b8b3e022ff6474933"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933; + url = "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933"; sha256 = "1jyjsjprsgb3r6cbc4x1wg1q1zqakqm8a62ah5lppxnjgq1sgjc5"; }; }; @@ -807,7 +807,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-intl-idn-65bd267525e82759e7d8c4e8ceea44f398838e65"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65; + url = "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65"; sha256 = "1cx2cjx0vzni297l7avd3cb1q4c8d2hylkvdqcjlpxjqdimn4jkn"; }; }; @@ -817,7 +817,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-intl-normalizer-8590a5f561694770bdcd3f9b5c69dde6945028e8"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8; + url = "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8"; sha256 = "1c60xin00q0d2gbyaiglxppn5hqwki616v5chzwyhlhf6aplwsh3"; }; }; @@ -827,7 +827,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-mbstring-9174a3d80210dca8daa7f31fec659150bbeabfc6"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6; + url = "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6"; sha256 = "17bhba3093di6xgi8f0cnf3cdd7fnbyp9l76d9y33cym6213ayx1"; }; }; @@ -837,7 +837,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-php72-9a142215a36a3888e30d0a9eeea9766764e96976"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976; + url = "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976"; sha256 = "06ipbcvrxjzgvraf2z9fwgy0bzvzjvs5z1j67grg1gb15x3d428b"; }; }; @@ -847,7 +847,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-php73-fba8933c384d6476ab14fb7b8526e5287ca7e010"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010; + url = "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010"; sha256 = "0fc1d60iw8iar2zcvkzwdvx0whkbw8p6ll0cry39nbkklzw85n1h"; }; }; @@ -857,7 +857,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-polyfill-php80-1100343ed1a92e3a38f9ae122fc0eb21602547be"; src = fetchurl { - url = https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be; + url = "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be"; sha256 = "0kwk2qgwswsmbfp1qx31ahw3lisgyivwhw5dycshr5v2iwwx3rhi"; }; }; @@ -867,7 +867,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-process-13d3161ef63a8ec21eeccaaf9a4d7f784a87a97d"; src = fetchurl { - url = https://api.github.com/repos/symfony/process/zipball/13d3161ef63a8ec21eeccaaf9a4d7f784a87a97d; + url = "https://api.github.com/repos/symfony/process/zipball/13d3161ef63a8ec21eeccaaf9a4d7f784a87a97d"; sha256 = "1h41y2k100fmrjz90m0vafpfgg2da6byy9m6vf1j9q41bhv6zccl"; }; }; @@ -877,7 +877,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-routing-9ddf033927ad9f30ba2bfd167a7b342cafa13e8e"; src = fetchurl { - url = https://api.github.com/repos/symfony/routing/zipball/9ddf033927ad9f30ba2bfd167a7b342cafa13e8e; + url = "https://api.github.com/repos/symfony/routing/zipball/9ddf033927ad9f30ba2bfd167a7b342cafa13e8e"; sha256 = "1l3b5z0kn7f9q0whrm2wnxv0l038w3la75bf95pbs74szlnibfhz"; }; }; @@ -887,7 +887,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-service-contracts-f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"; src = fetchurl { - url = https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb; + url = "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"; sha256 = "1i573rmajc33a9nrgwgc4k3svg29yp9xv17gp133rd1i705hwv1y"; }; }; @@ -897,7 +897,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-translation-db0ba1e85280d8ff11e38d53c70f8814d4d740f5"; src = fetchurl { - url = https://api.github.com/repos/symfony/translation/zipball/db0ba1e85280d8ff11e38d53c70f8814d4d740f5; + url = "https://api.github.com/repos/symfony/translation/zipball/db0ba1e85280d8ff11e38d53c70f8814d4d740f5"; sha256 = "08qxma91sffj8vqzb8dshwsxqf80y9kym3bsxx3gz05ksi01hk1d"; }; }; @@ -907,7 +907,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-translation-contracts-95c812666f3e91db75385749fe219c5e494c7f95"; src = fetchurl { - url = https://api.github.com/repos/symfony/translation-contracts/zipball/95c812666f3e91db75385749fe219c5e494c7f95; + url = "https://api.github.com/repos/symfony/translation-contracts/zipball/95c812666f3e91db75385749fe219c5e494c7f95"; sha256 = "073l1pbmwbkaviwwjq9ypb1w7dk366nn2vn1vancbal0zqk0zx7b"; }; }; @@ -917,7 +917,7 @@ let src = composerEnv.buildZipPackage { name = "symfony-var-dumper-50286e2b7189bfb4f419c0731e86632cddf7c5ee"; src = fetchurl { - url = https://api.github.com/repos/symfony/var-dumper/zipball/50286e2b7189bfb4f419c0731e86632cddf7c5ee; + url = "https://api.github.com/repos/symfony/var-dumper/zipball/50286e2b7189bfb4f419c0731e86632cddf7c5ee"; sha256 = "05yb04dvb5higlbhgdl2hv4wnnmxi6l53xvls5v56wj21ddsk6vf"; }; }; @@ -927,7 +927,7 @@ let src = composerEnv.buildZipPackage { name = "tijsverkoyen-css-to-inline-styles-b43b05cf43c1b6d849478965062b6ef73e223bb5"; src = fetchurl { - url = https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/b43b05cf43c1b6d849478965062b6ef73e223bb5; + url = "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/b43b05cf43c1b6d849478965062b6ef73e223bb5"; sha256 = "0lc6jviz8faqxxs453dbqvfdmm6l2iczxla22v2r6xhakl58pf3w"; }; }; @@ -937,7 +937,7 @@ let src = composerEnv.buildZipPackage { name = "vlucas-phpdotenv-a1bf4c9853d90ade427b4efe35355fc41b3d6988"; src = fetchurl { - url = https://api.github.com/repos/vlucas/phpdotenv/zipball/a1bf4c9853d90ade427b4efe35355fc41b3d6988; + url = "https://api.github.com/repos/vlucas/phpdotenv/zipball/a1bf4c9853d90ade427b4efe35355fc41b3d6988"; sha256 = "04cks58khh2rx1ni5p1v8i37k4hy6zwkazlas0jqlrxhznmd50wi"; }; }; diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 7f561c493e66..3f66afae901a 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -20,7 +20,7 @@ package.override rec { meta = with pkgs.lib; { description = "Zigbee to MQTT bridge using zigbee-shepherd"; license = licenses.gpl3; - homepage = https://github.com/Koenkk/zigbee2mqtt; + homepage = "https://github.com/Koenkk/zigbee2mqtt"; maintainers = with maintainers; [ sweber ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix index a9da40e3fe42..6b1e86d30a95 100644 --- a/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -10076,7 +10076,7 @@ let buildInputs = globalBuildInputs; meta = { description = "Zigbee to MQTT bridge using Zigbee-herdsman"; - homepage = https://koenkk.github.io/zigbee2mqtt; + homepage = "https://koenkk.github.io/zigbee2mqtt"; license = "GPL-3.0"; }; production = true; diff --git a/pkgs/tools/audio/stt/default.nix b/pkgs/tools/audio/stt/default.nix index 7834f87a0517..c8fff7ddbb4a 100644 --- a/pkgs/tools/audio/stt/default.nix +++ b/pkgs/tools/audio/stt/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/coqui-ai/STT; + homepage = "https://github.com/coqui-ai/STT"; description = "Deep learning toolkit for Speech-to-Text, battle-tested in research and production"; license = licenses.mpl20; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix index 350e28428d4b..6f77c54e30b4 100644 --- a/pkgs/tools/misc/fortune/default.nix +++ b/pkgs/tools/misc/fortune/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { '') ]; meta = with lib; { + mainProgram = "fortune"; description = "A program that displays a pseudorandom message from a database of quotations"; license = licenses.bsdOriginal; platforms = platforms.unix; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 8df7f34bb234..45c4441ea2d6 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -107,7 +107,7 @@ in { cp ${pluginName}-${version}.jar $out/bin/${pluginName}-${version}.jar ''; meta = { - homepage = https://github.com/Graylog2/graylog-plugin-integrations; + homepage = "https://github.com/Graylog2/graylog-plugin-integrations"; description = "A collection of open source Graylog integrations that will be released together"; }; }; @@ -224,7 +224,7 @@ in { sha256 = "1hkaklwzcsvqq45b98chwqxqdgnnbj4dg68agsll13yq4zx37qpp"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-snmp; + homepage = "https://github.com/graylog-labs/graylog-plugin-snmp"; description = "Graylog plugin to receive SNMP traps"; }; }; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index 61abb3eee105..826c9d85579c 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, openssh, gnupg -, perl, procps, gnugrep, gawk, findutils, gnused }: +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, makeWrapper +, coreutils +, openssh +, gnupg +, perl +, procps +, gnugrep +, gawk +, findutils +, gnused +}: stdenv.mkDerivation rec { pname = "keychain"; @@ -12,33 +25,19 @@ stdenv.mkDerivation rec { sha256 = "1bkjlg0a2bbdjhwp37ci1rwikvrl4s3xlbf2jq2z4azc96dr83mj"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildInputs = [ perl ]; installPhase = '' - mkdir -p $out/{bin,share/man/man1} + mkdir -p $out/bin cp keychain $out/bin/keychain - cp keychain.1 $out/share/man/man1 + installManPage keychain.1 wrapProgram $out/bin/keychain \ - --prefix PATH ":" "${coreutils}/bin" \ - --prefix PATH ":" "${openssh}/bin" \ - --prefix PATH ":" "${gnupg}/bin" \ - --prefix PATH ":" "${gnugrep}/bin" \ - --prefix PATH ":" "${gnused}/bin" \ - --prefix PATH ":" "${findutils}/bin" \ - --prefix PATH ":" "${gawk}/bin" \ - --prefix PATH ":" "${procps}/bin" + --prefix PATH ":" "${lib.makeBinPath [ coreutils findutils gawk gnupg gnugrep gnused openssh procps ]}" \ ''; - meta = { + meta = with lib; { description = "Keychain management tool"; - homepage = "https://www.funtoo.org/Keychain"; - license = lib.licenses.gpl2; - # other platforms are untested (AFAIK) - platforms = - with lib; - platforms.linux ++ platforms.darwin; - maintainers = with lib.maintainers; [ sigma ]; longDescription = '' Keychain helps you to manage SSH and GPG keys in a convenient and secure manner. It acts as a frontend to ssh-agent and ssh-add, but allows you @@ -51,5 +50,9 @@ stdenv.mkDerivation rec { for remote cron jobs to securely "hook in" to a long-running ssh-agent process, allowing your scripts to take advantage of key-based logins. ''; + homepage = "https://www.funtoo.org/Keychain"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ sigma SuperSandro2000 ]; }; } diff --git a/pkgs/tools/misc/keymapviz/default.nix b/pkgs/tools/misc/keymapviz/default.nix new file mode 100644 index 000000000000..14c56d48dfc9 --- /dev/null +++ b/pkgs/tools/misc/keymapviz/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "keymapviz"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "yskoht"; + repo = pname; + rev = version; + sha256 = "sha256-lNpUH4BvlnHx0SDq5YSsHdcTeEnf6MH2WRUEsCWWHA0="; + }; + + propagatedBuildInputs = with python3.pkgs; [ regex ]; + + meta = with lib; { + description = "A qmk keymap.c visualizer"; + homepage = "https://github.com/yskoht/keymapviz"; + license = licenses.mit; + maintainers = with maintainers; [ legendofmiracles ]; + }; +} diff --git a/pkgs/tools/misc/livedl/default.nix b/pkgs/tools/misc/livedl/default.nix index b989fe27a659..ef298fbc6464 100644 --- a/pkgs/tools/misc/livedl/default.nix +++ b/pkgs/tools/misc/livedl/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sourceRoot = "source/src"; - vendorSha256 = sha256:g5Y1IH1U1zOOHygTzAJuBnUj+MyPe64KHTYikipt3TY=; + vendorSha256 = "g5Y1IH1U1zOOHygTzAJuBnUj+MyPe64KHTYikipt3TY="; meta = with lib; { description = "Command-line tool to download nicovideo.jp livestreams"; diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 1873cc60557d..0de14426f213 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -2,14 +2,9 @@ , stdenv , fetchFromGitHub , gnugrep -, nixStable -, nixUnstable -, enableFlakes ? false +, nix +, enableFlakes ? null # deprecated }: - -let - nix = if enableFlakes then nixUnstable else nixStable; -in stdenv.mkDerivation rec { pname = "nix-direnv"; version = "1.5.0"; diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix index b415b43d0cd3..8dd811e3d2f7 100644 --- a/pkgs/tools/misc/octofetch/default.nix +++ b/pkgs/tools/misc/octofetch/default.nix @@ -7,19 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "octofetch"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "azur1s"; repo = pname; rev = version; - sha256 = "sha256-ciBFTVdHotjifNAoXJjI9CumyK98OkMmfWMbrEldlNI="; + sha256 = "sha256-/AXE1e02NfxQzJZd0QX6gJDjmFFmuUTOndulZElgIMI="; }; - cargoSha256 = "sha256-Gzemm5HY6YwlxesQlil6R+34OtAeU2k7f/9+Lll3i8k="; + cargoSha256 = "sha256:1ddyzbpsiy54r13nb9yrm64cbbifixnhkskwg5fvhhzj4ri4ks4a"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; meta = with lib; { diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 3250047e0e3d..27dc4ee6d5c9 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -5,18 +5,20 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.31.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-iJL3EFoBtp4UOLm4/b4JBwzK6iZSTE0cb6EzmlziOLk="; + sha256 = "1sgzz7p19vy7grvq1qrfgf5rw3yjnidcsdsky2l2g98i54md25ml"; }; - vendorSha256 = "sha256-LNlglYys4F7+W7PUmBT9cBnYs7y6AlB9wdaDibaxqC0="; + vendorSha256 = "1p9i01lwz7yidlmcri3pndmg8brgdrd0ai8sag9xn021hw2sn6qq"; proxyVendor = true; + CGO_ENABLED = 0; + subPackages = [ "cmd/otelcontribcol" ]; meta = with lib; { diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 00746a7afbd2..e87b550aa6fe 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { # Fix build with bash-completion 2.10 ./bash_completion_datadir.patch ]; + postPatch = '' # Fix build with Xcode 12.5 toolchain/case-insensitive filesystems # Backport of https://github.com/mobile-shell/mosh/commit/12199114fe4234f791ef4c306163901643b40538; @@ -40,12 +41,12 @@ stdenv.mkDerivation rec { }} substituteInPlace scripts/mosh.pl \ - --subst-var-by ssh "${openssh}/bin/ssh" - substituteInPlace scripts/mosh.pl \ - --subst-var-by mosh-client "$out/bin/mosh-client" + --subst-var-by ssh "${openssh}/bin/ssh" \ + --subst-var-by mosh-client "$out/bin/mosh-client" ''; - configureFlags = [ "--enable-completion" ] ++ lib.optional withUtempter "--with-utempter"; + configureFlags = [ "--enable-completion" ] + ++ lib.optional withUtempter "--with-utempter"; postInstall = '' wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { especially over Wi-Fi, cellular, and long-distance links. ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ viric SuperSandro2000 ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/ioccheck/default.nix b/pkgs/tools/security/ioccheck/default.nix index 1ad7bfd85fe2..455819ed1cf7 100644 --- a/pkgs/tools/security/ioccheck/default.nix +++ b/pkgs/tools/security/ioccheck/default.nix @@ -8,8 +8,6 @@ python3.pkgs.buildPythonApplication rec { version = "unstable-2021-09-29"; format = "pyproject"; - disabled = python3.pythonOlder "3.7"; - src = fetchFromGitHub { owner = "ranguli"; repo = pname; @@ -43,10 +41,13 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # Can be removed with the next release substituteInPlace pyproject.toml \ - --replace '"hurry.filesize" = "^0.9"' "" + --replace '"hurry.filesize" = "^0.9"' "" \ + --replace 'vt-py = ">=0.6.1,<0.8.0"' 'vt-py = ">=0.6.1"' ''; - pythonImportsCheck = [ "ioccheck" ]; + pythonImportsCheck = [ + "ioccheck" + ]; meta = with lib; { description = "Tool for researching IOCs"; diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 5a8e50c7096f..a191ea300470 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -1,20 +1,31 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "kubescape"; - version = "1.0.128"; + version = "1.0.130"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fHXT9vg7uenFDjYmdPkMu63dlmyIATEBCxOn39c80cg="; + sha256 = "sha256-NZqIqqDusfWMDLVtcdFAVOuIGMxr+I2xnNB3ckBI/cY="; }; - vendorSha256 = "sha256-cOxjsujlpRbdw4098eMHe2oNAJXWGjKbPeYpKt0DCp8="; - ldflags = [ "-s" "-w" "-X github.com/armosec/kubescape/clihandler/cmd.BuildNumber=v${version}" ]; + nativeBuildInputs = [ + installShellFiles + ]; + + vendorSha256 = "sha256-cOxjsujlpRbdw4098eMHe2oNAJXWGjKbPeYpKt0DCp8="; - nativeBuildInputs = [ installShellFiles ]; + ldflags = [ + "-s" + "-w" + "-X github.com/armosec/kubescape/clihandler/cmd.BuildNumber=v${version}" + ]; postInstall = '' # Running kubescape to generate completions outputs error warnings diff --git a/pkgs/tools/virtualization/extra-container/default.nix b/pkgs/tools/virtualization/extra-container/default.nix index ad0601a5243a..dad7a3d1be72 100644 --- a/pkgs/tools/virtualization/extra-container/default.nix +++ b/pkgs/tools/virtualization/extra-container/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Run declarative containers without full system rebuilds"; - homepage = https://github.com/erikarvstedt/extra-container; + homepage = "https://github.com/erikarvstedt/extra-container"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.earvstedt ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dafbd0c6d301..48d1c21445fd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -590,6 +590,7 @@ mapAliases ({ nfsUtils = nfs-utils; # added 2014-12-06 nginxUnstable = nginxMainline; # added 2018-04-25 nilfs_utils = nilfs-utils; # added 2018-04-25 + nix-direnv-flakes = nix-direnv; nix-review = nixpkgs-review; # added 2019-12-22 nixFlakes = nixStable; # added 2021-05-21 nmap_graphical = nmap-graphical; # added 2017-01-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e78d5b361db..508ced48d417 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3338,7 +3338,6 @@ with pkgs; nfstrace = callPackage ../tools/networking/nfstrace { }; nix-direnv = callPackage ../tools/misc/nix-direnv { }; - nix-direnv-flakes = callPackage ../tools/misc/nix-direnv { enableFlakes = true; }; nix-output-monitor = haskell.lib.justStaticExecutables (haskellPackages.nix-output-monitor); @@ -13160,6 +13159,8 @@ with pkgs; clips = callPackage ../development/interpreters/clips { }; + cliscord = callPackage ../misc/cliscord/default.nix { }; + clisp = callPackage ../development/interpreters/clisp { }; clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { }; @@ -18989,6 +18990,8 @@ with pkgs; presage = callPackage ../development/libraries/presage { }; + present = callPackage ../misc/present { }; + prime-server = callPackage ../development/libraries/prime-server { }; primesieve = callPackage ../development/libraries/science/math/primesieve { }; @@ -23266,6 +23269,8 @@ with pkgs; netease-music-tui = callPackage ../applications/audio/netease-music-tui { }; + netease-cloud-music-gtk = callPackage ../applications/audio/netease-cloud-music-gtk { }; + nordic = callPackage ../data/themes/nordic { }; inherit (callPackages ../data/fonts/noto-fonts {}) @@ -26706,6 +26711,8 @@ with pkgs; nload = callPackage ../applications/networking/nload { }; + nali = callPackage ../applications/networking/nali { }; + normalize = callPackage ../applications/audio/normalize { }; mailspring = callPackage ../applications/networking/mailreaders/mailspring {}; @@ -31450,6 +31457,8 @@ with pkgs; key = callPackage ../applications/science/logic/key { }; + keymapviz = callPackage ../tools/misc/keymapviz { }; + lean = callPackage ../applications/science/logic/lean {}; lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 87d6f4619bb7..1648f83aa000 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1152,9 +1152,7 @@ let ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix { }; - ppx_cstubs = callPackage ../development/ocaml-modules/ppx_cstubs { - ppxlib = ppxlib.override { version = "0.22.0"; }; - }; + ppx_cstubs = callPackage ../development/ocaml-modules/ppx_cstubs { }; ppx_derivers = callPackage ../development/ocaml-modules/ppx_derivers {}; |