diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 884ebcebf7f2..7f069c687ff1 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -132,7 +132,6 @@ Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build ```nix ldflags = [ - "-s" "-w" "-X main.Version=${version}" "-X main.Commit=${version}" ]; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5da600c84d2b..1f11c596a21d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -388,6 +388,12 @@ fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; }]; }; + adam248 = { + email = "adamjbutler091@gmail.com"; + github = "adam248"; + githubId = 85082674; + name = "Adam J. Butler"; + }; adamcstephens = { email = "happy.plan4249@valkor.net"; matrix = "@adam:valkor.net"; @@ -13961,6 +13967,12 @@ github = "p3psi-boo"; githubId = 43925055; }; + pabloaul = { + email = "contact@nojus.org"; + github = "pabloaul"; + githubId = 35423980; + name = "Nojus Dulskis"; + }; pablovsky = { email = "dealberapablo07@gmail.com"; github = "Pablo1107"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 0f0485a55bba..c80055f254fe 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -319,6 +319,7 @@ with lib.maintainers; { imincik nh2 nialov + r-burns sikmir willcohen ]; diff --git a/nixos/modules/programs/mininet.nix b/nixos/modules/programs/mininet.nix index 01ffd811e70e..3568736854d8 100644 --- a/nixos/modules/programs/mininet.nix +++ b/nixos/modules/programs/mininet.nix @@ -6,39 +6,6 @@ with lib; let cfg = config.programs.mininet; - - telnet = pkgs.runCommand "inetutils-telnet" - { } - '' - mkdir -p $out/bin - ln -s ${pkgs.inetutils}/bin/telnet $out/bin - ''; - - generatedPath = with pkgs; makeSearchPath "bin" [ - iperf - ethtool - iproute2 - socat - # mn errors out without a telnet binary - # pkgs.inetutils brings an undesired ifconfig into PATH see #43105 - nettools - telnet - ]; - - pyEnv = pkgs.python3.withPackages (ps: [ ps.mininet-python ]); - - mnexecWrapped = pkgs.runCommand "mnexec-wrapper" - { nativeBuildInputs = [ pkgs.makeWrapper pkgs.python3Packages.wrapPython ]; } - '' - makeWrapper ${pkgs.mininet}/bin/mnexec \ - $out/bin/mnexec \ - --prefix PATH : "${generatedPath}" - - makeWrapper ${pyEnv}/bin/mn \ - $out/bin/mn \ - --prefix PYTHONPATH : "${pyEnv}/${pyEnv.sitePackages}" \ - --prefix PATH : "${generatedPath}" - ''; in { options.programs.mininet.enable = mkEnableOption (lib.mdDoc "Mininet"); @@ -47,6 +14,6 @@ in virtualisation.vswitch.enable = true; - environment.systemPackages = [ mnexecWrapped ]; + environment.systemPackages = [ pkgs.mininet ]; }; } diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 7fb7847ce935..94919509ce17 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -314,6 +314,9 @@ in BindPaths = [ "${cfg.home}/${settingsDir}" cfg.settings.download-dir + # Transmission may need to read in the host's /run (eg. /run/systemd/resolve) + # or write in its private /run (eg. /run/host). + "/run" ] ++ optional cfg.settings.incomplete-dir-enabled cfg.settings.incomplete-dir ++ @@ -324,7 +327,6 @@ in # an AppArmor profile is provided to get a confinement based upon paths and rights. builtins.storeDir "/etc" - "/run" ] ++ optional (cfg.settings.script-torrent-done-enabled && cfg.settings.script-torrent-done-filename != null) @@ -349,10 +351,10 @@ in MemoryDenyWriteExecute = true; NoNewPrivileges = true; PrivateDevices = true; - PrivateMounts = true; + PrivateMounts = mkDefault true; PrivateNetwork = mkDefault false; PrivateTmp = true; - PrivateUsers = true; + PrivateUsers = mkDefault true; ProtectClock = true; ProtectControlGroups = true; # ProtectHome=true would not allow BindPaths= to work across /home, diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index 72b1fe61296b..15fcf0540583 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "giada"; - version = "0.26.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = version; - sha256 = "sha256-q3Lu3UaEKfS7F59G6rPx+5cKcsaXk+xcdtJRIXPwVIs="; + sha256 = "sha256-tONxVxzOFbwnuaW6YoHVZOmgd5S11qz38hcI+yQgjrQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index a171500577be..f78e06a77fac 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -544,7 +544,7 @@ dependencies = [ [[package]] name = "ark-secret-scalar" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=cbc342e#cbc342e95d3cbcd3c5ba8d45af7200eb58e63502" +source = "git+https://github.com/w3f/ring-vrf?rev=2019248#2019248785389b3246d55b1c3b0e9bdef4454cb7" dependencies = [ "ark-ec", "ark-ff", @@ -552,7 +552,7 @@ dependencies = [ "ark-std", "ark-transcript", "digest 0.10.7", - "rand_core 0.6.4", + "getrandom_or_panic", "zeroize", ] @@ -593,7 +593,7 @@ dependencies = [ [[package]] name = "ark-transcript" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=cbc342e#cbc342e95d3cbcd3c5ba8d45af7200eb58e63502" +source = "git+https://github.com/w3f/ring-vrf?rev=2019248#2019248785389b3246d55b1c3b0e9bdef4454cb7" dependencies = [ "ark-ff", "ark-serialize", @@ -730,150 +730,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" -[[package]] -name = "asset-hub-kusama-runtime" -version = "0.9.420" -dependencies = [ - "asset-test-utils", - "assets-common", - "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", - "cumulus-pallet-parachain-system", - "cumulus-pallet-session-benchmarking", - "cumulus-pallet-xcm", - "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", - "cumulus-primitives-utility", - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal", - "log", - "pallet-asset-conversion", - "pallet-asset-conversion-tx-payment", - "pallet-assets", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-message-queue", - "pallet-multisig", - "pallet-nft-fractionalization", - "pallet-nfts", - "pallet-nfts-runtime-api", - "pallet-proxy", - "pallet-session", - "pallet-state-trie-migration", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-uniques", - "pallet-utility", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parachains-common", - "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "polkadot-runtime-common", - "primitive-types", - "scale-info", - "smallvec", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-version", - "sp-weights", - "staging-parachain-info", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "substrate-wasm-builder", -] - -[[package]] -name = "asset-hub-polkadot-runtime" -version = "0.9.420" -dependencies = [ - "asset-test-utils", - "assets-common", - "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", - "cumulus-pallet-parachain-system", - "cumulus-pallet-session-benchmarking", - "cumulus-pallet-xcm", - "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", - "cumulus-primitives-utility", - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal", - "log", - "pallet-asset-tx-payment", - "pallet-assets", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-message-queue", - "pallet-multisig", - "pallet-nfts", - "pallet-nfts-runtime-api", - "pallet-proxy", - "pallet-session", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-uniques", - "pallet-utility", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parachains-common", - "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "polkadot-runtime-common", - "scale-info", - "smallvec", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-version", - "sp-weights", - "staging-parachain-info", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "substrate-wasm-builder", -] - [[package]] name = "asset-hub-rococo-emulated-chain" version = "0.0.0" @@ -905,7 +761,6 @@ dependencies = [ "pallet-xcm", "parachains-common", "parity-scale-codec", - "penpal-runtime", "rococo-runtime", "rococo-system-emulated-network", "sp-runtime", @@ -924,7 +779,6 @@ dependencies = [ "bp-bridge-hub-rococo", "bp-bridge-hub-westend", "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", @@ -1050,7 +904,6 @@ dependencies = [ "bp-bridge-hub-rococo", "bp-bridge-hub-westend", "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", @@ -1290,7 +1143,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1307,7 +1160,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1369,8 +1222,8 @@ dependencies = [ [[package]] name = "bandersnatch_vrfs" -version = "0.0.3" -source = "git+https://github.com/w3f/ring-vrf?rev=cbc342e#cbc342e95d3cbcd3c5ba8d45af7200eb58e63502" +version = "0.0.4" +source = "git+https://github.com/w3f/ring-vrf?rev=2019248#2019248785389b3246d55b1c3b0e9bdef4454cb7" dependencies = [ "ark-bls12-381", "ark-ec", @@ -1483,7 +1336,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1585,16 +1438,15 @@ dependencies = [ [[package]] name = "blake3" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", "arrayvec 0.7.4", "cc", "cfg-if", "constant_time_eq 0.3.0", - "digest 0.10.7", ] [[package]] @@ -1965,6 +1817,13 @@ dependencies = [ "sp-std 8.0.0", ] +[[package]] +name = "bp-xcm-bridge-hub" +version = "0.1.0" +dependencies = [ + "sp-std 8.0.0", +] + [[package]] name = "bp-xcm-bridge-hub-router" version = "0.1.0" @@ -1975,134 +1834,6 @@ dependencies = [ "sp-runtime", ] -[[package]] -name = "bridge-hub-kusama-runtime" -version = "0.1.0" -dependencies = [ - "bridge-hub-test-utils", - "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", - "cumulus-pallet-parachain-system", - "cumulus-pallet-session-benchmarking", - "cumulus-pallet-xcm", - "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", - "cumulus-primitives-utility", - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal", - "log", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-message-queue", - "pallet-multisig", - "pallet-session", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-utility", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parachains-common", - "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "polkadot-runtime-common", - "scale-info", - "serde", - "smallvec", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-io", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-version", - "staging-parachain-info", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "substrate-wasm-builder", -] - -[[package]] -name = "bridge-hub-polkadot-runtime" -version = "0.1.0" -dependencies = [ - "bridge-hub-test-utils", - "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", - "cumulus-pallet-parachain-system", - "cumulus-pallet-session-benchmarking", - "cumulus-pallet-xcm", - "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", - "cumulus-primitives-utility", - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal", - "log", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-message-queue", - "pallet-multisig", - "pallet-session", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-utility", - "pallet-xcm", - "pallet-xcm-benchmarks", - "parachains-common", - "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "polkadot-runtime-common", - "scale-info", - "serde", - "smallvec", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-io", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-version", - "staging-parachain-info", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "substrate-wasm-builder", -] - [[package]] name = "bridge-hub-rococo-emulated-chain" version = "0.0.0" @@ -2159,7 +1890,6 @@ dependencies = [ "bridge-hub-test-utils", "bridge-runtime-common", "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", @@ -2192,6 +1922,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", + "pallet-xcm-bridge-hub", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", @@ -2309,6 +2040,7 @@ dependencies = [ name = "bridge-hub-westend-runtime" version = "0.1.0" dependencies = [ + "bp-asset-hub-rococo", "bp-asset-hub-westend", "bp-bridge-hub-rococo", "bp-bridge-hub-westend", @@ -2323,7 +2055,6 @@ dependencies = [ "bridge-hub-test-utils", "bridge-runtime-common", "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", @@ -2356,6 +2087,7 @@ dependencies = [ "pallet-utility", "pallet-xcm", "pallet-xcm-benchmarks", + "pallet-xcm-bridge-hub", "parachains-common", "parity-scale-codec", "polkadot-core-primitives", @@ -2399,6 +2131,7 @@ dependencies = [ "bp-relayers", "bp-runtime", "bp-test-utils", + "bp-xcm-bridge-hub", "bp-xcm-bridge-hub-router", "frame-support", "frame-system", @@ -2701,7 +2434,7 @@ checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143" dependencies = [ "core2", "multibase", - "multihash", + "multihash 0.17.0", "serde", "unsigned-varint", ] @@ -2773,23 +2506,23 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272" dependencies = [ "clap_builder", - "clap_derive 4.4.2", + "clap_derive 4.4.7", ] [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1" dependencies = [ "anstream", "anstyle", - "clap_lex 0.5.1", + "clap_lex 0.6.0", "strsim", "terminal_size", ] @@ -2800,7 +2533,7 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", ] [[package]] @@ -2818,14 +2551,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2839,9 +2572,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "coarsetime" @@ -2865,84 +2598,11 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "collectives-polkadot-runtime" -version = "1.0.0" -dependencies = [ - "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", - "cumulus-pallet-parachain-system", - "cumulus-pallet-session-benchmarking", - "cumulus-pallet-xcm", - "cumulus-pallet-xcmp-queue", - "cumulus-primitives-core", - "cumulus-primitives-utility", - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "hex-literal", - "log", - "pallet-alliance", - "pallet-aura", - "pallet-authorship", - "pallet-balances", - "pallet-collator-selection", - "pallet-collective", - "pallet-collective-content", - "pallet-core-fellowship", - "pallet-message-queue", - "pallet-multisig", - "pallet-preimage", - "pallet-proxy", - "pallet-ranked-collective", - "pallet-referenda", - "pallet-salary", - "pallet-scheduler", - "pallet-session", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-utility", - "pallet-xcm", - "parachains-common", - "parity-scale-codec", - "polkadot-core-primitives", - "polkadot-parachain-primitives", - "polkadot-runtime-common", - "scale-info", - "smallvec", - "sp-api", - "sp-arithmetic", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-io", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-version", - "staging-parachain-info", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "substrate-wasm-builder", -] - [[package]] name = "collectives-westend-runtime" version = "1.0.0" dependencies = [ "cumulus-pallet-aura-ext", - "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-session-benchmarking", "cumulus-pallet-xcm", @@ -3065,7 +2725,7 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#edd1e90b847e560bf60fc2e8712235ccfa11a9a9" +source = "git+https://github.com/w3f/ring-proof#61e7b528bc0170d6bf541be32440d569b784425d" dependencies = [ "ark-ec", "ark-ff", @@ -3073,6 +2733,7 @@ dependencies = [ "ark-serialize", "ark-std", "fflonk", + "getrandom_or_panic", "merlin 3.0.0", "rand_chacha 0.3.1", ] @@ -3183,7 +2844,6 @@ dependencies = [ "pallet-balances", "pallet-collator-selection", "pallet-contracts", - "pallet-contracts-primitives", "pallet-insecure-randomness-collective-flip", "pallet-message-queue", "pallet-multisig", @@ -3449,7 +3109,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.4.6", + "clap 4.4.10", "criterion-plot", "futures", "is-terminal", @@ -3624,7 +3284,7 @@ dependencies = [ name = "cumulus-client-cli" version = "0.1.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "parity-scale-codec", "sc-chain-spec", "sc-cli", @@ -3845,6 +3505,7 @@ dependencies = [ "cumulus-client-network", "cumulus-client-pov-recovery", "cumulus-primitives-core", + "cumulus-primitives-proof-size-hostfunction", "cumulus-relay-chain-inprocess-interface", "cumulus-relay-chain-interface", "cumulus-relay-chain-minimal-node", @@ -3914,6 +3575,7 @@ dependencies = [ "cumulus-pallet-parachain-system-proc-macro", "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", + "cumulus-primitives-proof-size-hostfunction", "cumulus-test-client", "cumulus-test-relay-sproof-builder", "environmental", @@ -3945,16 +3607,17 @@ dependencies = [ "sp-version", "staging-xcm", "trie-db", + "trie-standardmap", ] [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4093,6 +3756,18 @@ dependencies = [ "tracing", ] +[[package]] +name = "cumulus-primitives-proof-size-hostfunction" +version = "0.1.0" +dependencies = [ + "sp-core", + "sp-externalities 0.19.0", + "sp-io", + "sp-runtime-interface 17.0.0", + "sp-state-machine", + "sp-trie", +] + [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" @@ -4179,11 +3854,13 @@ dependencies = [ "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", "futures", + "parking_lot 0.12.1", "polkadot-availability-recovery", "polkadot-collator-protocol", "polkadot-core-primitives", "polkadot-network-bridge", "polkadot-node-collation-generation", + "polkadot-node-core-chain-api", "polkadot-node-core-prospective-parachains", "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", @@ -4191,16 +3868,19 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "sc-authority-discovery", + "sc-client-api", "sc-network", "sc-network-common", "sc-service", "sc-tracing", "sc-utils", "sp-api", + "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-runtime", "substrate-prometheus-endpoint", + "tokio", "tracing", ] @@ -4234,6 +3914,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-storage 13.0.0", + "sp-version", "thiserror", "tokio", "tokio-util", @@ -4247,6 +3928,7 @@ version = "0.1.0" dependencies = [ "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", + "cumulus-primitives-proof-size-hostfunction", "cumulus-test-relay-sproof-builder", "cumulus-test-runtime", "cumulus-test-service", @@ -4323,7 +4005,7 @@ name = "cumulus-test-service" version = "0.1.0" dependencies = [ "async-trait", - "clap 4.4.6", + "clap 4.4.10", "criterion 0.5.1", "cumulus-client-cli", "cumulus-client-consensus-common", @@ -4446,7 +4128,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4486,7 +4168,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4503,7 +4185,7 @@ checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4802,7 +4484,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4814,7 +4496,7 @@ checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" [[package]] name = "dleq_vrf" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=cbc342e#cbc342e95d3cbcd3c5ba8d45af7200eb58e63502" +source = "git+https://github.com/w3f/ring-vrf?rev=2019248#2019248785389b3246d55b1c3b0e9bdef4454cb7" dependencies = [ "ark-ec", "ark-ff", @@ -4824,7 +4506,6 @@ dependencies = [ "ark-std", "ark-transcript", "arrayvec 0.7.4", - "rand_core 0.6.4", "zeroize", ] @@ -4864,7 +4545,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.38", + "syn 2.0.39", "termcolor", "toml 0.7.6", "walkdir", @@ -4953,15 +4634,16 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek 4.0.0", "ed25519", "rand_core 0.6.4", "serde", "sha2 0.10.7", + "subtle 2.4.1", "zeroize", ] @@ -5119,7 +4801,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5130,7 +4812,17 @@ checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", +] + +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "log", + "regex", ] [[package]] @@ -5148,9 +4840,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -5275,7 +4967,7 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5333,7 +5025,7 @@ checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd" dependencies = [ "expander 0.0.4", "indexmap 1.9.3", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -5342,11 +5034,12 @@ dependencies = [ [[package]] name = "fdlimit" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b" +checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5" dependencies = [ "libc", + "thiserror", ] [[package]] @@ -5388,7 +5081,7 @@ dependencies = [ [[package]] name = "fflonk" version = "0.1.0" -source = "git+https://github.com/w3f/fflonk#26a5045b24e169cffc1f9328ca83d71061145c40" +source = "git+https://github.com/w3f/fflonk#1beb0585e1c8488956fac7f05da061f9b41e8948" dependencies = [ "ark-ec", "ark-ff", @@ -5410,7 +5103,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ - "env_logger 0.10.0", + "env_logger 0.10.1", "log", ] @@ -5595,7 +5288,7 @@ dependencies = [ "Inflector", "array-bytes 6.1.0", "chrono", - "clap 4.4.6", + "clap 4.4.10", "comfy-table", "frame-benchmarking", "frame-support", @@ -5656,12 +5349,12 @@ dependencies = [ "frame-election-provider-support", "frame-support", "parity-scale-codec", - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "scale-info", "sp-arithmetic", - "syn 2.0.38", + "syn 2.0.39", "trybuild", ] @@ -5687,7 +5380,7 @@ dependencies = [ name = "frame-election-solution-type-fuzzer" version = "2.0.0-alpha.5" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "frame-election-provider-solution-type", "frame-election-provider-support", "frame-support", @@ -5813,7 +5506,7 @@ dependencies = [ "proc-macro2", "quote", "sp-core-hashing", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5821,10 +5514,10 @@ name = "frame-support-procedural-tools" version = "4.0.0-dev" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5833,7 +5526,7 @@ version = "3.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5904,6 +5597,7 @@ version = "4.0.0-dev" dependencies = [ "cfg-if", "criterion 0.4.0", + "docify", "frame-support", "log", "parity-scale-codec", @@ -5973,9 +5667,9 @@ dependencies = [ [[package]] name = "fs4" -version = "0.6.6" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" +checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7" dependencies = [ "rustix 0.38.21", "windows-sys 0.48.0", @@ -6065,7 +5759,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6189,6 +5883,16 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] +[[package]] +name = "getrandom_or_panic" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" +dependencies = [ + "rand 0.8.5", + "rand_core 0.6.4", +] + [[package]] name = "ghash" version = "0.4.4" @@ -6245,51 +5949,6 @@ dependencies = [ "regex", ] -[[package]] -name = "glutton-runtime" -version = "1.0.0" -dependencies = [ - "cumulus-pallet-aura-ext", - "cumulus-pallet-parachain-system", - "cumulus-pallet-xcm", - "cumulus-primitives-aura", - "cumulus-primitives-core", - "cumulus-primitives-timestamp", - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-benchmarking", - "frame-system-rpc-runtime-api", - "frame-try-runtime", - "pallet-aura", - "pallet-glutton", - "pallet-message-queue", - "pallet-sudo", - "pallet-timestamp", - "parachains-common", - "parity-scale-codec", - "scale-info", - "sp-api", - "sp-block-builder", - "sp-consensus-aura", - "sp-core", - "sp-genesis-builder", - "sp-inherents", - "sp-offchain", - "sp-runtime", - "sp-session", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-transaction-pool", - "sp-version", - "staging-parachain-info", - "staging-xcm", - "staging-xcm-builder", - "staging-xcm-executor", - "substrate-wasm-builder", -] - [[package]] name = "glutton-westend-runtime" version = "1.0.0" @@ -7090,7 +6749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" dependencies = [ "heck", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -7214,7 +6873,6 @@ dependencies = [ "pallet-child-bounties", "pallet-collective", "pallet-contracts", - "pallet-contracts-primitives", "pallet-conviction-voting", "pallet-core-fellowship", "pallet-democracy", @@ -7407,6 +7065,17 @@ dependencies = [ "rle-decode-fast", ] +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + [[package]] name = "libloading" version = "0.7.4" @@ -7495,7 +7164,7 @@ dependencies = [ "libp2p-identity", "log", "multiaddr", - "multihash", + "multihash 0.17.0", "multistream-select", "once_cell", "parking_lot 0.12.1", @@ -7555,7 +7224,7 @@ dependencies = [ "ed25519-dalek", "log", "multiaddr", - "multihash", + "multihash 0.17.0", "quick-protobuf", "rand 0.8.5", "sha2 0.10.7", @@ -7802,7 +7471,7 @@ dependencies = [ "libp2p-identity", "libp2p-noise", "log", - "multihash", + "multihash 0.17.0", "quick-protobuf", "quick-protobuf-codec", "rand 0.8.5", @@ -8094,7 +7763,7 @@ dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -8108,7 +7777,7 @@ dependencies = [ "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -8119,7 +7788,7 @@ checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -8130,7 +7799,7 @@ checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -8181,9 +7850,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memfd" @@ -8299,7 +7968,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" name = "minimal-node" version = "4.0.0-dev" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "frame", "futures", "futures-timer", @@ -8469,7 +8138,7 @@ dependencies = [ "data-encoding", "log", "multibase", - "multihash", + "multihash 0.17.0", "percent-encoding", "serde", "static_assertions", @@ -8499,19 +8168,87 @@ dependencies = [ "blake3", "core2", "digest 0.10.7", - "multihash-derive", + "multihash-derive 0.8.0", "sha2 0.10.7", "sha3", "unsigned-varint", ] +[[package]] +name = "multihash" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" +dependencies = [ + "core2", + "digest 0.10.7", + "multihash-derive 0.8.0", + "sha2 0.10.7", + "unsigned-varint", +] + +[[package]] +name = "multihash" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" +dependencies = [ + "core2", + "unsigned-varint", +] + +[[package]] +name = "multihash-codetable" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6d815ecb3c8238d00647f8630ede7060a642c9f704761cd6082cb4028af6935" +dependencies = [ + "blake2b_simd", + "blake2s_simd", + "blake3", + "core2", + "digest 0.10.7", + "multihash-derive 0.9.0", + "ripemd", + "serde", + "sha1", + "sha2 0.10.7", + "sha3", + "strobe-rs", +] + [[package]] name = "multihash-derive" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "multihash-derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "890e72cb7396cb99ed98c1246a97b243cc16394470d94e0bc8b0c2c11d84290e" +dependencies = [ + "core2", + "multihash 0.19.1", + "multihash-derive-impl", +] + +[[package]] +name = "multihash-derive-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38685e08adb338659871ecfc6ee47ba9b22dcc8abcf6975d379cc49145c3040" +dependencies = [ + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -8705,7 +8442,7 @@ name = "node-bench" version = "0.9.0-dev" dependencies = [ "array-bytes 6.1.0", - "clap 4.4.6", + "clap 4.4.10", "derive_more", "fs_extra", "futures", @@ -8780,7 +8517,7 @@ dependencies = [ name = "node-runtime-generate-bags" version = "3.0.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "generate-bags", "kitchensink-runtime", ] @@ -8789,7 +8526,7 @@ dependencies = [ name = "node-template" version = "4.0.0-dev" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "frame-benchmarking", "frame-benchmarking-cli", "frame-system", @@ -8833,14 +8570,14 @@ dependencies = [ name = "node-template-release" version = "3.0.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "flate2", "fs_extra", "glob", "itertools 0.10.5", "tar", "tempfile", - "toml_edit", + "toml_edit 0.19.14", ] [[package]] @@ -8914,7 +8651,7 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-timestamp", - "staging-node-executor", + "staging-node-cli", "substrate-test-client", "tempfile", ] @@ -9155,7 +8892,7 @@ dependencies = [ "itertools 0.11.0", "layout-rs", "petgraph", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -9755,8 +9492,8 @@ dependencies = [ "pallet-assets", "pallet-balances", "pallet-contracts-fixtures", - "pallet-contracts-primitives", "pallet-contracts-proc-macro", + "pallet-contracts-uapi", "pallet-insecure-randomness-collective-flip", "pallet-message-queue", "pallet-proxy", @@ -9787,11 +9524,21 @@ dependencies = [ name = "pallet-contracts-fixtures" version = "1.0.0" dependencies = [ + "anyhow", + "cfg-if", "frame-system", + "parity-wasm", "sp-runtime", + "tempfile", + "toml 0.8.8", + "twox-hash", "wat", ] +[[package]] +name = "pallet-contracts-fixtures-common" +version = "1.0.0" + [[package]] name = "pallet-contracts-mock-network" version = "1.0.0" @@ -9803,8 +9550,8 @@ dependencies = [ "pallet-balances", "pallet-contracts", "pallet-contracts-fixtures", - "pallet-contracts-primitives", "pallet-contracts-proc-macro", + "pallet-contracts-uapi", "pallet-insecure-randomness-collective-flip", "pallet-message-queue", "pallet-proxy", @@ -9830,25 +9577,23 @@ dependencies = [ "xcm-simulator", ] -[[package]] -name = "pallet-contracts-primitives" -version = "24.0.0" -dependencies = [ - "bitflags 1.3.2", - "parity-scale-codec", - "scale-info", - "sp-runtime", - "sp-std 8.0.0", - "sp-weights", -] - [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", +] + +[[package]] +name = "pallet-contracts-uapi" +version = "4.0.0-dev" +dependencies = [ + "bitflags 1.3.2", + "parity-scale-codec", + "paste", + "scale-info", ] [[package]] @@ -10407,6 +10152,7 @@ dependencies = [ "pallet-nfts", "parity-scale-codec", "sp-api", + "sp-std 8.0.0", ] [[package]] @@ -10779,6 +10525,7 @@ dependencies = [ name = "pallet-safe-mode" version = "4.0.0-dev" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -10811,6 +10558,24 @@ dependencies = [ "sp-std 8.0.0", ] +[[package]] +name = "pallet-sassafras" +version = "0.3.5-dev" +dependencies = [ + "array-bytes 6.1.0", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-consensus-sassafras", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 8.0.0", +] + [[package]] name = "pallet-scheduler" version = "4.0.0-dev" @@ -10956,11 +10721,11 @@ dependencies = [ name = "pallet-staking-reward-curve" version = "4.0.0-dev" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "sp-runtime", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -11182,6 +10947,7 @@ dependencies = [ name = "pallet-tx-pause" version = "4.0.0-dev" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -11317,6 +11083,31 @@ dependencies = [ "staging-xcm-executor", ] +[[package]] +name = "pallet-xcm-bridge-hub" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-messages", + "bp-runtime", + "bp-xcm-bridge-hub", + "bridge-runtime-common", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "pallet-bridge-messages", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std 8.0.0", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + [[package]] name = "pallet-xcm-bridge-hub-router" version = "0.1.0" @@ -11340,7 +11131,7 @@ dependencies = [ name = "parachain-template-node" version = "0.1.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "color-print", "cumulus-client-cli", "cumulus-client-collator", @@ -11521,9 +11312,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f19d20a0d2cc52327a88d131fa1c4ea81ea4a04714aedcfeca2dd410049cf8" +checksum = "59e9ab494af9e6e813c72170f0d3c1de1500990d62c97cc05cc7576f91aa402f" dependencies = [ "blake2 0.10.6", "crc32fast", @@ -11541,9 +11332,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.4" +version = "3.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8e946cc0cc711189c0b0249fb8b599cbeeab9784d83c415719368bb8d4ac64" +checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" dependencies = [ "arrayvec 0.7.4", "bitvec", @@ -11556,11 +11347,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.4" +version = "3.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a296c3079b5fefbc499e1de58dc26c09b1b9a5952d26694ee89f04a43ebbb3e" +checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -11728,6 +11519,7 @@ dependencies = [ "serde_json", "sp-core", "sp-runtime", + "westend-emulated-chain", ] [[package]] @@ -11827,7 +11619,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -11868,7 +11660,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -11951,7 +11743,7 @@ dependencies = [ [[package]] name = "polkadot" -version = "1.4.0" +version = "1.5.0" dependencies = [ "assert_cmd", "color-eyre", @@ -12089,7 +11881,8 @@ dependencies = [ name = "polkadot-cli" version = "1.1.0" dependencies = [ - "clap 4.4.6", + "cfg-if", + "clap 4.4.10", "frame-benchmarking-cli", "futures", "log", @@ -12215,6 +12008,7 @@ dependencies = [ "polkadot-node-subsystem-test-helpers", "polkadot-node-subsystem-util", "polkadot-primitives", + "quickcheck", "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", @@ -12431,6 +12225,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", + "polkadot-node-subsystem-types", "polkadot-primitives", "sc-client-api", "sc-consensus-babe", @@ -12555,6 +12350,7 @@ version = "1.0.0" dependencies = [ "always-assert", "assert_matches", + "blake3", "cfg-if", "criterion 0.4.0", "futures", @@ -12578,6 +12374,7 @@ dependencies = [ "rand 0.8.5", "rococo-runtime", "rusty-fork", + "sc-sysinfo", "slotmap", "sp-core", "sp-maybe-compressed-blob", @@ -12585,6 +12382,7 @@ dependencies = [ "tempfile", "test-parachain-adder", "test-parachain-halt", + "thiserror", "tokio", "tracing-gum", ] @@ -12633,6 +12431,7 @@ dependencies = [ "sp-externalities 0.19.0", "sp-io", "sp-tracing 10.0.0", + "substrate-build-script-utils", "tempfile", "thiserror", "tracing-gum", @@ -12657,6 +12456,7 @@ dependencies = [ name = "polkadot-node-core-pvf-prepare-worker" version = "1.0.0" dependencies = [ + "blake3", "cfg-if", "criterion 0.4.0", "libc", @@ -12835,7 +12635,9 @@ dependencies = [ "smallvec", "sp-api", "sp-authority-discovery", + "sp-blockchain", "sp-consensus-babe", + "sp-runtime", "substrate-prometheus-endpoint", "thiserror", ] @@ -12911,20 +12713,15 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "1.4.0" +version = "1.5.0" dependencies = [ "assert_cmd", - "asset-hub-kusama-runtime", - "asset-hub-polkadot-runtime", "asset-hub-rococo-runtime", "asset-hub-westend-runtime", "async-trait", - "bridge-hub-kusama-runtime", - "bridge-hub-polkadot-runtime", "bridge-hub-rococo-runtime", "bridge-hub-westend-runtime", - "clap 4.4.6", - "collectives-polkadot-runtime", + "clap 4.4.10", "collectives-westend-runtime", "color-print", "contracts-rococo-runtime", @@ -12941,14 +12738,18 @@ dependencies = [ "cumulus-relay-chain-interface", "frame-benchmarking", "frame-benchmarking-cli", + "frame-support", + "frame-system-rpc-runtime-api", + "frame-try-runtime", "futures", - "glutton-runtime", "glutton-westend-runtime", "hex-literal", "jsonrpsee", "log", "nix 0.26.2", + "pallet-transaction-payment", "pallet-transaction-payment-rpc", + "pallet-transaction-payment-rpc-runtime-api", "parachains-common", "parity-scale-codec", "penpal-runtime", @@ -12980,14 +12781,18 @@ dependencies = [ "sp-blockchain", "sp-consensus-aura", "sp-core", + "sp-genesis-builder", + "sp-inherents", "sp-io", "sp-keystore", "sp-offchain", "sp-runtime", "sp-session", + "sp-std 8.0.0", "sp-timestamp", "sp-tracing 10.0.0", "sp-transaction-pool", + "sp-version", "staging-xcm", "substrate-build-script-utils", "substrate-frame-rpc-system", @@ -13206,6 +13011,45 @@ dependencies = [ "thousands", ] +[[package]] +name = "polkadot-sdk-docs" +version = "0.0.1" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-parachain-system", + "docify", + "frame", + "kitchensink-runtime", + "pallet-aura", + "pallet-default-config-example", + "pallet-examples", + "pallet-timestamp", + "parity-scale-codec", + "sc-cli", + "sc-client-db", + "sc-consensus-aura", + "sc-consensus-babe", + "sc-consensus-beefy", + "sc-consensus-grandpa", + "sc-consensus-manual-seal", + "sc-consensus-pow", + "sc-network", + "sc-rpc", + "sc-rpc-api", + "scale-info", + "simple-mermaid", + "sp-api", + "sp-core", + "sp-io", + "sp-keyring", + "sp-runtime", + "staging-chain-spec-builder", + "staging-node-cli", + "staging-parachain-info", + "subkey", + "substrate-wasm-builder", +] + [[package]] name = "polkadot-service" version = "1.0.0" @@ -13232,6 +13076,7 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "parity-db", "parity-scale-codec", + "parking_lot 0.12.1", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", @@ -13347,7 +13192,6 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", - "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", @@ -13409,7 +13253,7 @@ version = "1.0.0" dependencies = [ "assert_matches", "async-trait", - "clap 4.4.6", + "clap 4.4.10", "color-eyre", "futures", "futures-timer", @@ -13556,7 +13400,7 @@ dependencies = [ name = "polkadot-voter-bags" version = "1.0.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "generate-bags", "sp-io", "westend-runtime", @@ -13734,7 +13578,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -13775,7 +13619,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.14", +] + +[[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]] @@ -13816,7 +13669,7 @@ checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -13888,7 +13741,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -14030,6 +13883,8 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" dependencies = [ + "env_logger 0.8.4", + "log", "rand 0.8.5", ] @@ -14238,6 +14093,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -14279,7 +14143,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -14296,14 +14160,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.6", - "regex-syntax 0.7.4", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -14320,10 +14184,16 @@ name = "regex-automata" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.8.2", ] [[package]] @@ -14334,15 +14204,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "remote-ext-tests-bags-list" version = "1.0.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "frame-system", "log", "pallet-bags-list-remote-tests", @@ -14426,7 +14296,7 @@ dependencies = [ [[package]] name = "ring" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#edd1e90b847e560bf60fc2e8712235ccfa11a9a9" +source = "git+https://github.com/w3f/ring-proof#61e7b528bc0170d6bf541be32440d569b784425d" dependencies = [ "ark-ec", "ark-ff", @@ -14454,6 +14324,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "ripemd" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "rle-decode-fast" version = "1.0.3" @@ -14509,6 +14388,7 @@ dependencies = [ "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", "cumulus-ping", + "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-primitives-utility", "frame-benchmarking", @@ -15008,7 +14888,8 @@ dependencies = [ "ip_network", "libp2p", "log", - "multihash", + "multihash 0.18.1", + "multihash-codetable", "parity-scale-codec", "prost", "prost-build", @@ -15065,6 +14946,7 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", + "sp-trie", "substrate-test-runtime-client", ] @@ -15100,10 +14982,10 @@ dependencies = [ name = "sc-chain-spec-derive" version = "4.0.0-dev" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -15113,7 +14995,7 @@ dependencies = [ "array-bytes 6.1.0", "bip39", "chrono", - "clap 4.4.6", + "clap 4.4.10", "fdlimit", "futures", "futures-timer", @@ -15685,6 +15567,7 @@ dependencies = [ "array-bytes 4.2.0", "arrayvec 0.7.4", "blake2 0.10.6", + "bytes", "futures", "futures-timer", "libp2p-identity", @@ -15750,6 +15633,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", + "tokio-stream", "tokio-test", "tokio-util", "unsigned-varint", @@ -15805,10 +15689,12 @@ name = "sc-network-gossip" version = "0.10.0-dev" dependencies = [ "ahash 0.8.3", + "async-trait", "futures", "futures-timer", "libp2p", "log", + "parity-scale-codec", "quickcheck", "sc-network", "sc-network-common", @@ -16095,6 +15981,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", + "sp-externalities 0.19.0", "sp-maybe-compressed-blob", "sp-rpc", "sp-runtime", @@ -16252,7 +16139,7 @@ dependencies = [ name = "sc-storage-monitor" version = "0.1.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "fs4", "log", "sc-client-db", @@ -16328,6 +16215,7 @@ dependencies = [ "lazy_static", "libc", "log", + "parity-scale-codec", "parking_lot 0.12.1", "regex", "rustc-hash", @@ -16350,10 +16238,10 @@ dependencies = [ name = "sc-tracing-proc-macro" version = "4.0.0-dev" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -16440,7 +16328,7 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -16583,18 +16471,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.24.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" +checksum = "2acea373acb8c21ecb5a23741452acd2593ed44ee3d343e72baaa143bc89d0d5" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.6.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" +checksum = "09e67c467c38fd24bd5499dc9a18183b31575c12ee549197e3e20d57aa4fe3b7" dependencies = [ "cc", ] @@ -16707,22 +16595,22 @@ checksum = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -16747,9 +16635,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -16788,7 +16676,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -17224,10 +17112,10 @@ dependencies = [ "assert_matches", "blake2 0.10.6", "expander 2.0.0", - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -17534,6 +17422,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "sp-core-fuzz" +version = "0.0.0" +dependencies = [ + "lazy_static", + "libfuzzer-sys", + "regex", + "sp-core", +] + [[package]] name = "sp-core-hashing" version = "9.0.0" @@ -17552,7 +17450,7 @@ version = "9.0.0" dependencies = [ "quote", "sp-core-hashing", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -17578,7 +17476,7 @@ dependencies = [ [[package]] name = "sp-crypto-ec-utils" version = "0.4.1" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "ark-bls12-377", "ark-bls12-377-ext", @@ -17610,17 +17508,17 @@ version = "8.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "sp-debug-derive" version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -17636,7 +17534,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.19.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "environmental", "parity-scale-codec", @@ -17780,7 +17678,7 @@ dependencies = [ name = "sp-npos-elections-fuzzer" version = "2.0.0-alpha.5" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "honggfuzz", "rand 0.8.5", "sp-npos-elections", @@ -17819,6 +17717,7 @@ dependencies = [ name = "sp-runtime" version = "24.0.0" dependencies = [ + "docify", "either", "hash256-std-hasher", "impl-trait-for-tuples", @@ -17829,6 +17728,7 @@ dependencies = [ "scale-info", "serde", "serde_json", + "simple-mermaid", "sp-api", "sp-application-crypto", "sp-arithmetic", @@ -17868,7 +17768,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -17888,22 +17788,23 @@ name = "sp-runtime-interface-proc-macro" version = "11.0.0" dependencies = [ "Inflector", - "proc-macro-crate", + "expander 2.0.0", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "sp-runtime-interface-proc-macro" version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "Inflector", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -18025,7 +17926,7 @@ version = "8.0.0" [[package]] name = "sp-std" version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" [[package]] name = "sp-storage" @@ -18042,7 +17943,7 @@ dependencies = [ [[package]] name = "sp-storage" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "impl-serde", "parity-scale-codec", @@ -18091,7 +17992,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "10.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "parity-scale-codec", "sp-std 8.0.0 (git+https://github.com/paritytech/polkadot-sdk)", @@ -18140,6 +18041,7 @@ dependencies = [ "scale-info", "schnellru", "sp-core", + "sp-externalities 0.19.0", "sp-runtime", "sp-std 8.0.0", "thiserror", @@ -18174,7 +18076,7 @@ dependencies = [ "proc-macro2", "quote", "sp-version", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -18192,7 +18094,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#fe9435db2fda7c9e2f4e29521564c72cac38f59b" +source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -18206,12 +18108,12 @@ dependencies = [ name = "sp-weights" version = "20.0.0" dependencies = [ + "bounded-collections", "parity-scale-codec", "scale-info", "serde", "smallvec", "sp-arithmetic", - "sp-core", "sp-debug-derive 8.0.0", "sp-std 8.0.0", ] @@ -18284,18 +18186,11 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" name = "staging-chain-spec-builder" version = "2.0.0" dependencies = [ - "ansi_term", - "clap 4.4.6", - "kitchensink-runtime", + "clap 4.4.10", "log", - "rand 0.8.5", "sc-chain-spec", - "sc-keystore", "serde_json", - "sp-core", - "sp-keystore", "sp-tracing 10.0.0", - "staging-node-cli", ] [[package]] @@ -18304,10 +18199,12 @@ version = "3.0.0-dev" dependencies = [ "array-bytes 6.1.0", "assert_cmd", - "clap 4.4.6", + "clap 4.4.10", "clap_complete", "criterion 0.4.0", + "frame-benchmarking", "frame-benchmarking-cli", + "frame-support", "frame-system", "frame-system-rpc-runtime-api", "futures", @@ -18317,13 +18214,20 @@ dependencies = [ "nix 0.26.2", "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", "rand 0.8.5", @@ -18358,27 +18262,31 @@ dependencies = [ "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-grandpa", "sp-core", + "sp-externalities 0.19.0", "sp-inherents", "sp-io", "sp-keyring", "sp-keystore", "sp-mixnet", "sp-runtime", + "sp-state-machine", "sp-statement-store", "sp-timestamp", "sp-tracing 10.0.0", "sp-transaction-storage-proof", - "staging-node-executor", + "sp-trie", "staging-node-inspect", "substrate-build-script-utils", "substrate-cli-test-utils", @@ -18389,44 +18297,6 @@ dependencies = [ "tokio-util", "try-runtime-cli", "wait-timeout", -] - -[[package]] -name = "staging-node-executor" -version = "3.0.0-dev" -dependencies = [ - "criterion 0.4.0", - "frame-benchmarking", - "frame-support", - "frame-system", - "futures", - "kitchensink-runtime", - "node-primitives", - "node-testing", - "pallet-balances", - "pallet-contracts", - "pallet-glutton", - "pallet-im-online", - "pallet-root-testing", - "pallet-sudo", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-treasury", - "parity-scale-codec", - "sc-executor", - "scale-info", - "serde_json", - "sp-application-crypto", - "sp-consensus-babe", - "sp-core", - "sp-externalities 0.19.0", - "sp-keyring", - "sp-keystore", - "sp-runtime", - "sp-state-machine", - "sp-statement-store", - "sp-tracing 10.0.0", - "sp-trie", "wat", ] @@ -18434,14 +18304,16 @@ dependencies = [ name = "staging-node-inspect" version = "0.9.0-dev" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "parity-scale-codec", "sc-cli", "sc-client-api", "sc-service", "sp-blockchain", "sp-core", + "sp-io", "sp-runtime", + "sp-statement-store", "thiserror", ] @@ -18590,6 +18462,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strobe-rs" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabb238a1cccccfa4c4fb703670c0d157e1256c1ba695abf1b93bd2bb14bab2d" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "keccak", + "subtle 2.4.1", + "zeroize", +] + [[package]] name = "strsim" version = "0.10.0" @@ -18641,30 +18526,10 @@ dependencies = [ name = "subkey" version = "3.0.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "sc-cli", ] -[[package]] -name = "substrate" -version = "1.0.0" -dependencies = [ - "frame-support", - "sc-chain-spec", - "sc-cli", - "sc-consensus-aura", - "sc-consensus-babe", - "sc-consensus-beefy", - "sc-consensus-grandpa", - "sc-consensus-manual-seal", - "sc-consensus-pow", - "sc-service", - "simple-mermaid", - "sp-runtime", - "staging-chain-spec-builder", - "subkey", -] - [[package]] name = "substrate-bip39" version = "0.4.4" @@ -18703,7 +18568,7 @@ dependencies = [ name = "substrate-frame-cli" version = "4.0.0-dev" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "frame-support", "frame-system", "sc-cli", @@ -19058,9 +18923,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -19125,13 +18990,13 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand 2.0.0", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "rustix 0.38.21", "windows-sys 0.48.0", ] @@ -19178,7 +19043,7 @@ dependencies = [ name = "test-parachain-adder-collator" version = "1.0.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "futures", "futures-timer", "log", @@ -19226,7 +19091,7 @@ dependencies = [ name = "test-parachain-undying-collator" version = "1.0.0" dependencies = [ - "clap 4.4.6", + "clap 4.4.10", "futures", "futures-timer", "log", @@ -19293,9 +19158,9 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] @@ -19322,13 +19187,13 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -19500,7 +19365,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -19594,14 +19459,26 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.14", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -19619,6 +19496,30 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.0.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.13" @@ -19681,14 +19582,14 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -19720,10 +19621,10 @@ version = "1.0.0" dependencies = [ "assert_matches", "expander 2.0.0", - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -19876,7 +19777,7 @@ version = "0.10.0-dev" dependencies = [ "assert_cmd", "async-trait", - "clap 4.4.6", + "clap 4.4.10", "frame-remote-externalities", "frame-try-runtime", "hex", @@ -20278,7 +20179,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] @@ -20312,7 +20213,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -21467,6 +21368,7 @@ dependencies = [ "frame-support", "frame-system", "futures", + "pallet-transaction-payment", "pallet-xcm", "parity-scale-codec", "polkadot-test-client", @@ -21488,7 +21390,8 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.38", + "staging-xcm", + "syn 2.0.39", "trybuild", ] @@ -21608,7 +21511,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index e1b042aadbb6..d46117edc1da 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -11,13 +11,15 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; - rev = "v${version}"; - hash = "sha256-Tblknr9nU6X4lKMW8ZPOo7jZ/MoE8e8G58NnLITzhxY="; + # NOTE: temporary tag with fix for building with nix + # `-nix` suffix should be removed in the next release + rev = "polkadot-v${version}-nix"; + hash = "sha256-pjny1aw9l2m9t8VyUB+EaQaPtYPypC6WqOwAco1kxNU="; # 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. @@ -41,12 +43,12 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ark-secret-scalar-0.0.2" = "sha256-rnU9+rf0POv4GuxKUp9Wv4/eNXi5gfGq+XhJLxpmSzU="; - "common-0.1.0" = "sha256-ru++KG2ZZqa/wDGnKF/VfWnazHRSpOAD0WYb7rHlpCU="; - "fflonk-0.1.0" = "sha256-MNvlePHQdY8DiOq6w7Hc1pgn7G58GDTeghCKHJdUy7E="; + "ark-secret-scalar-0.0.2" = "sha256-ytwKeUkiXIcwJLo9wpWSIjL4LBZJDbeED5Yqxso9l74="; + "common-0.1.0" = "sha256-9vTJNKsL6gK8MM8dUKrShEvL9Ac9YQg1q8iVE9+deak="; + "fflonk-0.1.0" = "sha256-PC7eJEOo/RN9Gk27CcTIyGMA9XZeFAJkO2FK02JVzN0="; "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-cv2mr5K6mAKiACVzS7mPOIpoyt8iUfGZXsqVuiGXbL0="; + "sp-crypto-ec-utils-0.4.1" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI="; }; }; @@ -69,6 +71,10 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + # NOTE: disable building `core`/`std` in wasm environment since rust-src isn't + # available for `rustc-wasm32` + WASM_BUILD_STD = 0; + # NOTE: we need to force lld otherwise rust-lld is not found for wasm32 target CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld"; PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix deleted file mode 100644 index 6888cebec2d0..000000000000 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkg-config, makeWrapper, gnome2, gtk2 }: -stdenv.mkDerivation { - version = "unstable-2014-08-20"; - pname = "supertux-editor"; - - src = fetchFromGitHub { - owner = "SuperTux"; - repo = "supertux-editor"; - rev = "0c666e8ccc7daf9e9720fe79abd63f8fa979c5e5"; - sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx"; - }; - - nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ mono gtk-sharp-2_0 gnome2.libglade gtk2 ]; - - installPhase = '' - mkdir -p $out/bin $out/lib/supertux-editor - cp *.{dll,dll.config,exe} $out/lib/supertux-editor - makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor \ - --add-flags "$out/lib/supertux-editor/supertux-editor.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ - --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //') - - makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor-debug \ - --add-flags "--debug $out/lib/supertux-editor/supertux-editor.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ - --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //') - ''; - - # Always needed on Mono, otherwise nothing runs - dontStrip = true; - - meta = with lib; { - description = "Level editor for SuperTux"; - homepage = "https://github.com/SuperTux/supertux-editor"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7680d3cbe841..799316e37fba 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4031,6 +4031,30 @@ final: prev: meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; + guard-collection = buildVimPlugin { + pname = "guard-collection"; + version = "2023-11-13"; + src = fetchFromGitHub { + owner = "nvimdev"; + repo = "guard-collection"; + rev = "13e00d19f418d68977c6bc803f0d23d09dce580d"; + sha256 = "1zhq99hf722m5m842ghadj9akmb0y1sqkpmbhhk15jynnvv16ab6"; + }; + meta.homepage = "https://github.com/nvimdev/guard-collection/"; + }; + + guard-nvim = buildVimPlugin { + pname = "guard.nvim"; + version = "2023-11-27"; + src = fetchFromGitHub { + owner = "nvimdev"; + repo = "guard.nvim"; + rev = "394317c25a6b0f0e064aebcfcf902e46fb0a04ba"; + sha256 = "sha256-Yva/mSn5RdvHLK5cVGHUCEHRauYrwy7wR2uDzyBM9sw="; + }; + meta.homepage = "https://github.com/nvimdev/guard.nvim/"; + }; + guess-indent-nvim = buildVimPlugin { pname = "guess-indent.nvim"; version = "2023-04-03"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d50566f1497d..7e640353b998 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -586,6 +586,10 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }; + guard-nvim = super.guard-nvim.overrideAttrs { + dependencies = with self; [ guard-collection ]; + }; + harpoon = super.harpoon.overrideAttrs { dependencies = with self; [ plenary-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 9e41c694649e..61d37c474faf 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -336,6 +336,8 @@ https://github.com/morhetz/gruvbox/,, https://github.com/eddyekofo94/gruvbox-flat.nvim/,, https://github.com/sainnhe/gruvbox-material/,, https://github.com/ellisonleao/gruvbox.nvim/,, +https://github.com/nvimdev/guard-collection/,HEAD, +https://github.com/nvimdev/guard.nvim/,HEAD, https://github.com/nmac427/guess-indent.nvim/,HEAD, https://github.com/sjl/gundo.vim/,, https://github.com/junegunn/gv.vim/,, diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix index 9a18bf968582..36bcae419654 100644 --- a/pkgs/applications/emulators/pcsx2/default.nix +++ b/pkgs/applications/emulators/pcsx2/default.nix @@ -1,12 +1,11 @@ { cmake , fetchFromGitHub , lib -, llvmPackages_16 +, llvmPackages_17 , cubeb , curl , extra-cmake-modules , ffmpeg -, fmt_8 , gettext , harfbuzz , libaio @@ -15,12 +14,12 @@ , libsamplerate , libXrandr , libzip +, makeWrapper , pkg-config , qtbase , qtsvg , qttools , qtwayland -, rapidyaml , SDL2 , soundtouch , strip-nondeterminism @@ -37,27 +36,26 @@ let pcsx2_patches = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2_patches"; - rev = "04d727b3bf451da11b6594602036e4f7f5580610"; - sha256 = "sha256-zrulsSMRNLPFvrC/jeYzl53i4ZvFQ4Yl2nB0bA6Y8KU="; + rev = "42d7ee72b66955e3bbd2caaeaa855f605b463722"; + sha256 = "sha256-Zd+Aeps2IWVX2fS1Vyczv/wAX8Z89XnCH1eqSPdYEw8="; }; in -llvmPackages_16.stdenv.mkDerivation rec { +llvmPackages_17.stdenv.mkDerivation rec { pname = "pcsx2"; - version = "1.7.5004"; + version = "1.7.5318"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-o+9VSuoZgTkS75rZ6qYM8ITD+0OcwXp+xh/hdUGpVK4="; + sha256 = "sha256-5SUlq3HQAzROG1yncA4u4XGVv+1I+s9FQ6LgJkiLSD0="; }; cmakeFlags = [ - "-DDISABLE_ADVANCE_SIMD=TRUE" - "-DUSE_SYSTEM_LIBS=ON" + "-DDISABLE_ADVANCE_SIMD=ON" "-DUSE_LINKED_FFMPEG=ON" - "-DDISABLE_BUILD_DATE=TRUE" + "-DDISABLE_BUILD_DATE=ON" ]; nativeBuildInputs = [ @@ -72,7 +70,6 @@ llvmPackages_16.stdenv.mkDerivation rec { buildInputs = [ curl ffmpeg - fmt_8 gettext harfbuzz libaio @@ -85,7 +82,6 @@ llvmPackages_16.stdenv.mkDerivation rec { qtsvg qttools qtwayland - rapidyaml SDL2 soundtouch vulkan-headers @@ -106,11 +102,22 @@ llvmPackages_16.stdenv.mkDerivation rec { strip-nondeterminism $out/bin/resources/patches.zip ''; - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ - vulkan-loader - ] ++ cubeb.passthru.backendLibs)}" - ]; + qtWrapperArgs = + let + libs = lib.makeLibraryPath ([ + vulkan-loader + ] ++ cubeb.passthru.backendLibs); + in [ + "--prefix LD_LIBRARY_PATH : ${libs}" + ]; + + # https://github.com/PCSX2/pcsx2/pull/10200 + # Can't avoid the double wrapping, the binary wrapper from qtWrapperArgs doesn't support --run + postFixup = '' + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/pcsx2-qt \ + --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi' + ''; meta = with lib; { description = "Playstation 2 emulator"; diff --git a/pkgs/applications/finance/cryptowatch/default.nix b/pkgs/applications/finance/cryptowatch/default.nix deleted file mode 100644 index 08c260c8b867..000000000000 --- a/pkgs/applications/finance/cryptowatch/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, wrapGAppsHook -, dbus -, libGL -, libX11 -, libXcursor -, libXi -, libXrandr -, udev -, unzip -, alsa-lib -}: - -stdenv.mkDerivation rec { - pname = "cryptowatch-desktop"; - version = "0.7.1"; - - src = fetchurl { - url = "https://cryptowat.ch/desktop/download/linux/${version}"; - hash = "sha256-ccyHfjp00CgQH+3SiDWx9yE1skOj0RWxnBomHWY/IaU="; - }; - - unpackPhase = "unzip $src"; - - nativeBuildInputs = [ - autoPatchelfHook - wrapGAppsHook - unzip - ]; - - buildInputs = [ - dbus - udev - alsa-lib - ]; - - sourceRoot = "."; - - installPhase = '' - install -m755 -D cryptowatch_desktop $out/bin/cryptowatch_desktop - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL libX11 libXcursor libXrandr libXi ]}" - ) - ''; - - meta = with lib; { - homepage = "https://cryptowat.ch"; - description = "Application for visualising real-time cryptocurrency market data"; - platforms = platforms.linux; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ livnev kashw2 ]; - }; -} diff --git a/pkgs/applications/misc/flowtime/default.nix b/pkgs/applications/misc/flowtime/default.nix index f2c80a35beb6..6637cb878191 100644 --- a/pkgs/applications/misc/flowtime/default.nix +++ b/pkgs/applications/misc/flowtime/default.nix @@ -5,12 +5,14 @@ , meson , ninja , wrapGAppsHook4 +, gst_all_1 , libadwaita , libxml2 , desktop-file-utils , pkg-config , libportal-gtk4 , blueprint-compiler +, appstream-glib }: stdenv.mkDerivation rec { @@ -32,13 +34,17 @@ stdenv.mkDerivation rec { pkg-config vala wrapGAppsHook4 + appstream-glib ]; buildInputs = [ libadwaita libxml2 libportal-gtk4 - ]; + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + ]); meta = with lib; { description = "Get what motivates you done, without losing concentration"; diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix index a52729d52c77..602c366c12a4 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -16,19 +16,22 @@ , libXfixes , libpulseaudio , libva -, ffmpeg +, ffmpeg_5 , libpng , libjpeg8 , curl +, vulkan-loader +, gnome +, zenity ? gnome.zenity }: stdenvNoCC.mkDerivation { pname = "parsec-bin"; - version = "150_90c"; + version = "150_91a"; src = fetchurl { - url = "https://web.archive.org/web/20231028212419/https://builds.parsec.app/package/parsec-linux.deb"; - sha256 = "sha256-rFSdl7BgnuJAj6w5in0/yszO8b5qcr9b+wjF1WkAU70="; + url = "https://web.archive.org/web/20231209190803if_/https://builds.parsec.app/package/parsec-linux.deb"; + sha256 = "sha256-/qugI7k0NYpq7p9l9auD2Pp+SFoFZ9jAZswpreVfgO4="; }; unpackPhase = '' @@ -55,7 +58,7 @@ stdenvNoCC.mkDerivation { alsa-lib libpulseaudio libva - ffmpeg + ffmpeg_5 libpng libjpeg8 curl @@ -64,6 +67,11 @@ stdenvNoCC.mkDerivation { libXi libXrandr libXfixes + vulkan-loader + ]; + + binPath = lib.makeBinPath [ + zenity ]; prepareParsec = '' @@ -80,6 +88,7 @@ stdenvNoCC.mkDerivation { mv usr/* $out wrapProgram $out/bin/parsecd \ + --prefix PATH : "$binPath" \ --prefix LD_LIBRARY_PATH : "$runtimeDependenciesPath" \ --run "$prepareParsec" @@ -108,7 +117,7 @@ stdenvNoCC.mkDerivation { changelog = "https://parsec.app/changelog"; description = "Remote streaming service client"; license = licenses.unfree; - maintainers = with maintainers; [ arcnmx ]; + maintainers = with maintainers; [ arcnmx pabloaul ]; platforms = platforms.linux; mainProgram = "parsecd"; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 011d36562e1b..eadcefe71bdc 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-ThsKOOLNcmFTUnLirSHea9wzw+FyC3v7I/5ghbz8GAg="; + hash_darwin = "sha256-20OgLWrtw2QwyfoehoU7WjmH3IoOG4k3dAya5U5c7Qc="; hash_darwin_aarch64 = - "sha256-UVBLCo8Lkbnt882PeTMnO8lxam42mIDkEN28Ps8E0a8="; - hash_linux = "sha256-X8bia1BaLQm5WKn5vdShpQ4A7sPNZ8lgmeXoYj2earc="; - version = "120.0.6099.71"; + "sha256-7aI141Ndtun3HglNKiW4+TTVgOVASnz98Rn1trgUgpo="; + hash_linux = "sha256-gJ6xXhW87URDvpFP88KgLKmwoFDlqMN1Vj6L+bDdbSc="; + version = "120.0.6099.109"; }; deps = { gn = { @@ -15,9 +15,9 @@ version = "2023-10-23"; }; }; - hash = "sha256-Zbo8xvOfvJVkjdqBaApK6hekmuRKHuYWRBTZTpqcOSM="; - hash_deb_amd64 = "sha256-ScFJQB9fY1cWHtFO8GpQ8yuCLaO1AvyAV5lbnqSrPCs="; - version = "120.0.6099.109"; + hash = "sha256-+T2TOLwIwFxVDae7MFDZrjREGF+3Zx2xt/Dlu7uZggc="; + hash_deb_amd64 = "sha256-0FB1gTbsjqFRy0ocE0w5ACtD9kSJ5AMnxg+qBxqCulc="; + version = "120.0.6099.129"; }; ungoogled-chromium = { deps = { @@ -28,12 +28,12 @@ version = "2023-10-23"; }; ungoogled-patches = { - hash = "sha256-wiW1w+HVPpEjROuE3yhYuGiZSwI8z5+k1CFnVZ0HtME="; - rev = "120.0.6099.109-1"; + hash = "sha256-kVhAa/+RnYEGy7McysqHsb3ysPIILnxGXe6BTLbioQk="; + rev = "120.0.6099.129-1"; }; }; - hash = "sha256-Zbo8xvOfvJVkjdqBaApK6hekmuRKHuYWRBTZTpqcOSM="; - hash_deb_amd64 = "sha256-ScFJQB9fY1cWHtFO8GpQ8yuCLaO1AvyAV5lbnqSrPCs="; - version = "120.0.6099.109"; + hash = "sha256-+T2TOLwIwFxVDae7MFDZrjREGF+3Zx2xt/Dlu7uZggc="; + hash_deb_amd64 = "sha256-0FB1gTbsjqFRy0ocE0w5ACtD9kSJ5AMnxg+qBxqCulc="; + version = "120.0.6099.129"; }; } diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 09c0fc69ed88..49697b777141 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.14.6"; - sha256 = "0q0c2gd7d7ws4v4lqql6l3l68g5kjypfmcc0vwyy0xx68z8sxm75"; + version = "2.14.7"; + sha256 = "0mrnyb98h4614aa3i3ki3gz3rsp60qy038phgmp3x9s0gq11bd23"; vendorHash = "sha256-bGl8IZppwLDS6cRO4HmflwIOhH3rOhE/9slJATe+onI="; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 5df669ed94a5..e4cad2ae422f 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 = "23.11.4"; - sha256 = "0j6yzjd2rnm6vzn2fky83pw3v943n3chhnr7a302rnafprlbmmp4"; - vendorHash = "sha256-1s2vj9GSNe4j9TtIo69uakrg8PnBHNchlApryBeHmKs="; + version = "23.12.2"; + sha256 = "1icra5x0mj02yiy8d7byhs4pzbxnixffwj6gdqxkh9g65d8mpc16"; + vendorHash = "sha256-8QyI8jxAdBTo75hqD3rtZtO71QaIs3VjlXI5xjGXS5w="; } diff --git a/pkgs/applications/networking/localproxy/default.nix b/pkgs/applications/networking/localproxy/default.nix index 9144b67c9abb..06968035f04a 100644 --- a/pkgs/applications/networking/localproxy/default.nix +++ b/pkgs/applications/networking/localproxy/default.nix @@ -14,13 +14,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "localproxy"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "aws-samples"; repo = "aws-iot-securetunneling-localproxy"; rev = "v${finalAttrs.version}"; - hash = "sha256-ec72bvBkRBj4qlTNfzNPeQt02OfOPA8y2PoejHpP9cY="; + hash = "sha256-voUKfXa43mOltePQEXgmJ2EBaN06E6R/2Zz6O09ogyY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 027564ae7a01..aa1f7f50daf8 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "transmission"; - version = "4.0.4"; + version = "4.0.5"; src = fetchFromGitHub { owner = "transmission"; repo = "transmission"; rev = finalAttrs.version; - hash = "sha256-Sz3+5VvfOgET1aiormEnBOrF+yN79tiSQvjLAoGqTLw="; + hash = "sha256-gd1LGAhMuSyC/19wxkoE2mqVozjGPfupIPGojKY0Hn4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index b573fa3a43f6..7b8113e906e4 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -60,5 +60,61 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = with maintainers; [ bluescreen303 mgdelacroix ]; platforms = platforms.linux; + knownVulnerabilities = [ + "CVE-2023-48958" + "CVE-2023-48090" + "CVE-2023-48039" + "CVE-2023-48014" + "CVE-2023-48013" + "CVE-2023-48011" + "CVE-2023-47465" + "CVE-2023-47384" + "CVE-2023-46932" + "CVE-2023-46931" + "CVE-2023-46930" + "CVE-2023-46928" + "CVE-2023-46927" + "CVE-2023-46871" + "CVE-2023-46001" + "CVE-2023-42298" + "CVE-2023-41000" + "CVE-2023-39562" + "CVE-2023-37767" + "CVE-2023-37766" + "CVE-2023-37765" + "CVE-2023-37174" + "CVE-2023-23143" + "CVE-2023-5998" + "CVE-2023-5595" + "CVE-2023-5586" + "CVE-2023-5520" + "CVE-2023-5377" + "CVE-2023-4778" + "CVE-2023-4758" + "CVE-2023-4756" + "CVE-2023-4755" + "CVE-2023-4754" + "CVE-2023-4722" + "CVE-2023-4721" + "CVE-2023-4720" + "CVE-2023-4683" + "CVE-2023-4682" + "CVE-2023-4681" + "CVE-2023-4678" + "CVE-2023-3523" + "CVE-2023-3291" + "CVE-2023-3013" + "CVE-2023-3012" + "CVE-2023-1655" + "CVE-2023-1654" + "CVE-2023-1452" + "CVE-2023-1449" + "CVE-2023-1448" + "CVE-2023-0866" + "CVE-2023-0841" + "CVE-2023-0819" + "CVE-2023-0818" + "CVE-2023-0817" + ]; }; } diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 05de3c1626df..1cd8b02bacf7 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.28.2"; + version = "1.29.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-g9J66CZOAoco7UmK+xPEE6T5Aes3LWEG3J40LuDcvYo="; + sha256 = "sha256-Vy/sW8Y9SFSBaoectehF7ROxuypD7k7tAkcfrEK+pmI="; }; vendorHash = null; diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index dc2f58b1d3a8..0af274265bff 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dwl"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "djpohly"; repo = "dwl"; rev = "v${finalAttrs.version}"; - hash = "sha256-OW7K7yMYSzqZWpQ9Vmpy8EgdWvyv3q1uh8A40f6AQF4="; + hash = "sha256-U/vqGE1dJKgEGTfPMw02z5KJbZLWY1vwDJWnJxT8urM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index a77526abb508..84c1c79598f9 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -1,12 +1,9 @@ { fetchFromGitLab , wlroots -, libdisplay-info -, libliftoff -, hwdata }: wlroots.overrideAttrs (old: { - version = "0.17.0-dev"; + version = "0.18.0-dev"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; @@ -16,11 +13,7 @@ wlroots.overrideAttrs hash = "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo="; }; - pname = "${old.pname}-hyprland"; + patches = [ ]; # don't inherit old.patches - buildInputs = old.buildInputs ++ [ - hwdata - libdisplay-info - libliftoff - ]; + pname = "${old.pname}-hyprland"; }) diff --git a/pkgs/applications/window-managers/tinywl/default.nix b/pkgs/applications/window-managers/tinywl/default.nix index c0b147e6ee58..d39373e78192 100644 --- a/pkgs/applications/window-managers/tinywl/default.nix +++ b/pkgs/applications/window-managers/tinywl/default.nix @@ -4,25 +4,25 @@ stdenv.mkDerivation { pname = "tinywl"; - inherit (wlroots) version src; - - sourceRoot = "${wlroots.src.name}/tinywl"; + inherit (wlroots) version src patches postPatch; nativeBuildInputs = [ pkg-config wayland-scanner ]; buildInputs = [ libxkbcommon pixman udev wayland wayland-protocols wlroots ]; + makeFlags = [ "-C" "tinywl" ]; + installPhase = '' runHook preInstall mkdir -p $out/bin - cp tinywl $out/bin + cp tinywl/tinywl $out/bin runHook postInstall ''; - meta = with lib; { - homepage = "https://github.com/swaywm/wlroots/tree/master/tinywl"; + meta = { + homepage = "https://gitlab.freedesktop.org/wlroots/wlroots/tree/master/tinywl"; description = ''A "minimum viable product" Wayland compositor based on wlroots''; - maintainers = with maintainers; [ qyliss ] ++ wlroots.meta.maintainers; - license = licenses.cc0; + maintainers = with lib.maintainers; [ qyliss ] ++ wlroots.meta.maintainers; + license = lib.licenses.cc0; inherit (wlroots.meta) platforms; mainProgram = "tinywl"; }; diff --git a/pkgs/by-name/de/decent-sampler/package.nix b/pkgs/by-name/de/decent-sampler/package.nix new file mode 100644 index 000000000000..449a589c9086 --- /dev/null +++ b/pkgs/by-name/de/decent-sampler/package.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchzip +, buildFHSEnv +, alsa-lib +, freetype +, nghttp2 +, libX11 +, }: + +let + pname = "decent-sampler"; + version = "1.9.4"; + + decent-sampler = stdenv.mkDerivation { + inherit pname version; + + src = fetchzip { + # dropbox link: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\ + + url = "https://archive.org/download/decent-sampler-linux-static-download-mirror/Decent_Sampler-${version}-Linux-Static-x86_64.tar.gz"; + hash = "sha256-lTp/mukCwLNyeTcBT68eqa7aD0o11Bylbd93A5VCILU="; + }; + + installPhase = '' + runHook preInstall + + install -Dm755 DecentSampler $out/bin/decent-sampler + + runHook postInstall + ''; + }; + +in + +buildFHSEnv { + inherit pname version; + + targetPkgs = pkgs: [ + alsa-lib + decent-sampler + freetype + nghttp2 + libX11 + ]; + + runScript = "decent-sampler"; + + meta = with lib; { + description = "An audio sample player"; + longDescription = '' + Decent Sampler is an audio sample player. + Allowing you to play sample libraries in the DecentSampler format + (files with extensions: dspreset and dslibrary). + ''; + mainProgram = "decent-sampler"; + homepage = "https://www.decentsamples.com/product/decent-sampler-plugin/"; + # It claims to be free but we currently cannot find any license + # that it is released under. + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ adam248 ]; + }; +} diff --git a/pkgs/by-name/ei/eigenlayer/package.nix b/pkgs/by-name/ei/eigenlayer/package.nix new file mode 100644 index 000000000000..9b125a91d154 --- /dev/null +++ b/pkgs/by-name/ei/eigenlayer/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +buildGoModule rec { + pname = "eigenlayer"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "Layr-Labs"; + repo = "eigenlayer-cli"; + rev = "v${version}"; + hash = "sha256-zLTzDVXj2XTjgMuTLXVQStzDkkOGU2kCgIvBmJKohY4"; + }; + + vendorHash = "sha256-gAW+yEj4aRHTuuZLrqQs8lebs9/O0uGxkHRK3B1TG+Q="; + + ldflags = ["-s" "-w"]; + subPackages = ["cmd/eigenlayer"]; + + passthru.updateScript = nix-update-script {}; + + meta = with lib; { + homepage = "https://www.eigenlayer.xyz/"; + changelog = "https://github.com/Layr-Labs/eigenlayer-cli/releases/tag/${src.rev}"; + description = "Utility that manages core operator functionalities like local keys, operator registration and updates"; + mainProgram = "eigenlayer"; + license = licenses.bsl11; + maintainers = with maintainers; [selfuryon]; + }; +} diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 6795d22e9782..a5b44e83a80b 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -22,6 +22,10 @@ , pkg-config }: +assert lib.assertMsg + (lib.count lib.id [openclSupport openblasSupport rocmSupport] == 1) + "llama-cpp: exactly one of openclSupport, openblasSupport and rocmSupport should be enabled"; + let cudatoolkit_joined = symlinkJoin { name = "${cudaPackages.cudatoolkit.name}-merged"; diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index a42fb0f87d59..06820aa28a19 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -19,13 +19,13 @@ , gnome }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "loupe"; - version = "45.2"; + version = "45.3"; src = fetchurl { - url = "mirror://gnome/sources/loupe/${lib.versions.major version}/loupe-${version}.tar.xz"; - hash = "sha256-uLP/rzZXAmsX4E8Z4EDLqNUetNDKtU5CKVsOWlJxwKs="; + url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz"; + hash = "sha256-9l8tEgjQhatf+pmN1DyS/pUictTVm1HP7MEevf/KLYY="; }; patches = [ @@ -82,4 +82,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "loupe"; }; -} +}) diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index 50cddab18be7..02c39c1bbb50 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -8,10 +8,11 @@ , libadwaita , libsoup_3 , glib-networking +, nix-update-script }: python3Packages.buildPythonApplication rec { pname = "monophony"; - version = "2.4.0"; + version = "2.5.1"; format = "other"; sourceRoot = "source/source"; @@ -19,7 +20,7 @@ python3Packages.buildPythonApplication rec { owner = "zehkira"; repo = "monophony"; rev = "v${version}"; - hash = "sha256-BIaBysqkNfRk7N4dzyjnN+ha2WkppkwFDSj4AAcp9UI="; + hash = "sha256-kBFznJcH6UOlzgUnhPSOUBxqqsHzIEpirN63gRYC/u0="; }; pythonPath = with python3Packages; [ @@ -57,6 +58,8 @@ python3Packages.buildPythonApplication rec { ) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://gitlab.com/zehkira/monophony"; description = "Linux app for streaming music from YouTube"; diff --git a/pkgs/by-name/wa/waybox/package.nix b/pkgs/by-name/wa/waybox/package.nix index 3274660b0752..70ec30f50db2 100644 --- a/pkgs/by-name/wa/waybox/package.nix +++ b/pkgs/by-name/wa/waybox/package.nix @@ -5,6 +5,8 @@ , libGL , libxkbcommon , libxml2 +, libevdev +, libinput , mesa , meson , ninja @@ -19,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waybox"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "wizbright"; repo = "waybox"; rev = finalAttrs.version; - hash = "sha256-G8dRa4hgev3x58uqp5To5OzF3zcPSuT3NL9MPnWf2M8="; + hash = "sha256-hAXS9laDfigWR2pfNmdPiOeez3NpTIuKHnpeQyYa9IQ="; }; nativeBuildInputs = [ @@ -40,6 +42,8 @@ stdenv.mkDerivation (finalAttrs: { libGL libxkbcommon libxml2 + libevdev + libinput mesa # for libEGL pixman udev diff --git a/pkgs/by-name/wi/wio/package.nix b/pkgs/by-name/wi/wio/package.nix index 73255a38208b..e8378f2fc560 100644 --- a/pkgs/by-name/wi/wio/package.nix +++ b/pkgs/by-name/wi/wio/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wio"; - version = "unstable-2023-05-28"; + version = "unstable-2023-11-23"; src = fetchFromGitHub { owner = "Rubo3"; repo = "wio"; - rev = "9d33d60839d3005ee16b5b04ae7f42c049939058"; - hash = "sha256-ylJ8VHQU4TWLrhxGRo6HHOB7RWTVAThMQRw0uAFboNE="; + rev = "77c33b555589068350078d634a256a8fbb7ffe6b"; + hash = "sha256-Wff8RPHfmgPYJ3cO0h5onHtWIvOYDqLjvF1O4uODuCY="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 235c26c737b0..7b2a05e97349 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,14 +3,14 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20231208065009"; + version = "20231219144426"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-Z5yUtkumr/JuKzq47QdPuHSJOSxD2XsK9sYE1hUhoyY="; + hash = "sha256-xiHQL4fyGcb0yY++aqwaaZ8spPINQwbhI/VIer2LOe0="; }; - vendorHash = "sha256-6167kRAC5m5FlBr7uk+qKUcjWsb45P5Vvovyb6hHSVQ="; + vendorHash = "sha256-azvMUi8eLNoNofRa2X4SKTTiMd6aOyO6H/rOiKjkpIY="; meta = with lib; { description = "community managed domain list"; homepage = "https://github.com/v2fly/domain-list-community"; diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index f3bc244eba00..a42fa79c6768 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , pkg-config , meson , ninja @@ -29,24 +28,15 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-5hXhCPXC7b2SsmvNSLDe/WYQcufN7FfhnaAgTNtqg0I="; + hash = "sha256-jWUPn5+ynuLdb2GaqKph1M62Ky00sRP/vUXedEvBT7A="; }; - patches = [ - # Fix broken theming with pygobject >= 3.46.0 - # https://github.com/linuxmint/cinnamon-screensaver/issues/446 - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon-screensaver/commit/37ab8ed18f35591f2bd99043f12c06d98b4527db.patch"; - hash = "sha256-4YSithosyTLy8OFu6DEhLT4c+EGEg84EenTKAiBiWo4="; - }) - ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index b5d2df761fad..9e86a0fb9dda 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-y-icons"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-T2tZUMXc3kvTFkWf9AGUTNkkmQ0OT8qTKpQk+ZuvEc0="; + hash = "sha256-Uzayo1hmNwOMszTV8/KqOLxjERBC/L16hRpCWbK10Uc="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index d99bdd97ec9e..a7c560e20579 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -18,6 +18,7 @@ let gmenuharness = callPackage ./development/gmenuharness { }; libusermetrics = callPackage ./development/libusermetrics { }; lomiri-api = callPackage ./development/lomiri-api { }; + lomiri-app-launch = callPackage ./development/lomiri-app-launch { }; trust-store = callPackage ./development/trust-store { }; u1db-qt = callPackage ./development/u1db-qt { }; @@ -31,8 +32,8 @@ let #### Services biometryd = callPackage ./services/biometryd { }; hfd-service = callPackage ./services/hfd-service { }; - lomiri-app-launch = callPackage ./development/lomiri-app-launch { }; lomiri-download-manager = callPackage ./services/lomiri-download-manager { }; + lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { }; mediascanner2 = callPackage ./services/mediascanner2 { }; }; in diff --git a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix new file mode 100644 index 000000000000..7629da2cbb84 --- /dev/null +++ b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix @@ -0,0 +1,169 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, testers +, cmake +, cmake-extras +, dbus +, dbus-test-runner +, glib +, gtest +, intltool +, json-glib +, libapparmor +, libxkbcommon +, lomiri-app-launch +, lomiri-ui-toolkit +, makeWrapper +, pkg-config +, python3 +, qtbase +, qtdeclarative +, qtwayland +, runtimeShell +, sqlite +, systemd +, wrapQtAppsHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-url-dispatcher"; + version = "0.1.3"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-url-dispatcher"; + rev = finalAttrs.version; + hash = "sha256-kde/HzhBHxTeyc2TCUJwpG7IfC8doDd/jNMF8KLM7KU="; + }; + + outputs = [ + "out" + "dev" + ]; + + patches = [ + # Fix case-sensitivity in tests + # Remove when https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/merge_requests/8 merged & in release + (fetchpatch { + url = "https://gitlab.com/sunweaver/lomiri-url-dispatcher/-/commit/ebdd31b9640ca243e90bc7b8aca7951085998bd8.patch"; + hash = "sha256-g4EohB3oDcWK4x62/3r/g6CFxqb7/rdK51+E/Fji1Do="; + }) + ]; + + postPatch = '' + substituteInPlace data/CMakeLists.txt \ + --replace "\''${SYSTEMD_USER_UNIT_DIR}" "\''${CMAKE_INSTALL_LIBDIR}/systemd/user" + + substituteInPlace tests/url_dispatcher_testability/CMakeLists.txt \ + --replace "\''${PYTHON_PACKAGE_DIR}" "$out/${python3.sitePackages}" + + # Update URI handler database whenever new url-handler is installed system-wide + substituteInPlace data/lomiri-url-dispatcher-update-system-dir.*.in \ + --replace '@CMAKE_INSTALL_FULL_DATAROOTDIR@' '/run/current-system/sw/share' + '' + lib.optionalString finalAttrs.finalPackage.doCheck '' + patchShebangs tests/test-sql.sh + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + glib # for gdbus-codegen + intltool + makeWrapper + pkg-config + (python3.withPackages (ps: with ps; [ + setuptools + ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ + python-dbusmock + ])) + wrapQtAppsHook + ]; + + buildInputs = [ + cmake-extras + dbus-test-runner + glib + gtest + json-glib + libapparmor + lomiri-app-launch + lomiri-ui-toolkit + qtdeclarative + sqlite + systemd + libxkbcommon + ]; + + nativeCheckInputs = [ + dbus + sqlite + ]; + + cmakeFlags = [ + "-DLOCAL_INSTALL=ON" + "-Denable_mirclient=OFF" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + # Tests work with an sqlite db, cannot handle >1 test at the same time + enableParallelChecking = false; + + dontWrapQtApps = true; + + preFixup = '' + substituteInPlace $out/bin/lomiri-url-dispatcher-dump \ + --replace '/bin/sh' '${runtimeShell}' + + wrapProgram $out/bin/lomiri-url-dispatcher-dump \ + --prefix PATH : ${lib.makeBinPath [ sqlite ]} + + # Move from qmlscene call in desktop file to easier-to-wrap script + guiScript=$out/bin/lomiri-url-dispatcher-gui + guiExec=$(grep 'Exec=' $out/share/applications/lomiri-url-dispatcher-gui.desktop | cut -d'=' -f2-) + + cat <$guiScript + #!${runtimeShell} + $guiExec + EOF + chmod +x $guiScript + + mkdir -p $out/share/icons/hicolor/scalable/apps + ln -s $out/share/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg $out/share/icons/hicolor/scalable/apps/ + + substituteInPlace $out/share/applications/lomiri-url-dispatcher-gui.desktop \ + --replace "Exec=$guiExec" "Exec=$(basename $guiScript)" \ + --replace "Icon=$out/share/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg" "Icon=lomiri-url-dispatcher-gui" + + # Calls qmlscene from PATH, needs Qt plugins & QML components + qtWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ qtdeclarative.dev ]} + ) + wrapQtApp $guiScript + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Lomiri operating environment service for requesting URLs to be opened"; + longDescription = '' + Allows applications to request a URL to be opened and handled by another + process without seeing the list of other applications on the system or + starting them inside its own Application Confinement. + ''; + homepage = "https://gitlab.com/ubports/development/core/lomiri-url-dispatcher"; + license = with licenses; [ lgpl3Only gpl3Only ]; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "lomiri-url-dispatcher" + ]; + }; +}) diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/development/compilers/julia/1.6-bin.nix index cf72457a1434..1ae22846d7ec 100644 --- a/pkgs/development/compilers/julia/1.6-bin.nix +++ b/pkgs/development/compilers/julia/1.6-bin.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ raskin ]; + maintainers = with lib.maintainers; [ raskin thomasjm ]; platforms = [ "x86_64-linux" ]; mainProgram = "julia"; }; diff --git a/pkgs/development/compilers/julia/1.8-bin.nix b/pkgs/development/compilers/julia/1.8-bin.nix index 24eac49df9db..d7a548a8d137 100644 --- a/pkgs/development/compilers/julia/1.8-bin.nix +++ b/pkgs/development/compilers/julia/1.8-bin.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ raskin nickcao wegank ]; + maintainers = with lib.maintainers; [ raskin nickcao wegank thomasjm ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "julia"; }; diff --git a/pkgs/development/compilers/julia/1.8.nix b/pkgs/development/compilers/julia/1.8.nix index 1a6d6e7332c1..8bd0b536e149 100644 --- a/pkgs/development/compilers/julia/1.8.nix +++ b/pkgs/development/compilers/julia/1.8.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { description = "High-level performance-oriented dynamical language for technical computing"; homepage = "https://julialang.org/"; license = licenses.mit; - maintainers = with maintainers; [ nickcao ]; + maintainers = with maintainers; [ nickcao thomasjm ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/development/compilers/julia/1.9-bin.nix b/pkgs/development/compilers/julia/1.9-bin.nix index 04e768d0bff8..a52e62139abe 100644 --- a/pkgs/development/compilers/julia/1.9-bin.nix +++ b/pkgs/development/compilers/julia/1.9-bin.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ raskin nickcao wegank ]; + maintainers = with lib.maintainers; [ raskin nickcao wegank thomasjm ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "julia"; }; diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix index 715414e7dab9..8c0585fd4e19 100644 --- a/pkgs/development/compilers/julia/1.9.nix +++ b/pkgs/development/compilers/julia/1.9.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "High-level performance-oriented dynamical language for technical computing"; homepage = "https://julialang.org/"; license = licenses.mit; - maintainers = with maintainers; [ nickcao joshniemela ]; + maintainers = with maintainers; [ nickcao joshniemela thomasjm ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 75df4243e573..bad47d45e11a 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -11,17 +11,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.11"; + version = "0.5.12"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-e6arK4TpN7CXOZWjlVx0ReI6hz8sEHFMgpl5/S04aEs="; + hash = "sha256-naX80UdSAwFAGS04Zd5VyVS2KQWnotE4+mJxWYRXXNU="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-GlHy2/g64kvKHNltgUOdHrpjt6nFh9gl9KXk4JFrrig="; + hash = "sha256-RD6pHDQI8ssU/E8LzLXmqtedLCL5wZV/bO3KHIWiYN8="; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 1bafd6cb728e..86c47da2e538 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "1.3.1"; + version = "1.3.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-9SsSXLZFwqsAeWFGsba8OG9bdmfQjn6qQHHQK6IdHK8="; + sha256 = "sha256-TaNuw84VCC1s2I7rmTdVKTrpT/nTrb+45haEFWf6S7k="; }; - vendorHash = "sha256-VRQUbGJTC2v8w/l4iaNn3vPX3AdV9Likp2nuG0PQieU="; + vendorHash = "sha256-rxWYNGFbFUKjy232DOhVlh341GV2VKLngJKM+DEd27o="; doCheck = false; diff --git a/pkgs/development/julia-modules/default.nix b/pkgs/development/julia-modules/default.nix index 973a50abe30d..f2c90752f098 100644 --- a/pkgs/development/julia-modules/default.nix +++ b/pkgs/development/julia-modules/default.nix @@ -170,6 +170,7 @@ runCommand "julia-${julia.version}-env" { inherit julia; inherit juliaWrapped; + meta = julia.meta; # Expose the steps we used along the way in case the user wants to use them, for example to build # expressions and build them separately to avoid IFD. diff --git a/pkgs/development/julia-modules/python/sources_nix.py b/pkgs/development/julia-modules/python/sources_nix.py index 99a952753e80..989bf6bf186f 100755 --- a/pkgs/development/julia-modules/python/sources_nix.py +++ b/pkgs/development/julia-modules/python/sources_nix.py @@ -45,10 +45,14 @@ with open(out_path, "w") as f: path = registry_info["path"] packageToml = toml.load(registry_path / path / "Package.toml") - all_versions = toml.load(registry_path / path / "Versions.toml") + versions_toml = registry_path / path / "Versions.toml" + all_versions = toml.load(versions_toml) if not pkg["version"] in all_versions: continue version_to_use = all_versions[pkg["version"]] + if not "nix-sha256" in version_to_use: + raise KeyError(f"""Couldn't find nix-sha256 hash for {pkg["name"]} {pkg["version"]} in {versions_toml}. This might indicate that we failed to prefetch the hash when computing the augmented registry. Was there a relevant failure in {registry_path / "failures.yml"}?""") + repo = packageToml["repo"] f.write(f""" "{uuid}" = {{ src = fetchgit {{ diff --git a/pkgs/development/julia-modules/registry.nix b/pkgs/development/julia-modules/registry.nix index 929a805b48c5..71d0a2733e8c 100644 --- a/pkgs/development/julia-modules/registry.nix +++ b/pkgs/development/julia-modules/registry.nix @@ -3,7 +3,7 @@ fetchFromGitHub { owner = "CodeDownIO"; repo = "General"; - rev = "baf9e22ecdf97b6424a611ac4a565c6ee60d3f44"; - sha256 = "1nd3x2z8r6578149pbpkx9qw2ajln1kfy7w5kjsnv56v180h0ddf"; - # date = "2023-12-14T12:20:00+00:00"; + rev = "de80ad56e87f222ca6a7a517c69039d35437ab42"; + sha256 = "0pz1jmmcb2vn854w8w0zlpnihi470649cd8djh1wzgq2i2fy83bl"; + # date = "2023-12-22T03:28:12+00:00"; } diff --git a/pkgs/development/libraries/gdal/tests.nix b/pkgs/development/libraries/gdal/tests.nix index 37b958706b32..b89bbd51ab20 100644 --- a/pkgs/development/libraries/gdal/tests.nix +++ b/pkgs/development/libraries/gdal/tests.nix @@ -4,33 +4,31 @@ let inherit (gdal) pname version; in -runCommand "${pname}-tests" { - nativeBuildInputs = [ gdal ]; - meta.timeout = 60; -} '' +runCommand "${pname}-tests" { meta.timeout = 60; } + '' # test version - ogrinfo --version \ + ${gdal}/bin/ogrinfo --version \ | grep 'GDAL ${version}' - gdalinfo --version \ + ${gdal}/bin/gdalinfo --version \ | grep 'GDAL ${version}' # test formats - ogrinfo --formats \ + ${gdal}/bin/ogrinfo --formats \ | grep 'GPKG.*GeoPackage' - gdalinfo --formats \ + ${gdal}/bin/gdalinfo --formats \ | grep 'GTiff.*GeoTIFF' # test vector file echo -e "Latitude,Longitude,Name\n48.1,0.25,'Test point'" > test.csv - ogrinfo ./test.csv + ${gdal}/bin/ogrinfo ./test.csv # test raster file - gdal_create \ + ${gdal}/bin/gdal_create \ -a_srs "EPSG:4326" \ -of GTiff \ -ot UInt16 \ @@ -40,7 +38,7 @@ runCommand "${pname}-tests" { -co COMPRESS=LZW \ test.tif - gdalinfo ./test.tif + ${gdal}/bin/gdalinfo ./test.tif touch $out '' diff --git a/pkgs/development/libraries/hnswlib/default.nix b/pkgs/development/libraries/hnswlib/default.nix index cba73d569344..4c5e46237760 100644 --- a/pkgs/development/libraries/hnswlib/default.nix +++ b/pkgs/development/libraries/hnswlib/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , python3 }: @@ -13,26 +12,18 @@ in stdenv.mkDerivation (finalAttrs: { pname = "hnswlib"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "nmslib"; repo = "hnswlib"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-XXz0NIQ5dCGwcX2HtbK5NFTalP0TjLO6ll6TmH3oflI="; + hash = "sha256-1KkAX42j/I06KO4wCnDsDifN1JiENqYKR5NNHBjyuVA="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-37365.patch"; - url = "https://github.com/nmslib/hnswlib/commit/f6d170ce0b41f9e75ace473b09df6e7872590757.patch"; - hash = "sha256-28nakC0rh6kx6yYjv7m6r9/yJ+lWQuooRFyYYQN2rX8="; - }) - ]; - # this is a header-only library, so we don't need to build it # we need `cmake` only to run tests - nativeBuildInputs = lib.optionals finalAttrs.finalPackage.doCheck [ + nativeCheckInputs = [ cmake python ]; diff --git a/pkgs/development/libraries/openturns/default.nix b/pkgs/development/libraries/openturns/default.nix index e20499b9206c..751f98aae6e5 100644 --- a/pkgs/development/libraries/openturns/default.nix +++ b/pkgs/development/libraries/openturns/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "openturns"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "openturns"; repo = "openturns"; rev = "v${version}"; - sha256 = "sha256-Lg42QqsHYFxeUjZjYFVJFxeJv2MzOpjoShfbIg/095A="; + sha256 = "sha256-Zq+Z3jLjdba3566H4RdwztqbRRID5K5yHvoGmgzq8QM="; }; nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx; diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 31198124faac..624ca4aa6672 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -19,7 +19,7 @@ , AGL , OpenGL , config -, withCuda ? config.cudaSupport, cudaPackages +, cudaSupport ? config.cudaSupport, cudaPackages }: stdenv.mkDerivation rec { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { cmake wrapQtAppsHook ] - ++ lib.optionals withCuda [ cudaPackages.cuda_nvcc ]; + ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; buildInputs = [ eigen @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" - ] ++ lib.optionals withCuda [ "-DWITH_CUDA=true" ]; + ] ++ lib.optionals cudaSupport [ "-DWITH_CUDA=true" ]; meta = { homepage = "https://pointclouds.org/"; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 7a998b409c2b..ec16a5d77758 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -29,15 +29,15 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.74.1"; + version = "0.74.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-IyjD8cmYNQoY4OUTNI6fxYHVfqTnuJrt8R4OPGUEK08="; + url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-pTX7Kpj+qKJEnNGgLMz1GQEx3d/1LnFa/azj/rU26uc="; }; patches = [ @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "vte"; versionPolicy = "odd-unstable"; }; tests = { @@ -133,4 +133,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ astsmtl antono ] ++ teams.gnome.members; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 789625f2f9f3..8b4abf7d5d12 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkg-config @@ -20,6 +21,8 @@ , seatd , vulkan-loader , glslang +, libliftoff +, libdisplay-info , nixosTests , enableXWayland ? true @@ -27,7 +30,7 @@ }: let - generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }: + generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], patches ? [ ], postPatch ? "" }: stdenv.mkDerivation (finalAttrs: { pname = "wlroots"; inherit version; @@ -42,7 +45,7 @@ let inherit hash; }; - postPatch = extraPatch; + inherit patches postPatch; # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; @@ -94,7 +97,7 @@ let # Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots): passthru.tests.tinywl = nixosTests.tinywl; - meta = with lib; { + meta = { description = "A modular Wayland compositor library"; longDescription = '' Pluggable, composable, unopinionated modules for building a Wayland @@ -102,9 +105,9 @@ let ''; inherit (finalAttrs.src.meta) homepage; changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ primeos synthetica rewine ]; }; }); @@ -118,11 +121,28 @@ rec { wlroots_0_16 = generic { version = "0.16.2"; hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ="; - extraPatch = '' + postPatch = '' substituteInPlace backend/drm/meson.build \ --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/ ''; }; - wlroots = wlroots_0_16; + wlroots_0_17 = generic { + version = "0.17.0"; + hash = "sha256-VUrnSG4UAAH0cBy15lG0w8RernwegD6lkOdLvWU3a4c="; + extraBuildInputs = [ + hwdata + libliftoff + libdisplay-info + ]; + patches = [ + (fetchpatch { + name = "tinywl-fix-wlroots-dependency-constraint-in-Makefile.patch"; + url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/fe53ec693789afb44c899cad8c2df70c8f9f9023.patch"; + hash = "sha256-wU62hXgmsAyT5j/bWeCFBkvM9cYjUntdCycQt5HAhb8="; + }) + ]; + }; + + wlroots = wlroots_0_17; } diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index eb9fdd85e68d..c3e3e5da9f8d 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -2,8 +2,7 @@ buildDunePackage rec { pname = "cryptokit"; - version = "1.18"; - duneVersion = "3"; + version = "1.19"; minimalOCamlVersion = "4.08"; @@ -11,7 +10,7 @@ buildDunePackage rec { owner = "xavierleroy"; repo = "cryptokit"; rev = "release${lib.replaceStrings ["."] [""] version}"; - hash = "sha256-8ae8hroCSkp4O5vM/qVOhAnnJJ+uygMYm3ix5ytwtHU="; + hash = "sha256-8RRAPFgL2pqKotc1I3fIB9q2cNi46SP8pt+0rZM+QUc="; }; # dont do autotools configuration, but do trigger findlib's preConfigure hook diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix index 061fed447466..c1b2ed2a9139 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.16" }: +{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.16.0" }: { pname , version ? defaultVersion diff --git a/pkgs/development/ocaml-modules/minttea/default.nix b/pkgs/development/ocaml-modules/minttea/default.nix new file mode 100644 index 000000000000..8d81317edd1f --- /dev/null +++ b/pkgs/development/ocaml-modules/minttea/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildDunePackage +, fetchurl +, riot +, tty +}: + +buildDunePackage rec { + pname = "minttea"; + version = "0.0.1"; + + minimalOCamlVersion = "5.1"; + + src = fetchurl { + url = "https://github.com/leostera/minttea/releases/download/${version}/minttea-${version}.tbz"; + hash = "sha256-+4nVeYKx2A2i2nll/PbStcEa+Dvxd0T7e/KsdJqY4bI="; + }; + + propagatedBuildInputs = [ + riot + tty + ]; + + doCheck = true; + + meta = { + description = "A fun, functional, and stateful way to build terminal apps in OCaml heavily inspired by Go's BubbleTea"; + homepage = "https://github.com/leostera/minttea"; + changelog = "https://github.com/leostera/minttea/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sixstring982 ]; + }; +} diff --git a/pkgs/development/php-packages/grumphp/composer-json.patch b/pkgs/development/php-packages/grumphp/composer-json.patch deleted file mode 100644 index 7fd7441612cc..000000000000 --- a/pkgs/development/php-packages/grumphp/composer-json.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2f53794374e0d32e1f322202c6668655792f745d Mon Sep 17 00:00:00 2001 -From: Pol Dellaiera -Date: Sat, 21 Oct 2023 16:46:59 +0200 -Subject: [PATCH] composer.json - ---- - composer.json | 5 +- - 1 file changed, 4 insertion(+), 1 deletion(-) - -diff --git i/composer.json w/composer.json -index 6ac54420..69b75a51 100644 ---- i/composer.json -+++ w/composer.json -@@ -96,7 +96,10 @@ - "bin/grumphp" - ], - "config": { -- "sort-packages": true -+ "sort-packages": true, -+ "platform": { -+ "php": "8.1" -+ } - }, - "extra": { - "class": "GrumPHP\\Composer\\GrumPHPPlugin" --- -2.42.0 diff --git a/pkgs/development/php-packages/grumphp/composer-lock.patch b/pkgs/development/php-packages/grumphp/composer-lock.patch deleted file mode 100644 index 2fc801557c4f..000000000000 --- a/pkgs/development/php-packages/grumphp/composer-lock.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2f53794374e0d32e1f322202c6668655792f745d Mon Sep 17 00:00:00 2001 -From: Pol Dellaiera -Date: Sat, 21 Oct 2023 16:46:59 +0200 -Subject: [PATCH] composer.lock - ---- - phar.composer.lock | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/phar.composer.lock b/phar.composer.lock -index 96b692c3..a8cb2a87 100644 ---- a/phar.composer.lock -+++ b/phar.composer.lock -@@ -4,7 +4,7 @@ - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], -- "content-hash": "8a069c630e6ddbc4475db9a992430539", -+ "content-hash": "0474062650b24a22c63007631cf35f1e", - "packages": [ - { - "name": "amphp/amp", --- -2.42.0 diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index 62608a21acac..4e3795e425e3 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -1,42 +1,20 @@ -{ fetchFromGitHub, stdenvNoCC, lib, php }: +{ fetchFromGitHub +, lib +, php +}: php.buildComposerProject (finalAttrs: { pname = "grumphp"; - version = "2.1.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "phpro"; repo = "grumphp"; rev = "v${finalAttrs.version}"; - hash = "sha256-RVgreCspdz+A6mdE2H4i8ajmdH8AZ9BOIw2OqLw7HfI="; + hash = "sha256-htddnBQ6VkVlZ+d5UYu2kyzrbfACRCZRdYtdGGaZ+FE="; }; - patches = [ - ./composer-json.patch - ]; - - composerLock = stdenvNoCC.mkDerivation (finalComposerLockAttrs: { - name = "grumphp-composer-lock"; - - src = fetchFromGitHub { - owner = "phpro"; - repo = "grumphp-shim"; - rev = "v${finalAttrs.version}"; - hash = "sha256-JxgRd0p/o3ouZ4MPke8cHqvAPuepY8ax0wx4t8+2dME="; - }; - - patches = [ - ./composer-lock.patch - ]; - - installPhase = '' - runHook preInstall - cp phar.composer.lock $out - runHook postInstall - ''; - }); - - vendorHash = "sha256-yefamPAzIabDCzZ9ghKq9iPH7AoCdgCCQ8PKrUN9ifQ="; + vendorHash = "sha256-UJsWZ5dYW8sEft/i122x7bJJ33TVjEp5CU65rW/tHhk="; meta = { changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 112c50ca038c..ce81659f8900 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.37.3"; + version = "0.37.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-WVVOJrQWWC4tuREjSs8bOA0J9Y/y2BLE2s3YysSaBt8="; + hash = "sha256-9LrgerS8yC45BKKjBWt/QQlyA6rPsL8AGOI0kFhUosk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cacheyou/default.nix b/pkgs/development/python-modules/cacheyou/default.nix deleted file mode 100644 index 375beadd4f6d..000000000000 --- a/pkgs/development/python-modules/cacheyou/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, buildPythonPackage -, cherrypy -, fetchPypi -, filelock -, msgpack -, pdm-backend -, pytestCheckHook -, pythonOlder -, redis -, requests -}: - -buildPythonPackage rec { - pname = "cacheyou"; - version = "23.3"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; - - __darwinAllowLocalNetworking = true; - - src = fetchPypi { - inherit pname version; - hash = "sha256-fkCPFfSXj+oiR3NLMIYh919/4Wm0YWeVGccuioXWHV0="; - }; - - nativeBuildInputs = [ - pdm-backend - ]; - - propagatedBuildInputs = [ - msgpack - requests - ]; - - passthru.optional-dependencies = { - filecache = [ - filelock - ]; - redis = [ - redis - ]; - }; - - nativeCheckInputs = [ - cherrypy - pytestCheckHook - ] ++ passthru.optional-dependencies.filecache; - - pythonImportsCheck = [ - "cacheyou" - ]; - - meta = { - description = "The httplib2 caching algorithms packaged up for use with requests"; - homepage = "https://github.com/frostming/cacheyou"; - changelog = "https://github.com/frostming/cacheyou/releases/tag/${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ natsukium ]; - }; -} diff --git a/pkgs/development/python-modules/devialet/default.nix b/pkgs/development/python-modules/devialet/default.nix index 086f27e42144..60f57090f40b 100644 --- a/pkgs/development/python-modules/devialet/default.nix +++ b/pkgs/development/python-modules/devialet/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "devialet"; - version = "1.4.3"; + version = "1.4.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = "devialet"; rev = "refs/tags/v${version}"; - hash = "sha256-DVwf1zQXwPe8W2SzL9CnYE+gwLgPEnI+tQTfR+ijwF4="; + hash = "sha256-oGa5tRCJAWBg/877UmmXnX7fkFLoxhyuG6gpXmyhRKo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index 997a7c899822..62a2bbff0ba0 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "1.0.0"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-bk6UU+QGrkHio5j0/rOup7EQV12F/lb4m4b7JiJ7LFw="; + hash = "sha256-JoSvI6L/hs6lZ1R3MEq1mPiJJf7JQahFd3d+PLqN2lw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ocifs/default.nix b/pkgs/development/python-modules/ocifs/default.nix index 479f2c839648..8fab505c310d 100644 --- a/pkgs/development/python-modules/ocifs/default.nix +++ b/pkgs/development/python-modules/ocifs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ocifs"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oracle"; repo = "ocifs"; - rev = "refs/tags/${version}"; - hash = "sha256-ugNITi2tSf3lhbASgr6ErmFDYinQjnhmtRjV3YL7F9U="; + rev = "refs/tags/v${version}"; + hash = "sha256-IGl9G4NyzhcqrfYfgeZin+wt1OwHmh6780MPfZBwsXA="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Oracle Cloud Infrastructure Object Storage fsspec implementation"; homepage = "https://ocifs.readthedocs.io"; - changelog = "https://github.com/oracle/ocifs/releases/tag/${version}"; + changelog = "https://github.com/oracle/ocifs/releases/tag/v${version}"; license = with licenses; [ upl ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 7a3b3cca06b0..39b1455b76ba 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -12,7 +12,6 @@ , colorlog , distributed , fakeredis -, fastai , google-cloud-storage , lightgbm , matplotlib @@ -44,7 +43,7 @@ buildPythonPackage rec { pname = "optuna"; - version = "3.4.0"; + version = "3.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -53,7 +52,7 @@ buildPythonPackage rec { owner = "optuna"; repo = "optuna"; rev = "refs/tags/v${version}"; - hash = "sha256-WUjO13NxX0FneOPS4nn6aHq48X95r+GJR/Oxir6n8Pk="; + hash = "sha256-lNurMkZZKpKXXQoqhuRUv8LCbdSi1ryj3kYYioYZPF0="; }; nativeBuildInputs = [ @@ -77,7 +76,6 @@ buildPythonPackage rec { catboost cma distributed - fastai lightgbm mlflow pandas diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index bab37b5b7d79..1345242c2051 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "peft"; - version = "0.6.2"; + version = "0.7.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hqXHU6PHn2jkWBRRCRuGIGjSCUc6jfUaHgrn3glTwlE="; + hash = "sha256-sdv9rMj5Qh2/QtBVSxHMAP/Tk+ZyrHtNfX/4q8/Qw3A="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 8c8343aef5f4..109b72039b1d 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "18.2.0"; + version = "18.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-xUaAuk1uQWZQPpLzSHDavZuCCqTEWhj+V3S1DLb9XQc="; + hash = "sha256-0u1gj8ZpUL/eehsPNjq7JoDdVDDhlS9SGDw5xizxRlE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 9888ef279f47..7eb310c93008 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.35.3"; + version = "0.35.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-DCG1sKpUUV2/2mVJ2ltCkzCxQxAkDtxzNX6uMSpJhi4="; + hash = "sha256-5clHLE8QavccxAhBEa6W2yOtWYmQ5oa9ZcctEIKXru4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index ad60d8e79f85..b5bd3d8f50a2 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20231122"; + version = "0.10.0.20231214"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0CrHVPoQTS3I9ZPvf/4wWQX4vYn5vAeWUxNanjnbF60="; + hash = "sha256-dqLtRoFPCR6oZ/tApsIMFCpDeveq56yOtCXdxGS8uOE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 683295edbc7f..2c8894cbb11f 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.10.2"; + version = "0.10.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi{ inherit pname version; - hash = "sha256-gCOFP2heAtzpe38j1ljOz1yR1P8pRZ0eILVK8Kd3tFc="; + hash = "sha256-AkobUj1zpjMyNhLn8xWhcJzwbR/UP/CCGQH2akBostk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 94bf1eef12d8..39baa283996a 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.14.0"; + version = "4.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-R52j4JnoM0nlZvlcDox2Wz3WjTEstNaqbg8SPiPHD4c="; + hash = "sha256-p31JRojOwoWQZE1w6UXEja0UvloMDbtKw75HHMUzgFU="; }; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index 2e3f3f6fabd6..3e3b44cb237e 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -16,24 +16,18 @@ buildPythonPackage rec { pname = "pyairvisual"; - version = "2023.11.0"; + version = "2023.12.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bachya"; repo = "pyairvisual"; rev = "refs/tags/${version}"; - hash = "sha256-69lLw+ZYQ4hfD6xsfq1DVTWCnbp7e+qexuW3osDUejg="; + hash = "sha256-uN31LeHYmg4V6Ln3EQp765nOsN5v56TxjYSS/g6TUCY="; }; - postPatch = '' - substituteInPlace pyproject.toml --replace \ - 'certifi = ">=2023.07.22"' \ - 'certifi = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index dc36f149a9b1..2254c1d8e3f0 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2023.11.0"; + version = "2023.12.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-gKOyTvdETGzKlpU67UKaHYTIvnAX9znHIynP3BiVbt4="; + hash = "sha256-20EPAvunKDByHRQ3jYz1Mbn6n1CFn4WWA6vbCdKen/g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix index ddeb72bfbdf9..66a05d81fa84 100644 --- a/pkgs/development/python-modules/pydrive2/default.nix +++ b/pkgs/development/python-modules/pydrive2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydrive2"; - version = "1.17.0"; + version = "1.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyDrive2"; inherit version; - hash = "sha256-aP6pNDR7thK3qEiBHUgUnbhAvPtfpNeothYbLSrf7HA="; + hash = "sha256-SdyohC98PWP9NatVSSryqLWznxzIEQQv43/77RxIMD8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pygtkspellcheck/default.nix b/pkgs/development/python-modules/pygtkspellcheck/default.nix index a467ff074643..22b71bdbac83 100644 --- a/pkgs/development/python-modules/pygtkspellcheck/default.nix +++ b/pkgs/development/python-modules/pygtkspellcheck/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pygtkspellcheck"; - version = "5.0.2"; + version = "5.0.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-rWV/ghoMWHOAmT8ablwOjJSEhtvPqT/UdoZBXL5Nj0s="; + hash = "sha256-NzaxRXU3BTIcRO9nowEak+Vk+XYw8nBCsTl//e/qg6w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 176e9fcd1545..9a6e1b54ec36 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.5.2"; + version = "1.5.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7iiB/a8E8E2TSkGuAWR08ESExDz8DKTMjqp4Xnp3wHU="; + hash = "sha256-9d6QbekUv63sjKdK+ZogYOkGfFXVW+JB6ITHnehLwtM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyiqvia/default.nix b/pkgs/development/python-modules/pyiqvia/default.nix index de604737ace6..1c3669bc1aa7 100644 --- a/pkgs/development/python-modules/pyiqvia/default.nix +++ b/pkgs/development/python-modules/pyiqvia/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "2023.10.0"; + version = "2023.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "pyiqvia"; rev = "refs/tags/${version}"; - hash = "sha256-8eTa2h+1QOL0T13+lg2OzvaQv6CYYKkviQb4J5KPsvM="; + hash = "sha256-qq6UQUz60WkmWqdmExlSQT3wapaHJr8DeH1eVrTOnpQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 2ae96c950c77..93f68ad6b216 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.40"; + version = "2.4.41"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-PWpVKtNEof/54MgRNhrJ2LuCAc9qrK1yJNUW+gN8yzA="; + hash = "sha256-7TIlzphdBhA6qyUa/Ig9BKmKHW21xzmV595MqssfZs0="; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 84e36567e034..746525e7030c 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.10.2"; + version = "5.10.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-Yrhd9pTHxdpGkea6BO/dM1O3nnGIV2CRsg40dpotf0U="; + hash = "sha256-cVmIxwO1TQ8H+Sm828sxaZ6InvIkdCRhFSH5k52W1DI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyngo/default.nix b/pkgs/development/python-modules/pyngo/default.nix index 91d39a4ab0a2..81bddae490d3 100644 --- a/pkgs/development/python-modules/pyngo/default.nix +++ b/pkgs/development/python-modules/pyngo/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pyngo"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "yezz123"; repo = "pyngo"; - rev = version; - hash = "sha256-qOY1ILMDqSguLnbhuu5JJVMvG3uA08Lv2fB70TgrKqI="; + rev = "refs/tags/${version}"; + hash = "sha256-cMWYmCbkhJmz+RMCh3NIhOkC5bX46nwz09WhTV+Mz6w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index c57fd7f12276..37ec8b60f0f3 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyopenuv"; - version = "2023.11.0"; + version = "2023.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "pyopenuv"; rev = "refs/tags/${version}"; - hash = "sha256-qlyKLovM0h3iWvhGecaFPswnchZXPNkr0PbSqK2UW0c="; + hash = "sha256-r+StbiU77/1dz41tCseleIWjiIvuvRveVgPNr3n4CEY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index af384e0a228c..1cb510076431 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.13.3"; + version = "1.13.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-OvzK7NHRcv/UGLLZ60yNBNdK/J21iFh8myCvdBec+7Q="; + hash = "sha256-VMf6WBWf33KEWJG8UtCDZCa20a8kmVd5UpLIcJgzDis="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index 8175214d68d1..f42315c33198 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.49.0"; + version = "0.50.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mozillazg"; repo = "python-pinyin"; rev = "refs/tags/v${version}"; - hash = "sha256-4XiPkx7tYD5PQVyeJ/nvxrRzWmeLp9JfY1B853IEE7U="; + hash = "sha256-9RnuC9AvTlUtZqep6kn5y1xQcq/dzA9jTZXAsMpKZWc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index 7372e88482ff..1a575db7c2e2 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyreadstat"; - version = "1.2.5"; + version = "1.2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Roche"; repo = "pyreadstat"; rev = "refs/tags/v${version}"; - hash = "sha256-npzriBrp/ex0noH6EAmWnFyHzVkOKvQ68J578NujMHA="; + hash = "sha256-VcPpGRrE/5udNijodO88Lw69JPOm6ZN7BZb4xD34srQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index d80e23d269ef..5ede9fb34ba9 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.10.9"; + version = "0.10.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-zKV2yDLhoRTvlDZ/bwEyJhtE6hx1IAgKNI37J31nQo8="; + hash = "sha256-QudaAZOxUXLUMMx10gEpWcaI+2ewpkNZOGUDEbxChg0="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 5a99cbb62ee7..b2cda67a8aba 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.41.0"; + version = "0.42.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-n4hTS3LnS8AOr1VNSqcVYul/qiTiLvI2bsOJJLbKA3E="; + hash = "sha256-oJUdQex+kjL4Yuuz02ASjFDjyfWA/Hsopy+ujGbDkLs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index 5d1efa486fb5..458d0942854a 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.4.14"; + version = "1.4.16"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = "refs/tags/${version}"; - hash = "sha256-EZ6W7DTcmZWjP2BmopU2G3S/82juGG+/ht5Fd8G0W1A="; + hash = "sha256-K0eb9j3X5jfNEdAbpK75gbOdD8nerEwlOXUdAGUFT+8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-crfsuite/default.nix b/pkgs/development/python-modules/python-crfsuite/default.nix index 2efaa484fd74..34ed7eba301e 100644 --- a/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/pkgs/development/python-modules/python-crfsuite/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "python-crfsuite"; - version = "0.9.9"; + version = "0.9.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-yqYmHWlVRmdW+Ya3/PvU/VBiKWPjvbXMGAwSnGKzp20="; + hash = "sha256-84UkYx4rUzNB8Q8sd2iScNxuzVmFSV3M96o3sQRbwuU="; }; preCheck = '' diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index a7e27ac64aa1..0e362ea35f18 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.11.0"; + version = "0.13.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8d/cjD7dcA4/bKZtQUjgUPVgfZdjl+ibOFRpC9dyybA="; + hash = "sha256-RbpbFd+GqFPl88FqKvYEE6HcwFRzPDUTs3vMYM6x7es="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 98cc6109ae78..8f4292d6bc3e 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "23.11.0"; + version = "23.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7HneedqHbNB9ZYFUCCQ/puLtA1QlIkTKqji0py9hwBE="; + hash = "sha256-rqaiygGdZMyZwHaNhmmbP3eRKpO8yT9hgFsz+azHzaM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix index eef8f21cb3aa..791bf2545051 100644 --- a/pkgs/development/python-modules/python-on-whales/default.nix +++ b/pkgs/development/python-modules/python-on-whales/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-on-whales"; - version = "0.67.0"; + version = "0.68.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gabrieldemarmiesse"; repo = "python-on-whales"; rev = "refs/tags/v${version}"; - hash = "sha256-wO2ZSELxu8BmIZN4x2mSLzsbU3sU49MEpjTfiSzVzaE="; + hash = "sha256-S9IfCCGMVXo7IPyOtu7TIeWRovE1fLQ9pjRO6tVJ4bU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index 7b1d22110632..73b084ec9d3d 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytile"; - version = "2023.10.0"; + version = "2023.12.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = "pytile"; rev = "refs/tags/${version}"; - hash = "sha256-L1Ovpxn7Y+reK8YcVBPwoRjKxcyByrPGz5i/csGzKfE="; + hash = "sha256-oHOeEaqkh+RjhpdQ5v1tFhaS6gUzl8UzDGnPLNRY90c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index c2244a1c1447..fdced71d178a 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.1.2"; + version = "2.1.3"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-d5DKAx67uuIPxtSgazIQnxLiHTBD0lwHaB6LD3R6vKA="; + hash = "sha256-3ELx4ukYlmsWvzK+GxEXM/0xFPPcZZcMv566jOXfcMs="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index ef2aaf634d2c..0ef7e51d2c38 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "2.3.0"; + version = "2.4.1"; format = "setuptools"; disabled = isPy27; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eDQQPIyUUEkvpXjWAcyljlFgVlu9is4fPPUTudP7NF4="; + hash = "sha256-LftT/ATrvEkVJPS63LSN/7vCsHhobm6xk8hFEa+wrzE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index eb457166876c..0493509e976b 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.42.3"; + version = "0.43.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RIeasdsLCBBs9eXUts53zlCkqkME48GBWVAcBoEHuOM="; + hash = "sha256-H7WkRK9lP92L47nFNDT1WusWfU0bLgXBA+KQqTyedL4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index 21dc11f2d666..e16505006c47 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyvo"; - version = "1.4.2"; + version = "1.5"; format = "setuptools"; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-Zv4piGWs/XJbxfGHUHctfxuImbjluxd1chUgvtV9lcs="; + hash = "sha256-heTWWyxmRaDlI9NHzZab5OLOBIbVdb45v67Rq5ckzc8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 37ca849a7676..e57e607afcf3 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.6.2"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UGD8hl0KN6PzLvmE4ZK+GsQbM3Bp8t9Mz4K62N6Zv/s="; + hash = "sha256-fC28uQK4mAN21VdAeT4NbezZY1qZVOIK3rs3v31S39Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index f480217aa621..9f0538136afc 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { pname = "qpsolvers"; - version = "4.0.1"; + version = "4.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; rev = "refs/tags/v${version}"; - hash = "sha256-s1d8oTrmptS3exUqn9HSSla6P4dIxS/qNalsDTbFmFs="; + hash = "sha256-brniRAGwN/areB7MnaGeF7CdNku7DG/Q+8TmCXY99iU="; }; pythonImportsCheck = [ "qpsolvers" ]; diff --git a/pkgs/development/python-modules/radio-beam/default.nix b/pkgs/development/python-modules/radio-beam/default.nix index 41653caaa3e0..6d743125e880 100644 --- a/pkgs/development/python-modules/radio-beam/default.nix +++ b/pkgs/development/python-modules/radio-beam/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "radio-beam"; - version = "0.3.6"; + version = "0.3.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-U+IjOTt7x9uzUl7IcQRu2s+MBKF/OR+sLddvHmp9hqU="; + hash = "sha256-7AFkuuYLzibwwgz6zrFw0fBXCnGLzdm4OgT+Chve5jU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rapidgzip/default.nix b/pkgs/development/python-modules/rapidgzip/default.nix index 450746876669..95d232aab985 100644 --- a/pkgs/development/python-modules/rapidgzip/default.nix +++ b/pkgs/development/python-modules/rapidgzip/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "rapidgzip"; - version = "0.10.4"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-dTVQTxzgjHAUuoWA2+asMI5g2fIWvHEl46bdTIAxAvg="; + hash = "sha256-gt3Za6ZtJa4hwqeiIrixSIbM0LZYKqegeCxdUhXhs/E="; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index 6aad6e527975..a08a08448438 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.7.1"; + version = "1.7.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ewels"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rWVJEuJx5nDUg6RvhubHu9U2Glilrkugjg28SpFIZys="; + hash = "sha256-uPEPYQIoLdjUJZlcg/0jenzIz464nwGi5KfOOyIQ/3I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index 03681c20b148..8065fea978bf 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.8.3"; + version = "0.8.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-d3GcswCTI8UUj4Ph/WujnQQlHB9m46UjNRkN0nA6Sxs="; + hash = "sha256-WYoElfkq0/uK3GPcIwDUP9w8l5zN9G2X/KDJbJNse9s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index e1bcdda29268..184f27c292ea 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2023.12.1"; + version = "2023.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Y+Qpu2tegUVoys0/KoVR/DVJPoxBjd/LROb4aqhpbM0="; + hash = "sha256-tewHBiSBu7RcsGGzGYTHGI0QbiksJwMwOeAk5LpXQNw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/screed/default.nix b/pkgs/development/python-modules/screed/default.nix index 4d8f88772dff..307844854d87 100644 --- a/pkgs/development/python-modules/screed/default.nix +++ b/pkgs/development/python-modules/screed/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "screed"; - version = "1.1.2"; + version = "1.1.3"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-c0/6eopkUoZJbYlbc2+R1rKYiVbi/UI1gSPZPshRm2o="; + hash = "sha256-N+gWl8fbqVoFNVTltahq/zKXBeHPXfxee42lht7gcrg="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/siobrultech-protocols/default.nix b/pkgs/development/python-modules/siobrultech-protocols/default.nix index e21580162cfe..49d873f95167 100644 --- a/pkgs/development/python-modules/siobrultech-protocols/default.nix +++ b/pkgs/development/python-modules/siobrultech-protocols/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "siobrultech-protocols"; - version = "0.13.0"; + version = "0.14.0"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sdwilsh"; repo = "siobrultech-protocols"; rev = "refs/tags/v${version}"; - hash = "sha256-6BGhelyv0FoPyGwzgIX5Gbbu9Ks19MtL1AZQRZWKzhM="; + hash = "sha256-8tls2wlLA3wQ78gK4JvvhSWZS5oHRzzsKE73M4i1eyg="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index c45d8394fa85..ead249a9a722 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slackclient"; - version = "3.26.0"; + version = "3.26.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-jvLzZFlR2msyCc9C7WvYpXIGoKCDRxJI5lgNUtbGh/w="; + hash = "sha256-jg4mUVT1sB9hxRqhLOeZxQHTpBK/N76b2XUaFe/nBKY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 28c24f533d75..8ce880889d66 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.1.10"; + version = "6.1.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "softlayer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-0NLa+kEArKqfqytnxbzXnX/OVhYFBKZO9odXGR0AoSA="; + hash = "sha256-2iN3T58aICQlGwr10/e/mWE9pA4rbJCBTE1jTu3GeGk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 475a9c6540a0..ea4172d77954 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.3.3"; + version = "1.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Q8oV0mw8POFscFcdsYZfTkavNVQyqWdLAdb4lDX4ahM="; + hash = "sha256-N2StqGUqOYS9mW/DAeSntNg3kii+UPdTUHDV7g1Hvus="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 85a736bd880c..58312bdce739 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.9.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "refs/tags/v${version}"; - hash = "sha256-ZLIxbFgayG+WVvSXu74eZJ/PbSHg6dzkkIr1OBry4DE="; + hash = "sha256-B+bJ1tKqTTlbNeJLxk56o2a21n3Yg6OHwJiFfCx46aw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index ea44c4b5a165..2db6ff91f9ed 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -6,22 +6,32 @@ , pytest-httpserver , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "vt-py"; - version = "0.17.5"; - format = "setuptools"; + version = "0.18.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "VirusTotal"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-O95W/J5y7qcR6PSzNQwOl0W19CyXifbq8okquESFSqM="; + hash = "sha256-QEe/ZoKM0uVH7Yqpgo7V17Odn4xqdEgdQeMVB+57xbA="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp ]; @@ -32,11 +42,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'" "" - ''; - pythonImportsCheck = [ "vt" ]; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index b6100a169117..c219a7d3c526 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -2,7 +2,6 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytest-asyncio , pytestCheckHook , pythonOlder @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.107"; + version = "0.0.108"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,18 +20,9 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-JHf6PZDK7yjyHjjUhkNpqEINCaY916wX5rXaw1Fx1ro="; + hash = "sha256-tn6ZI8lanQhWallvi/NwAWYPuSea+SlJX/6D1VdXRxM="; }; - patches = [ - (fetchpatch { - # https://github.com/zigpy/zha-device-handlers/pull/2787 - name = "zigpy-0.60-compat.patch"; - url = "https://github.com/zigpy/zha-device-handlers/commit/f497ccd2437ae9a24b9afdb84f11fc27a30df211.patch"; - hash = "sha256-ICatiA0QRmfJ4Vf4LWyUJI5TLeWoikII49HSBir5WNI="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace ', "setuptools-git-versioning<2"' "" \ diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 99cdb83515cf..db40bada3824 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.22.2"; + version = "0.22.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gkIo56SGqthLq2Ycjl/MqKLJvTxhkm8reUmwVhphxhg="; + hash = "sha256-AHAvp/Z3BDqyKEs7liwl+zU7mzAfI03bBnsU3Sfw2rU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 5d1bc6d70bf5..94fa9cdb0d38 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.12.0"; + version = "0.12.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nPk//1MMvtWf2iLZZ/2vJoBdFEJBmy8RBMwSFzfnNT8="; + hash = "sha256-Bs/m9Iyr8x+sMUVXt1whk2E4EJ5bpitMsEWZtmCyIf8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 1185f63e1903..c3f1c2b5d43e 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.60.1"; + version = "0.60.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-Ejf/Z9mgyO8y99rmuPPVOleyHWgYzxq3AO3TB8jkmtY="; + hash = "sha256-3hYgb2uvyFQmtfdVKBorGhTgVt/Dq1roXTu7xvE7SHY="; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index bc04b05bd7af..2047d4473e3e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.1.41"; + version = "3.1.42"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-weW4nCBnuMPq888lUG4V/luUi+z4kZ52jUnv6yks45Y="; + hash = "sha256-tQemwSqlwVjBdxwJ22OY1CxZ/Kv06S9u0ECHtxe3Jm4="; }; patches = [ diff --git a/pkgs/development/tools/fblog/default.nix b/pkgs/development/tools/fblog/default.nix index fd3f92d91035..b24981ffc49c 100644 --- a/pkgs/development/tools/fblog/default.nix +++ b/pkgs/development/tools/fblog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fblog"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "brocode"; repo = pname; rev = "v${version}"; - hash = "sha256-Leg0pd+dy4sWHprjwV61qZvV6t8MnfKifWBGF+Ne0+4="; + hash = "sha256-ByojMOkdE3B9KrApOWPihg6vJHpLQy0gsIlKPd5xJog="; }; - cargoHash = "sha256-JRy4UnTlBV8FcxxJyPJ1lXagnLdUQIIA/CBnVM24Yuk="; + cargoHash = "sha256-R7FLZ+yLvDltETphfqRLrcQZNt+rkJBFdmGL3pY0G04="; meta = with lib; { description = "A small command-line JSON log viewer"; diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/development/tools/glamoroustoolkit/default.nix index 99b9f528df46..1da5c8d03f4b 100644 --- a/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/pkgs/development/tools/glamoroustoolkit/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.0.7"; + version = "1.0.9"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-WcAOGPWbY3sCcwmSHTjZvO3ASYYPv1T0iEA5C/VXL9I="; + hash = "sha256-Z8gTgQuGChqA6k0GSnIU49FAkRBWygLHeHNBpTlpzYo="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/development/tools/kubeswitch/default.nix b/pkgs/development/tools/kubeswitch/default.nix index b789be0f0aaa..76aeeb2e94c8 100644 --- a/pkgs/development/tools/kubeswitch/default.nix +++ b/pkgs/development/tools/kubeswitch/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeswitch"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "danielfoehrKn"; repo = pname; rev = version; - sha256 = "sha256-7BQhkFvOgmLuzBEvAou8KANhxWna5KVokIF4DEIVU2g="; + sha256 = "sha256-zf7o41YYAppRge0EMXgIN8rI5Kco4/n7BJ90b/X6L1M="; }; vendorHash = null; diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 4e4f13007b6a..cf5e0c710273 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.174.0"; + version = "0.175.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Yzs6tGK0yp36d3fmtYdCuFEANRMUXQZeFTpOM8swm3w="; + sha256 = "sha256-kCWhCPlgc0KPbVayObpDQS9GuXSJ/q/mYQrCLOpIjcM="; }; - vendorHash = "sha256-svIpDqPIU/kzIL1h7Hq1IdmwfcvrXw96xMuS1eEsVTY="; + vendorHash = "sha256-gNDIXmJxJZuY20Q+MK4uzLMmz+VTUimOtsIblI378kY="; ldflags = [ "-s" "-w" diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index 17d6bb473d23..e55599ff9978 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-P7gXfACPK63f38KzV6UVQa8MZmxEaMNxl1GZYCDM54M="; + hash = "sha256-x5srXt9xTBkBNfG9r7GsDKVSbxJCKU3Y6HoBLvAHyi0="; }; - cargoHash = "sha256-4PTihulfKwvzzZTwmUfxkvp0XYHBxTUHH0pCwNKSxrM="; + cargoHash = "sha256-/ZzcsC89U+SfyZaANX1rbytVlQ88p4g+HKRd6JerpQc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index a25f80d56159..85ff24c845d6 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.74"; + version = "1.0.75"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-3CbI1iv8kSBJ8HFJDfCRPTyMr6KhuuVs7u96d6H5FGE="; + sha256 = "sha256-1huB+wQ0x770PQF/mFEDzfyjhjYiTRmr2Y+IhqAKP8M="; }; - cargoHash = "sha256-FekLNZMR3++MTlM8yJ5RmZI4t5B6lyKRxBlupOVzUFM="; + cargoHash = "sha256-svb1qWJpaZ2uBdXGWrMXwm1wwQGrhGe891JOtiHnaVg="; meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 054f5ba9cb47..ae2d9e9e26c3 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.39.0"; + version = "1.39.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-TiMwbiMIbhbLzTGndl3BpvX63ojydlCeylR9o5E+ZRk="; + hash = "sha256-Rlt8gRlZlxC/axHsicbQizoMNbQJsv6egZXj4SKUARw="; }; - cargoHash = "sha256-JXghF5lwpO898/BWC8srCN0B/ClF9VpW2C1l2nXcH50="; + cargoHash = "sha256-P0g5rhnSjMd9bD7/FBYaRyXwbeC5nAjDBA2EsQ4gfXA="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index eacce23bc424..3e23e3a7da7b 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hdparm"; version = "9.65"; src = fetchurl { - url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz"; + url = "mirror://sourceforge/hdparm/hdparm-${finalAttrs.version}.tar.gz"; sha256 = "sha256-0Ukp+RDQYJMucX6TgkJdR8LnFEI1pTcT1VqU995TWks="; }; - preBuild = '' - makeFlagsArray=(sbindir=$out/sbin manprefix=$out) - ''; + makeFlags = [ + "sbindir=${placeholder "out"}/sbin" + "manprefix=${placeholder "out"}" + ]; meta = with lib; { description = "A tool to get/set ATA/SATA drive parameters under Linux"; @@ -21,5 +22,4 @@ stdenv.mkDerivation rec { mainProgram = "hdparm"; maintainers = [ ]; }; - -} +}) diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 92192eb79f89..7aa9c5117352 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -34,7 +34,7 @@ assert (versionAtLeast version "4.9"); STRICT_KERNEL_RWX = yes; # Perform additional validation of commonly targeted structures. - DEBUG_CREDENTIALS = yes; + DEBUG_CREDENTIALS = whenOlder "6.6" yes; DEBUG_NOTIFIERS = yes; DEBUG_PI_LIST = whenOlder "5.2" yes; # doesn't BUG() DEBUG_PLIST = whenAtLeast "5.2" yes; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c10c3e8286ff..c635af0672c7 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,52 +2,52 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.302-hardened1.patch", - "sha256": "1qr0i1swrvbwxd7sx0fy6cg85k0aya518cdnmx2v1jpydvlkhn1a", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.302-hardened1/linux-hardened-4.19.302-hardened1.patch" + "name": "linux-hardened-4.19.303-hardened1.patch", + "sha256": "0bmf88vid8312rrdy4b1bnq4x2rhkiihp01b2j2jmpjbdsj2qbya", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.303-hardened1/linux-hardened-4.19.303-hardened1.patch" }, - "sha256": "1kkkpm34p5rq0iijzrzwaq0cb62w543argargw5p1wzg8803rlsk", - "version": "4.19.302" + "sha256": "0dlbl47xs7z4yf9cxbxqzd7zs1f9070jr6ck231wgppa6lwwwb82", + "version": "4.19.303" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.204-hardened1.patch", - "sha256": "0a1hyf7sjsv9g47x7nznpn5nq7p5jkzy2f4nsiy3pp1853f00v1d", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.204-hardened1/linux-hardened-5.10.204-hardened1.patch" + "name": "linux-hardened-5.10.205-hardened1.patch", + "sha256": "0viz1pybmh8vld40s2gh73a63743c3v7g2dbrsbqqjkh8xvn28zk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.205-hardened1/linux-hardened-5.10.205-hardened1.patch" }, - "sha256": "1vnamiyr378q52xgkg7kvpx80zck729dim77vp06a3q6n580g5gz", - "version": "5.10.204" + "sha256": "0qw8g0h4k0b4dyvspbj51cwr68ihwjzsi2b2261ipy3l1nl1fln5", + "version": "5.10.205" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.143-hardened1.patch", - "sha256": "0rg37d21k0ab3nzaif46qc2ql9wd3v50n800kbpfa4g9qsq51j99", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.143-hardened1/linux-hardened-5.15.143-hardened1.patch" + "name": "linux-hardened-5.15.144-hardened1.patch", + "sha256": "03b2hg01z7fpscgpiw10bvlhq5dph5shdx5zn15csg5vjy6dl2cb", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.144-hardened1/linux-hardened-5.15.144-hardened1.patch" }, - "sha256": "00lyv7zsj97mkg9i7dkb1a6km22mnr0qr687d9zz4ckjq1pb2sq9", - "version": "5.15.143" + "sha256": "0fsv18q64q17ad7mq818wfhb11dax4bdvbvqyk5ilxyfmypsylzh", + "version": "5.15.144" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.264-hardened1.patch", - "sha256": "1rb3bc6c4qgdy1yysdl72qpizippimk1rfshajcsn7i034c9g4ca", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.264-hardened1/linux-hardened-5.4.264-hardened1.patch" + "name": "linux-hardened-5.4.265-hardened1.patch", + "sha256": "17bs86fxv5l1dm0knvcnj5940r06pq41gd3fp71rn1p1kwk622y3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.265-hardened1/linux-hardened-5.4.265-hardened1.patch" }, - "sha256": "1c5n47dq9khb15hz24a000k3hj913vv1dda6famnm8wpjbfr176k", - "version": "5.4.264" + "sha256": "05cvvwjiznn7hfd02qklklalg0chahvh5v18w64lcva6kzj9kbjd", + "version": "5.4.265" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.68-hardened1.patch", - "sha256": "020xh7zsdfyp7g1n3fp8mmsy4ayhw309fcb65jwmkd8ha2mzm1yc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.68-hardened1/linux-hardened-6.1.68-hardened1.patch" + "name": "linux-hardened-6.1.69-hardened1.patch", + "sha256": "1dbwnf6bsxl9m03cngfpf3yb95j719r46dy9x8al59d9p8k0h9bn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.69-hardened1/linux-hardened-6.1.69-hardened1.patch" }, - "sha256": "1qc4cwqlfni9i6mzh6arghdsd842hp9lb7s832dxw1p261mg4prn", - "version": "6.1.68" + "sha256": "0hdm28k49kmy9r96hckps0bvvaq9m06l72n8ih305rccs6a2cgby", + "version": "6.1.69" }, "6.5": { "patch": { @@ -62,11 +62,11 @@ "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.6.7-hardened1.patch", - "sha256": "16yk9wz19wn0fkxdwl05qw1hwnfvidh3nmj0pnf61hgwif4kg7l3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.7-hardened1/linux-hardened-6.6.7-hardened1.patch" + "name": "linux-hardened-6.6.8-hardened1.patch", + "sha256": "0mjrp3bxvb1pprc5v2grxk1r3ifldch35lqsxyky1nvlzhphhgb9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.8-hardened1/linux-hardened-6.6.8-hardened1.patch" }, - "sha256": "0hfqdyxl4nqmm4pspfm1ang8616dbsaj0d968c0186ch0738xrhc", - "version": "6.6.7" + "sha256": "05i4ayj9wyjkd1s8ixx7bxwcyagqyx8rhj1zvbc3cjqyw4sc8djh", + "version": "6.6.8" } } diff --git a/pkgs/os-specific/linux/linuxptp/default.nix b/pkgs/os-specific/linux/linuxptp/default.nix index e5a1443d3225..27a9ccb3303f 100644 --- a/pkgs/os-specific/linux/linuxptp/default.nix +++ b/pkgs/os-specific/linux/linuxptp/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "linuxptp"; - version = "4.1"; + version = "4.2"; src = fetchurl { url = "mirror://sourceforge/linuxptp/${pname}-${version}.tgz"; - hash = "sha256-4XQ9RPggiJfjCJXaNXnmcP+Rm5FP60talJ8+Qh3d5TU="; + hash = "sha256-cOOOXSdk4CF0Q9pvFOiEb+QBpHIpOsE42EGcB6ZlRHo="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index cb3f0dd1bedc..f57e4039d203 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -153,7 +153,7 @@ assert withImportd -> withCompression; assert withCoredump -> withCompression; assert withHomed -> withCryptsetup; assert withHomed -> withPam; -assert withUkify -> withEfi; +assert withUkify -> (withEfi && withBootloader); assert withRepart -> withCryptsetup; assert withBootloader -> withEfi; # passwdqc is not packaged in nixpkgs yet, if you want to fix this, please submit a PR. diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index db725261dbc3..72b931092d3a 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "sha256-tbM2JWoub789s3YanT/lqCKl6JkY+FahSYb+lHvF7W8="; + sha256 = "sha256-wbfx6Ennyl4qWODRAtJ3eydSRFfE/ANCSl2GA9oq90A="; }; separateDebugInfo = true; - cargoHash = "sha256-l2rWR9HAXTuNEarj2hWaZxpTdUNGoCnNfsZs8Y+of+s="; + cargoHash = "sha256-Vdvk700NjjCTSD0Lscr5ckxsYa4pDJdmV7Kgr++0GFY="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index e988bc7f0ba7..639e4a0b0bc3 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -7,18 +7,18 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.8.4"; + version = "3.9.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-YfqIWPciFyPIpQypSDNEK2yXV1Ah9TiLiEzEFA/KcMw="; + hash = "sha256-MFMAfjvP7FQRG71xbgwhreDIBdQ4Qho/msdmDLiRetg="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-HgUHxfFchqarVMmxbEg1gRN9vSkEx48aSy1yreux9fs="; + hash = "sha256-hrDsgZlfLJTO3ROJ/Zb3OyF2QQTjsSJIt+2TesyXYUA="; }; packageJSON = ./package.json; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index 8e32a849b69b..ca8fec206830 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -52,7 +52,7 @@ "@types/node": "^18.7.18", "@typescript-eslint/eslint-plugin": "5.37.0", "@typescript-eslint/parser": "5.37.0", - "axios": "0.27.2", + "axios": "1.6.0", "cross-env": "7.0.3", "eslint": "8.23.1", "eslint-config-prettier": "8.5.0", diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 2cc7042068d4..9dc861c75866 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "10.2.2"; + version = "10.2.3"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" "modowners" ]; @@ -10,19 +10,19 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-MlrGBa/ZQwfETr5vt7CyJxtvZC021aeWsgKtfuc8wAc="; + hash = "sha256-F61RtPEjQ4uFVcJLG04CD4//w8X7uJinxzYyoW/MosA="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - hash = "sha256-Mt0si5TxkXGQp5vmVD37fl3WKXuuIcJNtiTcEYCroZ8="; + hash = "sha256-xoZgaml1SB9PEI3kTE3zRlJR5O4tog58bua2blvc8to="; }; - vendorHash = "sha256-z2eDbnezG9TWrqLPxAXHBgdtXvaEf8ccUQUe9MnhjtQ="; + vendorHash = "sha256-rQOnuh6t+cUqyAAnUhGgxMaW88pawnauAGQd6w0T57Q="; nativeBuildInputs = [ wire ]; - preBuild = let + postConfigure = let skipTest = lineOffset: testCase: file: let jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]); diff --git a/pkgs/tools/misc/boxxy/default.nix b/pkgs/tools/misc/boxxy/default.nix index 52a0b94abeda..ac723e959022 100644 --- a/pkgs/tools/misc/boxxy/default.nix +++ b/pkgs/tools/misc/boxxy/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "boxxy"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "queer"; repo = "boxxy"; rev = "v${version}"; - hash = "sha256-BxI2Ju1I1IytCjx6vUoIy1jzebSeRmoObDEtN/sBEDg="; + hash = "sha256-euIecFMDktL0gDkso83T1qZfVdfYAAC+WBMsfZaarAQ="; }; - cargoHash = "sha256-ZEQsCm13MoFtpIjjtD5UANH5zrPDX4IjEmqJLwnftps="; + cargoHash = "sha256-8aIuMRjZHLlP3x+C9S9WX21/i98RAUvGGwzptzCpRR4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 1b5f53385d51..9053ca87fd78 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -8,6 +8,7 @@ , libgit2 , oniguruma , libiconv +, Foundation , Security , xorg , zlib @@ -35,6 +36,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ libgit2 oniguruma xorg.libxcb ] ++ lib.optionals stdenv.isDarwin [ + Foundation libiconv Security zlib diff --git a/pkgs/tools/misc/faketty/default.nix b/pkgs/tools/misc/faketty/default.nix index 4515f83d1f83..815eb5a631c9 100644 --- a/pkgs/tools/misc/faketty/default.nix +++ b/pkgs/tools/misc/faketty/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "faketty"; - version = "1.0.13"; + version = "1.0.14"; src = fetchCrate { inherit pname version; - hash = "sha256-jV5b6mB81Nz0Q+Toj5DTQq2QcM+EoQ7jRYV/OXgtemA="; + hash = "sha256-oma8Vmp1AMmEGyZG8i/ztiyYH0RrLZ/l/vXgPJs+5o0="; }; - cargoHash = "sha256-9t1Km/ZXzxyO72CaWM81fWGcFkri7F+wMAVom0GV/YM="; + cargoHash = "sha256-+gojthIR5WMSjN1gCUyN0cKHWYBKBezsckVZJD7JncM="; postPatch = '' patchShebangs tests/test.sh diff --git a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix index de5f49aca256..4b4cb64181bb 100644 --- a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "google-cloud-sql-proxy"; - version = "2.7.2"; + version = "2.8.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${version}"; - hash = "sha256-mfPh9cdsn9Jq9a1gkF5f/24inxuwcITrp7KfSfp0pMQ="; + hash = "sha256-7BkzDfAXc06pEDz2gHwlJ2HKmWWkqbVwyre8NrQHY6M="; }; subPackages = [ "." ]; - vendorHash = "sha256-GfvEurTX5r2ZIOwaDJA4ncd8SNMusoqXuhcMGYvaVwQ="; + vendorHash = "sha256-9xe/4yMkCSD7Tfm3CWvN940odeT67HPGbBAimNOGgIc="; preCheck = '' buildFlagsArray+="-short" diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 727c6ae073e6..8f1ff2625d36 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -49,8 +49,8 @@ let src = fetchFromSavannah { repo = "grub"; - rev = "grub-2.12-rc1"; - hash = "sha256-DrNFzi2o7ZUfL3bMdG63xivZIjcTgv8RODJz7hLJ3WY="; + rev = "grub-2.12"; + hash = "sha256-lathsBb2f7urh8R86ihpTdwo3h1hAHnRiHd5gCLVpBc="; }; # HACK: the translations are stored on a different server, @@ -61,7 +61,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-XpQ4tu5eNRARdbg95LOjqp+2RCVRj1qZWe+Sc0O5zNg="; + outputHash = "sha256-XzW2e7Xe7Pi297eV/fD2B/6uONEz9UjL2EHDCY0huTA="; } '' mkdir -p po @@ -77,46 +77,12 @@ assert !(efiSupport && xenSupport); stdenv.mkDerivation rec { pname = "grub"; - version = "2.12-rc1"; + version = "2.12"; inherit src; patches = [ ./fix-bash-completion.patch ./add-hidden-menu-entries.patch - - # Revert upstream commit that breaks reading XFS filesystems - # FIXME: remove when fixed upstream - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=ef7850c757fb3dd2462a512cfa0ff19c89fcc0b1"; - revert = true; - hash = "sha256-p8Kcv9d7ri4eJU6Fgqyzdj0hV5MHSe50AF02FPDJx2Y="; - }) - - # Fixes for NTFS bugs (CVE-2023-4692 and CVE-2023-4693) - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=43651027d24e62a7a463254165e1e46e42aecdea"; - hash = "sha256-/oudbfL8Ph7ZsgsFUI0YIddji+7okFRG12E/rDsgvNM="; - }) - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=0ed2458cc4eff6d9a9199527e2a0b6d445802f94"; - hash = "sha256-6EhLzVapN2n62Lgo+PnB4SRvDkYWFkrKNinCvArRUXk="; - }) - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7e5f031a6a6a3decc2360a7b0c71abbe598e7354"; - hash = "sha256-R2vmVGidm1ZFxopt/71y2816z2i/vvPrthZE52oc4CI="; - }) - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7a5a116739fa6d8a625da7d6b9272c9a2462f967"; - hash = "sha256-T1LglEcUl9GXQjJ6Y4fKuFyFAujNRbcAb9KoNkl6jXs="; - }) - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1fe82c41e070385e273d7bb1cfb482627a3c28e8"; - hash = "sha256-x/V7bmRaNxo8NNOUwVti59n9ST/2yTJ/blWjk3omdqE="; - }) - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=e58b870ff926415e23fc386af41ff81b2f588763"; - hash = "sha256-a0faNQafL+uRIglnILkLj64ROWxqmczQTQSu3VdklSk="; - }) ]; postPatch = if kbdcompSupport then '' diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index cc5858c16fb7..6c1c2b81f90c 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.40.4"; + version = "1.41.0"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-PETvcHlR11hdi/KirPXKkH4mrLUyVpyQDtxf3SMx9tw="; + sha256 = "sha256-uVIN2oSpaRSeJK1bhjzMqSMmnQm+1i6xsw1RWjmsvGY="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index dc7fe1627a1c..689a502efde1 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, nixosTests }: let - version = "1.2023.12"; + version = "1.2023.13"; in stdenv.mkDerivation rec { pname = "plantuml-server"; inherit version; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-RHlv0kVJvAInLAd70001OTcJuh3Qg2C9o+//zR37zxc="; + sha256 = "sha256-8MfInkDJ57Usm4KTESwEig/X9xfoxXTf+oA9F3bgMT0="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 28bda2203ffc..5b5eaee20dc7 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.24.4"; + version = "0.25.2"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-m3LGxRUo1ModiSS1O1e5B513hRe42WuBo7GWYf/oaHA="; + hash = "sha256-308t/yaFFabFC9nr1eN/SMF+uBBnpGaaWiWD0wm/dtI="; }; - vendorHash = "sha256-lto71mayUJGDiKPSoKJD2DmIJikhv6sjEGsW4Ls1UUM="; + vendorHash = "sha256-3jjCAsqbD5HUM8972jGBxCiewSLh2aIRE68rpV03KqQ="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; diff --git a/pkgs/tools/networking/onetun/default.nix b/pkgs/tools/networking/onetun/default.nix index 46b040f513ea..ca07db7583a4 100644 --- a/pkgs/tools/networking/onetun/default.nix +++ b/pkgs/tools/networking/onetun/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "onetun"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "aramperes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-svf30eFldfbhi8L44linHccGApYFuEWZOjzyqM+tjw4="; + sha256 = "sha256-NH3K/EGFtBcTAxGntneV86zd8eWSV4fFxvr76xtE/mw="; }; - cargoHash = "sha256-KcixaVNZEpGeMg/sh3dua3D7vqzlBvf+Zh3MKk6LJac="; + cargoHash = "sha256-ZpgcFzQLiOWyhjSI+WcLa0UFUw8zQWfqJkrVVpIexgM="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index cc826474d3eb..5ba7917de049 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-6SWcepENdbkwv4qq4nuxSINAxXWZmLcj5NwJ3nBnKu8="; + hash = "sha256-ZrZ2mqf1/D4L+1SlTx3rwkmk9+RcqH/yuMZie6jtpmc="; }; - vendorHash = "sha256-8R3bVwziiC9n10dA8Zus7L0VyjWYKkdSszb44HqR8tE="; + vendorHash = "sha256-nIVm2+F+5rXTiode240zZXxIAQA4VkNynYnmdvSwEHw="; tags = [ "with_quic" diff --git a/pkgs/tools/package-management/harmonia/default.nix b/pkgs/tools/package-management/harmonia/default.nix index 9c472f080b15..9830570a07fd 100644 --- a/pkgs/tools/package-management/harmonia/default.nix +++ b/pkgs/tools/package-management/harmonia/default.nix @@ -5,6 +5,7 @@ , nixVersions , pkg-config , rustPlatform +, stdenv , nix-update-script , nixosTests }: @@ -32,6 +33,11 @@ rustPlatform.buildRustPackage rec { nixVersions.nix_2_19 ]; + # Workaround for https://github.com/NixOS/nixpkgs/issues/166205 + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + passthru = { updateScript = nix-update-script { extraArgs = [ "--version-regex" "harmonia-v(.*)" ]; diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index f61d49f493b6..1ad4b0e97873 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.34.0"; + version = "2.35.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-O7qxJ2TE62XDYljqvNsO3ssD/YhfOLfy9zF0W++T0Hw="; + hash = "sha256-WYLXhRoB8+a5zhTs1qxJVrDjor5orCw6UJrqEt+fBBQ="; }; - vendorHash = "sha256-qihPtpygHoIfGf2wj+klDWwL4sTHqDxi1jxjv57vUx4="; + vendorHash = "sha256-P9jSQG6EyVGMZKtThy8Q7Y/pV7mbMl2eGrylea0VHRc="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index b0ca29f5ea0c..58250f5320a7 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "9.12.0"; + version = "9.12.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-bNSSU7UJBexnZ95fJM0Oa70jGbbM0ghNA0ePESRMjX0="; + hash = "sha256-U3iEiKIb9lTNM4GK75a8khsjeZzYaMafoBfdpNiiwHQ="; }; proxyVendor = true; - vendorHash = "sha256-9hjQBoZW6pnuo1YDegp+yxpvR4Ja+6BqOg5/fqwPRig="; + vendorHash = "sha256-RRE0DsBkpI9hvo7k04eIadOKO3YE0g0DDjFj40ya1ZM="; subPackages = [ "apps/cnspec" diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 73080cf05b23..0e2e74d0787f 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-12-19"; + version = "2023-12-22"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-yIEu5JQ9sgf9HFP/pFZ/A2DG14c67imgfYRYL1+PiYA="; + hash = "sha256-NuukzG+l83YhIgVASLKCkE3FrS6+z8uURTxZyhT/RuA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index db955a1a2086..e3f43157f614 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "grype"; - version = "0.73.4"; + version = "0.73.5"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cYhgLMKj8fo49zr+NC7SARiyybCnqXf+DgB+6IkwkAw="; + hash = "sha256-a5Kna1axfA3uBHoTdT/B/6PA/Tr+w0bK6GeKcGIPRsQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-Zx8gJZVkobKjrGysrqYd6Hv2bGqEgOQ+EGSKDvOM33M="; + vendorHash = "sha256-eO0/kE0XPqsnoCBKxcwJjHoBhQlXlxVPcg6w1fHfWGs="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 3f64895d3673..3d10bb0bb51c 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.47" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.48" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 57f922329c23..899a80b10966 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: e9a1adf7e1a5edb3f76bd537fe6fa5c75435aec9 - ref: refs/tags/6.3.47 + revision: 261eca342915db81d67cdfe7f2ef7b3788fd508f + ref: refs/tags/6.3.48 specs: - metasploit-framework (6.3.47) + metasploit-framework (6.3.48) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) @@ -134,13 +134,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.3.0) - aws-partitions (1.864.0) - aws-sdk-core (3.190.0) + aws-partitions (1.872.0) + aws-sdk-core (3.190.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.430.0) + aws-sdk-ec2 (1.431.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) aws-sdk-ec2instanceconnect (1.36.0) @@ -149,7 +149,7 @@ GEM aws-sdk-iam (1.92.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.74.0) + aws-sdk-kms (1.75.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.141.0) @@ -191,7 +191,7 @@ GEM eventmachine (1.2.7) faker (3.2.2) i18n (>= 1.8.11, < 2) - faraday (2.7.12) + faraday (2.8.1) base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) @@ -219,7 +219,7 @@ GEM httpclient (2.8.3) i18n (1.14.1) concurrent-ruby (~> 1.0) - io-console (0.6.0) + io-console (0.7.1) irb (1.7.4) reline (>= 0.3.6) jmespath (1.6.2) @@ -274,7 +274,7 @@ GEM mustermann (3.0.0) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) - net-imap (0.4.7) + net-imap (0.4.8) date net-protocol net-ldap (0.18.0) @@ -282,7 +282,7 @@ GEM timeout net-smtp (0.4.0) net-protocol - net-ssh (7.2.0) + net-ssh (7.2.1) network_interface (0.0.4) nexpose (7.3.0) nio4r (2.7.0) @@ -334,7 +334,7 @@ GEM rasn1 (0.12.1) strptime (~> 0.2.5) rb-readline (0.5.5) - recog (3.1.2) + recog (3.1.4) nokogiri redcarpet (3.6.0) reline (0.4.1) @@ -393,7 +393,7 @@ GEM ruby-mysql (4.1.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.3.0) + ruby_smb (3.3.1) bindata openssl-ccm openssl-cmac @@ -463,4 +463,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.4.22 + 2.4.13 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 6c30b6a05f8a..935374a09ad4 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.47"; + version = "6.3.48"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-I1BpYCS2wLrvAKwqKn0QDOf0SvdsmT58OtiBDXwJkh8="; + hash = "sha256-AY0k44/gYXP4h3SoRVF9aK2L2skZ03Azd5V9hSRDoHQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index f185105372f4..a439c6380641 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16n1d0bh3zy925y4f8flrnkfir2smsj0j31zslfaz6vf6cvi9qjs"; + sha256 = "1ddbcz8p3abbw8d8pn796z1ry1mbapl6ayhh37ziwal6bd047kvm"; type = "gem"; }; - version = "1.864.0"; + version = "1.872.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19nglxz49nlzgsvnivb3bdm17vxjn1ng2br8659xv48nzjrmyid3"; + sha256 = "1ansagfl5irx1y6b9xf4xpi9j6q6k5pbd2aw80hn0p4m3ycafamh"; type = "gem"; }; - version = "3.190.0"; + version = "3.190.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zyazx97nskgl9xzspg2q1rji02p2jv789v8qd1qz6hknz0z6r5f"; + sha256 = "04lg4g6aivkf6zvvcc1clw0dqdlpkn3c87kiz5mfc7m2jr0m0ljx"; type = "gem"; }; - version = "1.430.0"; + version = "1.431.0"; }; aws-sdk-ec2instanceconnect = { groups = ["default"]; @@ -154,10 +154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1isrj19kzy9sb7a76a1c2n5x0d9lg1h2n7fp7cn13xjis0hpnlxj"; + sha256 = "1qzxqfgrhnl5rdc39a1gl2pgrdxgnsj12zycpxnsx8lg6arfmnr1"; type = "gem"; }; - version = "1.74.0"; + version = "1.75.0"; }; aws-sdk-s3 = { groups = ["default"]; @@ -404,10 +404,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19w1lzipnxs6vy3y0pw1mf956f768ppzgfrnlpwgrpnjjv9xqf7d"; + sha256 = "19p45ryrvxff6ggdj4fq76dk7wlkfgrh474c3kwzdsjx3xpdq8x8"; type = "gem"; }; - version = "2.7.12"; + version = "2.8.1"; }; faraday-net_http = { groups = ["default"]; @@ -554,10 +554,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff"; + sha256 = "1fmwbcapyhla84xhwj3gfws6rb4lw3928ybz6g3lr372dgxakzx5"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.1"; }; irb = { groups = ["default"]; @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "e9a1adf7e1a5edb3f76bd537fe6fa5c75435aec9"; - sha256 = "07wj15y0v0fq79y3x6bcyx5g9rqc21yjlamc03pvmh5n4ih6jl13"; + rev = "261eca342915db81d67cdfe7f2ef7b3788fd508f"; + sha256 = "0x508cj8azcmfwrp1lqrr7d8pbb8gm8lba3lhzw76qg0izij9381"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.47"; + version = "6.3.48"; }; metasploit-model = { groups = ["default"]; @@ -796,10 +796,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0541lfqaz46h8s3fks11vsd1iqzmgjjw3c0jp9agg92zblwj0axs"; + sha256 = "1wnmxcrpv7zaf8wli5nvfnz5ybmw7f3r06s05p3d96idc61193mv"; type = "gem"; }; - version = "0.4.7"; + version = "0.4.8"; }; net-ldap = { groups = ["default"]; @@ -836,10 +836,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jyj6j7w9zpj2zhp4dyhdjiwsn9rqwksj7s7fzpnn7rx2xvz2a1a"; + sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w"; type = "gem"; }; - version = "7.2.0"; + version = "7.2.1"; }; network_interface = { groups = ["default"]; @@ -1107,10 +1107,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15633qvzbgsigx55dxb9b07xh0spwr9njd5y2f454kc5zrrapp1a"; + sha256 = "1a9m9ngmcgvgzg8m8ahdhjvfm65k6hp8r7dqmrsh3zcphim4x71k"; type = "gem"; }; - version = "3.1.2"; + version = "3.1.4"; }; redcarpet = { groups = ["default"]; @@ -1377,10 +1377,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xfjl89a46xg1w98ywa2byf23jmhh3xyj4r501hgc7vma1i5gw3v"; + sha256 = "04m366ldi33h79k7f35dvyhq0jyh762v8360zf8ss5jbax3bzlkk"; type = "gem"; }; - version = "3.3.0"; + version = "3.3.1"; }; rubyntlm = { groups = ["default"]; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index d5bccc8dd8cd..c0c0fdef6fb9 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mQzZohEwalTXeNEPfLk5TqT2R7p4DAiyK5HlQmX+dwI="; + hash = "sha256-XTKJq7bq6iNzZ4LnxQxqzbNDdNh0ixFclB3kniNvg2I="; }; - vendorHash = "sha256-Os3Vx18H0e+yd0/BeDf3MbnPdIZGNPhzrRfu7Dky5to="; + vendorHash = "sha256-C/CDMj+R7p0wkjHSQX6GMRDU1PEDHi8574JS/A2zrzk="; subPackages = [ "cmd/nuclei/" diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index c1c4cef126ea..224d358ecb51 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.3.6"; + version = "4.4.1"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-eCOSUtSPIRaoc7pIyQAftcwG3P8321qk6GPbeDNNevI="; + hash = "sha256-Bbt20XE+PNIxl2qDzxpIh4yjU93JgXF4gn1kb4bvdBw="; }; buildInputs = [ diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/tools/virtualization/mininet/default.nix index c33389861dd0..3d7339bf56b6 100644 --- a/pkgs/tools/virtualization/mininet/default.nix +++ b/pkgs/tools/virtualization/mininet/default.nix @@ -1,11 +1,38 @@ { stdenv, lib, fetchFromGitHub +, runCommand , which , python3 , help2man +, makeWrapper +, ethtool +, inetutils +, iperf +, iproute2 +, nettools +, socat }: let pyEnv = python3.withPackages(ps: [ ps.setuptools ]); + + telnet = runCommand "inetutils-telnet" + { } + '' + mkdir -p "$out/bin" + ln -s "${inetutils}"/bin/telnet "$out/bin" + ''; + + generatedPath = lib.makeSearchPath "bin" [ + iperf + ethtool + iproute2 + socat + # mn errors out without a telnet binary + # pkgs.inetutils brings an undesired ifconfig into PATH see #43105 + nettools + telnet + ]; + in stdenv.mkDerivation rec { pname = "mininet"; @@ -24,7 +51,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; pythonPath = [ python3.pkgs.setuptools ]; - nativeBuildInputs = [ help2man ]; + nativeBuildInputs = [ help2man makeWrapper python3.pkgs.wrapPython ]; propagatedBuildInputs = [ python3 which ]; @@ -33,7 +60,18 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out $py # without --root, install fails - ${pyEnv.interpreter} setup.py install --root="/" --prefix=$py + "${pyEnv.interpreter}" setup.py install \ + --root="/" \ + --prefix="$py" \ + --install-scripts="$out/bin" + ''; + + postFixup = '' + wrapPythonProgramsIn "$out/bin" "$py $pythonPath" + wrapProgram "$out/bin/mnexec" \ + --prefix PATH : "${generatedPath}" + wrapProgram "$out/bin/mn" \ + --prefix PATH : "${generatedPath}" ''; doCheck = false; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f033921cde5d..69ee72a90323 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -151,6 +151,7 @@ mapAliases ({ composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 + cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 clash = throw "'clash' has been removed, upstream gone. Consider using 'clash-meta' instead."; # added 2023-11-10 clasp = clingo; # added 2022-12-22 claws-mail-gtk3 = claws-mail; # Added 2021-07-10 @@ -176,6 +177,7 @@ mapAliases ({ clang14Stdenv = lowPrio llvmPackages_14.stdenv; clang15Stdenv = lowPrio llvmPackages_15.stdenv; clang16Stdenv = lowPrio llvmPackages_16.stdenv; + clang17Stdenv = lowPrio llvmPackages_17.stdenv; clang-tools_7 = throw "clang-tools_7 has been removed from nixpkgs"; # Added 2023-11-19 clang_7 = throw "clang_7 has been removed from nixpkgs"; # Added 2023-11-19 @@ -921,6 +923,7 @@ mapAliases ({ starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 steam-run-native = steam-run; # added 2022-02-21 sumneko-lua-language-server = lua-language-server; # Added 2023-02-07 + supertux-editor = throw "'supertux-editor' has been removed, as it was broken and unmaintained"; # Added 2023-12-22 swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 swtpm-tpm2 = swtpm; # Added 2021-02-26 syncthing-cli = syncthing; # Added 2021-04-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae21ad1aeafb..620228dba2b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -590,8 +590,6 @@ with pkgs; crow-translate = libsForQt5.callPackage ../applications/misc/crow-translate { }; - cryptowatch-desktop = callPackage ../applications/finance/cryptowatch { }; - dae = callPackage ../tools/networking/dae { }; darling = callPackage ../applications/emulators/darling { }; @@ -4526,7 +4524,7 @@ with pkgs; }; broot = callPackage ../tools/misc/broot { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Foundation Security; }; bruteforce-luks = callPackage ../tools/security/bruteforce-luks { }; @@ -13580,8 +13578,6 @@ with pkgs; supertag = callPackage ../tools/filesystems/supertag { }; - supertux-editor = callPackage ../applications/editors/supertux-editor { }; - svgbob = callPackage ../tools/graphics/svgbob { }; svgcleaner = callPackage ../tools/graphics/svgcleaner { }; @@ -14981,6 +14977,10 @@ with pkgs; whsniff = callPackage ../applications/networking/sniffers/whsniff { }; + wio = callPackage ../by-name/wi/wio/package.nix { + wlroots = wlroots_0_17; + }; + wiiuse = callPackage ../development/libraries/wiiuse { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation IOBluetooth; @@ -24497,7 +24497,8 @@ with pkgs; pcg_c = callPackage ../development/libraries/pcg-c { }; pcl = libsForQt5.callPackage ../development/libraries/pcl { - inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL; }; pcre = callPackage ../development/libraries/pcre { }; @@ -27095,11 +27096,9 @@ with pkgs; OVMF = callPackage ../applications/virtualization/OVMF { }; OVMFFull = callPackage ../applications/virtualization/OVMF { secureBoot = true; - # CSM support is a BIOS emulation mechanism, - # SeaBIOS is only available on x86. - csmSupport = stdenv.hostPlatform.isx86; httpSupport = true; tpmSupport = true; + tlsSupport = true; }; ops = callPackage ../applications/virtualization/ops { }; @@ -27431,8 +27430,6 @@ with pkgs; tailscale = callPackage ../servers/tailscale { }; - tailscale-nginx-auth = callPackage ../by-name/ta/tailscale-nginx-auth/package.nix { }; - tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; tailspin = callPackage ../tools/misc/tailspin { }; @@ -31290,7 +31287,7 @@ with pkgs; dyff = callPackage ../development/tools/dyff { }; dwl = callPackage ../applications/window-managers/dwl { - wlroots = wlroots_0_16; + wlroots = wlroots_0_17; }; dwm = callPackage ../applications/window-managers/dwm { @@ -32658,6 +32655,7 @@ with pkgs; inherit (callPackages ../development/libraries/wlroots {}) wlroots_0_15 wlroots_0_16 + wlroots_0_17 wlroots; sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { }); @@ -32757,7 +32755,7 @@ with pkgs; kitti3 = python3.pkgs.callPackage ../applications/window-managers/i3/kitti3.nix { }; waybox = callPackage ../by-name/wa/waybox/package.nix { - wlroots = wlroots_0_15; + wlroots = wlroots_0_17; }; workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; @@ -34610,9 +34608,7 @@ with pkgs; enableDbusUi = false; }; - parsec-bin = callPackage ../applications/misc/parsec/bin.nix { - ffmpeg = ffmpeg_4; - }; + parsec-bin = callPackage ../applications/misc/parsec/bin.nix { }; pavucontrol = callPackage ../applications/audio/pavucontrol { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 08c2592a221e..9a11298ac9a3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1074,6 +1074,8 @@ let minisat = callPackage ../development/ocaml-modules/minisat { }; + minttea = callPackage ../development/ocaml-modules/minttea { }; + mirage = callPackage ../development/ocaml-modules/mirage { }; mirage-block = callPackage ../development/ocaml-modules/mirage-block { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index fc1cd2d4a174..5fe0e98b9a2d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -76,6 +76,7 @@ mapAliases ({ buildbot-pkg = throw "buildbot-pkg has been removed, it's only internally used in buildbot"; # added 2022-04-07 bt_proximity = bt-proximity; # added 2021-07-02 BTrees = btrees; # added 2023-02-19 + cacheyou = throw "cacheyou has been removed, as it was no longer used for the only consumer pdm"; # added 2023-12-21 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 cchardet = faust-cchardet; # added 2023-03-02 class-registry = phx-class-registry; # added 2021-10-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 02fb6a00b055..9cc0aec97ed1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1759,8 +1759,6 @@ self: super: with self; { cachey = callPackage ../development/python-modules/cachey { }; - cacheyou = callPackage ../development/python-modules/cacheyou { }; - cachier = callPackage ../development/python-modules/cachier { }; cachy = callPackage ../development/python-modules/cachy { };