diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-17 00:02:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-17 00:02:21 +0000 |
| commit | 1a097a5260fec9afc44ff7eed79a41118378450a (patch) | |
| tree | ee54f9276ef8d98064169d68e40dea34420513a7 | |
| parent | 49d00cb871499e704bd3e06354dd6dd8ecccdb3f (diff) | |
| parent | 63b875e099c14114b0dfdb21401a04de62903222 (diff) | |
Merge master into staging-next
105 files changed, 1512 insertions, 616 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 37e4efc678c14..451a76359c6df 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4041,7 +4041,7 @@ }; coffeeispower = { email = "tiagodinis33@proton.me"; - github = "coffee-is-power"; + github = "coffeeispower"; name = "Tiago Dinis"; githubId = 92828847; }; @@ -10652,6 +10652,12 @@ githubId = 56224949; name = "Mia Kanashi"; }; + kanielrkirby = { + email = "kanielrkirby@runbox.com"; + github = "kanielrkirby"; + githubId = 77940607; + name = "Kaniel Kirby"; + }; karantan = { name = "Gasper Vozel"; email = "karantan@gmail.com"; @@ -11364,6 +11370,16 @@ githubId = 11614750; name = "Alexander Sharov"; }; + kwaa = { + name = "藍+85CD"; + email = "kwa@kwaa.dev"; + matrix = "@kwaa:matrix.org"; + github = "kwaa"; + githubId = 50108258; + keys = [{ + fingerprint = "ABCB A12F 1A8E 3CCC F10B 5109 4444 7777 3333 4444"; + }]; + }; kwohlfahrt = { email = "kai.wohlfahrt@gmail.com"; github = "kwohlfahrt"; @@ -23018,6 +23034,15 @@ githubId = 5253988; name = "yvt"; }; + yzx9 = { + email = "yuan.zx@outlook.com"; + github = "yzx9"; + githubId = 41458459; + name = "Zexin Yuan"; + keys = [{ + fingerprint = "FE16 B281 90EF 6C3F F661 6441 C2DD 1916 FE47 1BE2"; + }]; + }; zachcoyle = { email = "zach.coyle@gmail.com"; github = "zachcoyle"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index b6cc254bd501f..d4b6190f19259 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -100,6 +100,7 @@ luuid,,,,20120509-2,, luv,,,,1.44.2-1,, lush.nvim,,,https://luarocks.org/dev,,,teto lyaml,,,,,,lblasc +lz.n,,,,,,mrcjkb magick,,,,,5.1,donovanglover markdown,,,,,, mediator_lua,,,,,, diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 2bc124d6066a9..a1ed29525bed2 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -858,7 +858,7 @@ with lib.maintainers; { members = [ hexa jonringer - tjni + natsukium ]; scope = "Maintain the Python interpreter and related packages."; shortName = "Python"; diff --git a/nixos/modules/services/web-apps/firefly-iii.nix b/nixos/modules/services/web-apps/firefly-iii.nix index 6b383139c8911..3e51bd226b02e 100644 --- a/nixos/modules/services/web-apps/firefly-iii.nix +++ b/nixos/modules/services/web-apps/firefly-iii.nix @@ -46,7 +46,8 @@ let Type = "oneshot"; User = user; Group = group; - StateDirectory = "${removePrefix "/var/lib/" cfg.dataDir}"; + StateDirectory = "firefly-iii"; + ReadWritePaths = [cfg.dataDir]; WorkingDirectory = cfg.package; PrivateTmp = true; PrivateDevices = true; diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 1035c961c02c9..021101fecaa48 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -10,7 +10,7 @@ in meta.maintainers = with maintainers; [ etu stunkymonkey mattchrist ]; options.services.freshrss = { - enable = mkEnableOption "FreshRSS feed reader"; + enable = mkEnableOption "FreshRSS RSS aggregator and reader with php-fpm backend."; package = mkPackageOption pkgs "freshrss" { }; @@ -108,7 +108,7 @@ in type = types.str; default = poolName; description = '' - Name of the phpfpm pool to use and setup. If not specified, a pool will be created + Name of the php-fpm pool to use and setup. If not specified, a pool will be created with default values. ''; }; diff --git a/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix b/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix index d58210c8d9610..9bd2cf310c0af 100644 --- a/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix +++ b/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix @@ -7,7 +7,7 @@ let cfg = config.services.nextjs-ollama-llm-ui; # we have to override the URL to a Ollama service here, because it gets baked into the web app. - nextjs-ollama-llm-ui = cfg.package.override { ollamaUrl = "https://ollama.lambdablob.com"; }; + nextjs-ollama-llm-ui = cfg.package.override { inherit (cfg) ollamaUrl; }; in { options = { diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/applications/accessibility/wvkbd/default.nix index a918797e2de28..ff8e5626f63ac 100644 --- a/pkgs/applications/accessibility/wvkbd/default.nix +++ b/pkgs/applications/accessibility/wvkbd/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/jjsullivan5196/wvkbd"; description = "On-screen keyboard for wlroots"; - maintainers = [ maintainers.elohmeier ]; platforms = platforms.linux; license = licenses.gpl3Plus; mainProgram = "wvkbd-mobintl"; diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index 626f85e8b0ce5..35ecdef1364c3 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -294,6 +294,9 @@ name = "arbitrary" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] [[package]] name = "ark-bls12-377" @@ -808,6 +811,7 @@ dependencies = [ "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-benchmarking", @@ -894,6 +898,7 @@ dependencies = [ "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", "emulated-integration-tests-common", + "frame-metadata-hash-extension", "frame-support", "frame-system", "pallet-asset-conversion", @@ -939,6 +944,7 @@ dependencies = [ "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-benchmarking", @@ -1896,7 +1902,7 @@ dependencies = [ "bp-parachains", "bp-polkadot-core", "bp-runtime", - "ed25519-dalek 2.1.0", + "ed25519-dalek 2.1.1", "finality-grandpa", "parity-scale-codec", "sp-application-crypto", @@ -2096,6 +2102,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "tuplex", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -2256,6 +2263,7 @@ dependencies = [ "testnet-parachains-constants", "tuplex", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -2363,9 +2371,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bzip2-sys" @@ -2507,6 +2515,32 @@ dependencies = [ ] [[package]] +name = "chain-spec-guide-runtime" +version = "0.0.0" +dependencies = [ + "docify", + "pallet-balances", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "parity-scale-codec", + "polkadot-sdk-frame", + "sc-chain-spec", + "scale-info", + "serde", + "serde_json", + "sp-application-crypto", + "sp-core", + "sp-genesis-builder", + "sp-keyring", + "sp-runtime", + "sp-std 14.0.0", + "staging-chain-spec-builder", + "substrate-wasm-builder", +] + +[[package]] name = "chrono" version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2603,15 +2637,6 @@ dependencies = [ ] [[package]] -name = "ckb-merkle-mountain-range" -version = "0.6.0" -source = "git+https://github.com/paritytech/merkle-mountain-range.git?branch=master#537f0e3f67c5adf7afff0800bbb81f02f17570a1" -dependencies = [ - "cfg-if", - "itertools 0.10.5", -] - -[[package]] name = "clang-sys" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2874,6 +2899,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -3129,6 +3155,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -3225,6 +3252,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -3289,6 +3317,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -4363,6 +4392,7 @@ dependencies = [ "sp-std 14.0.0", "sp-transaction-pool", "sp-version", + "staging-parachain-info", "substrate-wasm-builder", ] @@ -4689,6 +4719,17 @@ dependencies = [ ] [[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + +[[package]] name = "derive_more" version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4961,9 +5002,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek 4.1.2", "ed25519 2.2.2", @@ -5345,9 +5386,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fastrlp" @@ -5783,6 +5824,27 @@ dependencies = [ ] [[package]] +name = "frame-metadata-hash-extension" +version = "0.1.0" +dependencies = [ + "array-bytes", + "docify", + "frame-metadata", + "frame-support", + "frame-system", + "log", + "merkleized-metadata", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-runtime", + "sp-tracing 16.0.0", + "sp-transaction-pool", + "substrate-test-runtime-client", + "substrate-wasm-builder", +] + +[[package]] name = "frame-omni-bencher" version = "0.1.0" dependencies = [ @@ -6160,9 +6222,9 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" @@ -7234,123 +7296,15 @@ checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28" name = "kitchensink-runtime" version = "3.0.0-dev" dependencies = [ - "frame-benchmarking", - "frame-benchmarking-pallet-pov", - "frame-election-provider-support", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", "log", "node-primitives", - "pallet-alliance", - "pallet-asset-conversion", - "pallet-asset-conversion-ops", - "pallet-asset-conversion-tx-payment", - "pallet-asset-rate", - "pallet-asset-tx-payment", - "pallet-assets", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-bags-list", - "pallet-balances", - "pallet-beefy", - "pallet-beefy-mmr", - "pallet-bounties", - "pallet-broker", - "pallet-child-bounties", - "pallet-collective", - "pallet-contracts", - "pallet-conviction-voting", - "pallet-core-fellowship", - "pallet-democracy", - "pallet-election-provider-multi-phase", - "pallet-election-provider-support-benchmarking", - "pallet-elections-phragmen", "pallet-example-mbm", "pallet-example-tasks", - "pallet-fast-unstake", - "pallet-glutton", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-insecure-randomness-collective-flip", - "pallet-lottery", - "pallet-membership", - "pallet-message-queue", - "pallet-migrations", - "pallet-mixnet", - "pallet-mmr", - "pallet-multisig", - "pallet-nft-fractionalization", - "pallet-nfts", - "pallet-nfts-runtime-api", - "pallet-nis", - "pallet-nomination-pools", - "pallet-nomination-pools-benchmarking", - "pallet-nomination-pools-runtime-api", - "pallet-offences", - "pallet-offences-benchmarking", - "pallet-parameters", - "pallet-preimage", - "pallet-proxy", - "pallet-ranked-collective", - "pallet-recovery", - "pallet-referenda", - "pallet-remark", - "pallet-root-testing", - "pallet-safe-mode", - "pallet-salary", - "pallet-scheduler", - "pallet-session", - "pallet-session-benchmarking", - "pallet-skip-feeless-payment", - "pallet-society", - "pallet-staking", - "pallet-staking-reward-curve", - "pallet-staking-runtime-api", - "pallet-state-trie-migration", - "pallet-statement", - "pallet-sudo", - "pallet-timestamp", - "pallet-tips", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-transaction-storage", - "pallet-treasury", - "pallet-tx-pause", - "pallet-uniques", - "pallet-utility", - "pallet-vesting", - "pallet-whitelist", "parity-scale-codec", + "polkadot-sdk", "primitive-types", "scale-info", "serde_json", - "sp-api", - "sp-authority-discovery", - "sp-block-builder", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-consensus-grandpa", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-io", - "sp-mixnet", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-staking", - "sp-statement-store", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-transaction-pool", - "sp-version", "static_assertions", "substrate-wasm-builder", ] @@ -7626,7 +7580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ "bs58 0.4.0", - "ed25519-dalek 2.1.0", + "ed25519-dalek 2.1.1", "log", "multiaddr", "multihash 0.17.0", @@ -8049,8 +8003,9 @@ dependencies = [ [[package]] name = "litep2p" -version = "0.3.0" -source = "git+https://github.com/paritytech/litep2p?rev=e03a6023882db111beeb24d8c0ceaac0721d3f0f#e03a6023882db111beeb24d8c0ceaac0721d3f0f" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f02542ae3a94b4c4ffa37dc56388c923e286afa3bf65452e3984b50b2a2f316" dependencies = [ "async-trait", "bs58 0.4.0", @@ -8062,7 +8017,7 @@ dependencies = [ "hex-literal", "indexmap 2.2.3", "libc", - "mockall", + "mockall 0.12.1", "multiaddr", "multihash 0.17.0", "network-interface", @@ -8347,6 +8302,20 @@ dependencies = [ ] [[package]] +name = "merkleized-metadata" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f313fcff1d2a4bcaa2deeaa00bf7530d77d5f7bd0467a117dde2e29a75a7a17a" +dependencies = [ + "array-bytes", + "blake3", + "frame-metadata", + "parity-scale-codec", + "scale-decode", + "scale-info", +] + +[[package]] name = "merlin" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8409,7 +8378,7 @@ dependencies = [ "pallet-minimal-template", "polkadot-sdk-docs", "polkadot-sdk-frame", - "simple-mermaid", + "simple-mermaid 0.1.1", ] [[package]] @@ -8558,12 +8527,27 @@ dependencies = [ "downcast", "fragile", "lazy_static", - "mockall_derive", + "mockall_derive 0.11.4", "predicates 2.1.5", "predicates-tree", ] [[package]] +name = "mockall" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive 0.12.1", + "predicates 3.0.3", + "predicates-tree", +] + +[[package]] name = "mockall_derive" version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8576,6 +8560,18 @@ dependencies = [ ] [[package]] +name = "mockall_derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +dependencies = [ + "cfg-if", + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + +[[package]] name = "multiaddr" version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8963,10 +8959,12 @@ dependencies = [ "sc-sync-state-rpc", "sc-transaction-pool-api", "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", + "sp-consensus-beefy", "sp-keystore", "sp-runtime", "sp-statement-store", @@ -9001,6 +8999,7 @@ dependencies = [ name = "node-testing" version = "3.0.0-dev" dependencies = [ + "frame-metadata-hash-extension", "frame-system", "fs_extra", "futures", @@ -9756,7 +9755,7 @@ dependencies = [ "bp-beefy", "bp-runtime", "bp-test-utils", - "ckb-merkle-mountain-range 0.5.2", + "ckb-merkle-mountain-range", "frame-support", "frame-system", "log", @@ -9877,6 +9876,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std 14.0.0", + "sp-tracing 16.0.0", ] [[package]] @@ -10131,6 +10131,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", + "pallet-nomination-pools", "pallet-staking", "pallet-staking-reward-curve", "pallet-timestamp", @@ -10482,7 +10483,7 @@ dependencies = [ [[package]] name = "pallet-identity" -version = "28.0.0" +version = "29.0.0" dependencies = [ "enumflags2", "frame-benchmarking", @@ -10804,6 +10805,7 @@ dependencies = [ "frame-system", "pallet-bags-list", "pallet-balances", + "pallet-delegated-staking", "pallet-nomination-pools", "pallet-staking", "pallet-staking-reward-curve", @@ -10844,7 +10846,32 @@ dependencies = [ ] [[package]] -name = "pallet-nomination-pools-test-staking" +name = "pallet-nomination-pools-test-delegate-stake" +version = "1.0.0" +dependencies = [ + "frame-election-provider-support", + "frame-support", + "frame-system", + "log", + "pallet-bags-list", + "pallet-balances", + "pallet-delegated-staking", + "pallet-nomination-pools", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std 14.0.0", + "sp-tracing 16.0.0", +] + +[[package]] +name = "pallet-nomination-pools-test-transfer-stake" version = "1.0.0" dependencies = [ "frame-election-provider-support", @@ -11798,6 +11825,7 @@ dependencies = [ "docify", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-benchmarking", @@ -11959,9 +11987,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.11" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b5927e4a9ae8d6cdb6a69e4e04a0ec73381a358e21b8a576f44769f34e7c24" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec 0.7.4", "bitvec", @@ -11974,11 +12002,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.9" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2 1.0.82", "quote 1.0.35", "syn 1.0.109", @@ -12300,6 +12328,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -12400,6 +12429,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", + "xcm-fee-payment-runtime-api", ] [[package]] @@ -12647,6 +12677,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", "rand 0.8.5", + "rstest", "sc-network", "schnellru", "sp-core", @@ -12663,7 +12694,6 @@ version = "7.0.0" dependencies = [ "assert_matches", "async-trait", - "env_logger 0.11.3", "fatality", "futures", "futures-timer", @@ -12679,17 +12709,29 @@ dependencies = [ "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", "rand 0.8.5", + "rstest", "sc-network", "schnellru", "sp-application-crypto", "sp-core", "sp-keyring", + "sp-tracing 16.0.0", "thiserror", "tokio", "tracing-gum", ] [[package]] +name = "polkadot-ckb-merkle-mountain-range" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b44320e5f7ce2c18227537a3032ae5b2c476a7e8eddba45333e1011fc31b92" +dependencies = [ + "cfg-if", + "itertools 0.10.5", +] + +[[package]] name = "polkadot-cli" version = "7.0.0" dependencies = [ @@ -12801,6 +12843,7 @@ dependencies = [ "parity-scale-codec", "polkadot-node-primitives", "polkadot-primitives", + "quickcheck", "reed-solomon-novelpoly", "sp-core", "sp-trie", @@ -13447,6 +13490,7 @@ dependencies = [ "async-trait", "bitvec", "derive_more", + "fatality", "futures", "orchestra", "polkadot-node-jaeger", @@ -13489,6 +13533,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "pin-project", + "polkadot-erasure-coding", "polkadot-node-jaeger", "polkadot-node-metrics", "polkadot-node-network-protocol", @@ -13539,7 +13584,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "1.12.0" +version = "1.13.0" dependencies = [ "assert_cmd", "asset-hub-rococo-runtime", @@ -13710,10 +13755,12 @@ dependencies = [ "sc-sync-state-rpc", "sc-transaction-pool-api", "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", + "sp-consensus-beefy", "sp-keystore", "sp-runtime", "substrate-frame-rpc-system", @@ -13849,9 +13896,396 @@ dependencies = [ ] [[package]] +name = "polkadot-sdk" +version = "0.1.0" +dependencies = [ + "asset-test-utils", + "assets-common", + "binary-merkle-tree", + "bp-asset-hub-rococo", + "bp-asset-hub-westend", + "bp-bridge-hub-cumulus", + "bp-bridge-hub-kusama", + "bp-bridge-hub-polkadot", + "bp-bridge-hub-rococo", + "bp-bridge-hub-westend", + "bp-header-chain", + "bp-kusama", + "bp-messages", + "bp-parachains", + "bp-polkadot", + "bp-polkadot-bulletin", + "bp-polkadot-core", + "bp-relayers", + "bp-rococo", + "bp-runtime", + "bp-test-utils", + "bp-westend", + "bp-xcm-bridge-hub", + "bp-xcm-bridge-hub-router", + "bridge-hub-common", + "bridge-hub-test-utils", + "bridge-runtime-common", + "cumulus-client-cli", + "cumulus-client-collator", + "cumulus-client-consensus-aura", + "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", + "cumulus-client-consensus-relay-chain", + "cumulus-client-network", + "cumulus-client-parachain-inherent", + "cumulus-client-pov-recovery", + "cumulus-client-service", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-parachain-system-proc-macro", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-solo-to-para", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-ping", + "cumulus-primitives-aura", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-primitives-proof-size-hostfunction", + "cumulus-primitives-storage-weight-reclaim", + "cumulus-primitives-timestamp", + "cumulus-primitives-utility", + "cumulus-relay-chain-inprocess-interface", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-minimal-node", + "cumulus-relay-chain-rpc-interface", + "cumulus-test-relay-sproof-builder", + "emulated-integration-tests-common", + "fork-tree", + "frame-benchmarking", + "frame-benchmarking-cli", + "frame-benchmarking-pallet-pov", + "frame-election-provider-solution-type", + "frame-election-provider-support", + "frame-executive", + "frame-metadata-hash-extension", + "frame-remote-externalities", + "frame-support", + "frame-support-procedural", + "frame-support-procedural-tools", + "frame-support-procedural-tools-derive", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "generate-bags", + "mmr-gadget", + "mmr-rpc", + "pallet-alliance", + "pallet-asset-conversion", + "pallet-asset-conversion-ops", + "pallet-asset-conversion-tx-payment", + "pallet-asset-rate", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-atomic-swap", + "pallet-aura", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", + "pallet-bounties", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-bridge-relayers", + "pallet-broker", + "pallet-child-bounties", + "pallet-collator-selection", + "pallet-collective", + "pallet-collective-content", + "pallet-contracts", + "pallet-contracts-mock-network", + "pallet-contracts-proc-macro", + "pallet-contracts-uapi", + "pallet-conviction-voting", + "pallet-core-fellowship", + "pallet-delegated-staking", + "pallet-democracy", + "pallet-dev-mode", + "pallet-election-provider-multi-phase", + "pallet-election-provider-support-benchmarking", + "pallet-elections-phragmen", + "pallet-fast-unstake", + "pallet-glutton", + "pallet-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-insecure-randomness-collective-flip", + "pallet-lottery", + "pallet-membership", + "pallet-message-queue", + "pallet-migrations", + "pallet-mixnet", + "pallet-mmr", + "pallet-multisig", + "pallet-nft-fractionalization", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-nis", + "pallet-node-authorization", + "pallet-nomination-pools", + "pallet-nomination-pools-benchmarking", + "pallet-nomination-pools-runtime-api", + "pallet-offences", + "pallet-offences-benchmarking", + "pallet-paged-list", + "pallet-parameters", + "pallet-preimage", + "pallet-proxy", + "pallet-ranked-collective", + "pallet-recovery", + "pallet-referenda", + "pallet-remark", + "pallet-root-offences", + "pallet-root-testing", + "pallet-safe-mode", + "pallet-salary", + "pallet-scheduler", + "pallet-scored-pool", + "pallet-session", + "pallet-session-benchmarking", + "pallet-skip-feeless-payment", + "pallet-society", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-staking-reward-fn", + "pallet-staking-runtime-api", + "pallet-state-trie-migration", + "pallet-statement", + "pallet-sudo", + "pallet-timestamp", + "pallet-tips", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-storage", + "pallet-treasury", + "pallet-tx-pause", + "pallet-uniques", + "pallet-utility", + "pallet-vesting", + "pallet-whitelist", + "pallet-xcm", + "pallet-xcm-benchmarks", + "pallet-xcm-bridge-hub", + "pallet-xcm-bridge-hub-router", + "parachains-common", + "parachains-runtimes-test-utils", + "polkadot-approval-distribution", + "polkadot-availability-bitfield-distribution", + "polkadot-availability-distribution", + "polkadot-availability-recovery", + "polkadot-cli", + "polkadot-collator-protocol", + "polkadot-core-primitives", + "polkadot-dispute-distribution", + "polkadot-erasure-coding", + "polkadot-gossip-support", + "polkadot-network-bridge", + "polkadot-node-collation-generation", + "polkadot-node-core-approval-voting", + "polkadot-node-core-av-store", + "polkadot-node-core-backing", + "polkadot-node-core-bitfield-signing", + "polkadot-node-core-candidate-validation", + "polkadot-node-core-chain-api", + "polkadot-node-core-chain-selection", + "polkadot-node-core-dispute-coordinator", + "polkadot-node-core-parachains-inherent", + "polkadot-node-core-prospective-parachains", + "polkadot-node-core-provisioner", + "polkadot-node-core-pvf", + "polkadot-node-core-pvf-checker", + "polkadot-node-core-pvf-common", + "polkadot-node-core-pvf-execute-worker", + "polkadot-node-core-pvf-prepare-worker", + "polkadot-node-core-runtime-api", + "polkadot-node-jaeger", + "polkadot-node-metrics", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-types", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-rpc", + "polkadot-runtime-common", + "polkadot-runtime-metrics", + "polkadot-runtime-parachains", + "polkadot-sdk-frame", + "polkadot-service", + "polkadot-statement-distribution", + "polkadot-statement-table", + "rococo-runtime-constants", + "sc-allocator", + "sc-authority-discovery", + "sc-basic-authorship", + "sc-block-builder", + "sc-chain-spec", + "sc-chain-spec-derive", + "sc-cli", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-consensus-aura", + "sc-consensus-babe", + "sc-consensus-babe-rpc", + "sc-consensus-beefy", + "sc-consensus-beefy-rpc", + "sc-consensus-epochs", + "sc-consensus-grandpa", + "sc-consensus-grandpa-rpc", + "sc-consensus-manual-seal", + "sc-consensus-pow", + "sc-consensus-slots", + "sc-executor", + "sc-executor-common", + "sc-executor-polkavm", + "sc-executor-wasmtime", + "sc-informant", + "sc-keystore", + "sc-mixnet", + "sc-network", + "sc-network-common", + "sc-network-gossip", + "sc-network-light", + "sc-network-statement", + "sc-network-sync", + "sc-network-transactions", + "sc-network-types", + "sc-offchain", + "sc-proposer-metrics", + "sc-rpc", + "sc-rpc-api", + "sc-rpc-server", + "sc-rpc-spec-v2", + "sc-service", + "sc-state-db", + "sc-statement-store", + "sc-storage-monitor", + "sc-sync-state-rpc", + "sc-sysinfo", + "sc-telemetry", + "sc-tracing", + "sc-tracing-proc-macro", + "sc-transaction-pool", + "sc-transaction-pool-api", + "sc-utils", + "slot-range-helper", + "snowbridge-beacon-primitives", + "snowbridge-core", + "snowbridge-ethereum", + "snowbridge-outbound-queue-merkle-tree", + "snowbridge-outbound-queue-runtime-api", + "snowbridge-pallet-ethereum-client", + "snowbridge-pallet-ethereum-client-fixtures", + "snowbridge-pallet-inbound-queue", + "snowbridge-pallet-inbound-queue-fixtures", + "snowbridge-pallet-outbound-queue", + "snowbridge-pallet-system", + "snowbridge-router-primitives", + "snowbridge-runtime-common", + "snowbridge-runtime-test-common", + "snowbridge-system-runtime-api", + "sp-api", + "sp-api-proc-macro", + "sp-application-crypto", + "sp-arithmetic", + "sp-authority-discovery", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-aura", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-consensus-grandpa", + "sp-consensus-pow", + "sp-consensus-slots", + "sp-core", + "sp-core-hashing", + "sp-core-hashing-proc-macro", + "sp-crypto-ec-utils 0.10.0", + "sp-crypto-hashing", + "sp-crypto-hashing-proc-macro", + "sp-database", + "sp-debug-derive 14.0.0", + "sp-externalities 0.25.0", + "sp-genesis-builder", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-keystore", + "sp-maybe-compressed-blob", + "sp-metadata-ir", + "sp-mixnet", + "sp-mmr-primitives", + "sp-npos-elections", + "sp-offchain", + "sp-panic-handler", + "sp-rpc", + "sp-runtime", + "sp-runtime-interface 24.0.0", + "sp-runtime-interface-proc-macro 17.0.0", + "sp-session", + "sp-staking", + "sp-state-machine", + "sp-statement-store", + "sp-std 14.0.0", + "sp-storage 19.0.0", + "sp-timestamp", + "sp-tracing 16.0.0", + "sp-transaction-pool", + "sp-transaction-storage-proof", + "sp-trie", + "sp-version", + "sp-version-proc-macro", + "sp-wasm-interface 20.0.0", + "sp-weights", + "staging-chain-spec-builder", + "staging-node-inspect", + "staging-parachain-info", + "staging-tracking-allocator", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "subkey", + "substrate-bip39", + "substrate-build-script-utils", + "substrate-frame-rpc-support", + "substrate-frame-rpc-system", + "substrate-prometheus-endpoint", + "substrate-rpc-client", + "substrate-state-trie-migration-rpc", + "substrate-wasm-builder", + "testnet-parachains-constants", + "tracing-gum", + "tracing-gum-proc-macro", + "westend-runtime-constants", + "xcm-emulator", + "xcm-fee-payment-runtime-api", + "xcm-procedural", + "xcm-simulator", +] + +[[package]] name = "polkadot-sdk-docs" version = "0.0.1" dependencies = [ + "chain-spec-guide-runtime", "cumulus-client-service", "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -13859,6 +14293,7 @@ dependencies = [ "cumulus-primitives-storage-weight-reclaim", "docify", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "kitchensink-runtime", @@ -13885,7 +14320,9 @@ dependencies = [ "pallet-uniques", "pallet-utility", "parity-scale-codec", + "polkadot-sdk", "polkadot-sdk-frame", + "sc-chain-spec", "sc-cli", "sc-client-db", "sc-consensus-aura", @@ -13900,10 +14337,11 @@ dependencies = [ "sc-rpc-api", "sc-service", "scale-info", - "simple-mermaid", + "simple-mermaid 0.1.1", "sp-api", "sp-arithmetic", "sp-core", + "sp-genesis-builder", "sp-io", "sp-keyring", "sp-offchain", @@ -13915,6 +14353,7 @@ dependencies = [ "staging-xcm", "subkey", "substrate-wasm-builder", + "xcm-docs", ] [[package]] @@ -13960,6 +14399,7 @@ dependencies = [ "env_logger 0.11.3", "frame-benchmarking", "frame-benchmarking-cli", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-rpc-runtime-api", @@ -14097,6 +14537,7 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "polkadot-subsystem-bench", "rand_chacha 0.3.1", "sc-keystore", "sc-network", @@ -14161,6 +14602,7 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "polkadot-primitives-test-helpers", + "polkadot-statement-distribution", "prometheus", "pyroscope", "pyroscope_pprofrs", @@ -14185,6 +14627,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-timestamp", + "strum 0.24.1", "substrate-prometheus-endpoint", "tokio", "tracing-gum", @@ -14652,15 +15095,6 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", -] - -[[package]] -name = "proc-macro-crate" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" @@ -15481,6 +15915,7 @@ dependencies = [ "jsonpath_lib", "log", "num-traits", + "parking_lot 0.12.1", "serde_json", "sp-runtime", "substrate-prometheus-endpoint", @@ -15720,6 +16155,7 @@ dependencies = [ "bitvec", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-remote-externalities", "frame-support", "frame-system", @@ -16326,10 +16762,12 @@ name = "sc-chain-spec" version = "28.0.0" dependencies = [ "array-bytes", + "clap 4.5.3", "docify", "log", "memmap2 0.9.3", "parity-scale-codec", + "regex", "sc-chain-spec-derive", "sc-client-api", "sc-executor", @@ -16474,7 +16912,7 @@ dependencies = [ "futures", "futures-timer", "log", - "mockall", + "mockall 0.11.4", "parking_lot 0.12.1", "sc-client-api", "sc-network-types", @@ -16656,6 +17094,7 @@ dependencies = [ "sc-rpc", "serde", "serde_json", + "sp-application-crypto", "sp-consensus-beefy", "sp-core", "sp-runtime", @@ -16999,7 +17438,7 @@ dependencies = [ "linked_hash_set", "litep2p", "log", - "mockall", + "mockall 0.11.4", "multistream-select", "once_cell", "parity-scale-codec", @@ -17137,7 +17576,7 @@ dependencies = [ "futures-timer", "libp2p", "log", - "mockall", + "mockall 0.11.4", "parity-scale-codec", "prost 0.12.4", "prost-build 0.12.4", @@ -17221,12 +17660,15 @@ name = "sc-network-types" version = "0.10.0" dependencies = [ "bs58 0.5.0", + "ed25519-dalek 2.1.1", "libp2p-identity", "litep2p", "multiaddr", "multihash 0.17.0", + "quickcheck", "rand 0.8.5", "thiserror", + "zeroize", ] [[package]] @@ -17722,6 +18164,29 @@ dependencies = [ ] [[package]] +name = "scale-bits" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57b1e7f6b65ed1f04e79a85a57d755ad56d76fdf1e9bddcc9ae14f71fcdcf54" +dependencies = [ + "parity-scale-codec", + "scale-type-resolver", +] + +[[package]] +name = "scale-decode" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b12ebca36cec2a3f983c46295b282b35e5f8496346fb859a8776dad5389e5389" +dependencies = [ + "derive_more", + "parity-scale-codec", + "scale-bits", + "scale-type-resolver", + "smallvec", +] + +[[package]] name = "scale-info" version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -17748,6 +18213,12 @@ dependencies = [ ] [[package]] +name = "scale-type-resolver" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0cded6518aa0bd6c1be2b88ac81bf7044992f0f154bfbabd5ad34f43512abcb" + +[[package]] name = "schannel" version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -17856,9 +18327,9 @@ dependencies = [ [[package]] name = "sctp-proto" -version = "0.1.7" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f64cef148d3295c730c3cb340b0b252a4d570b1c7d4bf0808f88540b0a888bc" +checksum = "b6220f78bb44c15f326b0596113305f6101097a18755d53727a575c97e09fb24" dependencies = [ "bytes", "crc", @@ -18364,6 +18835,11 @@ dependencies = [ [[package]] name = "simple-mermaid" +version = "0.1.0" +source = "git+https://github.com/kianenigma/simple-mermaid.git?branch=main#e48b187bcfd5cc75111acd9d241f1bd36604344b" + +[[package]] +name = "simple-mermaid" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "620a1d43d70e142b1d46a929af51d44f383db9c7a2ec122de2cd992ccfcf3c18" @@ -18422,9 +18898,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smol" @@ -19500,7 +19976,7 @@ name = "sp-io" version = "30.0.0" dependencies = [ "bytes", - "ed25519-dalek 2.1.0", + "ed25519-dalek 2.1.1", "libsecp256k1", "log", "parity-scale-codec", @@ -19573,9 +20049,9 @@ name = "sp-mmr-primitives" version = "26.0.0" dependencies = [ "array-bytes", - "ckb-merkle-mountain-range 0.6.0", "log", "parity-scale-codec", + "polkadot-ckb-merkle-mountain-range", "scale-info", "serde", "sp-api", @@ -19654,7 +20130,7 @@ dependencies = [ "scale-info", "serde", "serde_json", - "simple-mermaid", + "simple-mermaid 0.1.1", "sp-api", "sp-application-crypto", "sp-arithmetic", @@ -19801,6 +20277,7 @@ dependencies = [ name = "sp-state-machine" version = "0.35.0" dependencies = [ + "arbitrary", "array-bytes", "assert_matches", "hash-db", @@ -19826,7 +20303,7 @@ version = "10.0.0" dependencies = [ "aes-gcm", "curve25519-dalek 4.1.2", - "ed25519-dalek 2.1.0", + "ed25519-dalek 2.1.1", "hkdf", "parity-scale-codec", "rand 0.8.5", @@ -20113,7 +20590,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "staging-chain-spec-builder" -version = "3.0.0" +version = "1.6.1" dependencies = [ "clap 4.5.3", "log", @@ -20131,101 +20608,26 @@ dependencies = [ "clap 4.5.3", "clap_complete", "criterion", - "frame-benchmarking", - "frame-benchmarking-cli", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", "futures", "jsonrpsee", "kitchensink-runtime", "log", - "mmr-gadget", "nix 0.28.0", "node-primitives", "node-rpc", "node-testing", - "pallet-asset-conversion-tx-payment", - "pallet-asset-tx-payment", - "pallet-assets", - "pallet-balances", - "pallet-contracts", - "pallet-glutton", - "pallet-im-online", - "pallet-root-testing", - "pallet-skip-feeless-payment", - "pallet-sudo", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-treasury", "parity-scale-codec", "platforms", + "polkadot-sdk", "rand 0.8.5", "regex", - "sc-authority-discovery", - "sc-basic-authorship", - "sc-block-builder", - "sc-chain-spec", - "sc-cli", - "sc-client-api", - "sc-client-db", - "sc-consensus", - "sc-consensus-babe", - "sc-consensus-beefy", - "sc-consensus-epochs", - "sc-consensus-grandpa", - "sc-consensus-slots", - "sc-executor", - "sc-keystore", - "sc-mixnet", - "sc-network", - "sc-network-common", - "sc-network-statement", - "sc-network-sync", - "sc-offchain", - "sc-rpc", - "sc-service", "sc-service-test", - "sc-statement-store", - "sc-storage-monitor", - "sc-sync-state-rpc", - "sc-sysinfo", - "sc-telemetry", - "sc-transaction-pool", - "sc-transaction-pool-api", "scale-info", "serde", "serde_json", "soketto", - "sp-api", - "sp-application-crypto", - "sp-authority-discovery", - "sp-blockchain", - "sp-consensus", - "sp-consensus-babe", - "sp-consensus-beefy", - "sp-consensus-grandpa", - "sp-core", - "sp-crypto-hashing", - "sp-externalities 0.25.0", - "sp-genesis-builder", - "sp-inherents", - "sp-io", - "sp-keyring", - "sp-keystore", - "sp-mixnet", - "sp-mmr-primitives", - "sp-runtime", - "sp-state-machine", - "sp-statement-store", - "sp-timestamp", - "sp-tracing 16.0.0", - "sp-transaction-storage-proof", - "sp-trie", "staging-node-inspect", - "substrate-build-script-utils", "substrate-cli-test-utils", - "substrate-rpc-client", "tempfile", "tokio", "tokio-util", @@ -20374,17 +20776,17 @@ dependencies = [ [[package]] name = "str0m" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3f10d3f68e60168d81110410428a435dbde28cc5525f5f7c6fdec92dbdc2800" +checksum = "6706347e49b13373f7ddfafad47df7583ed52083d6fc8a594eb2c80497ef959d" dependencies = [ "combine", "crc", + "fastrand 2.1.0", "hmac 0.12.1", "once_cell", "openssl", "openssl-sys", - "rand 0.8.5", "sctp-proto", "serde", "sha-1 0.10.1", @@ -20709,6 +21111,7 @@ version = "2.0.0" dependencies = [ "array-bytes", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-rpc-runtime-api", @@ -20800,13 +21203,22 @@ dependencies = [ name = "substrate-wasm-builder" version = "17.0.0" dependencies = [ + "array-bytes", "build-helper", "cargo_metadata", "console", "filetime", + "frame-metadata", + "merkleized-metadata", + "parity-scale-codec", "parity-wasm", "polkavm-linker", + "sc-executor", + "sp-core", + "sp-io", "sp-maybe-compressed-blob", + "sp-tracing 16.0.0", + "sp-version", "strum 0.26.2", "tempfile", "toml 0.8.8", @@ -21046,7 +21458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "fastrand 2.0.0", + "fastrand 2.1.0", "redox_syscall 0.4.1", "rustix 0.38.21", "windows-sys 0.48.0", @@ -21078,6 +21490,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] +name = "test-log" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93" +dependencies = [ + "env_logger 0.11.3", + "test-log-macros", + "tracing-subscriber 0.3.18", +] + +[[package]] +name = "test-log-macros" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + +[[package]] name = "test-parachain-adder" version = "1.0.0" dependencies = [ @@ -21216,9 +21650,9 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] @@ -21245,9 +21679,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", @@ -21491,9 +21925,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -21501,7 +21935,6 @@ dependencies = [ "futures-sink", "pin-project-lite 0.2.12", "tokio", - "tracing", ] [[package]] @@ -21547,17 +21980,6 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.2.3", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" @@ -22734,6 +23156,7 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-executive", + "frame-metadata-hash-extension", "frame-remote-externalities", "frame-support", "frame-system", @@ -22752,6 +23175,7 @@ dependencies = [ "pallet-beefy-mmr", "pallet-collective", "pallet-conviction-voting", + "pallet-delegated-staking", "pallet-democracy", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", @@ -23302,6 +23726,31 @@ dependencies = [ ] [[package]] +name = "xcm-docs" +version = "0.1.0" +dependencies = [ + "docify", + "pallet-balances", + "pallet-message-queue", + "pallet-xcm", + "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-runtime-parachains", + "polkadot-sdk-frame", + "scale-info", + "simple-mermaid 0.1.0", + "sp-io", + "sp-runtime", + "sp-std 14.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "test-log", + "xcm-simulator", +] + +[[package]] name = "xcm-emulator" version = "0.5.0" dependencies = [ @@ -23399,12 +23848,16 @@ name = "xcm-simulator" version = "7.0.0" dependencies = [ "frame-support", + "frame-system", "parity-scale-codec", "paste", "polkadot-core-primitives", "polkadot-parachain-primitives", + "polkadot-primitives", "polkadot-runtime-parachains", + "scale-info", "sp-io", + "sp-runtime", "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index f247b05eb93ab..6af16ffac8a46 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -17,13 +17,13 @@ let in rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; rev = "polkadot-v${version}"; - hash = "sha256-/m7Tg+9JHbnwKwWPY8gWIJkIHktGFlqcrbLLgNWjfwU="; + hash = "sha256-9ZjiKv+05//Kf6q3mL1P5kOCOm1KCGmQIZkrD54pyeI="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -48,10 +48,9 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "ark-secret-scalar-0.0.2" = "sha256-91sODxaj0psMw0WqigMCGO5a7+NenAsRj5ZmW6C7lvc="; - "ckb-merkle-mountain-range-0.6.0" = "sha256-oTe1l406lTpgOefPai664JYwzezLjkIDXpiZTfjbd28="; "common-0.1.0" = "sha256-LHz2dK1p8GwyMimlR7AxHLz1tjTYolPwdjP7pxork1o="; "fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo="; - "litep2p-0.3.0" = "sha256-y0my2vi0+2CWNOtCh/vtsUbIcU1iNSFAJbLiCktEcOc="; + "simple-mermaid-0.1.0" = "sha256-IekTldxYq+uoXwGvbpkVTXv2xrcZ0TQfyyE2i2zH+6w="; "sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8="; "sp-crypto-ec-utils-0.4.1" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI="; }; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index c35a968394a5c..7507faa4e81ec 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5915,6 +5915,18 @@ final: prev: meta.homepage = "https://github.com/mkasa/lushtags/"; }; + lz-n = buildNeovimPlugin { + pname = "lz.n"; + version = "2024-06-16"; + src = fetchFromGitHub { + owner = "nvim-neorocks"; + repo = "lz.n"; + rev = "ffd6633cbe2145177bd522fa340104fa44afbc1c"; + sha256 = "sha256-aV+m4+8oWwIPTQhilXfHOUyYqQGl4NRnk7HvEQYMp0Y="; + }; + meta.homepage = "https://github.com/nvim-neorocks/lz.n/"; + }; + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-07-04"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 65f9937deec04..fa6a8ac6848fe 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -500,6 +500,7 @@ https://github.com/l3mon4d3/luasnip/,, https://github.com/alvarosevilla95/luatab.nvim/,, https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, +https://github.com/nvim-neorocks/lz.n/,, https://github.com/WhiteBlackGoose/magma-nvim-goose/,HEAD, https://github.com/winston0410/mark-radar.nvim/,HEAD, https://github.com/iamcco/markdown-preview.nvim/,, diff --git a/pkgs/applications/editors/vscode/extensions/README.md b/pkgs/applications/editors/vscode/extensions/README.md index 656ea1bdb3ae0..12ac4f5f5bb2e 100644 --- a/pkgs/applications/editors/vscode/extensions/README.md +++ b/pkgs/applications/editors/vscode/extensions/README.md @@ -20,6 +20,11 @@ - `description` should mention it is a Visual Studio Code extension. - `downloadPage` is the VSCode marketplace URL. - `homepage` is the source-code URL. + - `maintainers`: + - optionally consider adding yourself as a maintainer to be notified of updates, breakages and help with upkeep. + - recommended format is: + - a `non-nested with`, such as: `with lib.maintainers; [ your-username ];`. + - maintainers are listed in alphabetical order. - verify `license` in upstream. * On commit messages: diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index fcdbf41c04ebc..52fb2627117fc 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2608,6 +2608,22 @@ let }; }; + lapo.asn1js = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "asn1js"; + publisher = "lapo"; + version = "0.1.4"; + hash = "sha256-utbIKlwNHnJZj/51f8hEDmUA/A26De/gY73iT4tXKRU="; + }; + meta = { + description = "Decode ASN.1 content inside VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=lapo.asn1js"; + homepage = "https://github.com/lapo-luchini/vscode-asn1js"; + maintainers = with lib.maintainers; [ katexochen ]; + license = lib.licenses.isc; + }; + }; + llvm-org.lldb-vscode = llvmPackages.lldb; llvm-vs-code-extensions.vscode-clangd = buildVscodeMarketplaceExtension { @@ -3150,6 +3166,22 @@ let ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; + ms-vscode-remote.remote-ssh-edit = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "remote-ssh-edit"; + publisher = "ms-vscode-remote"; + version = "0.86.0"; + hash = "sha256-JsbaoIekUo2nKCu+fNbGlh5d1Tt/QJGUuXUGP04TsDI="; + }; + meta = { + description = "A Visual Studio Code extension that complements the Remote SSH extension with syntax colorization, keyword intellisense, and simple snippets when editing SSH configuration files"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-ssh-edit"; + homepage = "https://code.visualstudio.com/docs/remote/ssh"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.pandapip1 ]; + }; + }; + ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; mshr-h.veriloghdl = buildVscodeMarketplaceExtension { @@ -4622,8 +4654,8 @@ let mktplcRef = { name = "vscode-icons"; publisher = "vscode-icons-team"; - version = "12.2.0"; - sha256 = "12s5br0s9n99vjn6chivzdsjb71p0lai6vnif7lv13x497dkw4rz"; + version = "12.8.0"; + hash = "sha256-2+Wf0AL9C5xOQCjA9maMt/W/kviNuiyMfaOFDU82KxM="; }; meta = { description = "Bring real icons to your Visual Studio Code"; diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index f383ef7dfb4ad..f56f477c8560d 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -13,19 +13,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-CPUlJ1QzGiZKd4r46Iioc5svw0oLsMsYnc0KxT1p0zM="; + hash = "sha256-fvDzsFOG1pdmpC3RDY8zGP0yL/TzX6i00LnIX+yceVU="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-qSTCZHL7nfB300qwuqgl/4u+SYNMA2BFCrD+yQEgN/c="; + hash = "sha256-3yRZzOTuiTbkUUz1D3mZo7G5vayM6W9YBbJxTiVou9g="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-FcZH2bB5B3wnu6F76kGp9FBdD3yZtr57TQ5xaUfRcmY="; + hash = "sha256-fKvR2bea4UxvnZ+LlWR/ahpKe8mk5f4mZrjqTFpsC5A="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-3HdK4x2WNdb9Zxqjtn9lmbgrMOzz14rH0ZF0x9B0BHY="; + hash = "sha256-nkK3BH+MRi6KdThq4kYR9ZAfnuSkC2r/lKWpEtmD7Ak="; }; } .${system} or (throw "Unsupported system: ${system}"); @@ -37,7 +37,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # Please update the corresponding binary (typos-lsp) # when updating this extension. # See pkgs/by-name/ty/typos-lsp/package.nix - version = "0.1.18"; + version = "0.1.19"; inherit (extInfo) hash arch; }; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index bd6b5e4d080d0..9abb44fd61a4e 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.10"; + version = "9.11"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-r8NLSRv6FMYsP99ifdK13Kxefp8/FFrbFDMleK+M8cA="; + hash = "sha256-36AMJk6nEWnQKoSagz5Iyudh+whCKgDfhkTr1nv4ckA="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-ZqajfgPSKTcNBiDWEc9UgZWWmvkJvTA0S+j98Qz/y08="; + hash = "sha256-vqlikMatRlGxvWJ6BJu2HyBclV4x+vzNPNe8py7jKqo="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/graphics/brlcad/default.nix b/pkgs/applications/graphics/brlcad/default.nix index f30a6acbbbee7..91b063f8fc935 100644 --- a/pkgs/applications/graphics/brlcad/default.nix +++ b/pkgs/applications/graphics/brlcad/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , fontconfig , libX11 @@ -11,15 +12,25 @@ stdenv.mkDerivation rec { pname = "brlcad"; - version = "7.34.2"; + version = "7.38.2"; src = fetchFromGitHub { owner = "BRL-CAD"; - repo = pname; + repo = "brlcad"; rev = "refs/tags/rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - hash = "sha256-oafu255xElEIk8p4yvNyR2maykUfxQui/L5MkicA+JA="; + hash = "sha256-23UTeH4gY2x/QGYZ64glAkf6LmsXBAppIOHgoUdxgpo="; }; + patches = [ + # This commit was bringing an impurity in the rpath resulting in: + # RPATH of binary /nix/store/rq2hjvfgq2nvh5zxch51ij34rqqdpark-brlcad-7.38.0/bin/tclsh contains a forbidden reference to /build/ + (fetchpatch { + url = "https://github.com/BRL-CAD/brlcad/commit/fbdbf042b2db4c7d46839a17bbf4985cdb81f0ae.patch"; + revert = true; + hash = "sha256-Wfihd7TLkE8aOpLdDtYmhhd7nZijiVGh1nbUjWr/BjQ="; + }) + ]; + nativeBuildInputs = [ cmake ]; @@ -36,11 +47,19 @@ stdenv.mkDerivation rec { "-DBRLCAD_ENABLE_STRICT=OFF" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + meta = with lib; { homepage = "https://brlcad.org"; description = "BRL-CAD is a powerful cross-platform open source combinatorial solid modeling system"; + changelog = "https://github.com/BRL-CAD/brlcad/releases/tag/${src.rev}"; license = with licenses; [ lgpl21 bsd2 ]; maintainers = with maintainers; [ GaetanLepage ]; platforms = platforms.linux; + # error Exactly one of ON_LITTLE_ENDIAN or ON_BIG_ENDIAN should be defined. + broken = stdenv.system == "aarch64-linux"; }; } diff --git a/pkgs/applications/misc/gpu-burn/default.nix b/pkgs/applications/misc/gpu-burn/default.nix index fe7bcf3dcb71a..eaf0fc44d29dd 100644 --- a/pkgs/applications/misc/gpu-burn/default.nix +++ b/pkgs/applications/misc/gpu-burn/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation { homepage = "http://wili.cc/blog/gpu-burn.html"; description = "Multi-GPU CUDA stress test"; platforms = platforms.linux; - maintainers = with maintainers; [ elohmeier ]; license = licenses.bsd2; mainProgram = "gpu_burn"; }; diff --git a/pkgs/applications/misc/mission-center/Cargo.lock b/pkgs/applications/misc/mission-center/Cargo.lock index 33ea0c352d293..554a818901516 100644 --- a/pkgs/applications/misc/mission-center/Cargo.lock +++ b/pkgs/applications/misc/mission-center/Cargo.lock @@ -675,7 +675,7 @@ dependencies = [ [[package]] name = "missioncenter" -version = "0.5.1" +version = "0.5.2" dependencies = [ "dbus", "errno-sys", diff --git a/pkgs/applications/misc/mission-center/default.nix b/pkgs/applications/misc/mission-center/default.nix index e13774cf3c881..9188df9e5b3b4 100644 --- a/pkgs/applications/misc/mission-center/default.nix +++ b/pkgs/applications/misc/mission-center/default.nix @@ -1,38 +1,39 @@ -{ lib -, stdenv -, fetchFromGitLab -, fetchFromGitHub -, cargo -, libxml2 -, meson -, ninja -, pkg-config -, python311 -, rustPlatform -, symlinkJoin -, rustc -, wrapGAppsHook4 -, appstream-glib -, blueprint-compiler -, cairo -, cmake -, dbus -, desktop-file-utils -, gdk-pixbuf -, gettext -, glib -, graphene -, gtk4 -, libGL -, libadwaita -, libdrm -, mesa -, pango -, sqlite -, udev -, wayland -, dmidecode -, vulkan-loader +{ + lib, + stdenv, + fetchFromGitLab, + fetchFromGitHub, + cargo, + libxml2, + meson, + ninja, + pkg-config, + python311, + rustPlatform, + symlinkJoin, + rustc, + wrapGAppsHook4, + appstream-glib, + blueprint-compiler, + cairo, + cmake, + dbus, + desktop-file-utils, + gdk-pixbuf, + gettext, + glib, + graphene, + gtk4, + libGL, + libadwaita, + libdrm, + mesa, + pango, + sqlite, + udev, + wayland, + dmidecode, + vulkan-loader, }: let @@ -45,28 +46,23 @@ let in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-I/UkHXDGbKiOcn7R0nQVKcgdvyV4ycgQGNoHA6QMAnw="; + hash = "sha256-84D+CttolY5hleCJbDiN3mlk0+nlwwJUJhGoKGVT/lw="; }; cargoDeps = symlinkJoin { name = "cargo-vendor-dir"; paths = [ - (rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - }) - (rustPlatform.importCargoLock { - lockFile = ./gatherer-Cargo.lock; - }) + (rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }) + (rustPlatform.importCargoLock { lockFile = ./gatherer-Cargo.lock; }) ]; }; - nativeBuildInputs = [ blueprint-compiler cargo @@ -139,6 +135,7 @@ stdenv.mkDerivation rec { meta = { description = "Monitor your CPU, Memory, Disk, Network and GPU usage"; homepage = "https://gitlab.com/mission-center-devs/mission-center"; + changelog = "https://gitlab.com/mission-center-devs/mission-center/-/releases/v${version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock index 927b9f29c8169..d6ad543585a4f 100644 --- a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock +++ b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock @@ -383,7 +383,7 @@ dependencies = [ [[package]] name = "gatherer" -version = "0.5.1" +version = "0.5.2" dependencies = [ "anyhow", "arrayvec", diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 40530d16391ff..a73767492f3fe 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4919"; + version = "4921"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-WMFZEGTXVAaBlEKUqclmkw3pKnWSdbvulDvSi7TQn8k="; + sha256 = "sha256-s7EKHXh3UNMDzBmWUTZaLR1P21e27cWJNYRlFcpJu50="; }; patches = [ diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 5882057988a4e..14b2f19ccd4bb 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.29.6.5"; + version = "3.30.0.0"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-2x3np1cmjJ/IN/vSqKX6mTQbtFROxPzhXPjeJ6mxe9k="; + hash = "sha256-KpY/GjagRx0XkH18dDJcf6JfkT/0V8ZHJ5DHtAEUaF4="; }; patches = [ diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 147eda18aa9c3..c52cb3f44fad7 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "126.0.2592.36"; + version = "126.0.2592.53"; revision = "1"; - hash = "sha256-u9gcTjener35uKt99T27+LK0A4SYNdWCW5FSHWEnaNA="; + hash = "sha256-d1zqZUhk5C/jrdZngQQlGplrSssE/LUR3/AybStNavE="; }; dev = import ./browser.nix { channel = "dev"; - version = "127.0.2620.3"; + version = "127.0.2638.2"; revision = "1"; - hash = "sha256-x5reGA7XZTN3FsCHf7oXstltCDSVANR8VegIuO201qs="; + hash = "sha256-Bv0X30ilcNBI9pblnrO1QA7ElTPMO5/JmIZIjhldO7Y="; }; stable = import ./browser.nix { channel = "stable"; - version = "125.0.2535.85"; + version = "125.0.2535.92"; revision = "1"; - hash = "sha256-4GD/1jAw+nIwI5AOwrkuPNF5zAnnzje9oEQnaHOapPg="; + hash = "sha256-DuVz6+BzGTWZJ4smizIK2dV1OTmv0uTIQpD+yclHDN8="; }; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 9fc07b6c19ff0..57d16d577dfc6 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.5.5"; - sha256 = "0lgpqx672ics998830y8qklchdmbj272xfbs5r414hqlznbbi8w1"; - vendorHash = "sha256-PV0HbsIcO6FjdczCWJgR6X5THUREDht2R4NJ7HxkBNw="; + version = "24.6.2"; + sha256 = "0qghp8v4lz51yv5j5k8dps4qv58hjdjdc3jzrrq3g239x8b2h6ys"; + vendorHash = "sha256-7Q6V9DKROkSTxU7n511aOpaMDRfhP88p6PJ89Sr6kOQ="; } diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 8536cd145f145..78aa173867692 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -5,11 +5,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "229.240517.0"; + version = "230.240603.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-NVr9OOq5YdqvCkrtjTRIfWWquxJ/sN8MhSlw3RvZVFs="; + hash = "sha256-pgRqlaUbEDEAd4frooSloeiNEX02VESPhqIzRIuQshI="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index d14fd28d9db14..7bae5b5388d7a 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-l4wHCapIvD3kZk1DqLNWDLjwg6j7g0+qMB/KuMzH+pQ="; + hash = "sha256-5oBIw9PVbEGF1e47GeYNF6gJFm5z3M9KeJ1711cAg2s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 622f088d596bf..72cf6cbb57523 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = "https://www.portfolio-performance.info/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.epl10; - maintainers = with maintainers; [ elohmeier kilianar oyren shawn8901 ]; + maintainers = with maintainers; [ kilianar oyren shawn8901 ]; mainProgram = "portfolio"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix index eb28bf2dfd920..8ada870912eb9 100644 --- a/pkgs/applications/office/pympress/default.nix +++ b/pkgs/applications/office/pympress/default.nix @@ -8,6 +8,7 @@ , libcanberra-gtk3 , poppler_gi , withGstreamer ? stdenv.isLinux +, gst_all_1 , withVLC ? stdenv.isLinux }: @@ -29,7 +30,16 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gtk3 poppler_gi - ] ++ lib.optional withGstreamer libcanberra-gtk3; + ] ++ lib.optionals withGstreamer [ + libcanberra-gtk3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + (gst_all_1.gst-plugins-good.override {gtkSupport = true;}) + gst_all_1.gst-libav + gst_all_1.gst-vaapi + ]; propagatedBuildInputs = with python3Packages; [ pycairo diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 5f2a117198965..941f34231ca94 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "scribus"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "mirror://sourceforge/scribus/scribus-devel/scribus-${finalAttrs.version}.tar.xz"; - hash = "sha256-4J3Xjm22HQG5MhEI/t7bzNbsCrNS3Vuv24sEHw73npk="; + hash = "sha256-fv+bH0fjcuVrs2nx2+GP5JEBeJtea8/beJDgNGtkE4M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix deleted file mode 100644 index 0b0491a71aaef..0000000000000 --- a/pkgs/applications/science/biology/spades/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, zlib, bzip2, cmake, python3 }: - -stdenv.mkDerivation rec { - pname = "SPAdes"; - version = "3.15.5"; - - src = fetchurl { - url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-FVw2QNVx8uexmgUDHR/Q0ZvYLfeF04hw+5O9JBsSu/o="; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ zlib bzip2 python3 ]; - - doCheck = true; - - sourceRoot = "${pname}-${version}/src"; - - env.CXXFLAGS = toString [ - # GCC 13: error: 'uint32_t' does not name a type - "-include cstdint" - ]; - - meta = with lib; { - description = "St. Petersburg genome assembler: assembly toolkit containing various assembly pipelines"; - license = licenses.gpl2Only; - homepage = "http://cab.spbu.ru/software/spades/"; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = [ maintainers.bzizou ]; - }; -} diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index ade5239762518..7f0e70c642134 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.13.0"; + version = "8.14.0"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Xd8mZ8tsemJ53hAMED2biRyDlEw/gG/Hh1iZSwSB1vY="; + hash = "sha256-6oguN4u4OUDXpDsbueSBNwtWgLCaKmgq3w/d/MsMh7Y="; # https://github.com/python-versioneer/python-versioneer/issues/217 postFetch = '' sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#' diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index 79ab2a32e26f1..e464079da93c7 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-wvPtcYW++PmDvCpgTIppvwg4Zibrg384yth9da11fMk="; + sha256 = "sha256-LZL9f/pX74rKW+wnNHGKwGuuISOTcFVr6W9h/JEK0U4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix index 413de25764114..859ddf6dcecc0 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix @@ -22,27 +22,27 @@ let plugins = { hy3 = { fetchFromGitHub, cmake, hyprland }: - mkHyprlandPlugin hyprland { + mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "hl0.40.0"; - hash = "sha256-Y9bIML3C5xyKKv+Yel4LUfSkScwGunOVZkg+Z1dPwHI="; + rev = "hl${version}"; + hash = "sha256-gEEWWlQRvejSR2RRg78Lubz6siIgknqj6CslveyyIP4="; }; nativeBuildInputs = [ cmake ]; dontStrip = true; - meta = with lib; { + meta = { homepage = "https://github.com/outfoxxed/hy3"; description = "Hyprland plugin for an i3 / sway like manual tiling layout"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.aacebedo ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aacebedo ]; }; }; }; diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 6b88271602623..4077ee5ced8e4 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -224,7 +224,7 @@ in '' CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/" -e "s/-/_/g") grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \ - | awk -F= "/^cargo:/ { sub(/^cargo:/, \"\", \$1); gsub(/-/, \"_\", \$1); print \"export \" toupper(\"DEP_$(echo $CRATENAME)_\" \$1) \"=\" \$2 }" > target/env + | awk -F= "/^cargo:/ { sub(/^cargo:/, \"\", \$1); gsub(/-/, \"_\", \$1); print \"export \" toupper(\"DEP_$(echo $CRATENAME)_\" \$1) \"=\" \"\\\"\"\$2\"\\\"\" }" > target/env set -e fi runHook postConfigure diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix index e6dfd4a48ddf5..866958347f192 100644 --- a/pkgs/by-name/ba/baresip/package.nix +++ b/pkgs/by-name/ba/baresip/package.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { meta = { description = "Modular SIP User-Agent with audio and video support"; homepage = "https://github.com/baresip/baresip"; - maintainers = with lib.maintainers; [ elohmeier raskin ehmry ]; + maintainers = with lib.maintainers; [ raskin ehmry ]; mainProgram = "baresip"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; diff --git a/pkgs/games/BeatSaberModManager/deps.nix b/pkgs/by-name/be/beatsabermodmanager/deps.nix index 64115dd683e94..64115dd683e94 100644 --- a/pkgs/games/BeatSaberModManager/deps.nix +++ b/pkgs/by-name/be/beatsabermodmanager/deps.nix diff --git a/pkgs/games/BeatSaberModManager/default.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix index 5c0f73d329f24..d21283e0952c9 100644 --- a/pkgs/games/BeatSaberModManager/default.nix +++ b/pkgs/by-name/be/beatsabermodmanager/package.nix @@ -18,12 +18,12 @@ }: buildDotnetModule rec { - pname = "BeatSaberModManager"; + pname = "beatsabermodmanager"; version = "0.0.5"; src = fetchFromGitHub { owner = "affederaffe"; - repo = pname; + repo = "BeatSaberModManager"; rev = "v${version}"; sha256 = "sha256-HHWC+MAwJ+AMCuBzSuR7FbW3k+wLri0B9J1DftyfNEU="; fetchSubmodules = true; # It vendors BSIPA-Linux diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index 9c7212345c277..9f6f9ff3d8bee 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -7,7 +7,7 @@ let pname = "beekeeper-studio"; - version = "4.3.4"; + version = "4.4.0"; plat = { aarch64-linux = "-arm64"; @@ -16,7 +16,7 @@ let hash = { aarch64-linux = "sha256-RzPw+jsHecOYSBn/TrEFew5V0LvYS15dUuscS7+GraM="; - x86_64-linux = "sha256-RT+A2rq0rMv2o0au5cfcZJysGy+7xYvBDfEJ/TyJmZw="; + x86_64-linux = "sha256-fWr0ezPU5U8G9M3JEjUdBFZksbJL5CUjdNbAyT5dwI8="; }.${stdenv.hostPlatform.system}; src = fetchurl { diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index d8cd547778f96..83fab6d81e8f2 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -8,6 +8,7 @@ , writeShellScriptBin , makeWrapper , copyDesktopItems +, giflib , makeDesktopItem , pkg-config , pixman @@ -57,6 +58,7 @@ buildNpmPackage' rec { pango ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreText + giflib ]; desktopItems = [ diff --git a/pkgs/by-name/bt/btrfs-assistant/package.nix b/pkgs/by-name/bt/btrfs-assistant/package.nix index f461d67b6f783..fce0bd8fc6eb7 100644 --- a/pkgs/by-name/bt/btrfs-assistant/package.nix +++ b/pkgs/by-name/bt/btrfs-assistant/package.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, fetchFromGitLab -, bash -, btrfs-progs -, cmake -, coreutils -, git -, pkg-config -, qt6 -, snapper -, util-linux -, enableSnapper ? true -, nix-update-script +{ + lib, + stdenv, + fetchFromGitLab, + bash, + btrfs-progs, + cmake, + coreutils, + git, + pkg-config, + qt6, + snapper, + util-linux, + enableSnapper ? true, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -29,53 +30,47 @@ stdenv.mkDerivation (finalAttrs: { cmake git pkg-config + qt6.wrapQtAppsHook ]; buildInputs = [ btrfs-progs + coreutils qt6.qtbase qt6.qtsvg qt6.qttools qt6.qtwayland - ]; - - propagatedBuildInputs = [ qt6.wrapQtAppsHook ]; + util-linux + ] ++ lib.optionals enableSnapper [ snapper ]; - prePatch = '' - substituteInPlace src/util/System.cpp \ - --replace '/bin/bash' "${lib.getExe bash}" - '' - + lib.optionalString enableSnapper '' - substituteInPlace src/main.cpp \ - --replace '/usr/bin/snapper' "${lib.getExe snapper}" - ''; + prePatch = + '' + substituteInPlace src/util/System.cpp \ + --replace-fail '/bin/bash' "${lib.getExe bash}" - postPatch = '' - substituteInPlace src/org.btrfs-assistant.pkexec.policy \ - --replace '/usr/bin' "$out/bin" + substituteInPlace src/main.cpp \ + --replace-fail 'if (!qEnvironmentVariableIsEmpty("DISPLAY"))' ' if(!qEnvironmentVariableIsEmpty("DISPLAY") || !qEnvironmentVariableIsEmpty("WAYLAND_DISPLAY"))' + '' + + lib.optionalString enableSnapper '' + substituteInPlace src/main.cpp \ + --replace-fail '/usr/bin/snapper' "${lib.getExe snapper}" + ''; - substituteInPlace src/btrfs-assistant \ - --replace 'btrfs-assistant-bin' "$out/bin/btrfs-assistant-bin" + postPatch = + '' + substituteInPlace src/org.btrfs-assistant.pkexec.policy \ + --replace-fail '/usr/bin' "$out/bin" - substituteInPlace src/btrfs-assistant-launcher \ - --replace 'btrfs-assistant' "$out/bin/btrfs-assistant" - '' - + lib.optionalString enableSnapper '' - substituteInPlace src/btrfs-assistant.conf \ - --replace '/usr/bin/snapper' "${lib.getExe snapper}" - ''; + substituteInPlace src/btrfs-assistant \ + --replace-fail 'btrfs-assistant-bin' "$out/bin/btrfs-assistant-bin" - qtWrapperArgs = - let - runtimeDeps = lib.makeBinPath ([ - coreutils - util-linux - ] - ++ lib.optionals enableSnapper [ snapper ]); - in - [ - "--prefix PATH : ${runtimeDeps}" - ]; + substituteInPlace src/btrfs-assistant-launcher \ + --replace-fail 'btrfs-assistant' "$out/bin/btrfs-assistant" + '' + + lib.optionalString enableSnapper '' + substituteInPlace src/btrfs-assistant.conf \ + --replace-fail '/usr/bin/snapper' "${lib.getExe snapper}" + ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 7334d8a5ee08a..9ff956d3c6f04 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -44,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "317"; + version = "318"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-faTV9gOzPZMCLHoohzwOJ7v0gStavhUL6JQ1hFjcvhA="; + hash = "sha256-1SpSzC5wOsv4Ha0ShtuyPsKLm0fVuPt8KFejJHFU8MY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index 7e1493956ca3e..39a506dbc69e4 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cue"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - hash = "sha256-gjuQ7sp6/GeKSqyyicOtH5Q/1xRy/7cta4KKMn2cfzQ="; + hash = "sha256-hhu66uiBkxyYRw8eruqxVifr2yftDXcYRTK5VYbjRPQ="; }; vendorHash = "sha256-FsFignBh669E60S8l8siQHLzeSfB5X/XOHBXPMDX3Cg="; @@ -24,7 +24,11 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + "-X cuelang.org/go/cmd/cue/cmd.version=v${version}" + ]; postInstall = '' installShellCompletion --cmd cue \ @@ -48,7 +52,7 @@ buildGoModule rec { meta = with lib; { description = "Data constraint language which aims to simplify tasks involving defining and using data"; homepage = "https://cuelang.org/"; - license = lib.licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ aaronjheng ]; mainProgram = "cue"; }; diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 4f516930c313a..ee80efd1c3d6f 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -1,23 +1,27 @@ -{ lib -, stdenvNoCC -, fetchurl -, makeWrapper -, openjdk17 -, gnused -, autoPatchelfHook -, wrapGAppsHook3 +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + makeWrapper, + openjdk17, + gnused, + autoPatchelfHook, + wrapGAppsHook3, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; version = "24.0.5"; - nativeBuildInputs = [ - makeWrapper - gnused - autoPatchelfHook - wrapGAppsHook3 - ]; + nativeBuildInputs = + [ makeWrapper ] + ++ lib.optionals (!stdenvNoCC.isDarwin) [ + gnused + wrapGAppsHook3 + autoPatchelfHook + ] + ++ lib.optionals stdenvNoCC.isDarwin [ undmg ]; src = let @@ -26,10 +30,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { suffix = selectSystem { x86_64-linux = "linux.gtk.x86_64-nojdk.tar.gz"; aarch64-linux = "linux.gtk.aarch64-nojdk.tar.gz"; + x86_64-darwin = "macos-x86_64.dmg"; + aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { x86_64-linux = "sha256-q6VIr55hXn47kZrE2i6McEOfp2FBOvwB0CcUnRHFMZs="; aarch64-linux = "sha256-Xn3X1C31UALBAsZIGyMWdp0HNhJEm5N+7Go7nMs8W64="; + x86_64-darwin = "sha256-XOQaMNQHOC4dVJXIUn4l4Oa7Gohbq+JMDFusIy/U+tc="; + aarch64-darwin = "sha256-554ea5p1MR4XIHtSeByd4S/Ke4cKRZbITTNRRDoRqPI="; }; in fetchurl { @@ -40,28 +48,44 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontConfigure = true; dontBuild = true; - installPhase = '' - runHook preInstall - mkdir -p $out/opt/dbeaver $out/bin - cp -r * $out/opt/dbeaver - makeWrapper $out/opt/dbeaver/dbeaver $out/bin/dbeaver \ - --prefix PATH : "${openjdk17}/bin" \ - --set JAVA_HOME "${openjdk17.home}" + sourceRoot = lib.optional stdenvNoCC.isDarwin "dbeaver.app"; - mkdir -p $out/share/icons/hicolor/256x256/apps - ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png + installPhase = + if !stdenvNoCC.isDarwin then + '' + runHook preInstall + mkdir -p $out/opt/dbeaver $out/bin + cp -r * $out/opt/dbeaver + makeWrapper $out/opt/dbeaver/dbeaver $out/bin/dbeaver \ + --prefix PATH : "${openjdk17}/bin" \ + --set JAVA_HOME "${openjdk17.home}" - mkdir -p $out/share/applications - ln -s $out/opt/dbeaver/dbeaver-ce.desktop $out/share/applications/dbeaver.desktop + mkdir -p $out/share/icons/hicolor/256x256/apps + ln -s $out/opt/dbeaver/dbeaver.png $out/share/icons/hicolor/256x256/apps/dbeaver.png - substituteInPlace $out/opt/dbeaver/dbeaver-ce.desktop \ - --replace-fail "/usr/share/dbeaver-ce/dbeaver.png" "dbeaver" \ - --replace-fail "/usr/share/dbeaver-ce/dbeaver" "$out/bin/dbeaver" + mkdir -p $out/share/applications + ln -s $out/opt/dbeaver/dbeaver-ce.desktop $out/share/applications/dbeaver.desktop - sed -i '/^Path=/d' $out/share/applications/dbeaver.desktop + substituteInPlace $out/opt/dbeaver/dbeaver-ce.desktop \ + --replace-fail "/usr/share/dbeaver-ce/dbeaver.png" "dbeaver" \ + --replace-fail "/usr/share/dbeaver-ce/dbeaver" "$out/bin/dbeaver" - runHook postInstall - ''; + sed -i '/^Path=/d' $out/share/applications/dbeaver.desktop + + runHook postInstall + '' + else + '' + runHook preInstall + + mkdir -p $out/{Applications/dbeaver.app,bin} + cp -R . $out/Applications/dbeaver.app + makeWrapper $out/{Applications/dbeaver.app/Contents/MacOS,bin}/dbeaver \ + --prefix PATH : "${openjdk17}/bin" \ + --set JAVA_HOME "${openjdk17.home}" + + runHook postInstall + ''; passthru.updateScript = ./update.sh; @@ -76,8 +100,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ gepbird mkg20001 ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ + gepbird + mkg20001 + yzx9 + ]; mainProgram = "dbeaver"; }; }) diff --git a/pkgs/by-name/db/dbeaver-bin/update.sh b/pkgs/by-name/db/dbeaver-bin/update.sh index ad8461e5a2eb8..64b965da6db07 100755 --- a/pkgs/by-name/db/dbeaver-bin/update.sh +++ b/pkgs/by-name/db/dbeaver-bin/update.sh @@ -14,7 +14,9 @@ fi for i in \ "x86_64-linux linux.gtk.x86_64-nojdk.tar.gz" \ - "aarch64-linux linux.gtk.aarch64-nojdk.tar.gz" + "aarch64-linux linux.gtk.aarch64-nojdk.tar.gz" \ + "x86_64-darwin macos-x86_64.dmg" \ + "aarch64-darwin macos-aarch64.dmg" do set -- $i prefetch=$(nix-prefetch-url "https://github.com/dbeaver/dbeaver/releases/download/$latestVersion/dbeaver-ce-$latestVersion-$2") diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/by-name/fi/fil-plugins/package.nix index 7aec4cff35580..1d819fd8b7639 100644 --- a/pkgs/applications/audio/FIL-plugins/default.nix +++ b/pkgs/by-name/fi/fil-plugins/package.nix @@ -4,12 +4,12 @@ , ladspaH }: -stdenv.mkDerivation rec { - pname = "FIL-plugins"; +stdenv.mkDerivation (finalAttrs: { + pname = "fil-plugins"; version = "0.3.0"; src = fetchurl { - url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/FIL-plugins-${finalAttrs.version}.tar.bz2"; hash = "sha256-HAvycSEZZfZwoVp3g7QWcwfbdyZKwWJKBuVmeWTajuk="; }; @@ -34,10 +34,9 @@ stdenv.mkDerivation rec { All switches and controls are internally smoothed, so they can be used 'live' whithout any clicks or zipper noises. This should make this plugin a good candidate for use in systems that allow automation of plugin control ports, such as Ardour, or for stage use. ''; - version = version; homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ha/hatsu/package.nix b/pkgs/by-name/ha/hatsu/package.nix new file mode 100644 index 0000000000000..ec88f6aea5bba --- /dev/null +++ b/pkgs/by-name/ha/hatsu/package.nix @@ -0,0 +1,40 @@ +{ cmake +, fetchFromGitHub +, gitUpdater +, lib +, openssl +, pkg-config +, rustPlatform +}: +rustPlatform.buildRustPackage rec { + pname = "hatsu"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "importantimport"; + repo = "hatsu"; + rev = "v${version}"; + hash = "sha256-gBzhuV0SDmNwl5PkpdGxkMBn5m4vEXfv23WK7+ZzQs8="; + }; + + cargoHash = "sha256-A2tl0jjKODA/qodxkIe/3V4ZDGV4X0myiduJsLtd7r0="; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ openssl ]; + + env = { OPENSSL_NO_VENDOR = true; }; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "beta"; + }; + + meta = { + description = "Self-hosted and fully-automated ActivityPub bridge for static sites"; + homepage = "https://github.com/importantimport/hatsu"; + license = lib.licenses.agpl3Only; + mainProgram = "hatsu"; + maintainers = with lib.maintainers; [ kwaa ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json new file mode 100644 index 0000000000000..ef4aabbe6b03a --- /dev/null +++ b/pkgs/by-name/hy/hyprland/info.json @@ -0,0 +1,7 @@ +{ + "branch": "main", + "commit_hash": "9e781040d9067c2711ec2e9f5b47b76ef70762b3", + "commit_message": "props: bump version to 0.41.1", + "date": "2024-06-13", + "tag": "v0.41.1" +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/by-name/hy/hyprland/package.nix index 958e84ac78f0e..ae3e38de9a6ce 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -9,21 +9,29 @@ , binutils , cairo , epoll-shim +, expat +, fribidi , git , hyprcursor , hyprland-protocols , hyprlang +, hyprutils , hyprwayland-scanner , jq , libGL , libdrm +, libdatrie , libexecinfo , libinput +, libselinux +, libsepol +, libthai , libuuid , libxkbcommon , mesa , pango , pciutils +, pcre2 , pkgconf , python3 , systemd @@ -47,30 +55,41 @@ , hidpiXWayland ? false , enableNvidiaPatches ? false }: +let + info = builtins.fromJSON (builtins.readFile ./info.json); +in assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed."; assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed."; assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.40.0-unstable-2024-05-05"; + version = "0.41.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; fetchSubmodules = true; - rev = "f15513309b24790099d42974274eb23f66f7c985"; - hash = "sha256-zKOfgXPTlRqCR+EME4qjN9rgAnC3viI5KWx10dhKszw="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-hLnnNBWP1Qjs1I3fndMgp8rbWJruxdnGTq77A4Rv4R4="; }; postPatch = '' # Fix hardcoded paths to /usr installation sed -i "s#/usr#$out#" src/render/OpenGL.cpp + + # Remove extra @PREFIX@ to fix pkg-config paths + sed -i "s#@PREFIX@/##g" hyprland.pc.in ''; - # used by version.sh - DATE = "2024-05-05"; - HASH = finalAttrs.src.rev; + # variables used by generateVersion.sh script, and shown in `hyprctl version` + BRANCH = info.branch; + COMMITS = info.commit_hash; + DATE = info.date; + DIRTY = ""; + HASH = info.commit_hash; + MESSAGE = info.commit_message; + TAG = info.tag; depsBuildBuild = [ # to find wayland-scanner when cross-compiling @@ -98,13 +117,20 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo + expat + fribidi git - hyprcursor + hyprcursor.dev hyprland-protocols hyprlang + hyprutils libGL + libdatrie libdrm libinput + libselinux + libsepol + libthai libuuid libxkbcommon mesa @@ -112,6 +138,7 @@ stdenv.mkDerivation (finalAttrs: { wayland-protocols pango pciutils + pcre2 tomlplusplus # for subproject wlroots-hyprland seatd @@ -152,11 +179,16 @@ stdenv.mkDerivation (finalAttrs: { passthru.providedSessions = [ "hyprland" ]; - meta = with lib; { + passthru.updateScript = ./update.sh; + + meta = { homepage = "https://github.com/hyprwm/Hyprland"; description = "Dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; - license = licenses.bsd3; - maintainers = with maintainers; [ wozeparrot fufexan ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + wozeparrot + fufexan + ]; mainProgram = "Hyprland"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprland/update.sh b/pkgs/by-name/hy/hyprland/update.sh new file mode 100755 index 0000000000000..c729705f6b1d0 --- /dev/null +++ b/pkgs/by-name/hy/hyprland/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p common-updater-scripts fd jq + +set -eou pipefail + +latest_release="$(curl --silent 'https://api.github.com/repos/hyprwm/Hyprland/releases/latest')" +latest_tag="$(curl --silent 'https://api.github.com/repos/hyprwm/Hyprland/tags?per_page=1')" +commit_hash="$(jq -r '.[0].commit.sha' <<<"$latest_tag")" +latest_commit="$(curl --silent 'https://api.github.com/repos/hyprwm/Hyprland/commits/'"$commit_hash"'')" +commit_message="$(jq -r '.commit.message' <<<"$latest_commit")" + +tag=$(jq -r '.tag_name' <<<"$latest_release") +# drop 'v' prefix +version="${tag#v}" + +branch=$(jq -r '.target_commitish' <<<"$latest_release") + +date=$(jq -r '.created_at' <<<"$latest_release") +# truncate time +date=${date%T*} + +# update version; otherwise fail +update-source-version hyprland "$version" --ignore-same-hash + +# find hyprland dir +files="$(fd --full-path /hyprland/ | head -1)" +dir="${files%/*}" + +echo -e '{ + "branch": "'"$branch"'", + "commit_hash": "'"$commit_hash"'", + "commit_message": "'"$commit_message"'", + "date": "'"$date"'", + "tag": "'"$tag"'" +}' >"$dir/info.json" diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix new file mode 100644 index 0000000000000..f29cb3665fbda --- /dev/null +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hyprutils"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprutils"; + rev = "v${finalAttrs.version}"; + hash = "sha256-8KvVqtApNt4FWTdn1TqVvw00rpqyG9UuUPA2ilPVD1U="; + }; + + nativeBuildInputs = [ cmake ]; + + outputs = [ "out" "dev" ]; + + doCheck = false; + + meta = { + homepage = "https://github.com/hyprwm/hyprutils"; + description = "Small C++ library for utilities used across the Hypr* ecosystem"; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + donovanglover + johnrtitor + ]; + }; +}) diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix index 1aebc8b626000..ec295b2d72859 100644 --- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -4,17 +4,18 @@ , cmake , pkg-config , pugixml +, nix-update-script , }: stdenv.mkDerivation (finalAttrs: { pname = "hyprwayland-scanner"; - version = "0.3.4"; + version = "0.3.10"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprwayland-scanner"; rev = "v${finalAttrs.version}"; - hash = "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY="; + hash = "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM="; }; nativeBuildInputs = [ @@ -28,12 +29,15 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://github.com/hyprwm/hyprwayland-scanner"; description = "Hyprland version of wayland-scanner in and for C++"; - license = licenses.bsd3; - maintainers = with maintainers; [ fufexan ]; + changelog = "https://github.com/hyprwm/hyprwayland-scanner/releases/tag/${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fufexan ]; mainProgram = "hyprwayland-scanner"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/jo/joularjx/package.nix b/pkgs/by-name/jo/joularjx/package.nix new file mode 100644 index 0000000000000..df0d66290a8dc --- /dev/null +++ b/pkgs/by-name/jo/joularjx/package.nix @@ -0,0 +1,42 @@ +{ + fetchFromGitHub, + maven, + makeWrapper, + jre, + lib, +}: + +maven.buildMavenPackage rec { + pname = "joularjx"; + version = "2.9.0"; + + src = fetchFromGitHub { + owner = "joular"; + repo = pname; + rev = version; + hash = "sha256-/Drv6PVMmz3QNEu8zMokTKBZeYWMjuKczu18qKqNAx4="; + }; + + mvnHash = "sha256-TKHo0hZBjgBeUWYvbjF3MZ6Egp3qB2LGwWfrGrcVkOk="; + + mvnParameters = "-DskipTests"; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share + cp target/joularjx-${version}.jar $out/share/joularjx.jar + makeWrapper ${jre}/bin/java $out/bin/joularjx \ + --add-flags "-javaagent:$out/share/joularjx.jar" + runHook postInstall + ''; + + meta = with lib; { + description = "Java-based agent for software power monitoring at the source code level"; + homepage = "https://github.com/joular/joularjx"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ julienmalka ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix new file mode 100644 index 0000000000000..6f78d0994d352 --- /dev/null +++ b/pkgs/by-name/la/lazysql/package.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, xorg ? null +, darwin ? null +}: + +buildGoModule rec { + pname = "lazysql"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "jorgerojas26"; + repo = "lazysql"; + rev = "v${version}"; + hash = "sha256-yPf9/SM4uET/I8FsDU1le9JgxELu0DR9k7mv8PnBwvQ="; + }; + + vendorHash = "sha256-tgD6qoCVC1ox15VPJWVvhe4yg3R81ktMuW2dsaU69rY="; + + buildInputs = lib.optionals stdenv.isLinux [ xorg.libX11 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + + meta = with lib; { + description = "A cross-platform TUI database management tool written in Go"; + homepage = "https://github.com/jorgerojas26/lazysql"; + license = licenses.mit; + maintainers = with maintainers; [ kanielrkirby ]; + mainProgram = "lazysql"; + }; +} diff --git a/pkgs/development/tools/literate-programming/Literate/dub-lock.json b/pkgs/by-name/li/literate/dub-lock.json index 18a1e415e5622..18a1e415e5622 100644 --- a/pkgs/development/tools/literate-programming/Literate/dub-lock.json +++ b/pkgs/by-name/li/literate/dub-lock.json diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/by-name/li/literate/package.nix index 0892d9f64485b..29b177ec53a83 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/by-name/li/literate/package.nix @@ -5,7 +5,7 @@ }: buildDubPackage { - pname = "Literate"; + pname = "literate"; version = "unstable-2021-01-22"; src = fetchFromGitHub { diff --git a/pkgs/by-name/pl/plattenalbum/package.nix b/pkgs/by-name/pl/plattenalbum/package.nix index 51977c84a321f..200bc55569da2 100644 --- a/pkgs/by-name/pl/plattenalbum/package.nix +++ b/pkgs/by-name/pl/plattenalbum/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication rec { pname = "plattenalbum"; - version = "2.1.0"; + version = "2.1.1"; pyproject = false; src = fetchFromGitHub { owner = "SoongNoonien"; repo = "plattenalbum"; - rev = "v${version}"; - hash = "sha256-vRBlShbNuPpL29huhzYSuUcMJmSLljO4nc6cSAp3NB4="; + rev = "refs/tags/v${version}"; + hash = "sha256-M4WjRQQYu8ixUYV6LgiyAPyvCS1Vk+UpLq/Sek0qBlw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/powerjoular/package.nix b/pkgs/by-name/po/powerjoular/package.nix new file mode 100644 index 0000000000000..62313198f92b1 --- /dev/null +++ b/pkgs/by-name/po/powerjoular/package.nix @@ -0,0 +1,45 @@ +{ + stdenv, + lib, + fetchFromGitHub, + gnat, + gprbuild, +}: + +stdenv.mkDerivation rec { + pname = "powerjoular"; + version = "0.7.3"; + + src = fetchFromGitHub { + owner = "joular"; + repo = pname; + rev = version; + hash = "sha256-UjoGY1C58xhINmji7R63wqkWK9yCeXa0wwosnIcfYdA="; + }; + + nativeBuildInputs = [ + gnat + gprbuild + ]; + + buildPhase = '' + runHook preBuild + gprbuild + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp obj/powerjoular $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "CLI software to monitor the power consumption of software and hardware components"; + homepage = "https://github.com/joular/powerjoular"; + maintainers = [ maintainers.julienmalka ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix index 4ae6c6894d089..3398236ec6a57 100644 --- a/pkgs/by-name/rc/rcu/package.nix +++ b/pkgs/by-name/rc/rcu/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "rcu"; - version = "2024.001o"; + version = "2024.001p"; format = "other"; src = let src-tarball = requireFile { name = "rcu-d${version}-source.tar.gz"; - sha256 = "1smi4cfnwbdil0f77244dfq65i173vb4g3kk451lwh35s91ar628"; + sha256 = "1njsfj4pfqh4c9gppkdlkkfba31v186wjz3zm94adhhpdwzx2ybb"; url = "http://www.davisr.me/projects/rcu/"; }; in runCommand "${src-tarball.name}-unpacked" {} '' diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/by-name/sk/skypeexport/package.nix index de70f49fe6040..2e6d72866073f 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/by-name/sk/skypeexport/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost }: -stdenv.mkDerivation rec { - pname = "SkypeExport"; +stdenv.mkDerivation (finalAttrs: { + pname = "skypeexport"; version = "1.4.0"; src = fetchFromGitHub { owner = "Temptin"; repo = "SkypeExport"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1ilkh0s3dz5cp83wwgmscnfmnyck5qcwqg1yxp9zv6s356dxnbak"; }; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ yana ]; }; -} +}) diff --git a/pkgs/by-name/sp/spades/package.nix b/pkgs/by-name/sp/spades/package.nix new file mode 100644 index 0000000000000..9a60ee499a645 --- /dev/null +++ b/pkgs/by-name/sp/spades/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchurl, + zlib, + bzip2, + cmake, + python3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "spades"; + version = "3.15.5"; + + src = fetchurl { + url = "https://github.com/ablab/spades/releases/download/v${finalAttrs.version}/SPAdes-${finalAttrs.version}.tar.gz"; + hash = "sha256-FVw2QNVx8uexmgUDHR/Q0ZvYLfeF04hw+5O9JBsSu/o="; + }; + sourceRoot = "SPAdes-${finalAttrs.version}/src"; + + env.CXXFLAGS = toString [ + # GCC 13: error: 'uint32_t' does not name a type + "-include cstdint" + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + zlib + bzip2 + python3 + ]; + + doCheck = true; + + meta = { + description = "St. Petersburg genome assembler, a toolkit for assembling and analyzing sequencing data"; + license = lib.licenses.gpl2Only; + homepage = "http://ablab.github.io/spades"; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; + maintainers = with lib.maintainers; [ bzizou ]; + }; +}) diff --git a/pkgs/by-name/sq/sqlite-vss/package.nix b/pkgs/by-name/sq/sqlite-vss/package.nix index b619e8ae6ed5e..e1c65b63407af 100644 --- a/pkgs/by-name/sq/sqlite-vss/package.nix +++ b/pkgs/by-name/sq/sqlite-vss/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/asg017/sqlite-vss"; changelog = "https://github.com/asg017/sqlite-vss/releases/tag/v${finalAttrs.version}"; license = licenses.mit; - maintainers = with maintainers; [ elohmeier ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix index 3705a40ef096a..f16f01b2b92e3 100644 --- a/pkgs/by-name/ta/tailscale-nginx-auth/package.nix +++ b/pkgs/by-name/ta/tailscale-nginx-auth/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildGoModule, fetchFromGitHub }: let - version = "1.66.4"; + version = "1.68.0"; in buildGoModule { pname = "tailscale-nginx-auth"; @@ -11,9 +11,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-ETBca3qKO2iS30teIF5sr/oyJdRSKFqLFVO3+mmm7bo="; + hash = "sha256-GTl5RCwIoDuzbaigy0/++xaPPEMLRDbBi/z82xCDOZY="; }; - vendorHash = "sha256-Hd77xy8stw0Y6sfk3/ItqRIbM/349M/4uf0iNy1xJGw="; + vendorHash = "sha256-SUjoeOFYz6zbEgv/vND7kEXbuWlZDrUKF2Dmqsf/KVw="; CGO_ENABLED = 0; diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index 0c69a0cf1a4ce..46e370cfa291c 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "typos-lsp"; # Please update the corresponding VSCode extension too. # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix - version = "0.1.18"; + version = "0.1.19"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-6ELn2Q7pAUgnwe8+vAUbuRjaKFWvbGZ1SMfXQ1qKp5c="; + hash = "sha256-3bXOMW6aU4ryJqrUmpCIbBqRWrh4R6tlkEHPqpPSsVI="; }; - cargoHash = "sha256-UDID+dI8ETP084WR482uWli2++bI4mRiMvpFpWUlvZE="; + cargoHash = "sha256-3GHVGjn4upI7U8GyxwlrLpchWALGFuMSektCrwLiIIM="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 245006f199041..2377636d77417 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "30.1.1"; + version = "30.2.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-PVPr/mI13UDJfXy+vmj3DfZ1vkcE7r7YoWTeXokJz50="; + hash = "sha256-L08xBKZHFFByemEa4GgwQRr+wRCocuT/RO+hV/S+hFA="; }; - npmDepsHash = "sha256-/MWONDfq+2TqwcOJFnjLatSdGvMqcgMjJnuuAduWJ14="; + npmDepsHash = "sha256-oRV6QVcJiVKvUtfrewTtnmlIMDaGknn0lEHdcNM3V2g="; nativeBuildInputs = [ remarshal diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 226cc1ebd3494..d6c38b555dd6e 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.15"; + version = "1.4.17"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-32GhThVaLjIkCfHAaPWtZjZJ8Cmk7LM6KEHxVSYIrEg="; + hash = "sha256-P3CoRV6zopAtQDmtkbk0o0jKHu4jpKkqPeCCSQWn0aI="; }; buildInputs = [ diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 73565ba0311b0..fa419830f3c7c 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for real-time communications with async IO support and a complete SIP stack"; homepage = "https://github.com/baresip/re"; - maintainers = with lib.maintainers; [ elohmeier raskin ]; + maintainers = with lib.maintainers; [ raskin ]; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 723708d353ede..10dba7e7a59dd 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for real-time audio and video processing"; homepage = "https://github.com/baresip/rem"; - maintainers = with lib.maintainers; [ elohmeier raskin ]; + maintainers = with lib.maintainers; [ raskin ]; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 26eb29493a494..095406cd5fbb9 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-NYdV70YEepjGMmeTALTQvlRvK3R7JjA4VJYYjOwO4AA="; + hash = "sha256-qZharhEZ16q3Vd2PwVsKQaP/b6bT/okwEPKKwvRl5D8="; }; outputs = [ diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 8aea13bf0cbd9..72eae199dd015 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2388,6 +2388,29 @@ buildLuarocksPackage { }; }) {}; +lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: +buildLuarocksPackage { + pname = "lz.n"; + version = "1.2.2-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lz.n-1.2.2-1.rockspec"; + sha256 = "1vbb5q3rfk0wfx4pdv3xcxnmflrrny5gm21d8h1wj32m6kbc6ddi"; + }).outPath; + src = fetchzip { + url = "https://github.com/nvim-neorocks/lz.n/archive/v1.2.2.zip"; + sha256 = "0im71h313vxijdkx9q5506lrhk1rqxvraqh89l7h4nr8xziscpv9"; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/nvim-neorocks/lz.n"; + description = "🦥 A dead simple lazy-loading Lua library for Neovim plugins."; + maintainers = with lib.maintainers; [ mrcjkb ]; + license.fullName = "GPL-2+"; + }; +}) {}; + magick = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lua }: buildLuarocksPackage { pname = "magick"; diff --git a/pkgs/development/python-modules/aiohttp-swagger/default.nix b/pkgs/development/python-modules/aiohttp-swagger/default.nix index c97a3a27c7a34..0b7dc5c6ea2e2 100644 --- a/pkgs/development/python-modules/aiohttp-swagger/default.nix +++ b/pkgs/development/python-modules/aiohttp-swagger/default.nix @@ -54,6 +54,5 @@ buildPythonPackage rec { description = "Swagger API Documentation builder for aiohttp"; homepage = "https://github.com/cr0hn/aiohttp-swagger"; license = licenses.mit; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index a05570b39a336..117e5c0c41966 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -40,6 +40,5 @@ buildPythonPackage rec { description = "Click command line utilities"; homepage = "https://github.com/hjacobs/python-clickclick/"; license = licenses.asl20; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index f48debb7582e4..6c8373b3fad24 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -95,6 +95,5 @@ buildPythonPackage rec { homepage = "https://github.com/spec-first/connexion"; changelog = "https://github.com/spec-first/connexion/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix index 71ee75a9f6b9a..5aad0ccdc321d 100644 --- a/pkgs/development/python-modules/django-sesame/default.nix +++ b/pkgs/development/python-modules/django-sesame/default.nix @@ -45,6 +45,5 @@ buildPythonPackage rec { homepage = "https://github.com/aaugustin/django-sesame"; changelog = "https://github.com/aaugustin/django-sesame/blob/${version}/docs/changelog.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/dwdwfsapi/default.nix b/pkgs/development/python-modules/dwdwfsapi/default.nix index f903f7502147e..8f72d8c974b77 100644 --- a/pkgs/development/python-modules/dwdwfsapi/default.nix +++ b/pkgs/development/python-modules/dwdwfsapi/default.nix @@ -37,6 +37,5 @@ buildPythonPackage rec { homepage = "https://github.com/stephan192/dwdwfsapi"; changelog = "https://github.com/stephan192/dwdwfsapi/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/editables/default.nix b/pkgs/development/python-modules/editables/default.nix index 06b93554322de..32030cff7d467 100644 --- a/pkgs/development/python-modules/editables/default.nix +++ b/pkgs/development/python-modules/editables/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "editables"; version = "0.5"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-MJYn2bXErcDmaNjG+nusG6fIxdQVwtJ/YPCB+OgNHeI="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -25,10 +25,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "editables" ]; - meta = with lib; { + meta = { description = "Editable installations"; - maintainers = with maintainers; [ ]; homepage = "https://github.com/pfmoore/editables"; - license = licenses.mit; + changelog = "https://github.com/pfmoore/editables/blob/${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getchoo ]; }; } diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index 69e9aa04d8467..46c9517337104 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -42,6 +42,5 @@ buildPythonPackage rec { homepage = "https://github.com/scottwernervt/favicon"; changelog = "https://github.com/scottwernervt/favicon/blob/${version}/CHANGELOG.rst"; license = licenses.mit; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index 25b906c7fe45b..098cbce956fec 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -42,7 +42,6 @@ buildPythonPackage rec { description = "Pure-python FinTS (formerly known as HBCI) implementation"; license = licenses.lgpl3Only; maintainers = with maintainers; [ - elohmeier dotlambda ]; }; diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix index a7bc311ae031c..126a259a95653 100644 --- a/pkgs/development/python-modules/graph-tool/default.nix +++ b/pkgs/development/python-modules/graph-tool/default.nix @@ -22,6 +22,7 @@ python, scipy, sparsehash, + gitUpdater, }: let @@ -33,12 +34,12 @@ let in buildPythonPackage rec { pname = "graph-tool"; - version = "2.68"; + version = "2.70"; format = "other"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - hash = "sha256-jB+/R6yZVhU0iohxYVNHdD205MauRxMoohbj4a2T+rw="; + hash = "sha256-hohGgOnxP1nb8NfkDRYPJ08sx0EH8PxX7Rblk1PLlIk="; }; # Remove error messages about tput during build process without adding ncurses, @@ -88,6 +89,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "graph_tool" ]; + passthru.updateScript = gitUpdater { + url = "https://git.skewed.de/count0/graph-tool"; + rev-prefix = "release-"; + }; + meta = { description = "Python module for manipulation and statistical analysis of graphs"; homepage = "https://graph-tool.skewed.de"; diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 9489be94213c6..25296b64d9baa 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -38,11 +38,11 @@ buildPythonPackage rec { --replace "--cov=gunicorn --cov-report=xml" "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ packaging ]; + dependencies = [ packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { gevent = [ gevent ]; eventlet = [ eventlet ]; tornado = [ tornado ]; @@ -52,16 +52,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "gunicorn" ]; - nativeCheckInputs = [ - pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); - meta = with lib; { - changelog = "https://github.com/benoitc/gunicorn/releases/tag/${version}"; - homepage = "https://github.com/benoitc/gunicorn"; + meta = { description = "gunicorn 'Green Unicorn' is a WSGI HTTP Server for UNIX, fast clients and sleepy applications"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + homepage = "https://github.com/benoitc/gunicorn"; + changelog = "https://github.com/benoitc/gunicorn/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getchoo ]; mainProgram = "gunicorn"; }; } diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index a0f3174f1c682..b4220824ae93a 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -68,6 +68,5 @@ buildPythonPackage rec { description = "Jupyter Packaging Utilities"; homepage = "https://github.com/jupyter/jupyter-packaging"; license = licenses.bsd3; - maintainers = [ maintainers.elohmeier ]; }; } diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index 71cf418e13a2b..6ac18bef59372 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -54,6 +54,5 @@ buildPythonPackage rec { description = "Jupyter lab environment notebook server extension"; homepage = "https://github.com/jupyter/nbclassic"; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index 579035c1df5d2..ca8a72fff516b 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pims"; - version = "0.6.1"; + version = "0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "soft-matter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QdllA1QTSJ8vWaSJ0XoUanX53sb4RaOmdXBCFEsoWMU="; + hash = "sha256-3SBZk11w6eTZFmETMRJaYncxY38CYne1KzoF5oRgzuY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix index 7cdc7aebeba35..e707086e259cb 100644 --- a/pkgs/development/python-modules/ptyprocess/default.nix +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -28,17 +28,17 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ptyprocess" ]; - meta = with lib; { + meta = { description = "Run a subprocess in a pseudo terminal"; homepage = "https://github.com/pexpect/ptyprocess"; changelog = "https://github.com/pexpect/ptyprocess/releases/tag/${version}"; - license = licenses.isc; - maintainers = with maintainers; [ ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ getchoo ]; }; } diff --git a/pkgs/development/python-modules/python-ethtool/default.nix b/pkgs/development/python-modules/python-ethtool/default.nix index d028d1af2429d..b140db8c9f220 100644 --- a/pkgs/development/python-modules/python-ethtool/default.nix +++ b/pkgs/development/python-modules/python-ethtool/default.nix @@ -31,6 +31,5 @@ buildPythonPackage rec { description = "Python bindings for the ethtool kernel interface"; homepage = "https://github.com/fedora-python/python-ethtool"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/python-linux-procfs/default.nix b/pkgs/development/python-modules/python-linux-procfs/default.nix index 0b074adf94a5c..f4306acedf710 100644 --- a/pkgs/development/python-modules/python-linux-procfs/default.nix +++ b/pkgs/development/python-modules/python-linux-procfs/default.nix @@ -26,6 +26,5 @@ buildPythonPackage rec { mainProgram = "pflags"; homepage = "https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/python-linux-procfs.git/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/pyxlsb/default.nix b/pkgs/development/python-modules/pyxlsb/default.nix index a6d14a1aff3c0..36e33930d47d4 100644 --- a/pkgs/development/python-modules/pyxlsb/default.nix +++ b/pkgs/development/python-modules/pyxlsb/default.nix @@ -22,6 +22,5 @@ buildPythonPackage rec { description = "Excel 2007-2010 Binary Workbook (xlsb) parser"; homepage = "https://github.com/willtrnr/pyxlsb"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/returns/default.nix b/pkgs/development/python-modules/returns/default.nix index a468f377387fd..27fa225ba7d05 100644 --- a/pkgs/development/python-modules/returns/default.nix +++ b/pkgs/development/python-modules/returns/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "returns"; - version = "0.22.0"; + version = "0.23.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dry-python"; repo = "returns"; rev = "refs/tags/${version}"; - hash = "sha256-0eFirhBsj8SWfoAPWEMuFa+EvBgHKpNeKVj3qJ4L6hE="; + hash = "sha256-4ZP/wvPgqQQec/BaXuL9r7BEc2G+LztMdFul0NeEJTc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix index 6977f292e359e..d1e12b2ae1fad 100644 --- a/pkgs/development/python-modules/sepaxml/default.nix +++ b/pkgs/development/python-modules/sepaxml/default.nix @@ -39,6 +39,5 @@ buildPythonPackage rec { description = "SEPA Direct Debit XML generation in python"; homepage = "https://github.com/raphaelm/python-sepaxml/"; license = licenses.mit; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/pkgs/development/python-modules/swagger-ui-bundle/default.nix index d58bf4d9a4f05..b71ae59cca9ba 100644 --- a/pkgs/development/python-modules/swagger-ui-bundle/default.nix +++ b/pkgs/development/python-modules/swagger-ui-bundle/default.nix @@ -35,6 +35,5 @@ buildPythonPackage rec { description = "bundled swagger-ui pip package"; homepage = "https://github.com/dtkav/swagger_ui_bundle"; license = licenses.asl20; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 914da465b54c8..d07a93a3a8b43 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -98,6 +98,5 @@ buildPythonPackage rec { mainProgram = "weasyprint"; homepage = "https://weasyprint.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 26d98065c8207..e481df1d538bb 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { description = "Continuous Integration platform built on container technology"; mainProgram = "drone-server"; homepage = "https://github.com/harness/drone"; - maintainers = with maintainers; [ elohmeier vdemeester techknowlogick ]; + maintainers = with maintainers; [ vdemeester techknowlogick ]; license = with licenses; if enableUnfree then unfreeRedistributable else asl20; }; } diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index 5560f4aee6ebc..7050df4489709 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -3,6 +3,7 @@ stdenvNoCC, callPackages, fetchurl, + installShellFiles, nodejs, testers, withNode ? true, @@ -25,6 +26,8 @@ buildInputs = lib.optionals withNode [ nodejs ]; + nativeBuildInputs = [ installShellFiles nodejs ]; + installPhase = '' runHook preInstall @@ -36,6 +39,25 @@ runHook postInstall ''; + postInstall = + if lib.toInt (lib.versions.major version) < 9 then '' + export HOME="$PWD" + node $out/bin/pnpm install-completion bash + node $out/bin/pnpm install-completion fish + node $out/bin/pnpm install-completion zsh + sed -i '1 i#compdef pnpm' .config/tabtab/zsh/pnpm.zsh + installShellCompletion \ + .config/tabtab/bash/pnpm.bash \ + .config/tabtab/fish/pnpm.fish \ + .config/tabtab/zsh/pnpm.zsh + '' else '' + node $out/bin/pnpm completion bash >pnpm.bash + node $out/bin/pnpm completion fish >pnpm.fish + node $out/bin/pnpm completion zsh >pnpm.zsh + sed -i '1 i#compdef pnpm' pnpm.zsh + installShellCompletion pnpm.{bash,fish,zsh} + ''; + passthru = let fetchDepsAttrs = callPackages ./fetch-deps { pnpm = finalAttrs.finalPackage; }; in { diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index f54f77113e42e..571c0a489ea72 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.44.1"; + version = "4.44.2"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-5l948J0NTeWOeUMlcoEQZws8viqtARdkJsGch4c6Trw="; + hash = "sha256-l5/D2yCbf4CB4bUB/wIN/MW4u2D8pv7N6bL5q5DoDMs="; }; - vendorHash = "sha256-j5vcx5wW2v1kNc2QCPR11JEb1fTA9q4E4mbJ2VJC37A="; + vendorHash = "sha256-HiRdz6fDu0Q0mAi2E5Ec0Hst8mhJEfvNuoDXJ5Ak+js="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/os-specific/linux/ksmbd-tools/default.nix b/pkgs/os-specific/linux/ksmbd-tools/default.nix index b81f581c07aaa..de5d15a0c75aa 100644 --- a/pkgs/os-specific/linux/ksmbd-tools/default.nix +++ b/pkgs/os-specific/linux/ksmbd-tools/default.nix @@ -37,6 +37,5 @@ stdenv.mkDerivation rec { homepage = "https://www.kernel.org/doc/html/latest/filesystems/cifs/ksmbd.html"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/os-specific/linux/tuna/default.nix b/pkgs/os-specific/linux/tuna/default.nix index 3b527c8b534fe..634680dc318c2 100644 --- a/pkgs/os-specific/linux/tuna/default.nix +++ b/pkgs/os-specific/linux/tuna/default.nix @@ -57,6 +57,5 @@ buildPythonApplication rec { homepage = "https://git.kernel.org/pub/scm/utils/tuna/tuna.git"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index e5c9d4310cb82..a69e7eb3aecdd 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -10,10 +10,11 @@ , shadow , procps , nixosTests +, installShellFiles }: let - version = "1.68.0"; + version = "1.68.1"; in buildGoModule { pname = "tailscale"; @@ -23,7 +24,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-GTl5RCwIoDuzbaigy0/++xaPPEMLRDbBi/z82xCDOZY="; + hash = "sha256-ZAzro69F7ovfdqzRss/U7puh1T37bkEtUXabCYc5LwU="; }; patches = [ @@ -37,7 +38,7 @@ buildGoModule { vendorHash = "sha256-SUjoeOFYz6zbEgv/vND7kEXbuWlZDrUKF2Dmqsf/KVw="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ] ++ [ installShellFiles ]; CGO_ENABLED = 0; @@ -63,6 +64,12 @@ buildGoModule { --prefix PATH : ${lib.makeBinPath [ iproute2 iptables getent shadow ]} \ --suffix PATH : ${lib.makeBinPath [ procps ]} + local INSTALL="$out/bin/tailscale" + installShellCompletion --cmd tailscale \ + --bash <($out/bin/tailscale completion bash) \ + --fish <($out/bin/tailscale completion fish) \ + --zsh <($out/bin/tailscale completion zsh) + sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service ''; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f1641a4d32126..946d724f86aac 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,14 +5,14 @@ , git, nix, nixfmt-classic, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2024-06-04"; + version = "2024-06-13"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "efdfe2f29ac57a9de76391b4e5548edab6a43241"; - sha256 = "sha256-IyBZMAcSFhZ2zdDZ9FcKpSEK3N2qjkTbkh3ToigFtTw="; + rev = "0c9b42a863778d67aee22bbd43f296110fe1f047"; + sha256 = "sha256-8ZVYN97K4KJOG+JnVpCVbMx2HGypvk7KZmwNzUfcovo="; }; strictDeps = true; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index fc4ed942e9799..5ff28355bc7c4 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.17.3"; + version = "4.17.4"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IfgZd8dXSJU4WlW6i2EUP5DJcfaCNFT6STlCdLD+7nI="; + sha256 = "sha256-DF9Bx6CzZLdnyqe8PNWU2I9ym2SBDAjdwG9/zxvSjgs="; }; - vendorHash = "sha256-0QL/+Oaulk2PUAKTUZaYzZ7wLjrTgh2m2WoJM3QxvXw="; + vendorHash = "sha256-tX/QpAZLuQEYhm1I1twlg3TefaLqfiEz9cXID+r6EHA="; doCheck = false; diff --git a/pkgs/tools/games/steam-rom-manager/default.nix b/pkgs/tools/games/steam-rom-manager/default.nix index 6f4e7e0de333a..a58bcf55f34bd 100644 --- a/pkgs/tools/games/steam-rom-manager/default.nix +++ b/pkgs/tools/games/steam-rom-manager/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { name = "steam-rom-manager"; - version = "2.5.9"; + version = "2.5.11"; src = fetchurl { url = "https://github.com/SteamGridDB/steam-rom-manager/releases/download/v${version}/Steam-ROM-Manager-${version}.AppImage"; - sha256 = "sha256-jBRDlCOPamTwjE4x6J6MoN1EQBmILJ+yPMez/0f6F9c="; + sha256 = "sha256-KeJ1O7YZOP8l09XFIa043tEAAU6bwpvCsJQ5r5aeuQY="; }; extraInstallCommands = let diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix index 8a56bfb84845c..80f26666f0ffc 100644 --- a/pkgs/tools/networking/ligolo-ng/default.nix +++ b/pkgs/tools/networking/ligolo-ng/default.nix @@ -34,6 +34,5 @@ buildGoModule rec { homepage = "https://github.com/tnpitsecurity/ligolo-ng"; changelog = "https://github.com/nicocha30/ligolo-ng/releases/tag/v${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/tools/networking/snmpcheck/default.nix b/pkgs/tools/networking/snmpcheck/default.nix index b365ccc5f1911..dbf6c95de8ac1 100644 --- a/pkgs/tools/networking/snmpcheck/default.nix +++ b/pkgs/tools/networking/snmpcheck/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { description = "SNMP enumerator"; homepage = "http://www.nothink.org/codes/snmpcheck/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ elohmeier ]; mainProgram = "snmp-check"; }; } diff --git a/pkgs/tools/security/cewl/default.nix b/pkgs/tools/security/cewl/default.nix index dc1ad37513daa..833c521250792 100644 --- a/pkgs/tools/security/cewl/default.nix +++ b/pkgs/tools/security/cewl/default.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { mainProgram = "cewl"; homepage = "https://digi.ninja/projects/cewl.php/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/tools/security/evil-winrm/default.nix b/pkgs/tools/security/evil-winrm/default.nix index ab406caafb65c..b8e88e1db9ebd 100644 --- a/pkgs/tools/security/evil-winrm/default.nix +++ b/pkgs/tools/security/evil-winrm/default.nix @@ -42,6 +42,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Hackplayers/evil-winrm"; changelog = "https://github.com/Hackplayers/evil-winrm/blob/v${version}/CHANGELOG.md"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ elohmeier ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a16d5e0de6201..213afdf99d9a1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -109,6 +109,7 @@ mapAliases ({ bash_5 = bash; # Added 2021-08-20 bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 bazel_4 = throw "'bazel_4' has been removed from nixpkgs as it has reached end of life"; # Added 2024-01-23 + BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12 bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 bee-unstable = throw "bee-unstable has been removed, use 'bee' instead"; # Added 2024-02-12 bee-clef = throw "bee-clef has been removed as the upstream project was archived"; # Added 2024-02-12 @@ -372,6 +373,7 @@ mapAliases ({ fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03 inherit (luaPackages) fennel; # Added 2022-09-24 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve + FIL-plugins = fil-plugins; # Added 2024-06-12 findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; @@ -691,6 +693,7 @@ mapAliases ({ lispPackages_new = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 lispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 lispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07 + Literate = literate; # Added 2024-06-12 llama = walk; # Added 2023-01-23 # Linux kernels @@ -1215,6 +1218,7 @@ mapAliases ({ shipyard = jumppad; # Added 2023-06-06 signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17 simplenote = throw "'simplenote' has been removed because it is no longer maintained and insecure"; # Added 2023-10-09 + SkypeExport = skypeexport; # Added 2024-06-12 slack-dark = slack; # Added 2020-03-27 slmenu = throw "slmenu has been removed (upstream is gone)"; # Added 2023-04-06 slurm-llnl = slurm; # renamed July 2017 @@ -1224,6 +1228,7 @@ mapAliases ({ solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16 soundOfSorting = sound-of-sorting; # Added 2023-07-07 soundux = throw "'soundux' has been removed, as it is unmaintained."; # Added on 2024-02-14 + SPAdes = spades; # Added 2024-06-12 spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad60fa1882282..4a867078fdbf9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4197,8 +4197,6 @@ with pkgs; beats = callPackage ../tools/misc/beats { }; - BeatSaberModManager = callPackage ../games/BeatSaberModManager/default.nix { }; - beauty-line-icon-theme = callPackage ../data/icons/beauty-line-icon-theme { inherit (plasma5Packages) breeze-icons; }; @@ -5502,8 +5500,6 @@ with pkgs; hypr = callPackage ../applications/window-managers/hyprwm/hypr { cairo = cairo.override { xcbSupport = true; }; }; - hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { }; - hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { }; hyprland-per-window-layout = callPackage ../tools/wayland/hyprland-per-window-layout { }; @@ -5516,7 +5512,7 @@ with pkgs; hyprshade = python311Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { }; - hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland/plugins.nix { }); + hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland-plugins { }); hysteria = callPackage ../tools/networking/hysteria { }; @@ -18611,8 +18607,6 @@ with pkgs; license-scanner = callPackage ../development/tools/license-scanner { }; - Literate = callPackage ../development/tools/literate-programming/Literate { }; - md-tangle = callPackage ../development/tools/literate-programming/md-tangle { }; # NOTE: Override and set useIcon = false to use Awk instead of Icon. @@ -25832,7 +25826,7 @@ with pkgs; matrix-alertmanager = callPackage ../servers/monitoring/matrix-alertmanager { }; - mattermost = callPackage ../servers/mattermost { buildGoModule = buildGo122Module; }; + mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; matterbridge = callPackage ../servers/matterbridge { }; @@ -30596,8 +30590,6 @@ with pkgs; fig2dev = callPackage ../applications/graphics/fig2dev { }; - FIL-plugins = callPackage ../applications/audio/FIL-plugins { }; - finalfrontier = callPackage ../applications/science/machine-learning/finalfrontier { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -34218,8 +34210,6 @@ with pkgs; skypeforlinux = callPackage ../applications/networking/instant-messengers/skypeforlinux { }; - SkypeExport = callPackage ../applications/networking/instant-messengers/SkypeExport { }; - slingshot = callPackage ../tools/misc/slingshot { }; slop = callPackage ../tools/misc/slop { }; @@ -37955,8 +37945,6 @@ with pkgs; seaview = callPackage ../applications/science/biology/seaview { }; - SPAdes = callPackage ../applications/science/biology/spades { }; - svaba = callPackage ../applications/science/biology/svaba { }; tandem-aligner = callPackage ../applications/science/biology/tandem-aligner { }; |