Merge staging-next into staging

Changed files
+1531 -1842
.github
maintainers
nixos
modules
services
x11
desktop-managers
tests
pkgs
applications
editors
graphics
misc
trenchbroom
networking
terminal-emulators
kitty
by-name
desktops
deepin
apps
deepin-terminal
library
qt5integration
gnome
lxqt
compton-conf
libdbusmenu-lxqt
libfm-qt
liblxqt
libqtxdg
libsysstat
lximage-qt
lxqt-about
lxqt-admin
lxqt-archiver
lxqt-build-tools
lxqt-config
lxqt-globalkeys
lxqt-menu-data
lxqt-notificationd
lxqt-openssh-askpass
lxqt-panel
lxqt-policykit
lxqt-powermanagement
lxqt-qtplugin
lxqt-runner
lxqt-session
lxqt-sudo
lxqt-themes
obconf-qt
pavucontrol-qt
pcmanfm-qt
qlipper
qps
qterminal
qtermwidget
qtxdg-tools
screengrab
xdg-desktop-portal-lxqt
development
compilers
circt
python-modules
dask-mpi
jaraco-test
litellm
timetagger
tokenizers
transformers
tools
os-specific
linux
servers
klipper
redpanda
shells
nushell
tools
text
mdbook-cmdrun
top-level
+1 -1
.github/CODEOWNERS
···
# GNOME
/pkgs/desktops/gnome @jtojnar
-
/pkgs/desktops/gnome/extensions @piegamesde @jtojnar
+
/pkgs/desktops/gnome/extensions @jtojnar
/pkgs/build-support/make-hardcode-gsettings-patch @jtojnar
# Cinnamon
+6
maintainers/maintainer-list.nix
···
githubId = 1108325;
name = "Théo Zimmermann";
+
zlepper = {
+
name = "Rasmus Hansen";
+
github = "zlepper";
+
githubId = 1499810;
+
email = "hansen13579@gmail.com";
+
};
zmitchell = {
name = "Zach Mitchell";
email = "zmitchell@fastmail.com";
+3
maintainers/team-list.nix
···
rrbutani
sternenseemann
];
+
githubTeams = [
+
"llvm"
+
];
scope = "Maintain LLVM package sets and related packages";
shortName = "LLVM";
enableFeatureFreezePing = true;
+1 -1
nixos/modules/services/x11/desktop-managers/lxqt.nix
···
services.xserver.libinput.enable = mkDefault true;
-
xdg.portal.lxqt.enable = true;
+
xdg.portal.lxqt.enable = mkDefault true;
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050804
xdg.portal.config.lxqt.default = mkDefault [ "lxqt" "gtk" ];
+1 -1
nixos/tests/gnome-extensions.nix
···
{ pkgs, lib, ...}:
{
name = "gnome-extensions";
-
meta.maintainers = [ lib.maintainers.piegames ];
+
meta.maintainers = [ ];
nodes.machine =
{ pkgs, ... }:
+11
pkgs/applications/editors/jetbrains/bin/ides.json
···
"longDescription": "WebStorm provides an editor for HTML, JavaScript (incl. Node.js), and CSS with on-the-fly code analysis, error prevention and automated refactorings for JavaScript code.",
"homepage": "https://www.jetbrains.com/webstorm/"
}
+
},
+
"writerside": {
+
"product": "Writerside",
+
"wmClass": "jetbrains-writerside",
+
"meta": {
+
"isOpenSource": false,
+
"description": "Documentation IDE from JetBrains",
+
"maintainers": [ "zlepper"],
+
"longDescription": "The most powerful development environment – now adapted for writing documentation.",
+
"homepage": "https://www.jetbrains.com/writerside/"
+
}
}
}
+5 -1
pkgs/applications/editors/jetbrains/bin/update_bin.py
···
try:
build = latest_build(channel)
new_version = build["@version"]
-
new_build_number = build["@fullNumber"]
+
new_build_number = ""
+
if "@fullNumber" not in build:
+
new_build_number = build["@number"]
+
else:
+
new_build_number = build["@fullNumber"]
if "EAP" not in channel["@name"]:
version_or_build_number = new_version
else:
+32
pkgs/applications/editors/jetbrains/bin/versions.json
···
"sha256": "d4c7cb7f1462c2b2bd9042b4714ab9de66c455ab9752c87698dc3902f0d49a2a",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.tar.gz",
"build_number": "241.14494.235"
+
},
+
"writerside": {
+
"update-channel": "Writerside EAP",
+
"url-template": "https://download.jetbrains.com/writerside/writerside-{version}.tar.gz",
+
"version": "2023.3 EAP",
+
"sha256": "8eae1c965c1b5dae17c580cd3ed9b2a6182a3b54a54f8e6152472815118ae2c2",
+
"url": "https://download.jetbrains.com/writerside/writerside-233.14938.tar.gz",
+
"build_number": "233.14938"
}
},
"aarch64-linux": {
···
"sha256": "6691e4855fd4ecf3da9b63b78a11afc3441fb2139cdc7e7aaa5d78aa92a88c12",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1-aarch64.tar.gz",
"build_number": "241.14494.235"
+
},
+
"writerside": {
+
"update-channel": "Writerside EAP",
+
"url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.tar.gz",
+
"version": "2023.3 EAP",
+
"sha256": "b09dac04217d5d523501bdb1e9026fd17fb6370dff2610502472bbf6a48323d8",
+
"url": "https://download.jetbrains.com/writerside/writerside-233.14938-aarch64.tar.gz",
+
"build_number": "233.14938"
}
},
"x86_64-darwin": {
···
"sha256": "b3b41e5e8559e36e0bd4121dee61d39a8ba5b5ce8193e7b026c5bc261e973df5",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.dmg",
"build_number": "241.14494.235"
+
},
+
"writerside": {
+
"update-channel": "Writerside EAP",
+
"url-template": "https://download.jetbrains.com/writerside/writerside-{version}.dmg",
+
"version": "2023.3 EAP",
+
"sha256": "53c7ad5a8808776b60eb82b3155c6f3a2a0dfad43ba8d9238a0db1752d503b09",
+
"url": "https://download.jetbrains.com/writerside/writerside-233.14938.dmg",
+
"build_number": "233.14938"
}
},
"aarch64-darwin": {
···
"sha256": "95dd3a397fe063583c5e3ba4fefafdfcad740c18447c1a70c0f03cb004436496",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1-aarch64.dmg",
"build_number": "241.14494.235"
+
},
+
"writerside": {
+
"update-channel": "Writerside EAP",
+
"url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.dmg",
+
"version": "2023.3 EAP",
+
"sha256": "2a78fbcabcdd5b7c906d933dd91ac927bde22ae3bba988dad7450184fd90457a",
+
"url": "https://download.jetbrains.com/writerside/writerside-233.14938-aarch64.dmg",
+
"build_number": "233.14938"
}
}
}
+2
pkgs/applications/editors/jetbrains/default.nix
···
webstorm = mkJetBrainsProduct { pname = "webstorm"; extraBuildInputs = [ stdenv.cc.cc musl ]; };
+
writerside = mkJetBrainsProduct { pname = "writerside"; extraBuildInputs = [ stdenv.cc.cc musl ]; };
+
plugins = callPackage ./plugins { } // { __attrsFailEvaluation = true; };
}
-729
pkgs/applications/graphics/flaca/Cargo.lock
···
-
# This file is automatically @generated by Cargo.
-
# It is not intended for manual editing.
-
version = 3
-
-
[[package]]
-
name = "adler"
-
version = "1.0.2"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-
[[package]]
-
name = "ahash"
-
version = "0.8.3"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
-
dependencies = [
-
"cfg-if",
-
"once_cell",
-
"version_check",
-
]
-
-
[[package]]
-
name = "argyle"
-
version = "0.6.8"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "7a7b00c835644c00c2f160668103439b2e4374e9340fda8a9730e2efa8925145"
-
-
[[package]]
-
name = "autocfg"
-
version = "1.1.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-
[[package]]
-
name = "bitflags"
-
version = "1.3.2"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-
[[package]]
-
name = "bitflags"
-
version = "2.4.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
-
-
[[package]]
-
name = "bitvec"
-
version = "1.0.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-
dependencies = [
-
"funty",
-
"radium",
-
"tap",
-
"wyz",
-
]
-
-
[[package]]
-
name = "bytecount"
-
version = "0.6.3"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
-
-
[[package]]
-
name = "bytemuck"
-
version = "1.14.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
-
-
[[package]]
-
name = "byteorder"
-
version = "1.4.3"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-
[[package]]
-
name = "cc"
-
version = "1.0.83"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-
dependencies = [
-
"jobserver",
-
"libc",
-
]
-
-
[[package]]
-
name = "cfg-if"
-
version = "1.0.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-
[[package]]
-
name = "color_quant"
-
version = "1.1.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-
[[package]]
-
name = "crc32fast"
-
version = "1.3.2"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-
dependencies = [
-
"cfg-if",
-
]
-
-
[[package]]
-
name = "crossbeam-channel"
-
version = "0.5.8"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-
dependencies = [
-
"cfg-if",
-
"crossbeam-utils",
-
]
-
-
[[package]]
-
name = "crossbeam-deque"
-
version = "0.8.3"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
-
dependencies = [
-
"cfg-if",
-
"crossbeam-epoch",
-
"crossbeam-utils",
-
]
-
-
[[package]]
-
name = "crossbeam-epoch"
-
version = "0.9.15"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
-
dependencies = [
-
"autocfg",
-
"cfg-if",
-
"crossbeam-utils",
-
"memoffset",
-
"scopeguard",
-
]
-
-
[[package]]
-
name = "crossbeam-utils"
-
version = "0.8.16"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-
dependencies = [
-
"cfg-if",
-
]
-
-
[[package]]
-
name = "ctrlc"
-
version = "3.4.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf"
-
dependencies = [
-
"nix",
-
"windows-sys",
-
]
-
-
[[package]]
-
name = "dactyl"
-
version = "0.5.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "72f762271c6826d426c3fd2e37aa827fa039596bc7050e9289cb713265be3d7f"
-
dependencies = [
-
"num-traits",
-
]
-
-
[[package]]
-
name = "dowser"
-
version = "0.8.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "4ea8b43a90f6c54a58a97ad6a82001227bafeeb4550ee05732fb656133494918"
-
dependencies = [
-
"ahash",
-
"dactyl",
-
]
-
-
[[package]]
-
name = "dunce"
-
version = "1.0.4"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
-
-
[[package]]
-
name = "either"
-
version = "1.9.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
-
-
[[package]]
-
name = "errno"
-
version = "0.3.3"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
-
dependencies = [
-
"errno-dragonfly",
-
"libc",
-
"windows-sys",
-
]
-
-
[[package]]
-
name = "errno-dragonfly"
-
version = "0.1.2"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-
dependencies = [
-
"cc",
-
"libc",
-
]
-
-
[[package]]
-
name = "fastrand"
-
version = "2.0.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
-
-
[[package]]
-
name = "fdeflate"
-
version = "0.3.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
-
dependencies = [
-
"simd-adler32",
-
]
-
-
[[package]]
-
name = "flaca"
-
version = "2.3.0"
-
dependencies = [
-
"argyle",
-
"cc",
-
"ctrlc",
-
"dactyl",
-
"dowser",
-
"fyi_msg",
-
"libc",
-
"mozjpeg-sys",
-
"oxipng",
-
"rayon",
-
"write_atomic",
-
]
-
-
[[package]]
-
name = "flate2"
-
version = "1.0.27"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
-
dependencies = [
-
"crc32fast",
-
"miniz_oxide",
-
]
-
-
[[package]]
-
name = "funty"
-
version = "2.0.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
-
[[package]]
-
name = "fyi_msg"
-
version = "0.11.5"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "04bb9530916893c31bca029d18088c77f02ea93e270cffab771f9b985cdeb4bb"
-
dependencies = [
-
"ahash",
-
"bytecount",
-
"dactyl",
-
"term_size",
-
"unicode-width",
-
]
-
-
[[package]]
-
name = "hashbrown"
-
version = "0.12.3"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-
[[package]]
-
name = "hermit-abi"
-
version = "0.3.2"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
-
-
[[package]]
-
name = "image"
-
version = "0.24.7"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
-
dependencies = [
-
"bytemuck",
-
"byteorder",
-
"color_quant",
-
"num-rational",
-
"num-traits",
-
"png",
-
]
-
-
[[package]]
-
name = "indexmap"
-
version = "1.9.3"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-
dependencies = [
-
"autocfg",
-
"hashbrown",
-
]
-
-
[[package]]
-
name = "itertools"
-
version = "0.10.5"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-
dependencies = [
-
"either",
-
]
-
-
[[package]]
-
name = "jobserver"
-
version = "0.1.26"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
-
dependencies = [
-
"libc",
-
]
-
-
[[package]]
-
name = "libc"
-
version = "0.2.148"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
-
-
[[package]]
-
name = "libdeflate-sys"
-
version = "0.11.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "cb6784b6b84b67d71b4307963d456a9c7c29f9b47c658f533e598de369e34277"
-
dependencies = [
-
"cc",
-
]
-
-
[[package]]
-
name = "libdeflater"
-
version = "0.11.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d8e285aa6a046fd338b2592c16bee148b2b00789138ed6b7bb56bb13d585050d"
-
dependencies = [
-
"libdeflate-sys",
-
]
-
-
[[package]]
-
name = "linux-raw-sys"
-
version = "0.4.7"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
-
-
[[package]]
-
name = "log"
-
version = "0.4.20"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
-
-
[[package]]
-
name = "memoffset"
-
version = "0.9.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-
dependencies = [
-
"autocfg",
-
]
-
-
[[package]]
-
name = "miniz_oxide"
-
version = "0.7.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
-
dependencies = [
-
"adler",
-
"simd-adler32",
-
]
-
-
[[package]]
-
name = "mozjpeg-sys"
-
version = "2.0.2"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "808feab72499ffd6c267a6fd06bd07e37bef14650c328a5c64636fecfa113eff"
-
dependencies = [
-
"cc",
-
"dunce",
-
"libc",
-
"nasm-rs",
-
]
-
-
[[package]]
-
name = "nasm-rs"
-
version = "0.2.5"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "fe4d98d0065f4b1daf164b3eafb11974c94662e5e2396cf03f32d0bb5c17da51"
-
dependencies = [
-
"rayon",
-
]
-
-
[[package]]
-
name = "nix"
-
version = "0.27.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
-
dependencies = [
-
"bitflags 2.4.0",
-
"cfg-if",
-
"libc",
-
]
-
-
[[package]]
-
name = "num-integer"
-
version = "0.1.45"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-
dependencies = [
-
"autocfg",
-
"num-traits",
-
]
-
-
[[package]]
-
name = "num-rational"
-
version = "0.4.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
-
dependencies = [
-
"autocfg",
-
"num-integer",
-
"num-traits",
-
]
-
-
[[package]]
-
name = "num-traits"
-
version = "0.2.16"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
-
dependencies = [
-
"autocfg",
-
]
-
-
[[package]]
-
name = "num_cpus"
-
version = "1.16.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-
dependencies = [
-
"hermit-abi",
-
"libc",
-
]
-
-
[[package]]
-
name = "once_cell"
-
version = "1.18.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
-
-
[[package]]
-
name = "oxipng"
-
version = "8.0.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "630638e107fb436644c300e781d3f17e1b04656138ba0d40564be4be3b06db32"
-
dependencies = [
-
"bitvec",
-
"crossbeam-channel",
-
"image",
-
"indexmap",
-
"itertools",
-
"libdeflater",
-
"log",
-
"rgb",
-
"rustc-hash",
-
"rustc_version",
-
]
-
-
[[package]]
-
name = "png"
-
version = "0.17.10"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
-
dependencies = [
-
"bitflags 1.3.2",
-
"crc32fast",
-
"fdeflate",
-
"flate2",
-
"miniz_oxide",
-
]
-
-
[[package]]
-
name = "radium"
-
version = "0.7.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
-
[[package]]
-
name = "rayon"
-
version = "1.7.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
-
dependencies = [
-
"either",
-
"rayon-core",
-
]
-
-
[[package]]
-
name = "rayon-core"
-
version = "1.11.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
-
dependencies = [
-
"crossbeam-channel",
-
"crossbeam-deque",
-
"crossbeam-utils",
-
"num_cpus",
-
]
-
-
[[package]]
-
name = "redox_syscall"
-
version = "0.3.5"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-
dependencies = [
-
"bitflags 1.3.2",
-
]
-
-
[[package]]
-
name = "rgb"
-
version = "0.8.36"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59"
-
dependencies = [
-
"bytemuck",
-
]
-
-
[[package]]
-
name = "rustc-hash"
-
version = "1.1.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-
[[package]]
-
name = "rustc_version"
-
version = "0.4.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-
dependencies = [
-
"semver",
-
]
-
-
[[package]]
-
name = "rustix"
-
version = "0.38.13"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662"
-
dependencies = [
-
"bitflags 2.4.0",
-
"errno",
-
"libc",
-
"linux-raw-sys",
-
"windows-sys",
-
]
-
-
[[package]]
-
name = "scopeguard"
-
version = "1.2.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-
[[package]]
-
name = "semver"
-
version = "1.0.18"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
-
-
[[package]]
-
name = "simd-adler32"
-
version = "0.3.7"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
-
-
[[package]]
-
name = "tap"
-
version = "1.0.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
-
[[package]]
-
name = "tempfile"
-
version = "3.8.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
-
dependencies = [
-
"cfg-if",
-
"fastrand",
-
"redox_syscall",
-
"rustix",
-
"windows-sys",
-
]
-
-
[[package]]
-
name = "term_size"
-
version = "0.3.2"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
-
dependencies = [
-
"libc",
-
"winapi",
-
]
-
-
[[package]]
-
name = "unicode-width"
-
version = "0.1.10"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
-
[[package]]
-
name = "version_check"
-
version = "0.9.4"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-
[[package]]
-
name = "winapi"
-
version = "0.3.9"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-
dependencies = [
-
"winapi-i686-pc-windows-gnu",
-
"winapi-x86_64-pc-windows-gnu",
-
]
-
-
[[package]]
-
name = "winapi-i686-pc-windows-gnu"
-
version = "0.4.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-
[[package]]
-
name = "winapi-x86_64-pc-windows-gnu"
-
version = "0.4.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-
[[package]]
-
name = "windows-sys"
-
version = "0.48.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-
dependencies = [
-
"windows-targets",
-
]
-
-
[[package]]
-
name = "windows-targets"
-
version = "0.48.5"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-
dependencies = [
-
"windows_aarch64_gnullvm",
-
"windows_aarch64_msvc",
-
"windows_i686_gnu",
-
"windows_i686_msvc",
-
"windows_x86_64_gnu",
-
"windows_x86_64_gnullvm",
-
"windows_x86_64_msvc",
-
]
-
-
[[package]]
-
name = "windows_aarch64_gnullvm"
-
version = "0.48.5"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-
[[package]]
-
name = "windows_aarch64_msvc"
-
version = "0.48.5"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-
[[package]]
-
name = "windows_i686_gnu"
-
version = "0.48.5"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-
[[package]]
-
name = "windows_i686_msvc"
-
version = "0.48.5"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-
[[package]]
-
name = "windows_x86_64_gnu"
-
version = "0.48.5"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-
[[package]]
-
name = "windows_x86_64_gnullvm"
-
version = "0.48.5"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-
[[package]]
-
name = "windows_x86_64_msvc"
-
version = "0.48.5"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-
[[package]]
-
name = "write_atomic"
-
version = "0.4.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "e1cc5bd3df909eefc4f13328da8ac3b9e6016e0899477c0354c6880c67362cfc"
-
dependencies = [
-
"rustix",
-
"tempfile",
-
]
-
-
[[package]]
-
name = "wyz"
-
version = "0.5.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-
dependencies = [
-
"tap",
-
]
+27 -13
pkgs/applications/graphics/flaca/default.nix
···
-
{ lib, fetchFromGitHub, rustPlatform }:
+
{ lib
+
, fetchFromGitHub
+
, rustPlatform
+
, fetchurl
+
, runCommand
+
, lndir
+
}:
rustPlatform.buildRustPackage rec {
pname = "flaca";
-
version = "2.3.0";
+
version = "2.4.6";
-
src = fetchFromGitHub {
-
owner = "Blobfolio";
-
repo = pname;
-
rev = "v${version}";
-
hash = "sha256-gK9nKvhrqGQ3yDAfnqDF2K1g6JK3CYz0kSpTLqfGTzc=";
-
};
+
src =
+
let
+
source = fetchFromGitHub {
+
owner = "Blobfolio";
+
repo = pname;
+
rev = "v${version}";
+
hash = "sha256-uybEo098+Y92b2P9CniKFmaV8hQZFuOSthgQRGZ/ncc=";
+
};
+
lockFile = fetchurl {
+
url = "https://github.com/Blobfolio/flaca/releases/download/v${version}/Cargo.lock";
+
hash = "sha256-xAjpw71HgS6fILg5zNuc43s0fIqYcoUMMbCH65xrlww=";
+
};
+
in
+
runCommand "source-with-lock" { nativeBuildInputs = [ lndir ]; } ''
+
mkdir -p $out
+
ln -s ${lockFile} $out/Cargo.lock
+
lndir -silent ${source} $out
+
'';
-
# upstream does not provide a Cargo.lock
-
cargoLock.lockFile = ./Cargo.lock;
-
postPatch = ''
-
ln -s ${./Cargo.lock} Cargo.lock
-
'';
+
cargoHash = "sha256-w+PeuH6VFIu3iH5EXF6gEwyYoGeqXX0yd5jJs2NqisQ=";
meta = with lib; {
description = "A CLI tool to losslessly compress JPEG and PNG images";
+4 -4
pkgs/applications/misc/trenchbroom/default.nix
···
, cmake, ninja, curl, git, pandoc, pkg-config, unzip, zip
, libGL, libGLU, freeimage, freetype, assimp
, catch2, fmt, glew, miniz, tinyxml-2, xorg
-
, qtbase, wrapQtAppsHook
+
, qtbase, qtwayland, wrapQtAppsHook
, copyDesktopItems, makeDesktopItem
}:
stdenv.mkDerivation rec {
pname = "TrenchBroom";
-
version = "2023.1";
+
version = "2024.1";
src = fetchFromGitHub {
owner = "TrenchBroom";
repo = "TrenchBroom";
rev = "v${version}";
-
sha256 = "sha256-62xcFKSqxPS+J54+kLo/hewM+Wu/rVBGD8oiECDCJpA=";
+
hash = "sha256-HNK/gLbew7MKN6GVStxDb2tyMgyw2l1+dhPr6fSaZ4A=";
fetchSubmodules = true;
};
# Manually simulate a vcpkg installation so that it can link the libraries
···
nativeBuildInputs = [ cmake ninja curl git pandoc wrapQtAppsHook copyDesktopItems pkg-config unzip zip ];
buildInputs = [
libGL libGLU xorg.libXxf86vm xorg.libSM
-
freeimage freetype qtbase catch2 fmt
+
freeimage freetype qtbase qtwayland catch2 fmt
glew miniz tinyxml-2 assimp
];
QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
+3 -3
pkgs/applications/networking/iroh/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "iroh";
-
version = "0.13.0";
+
version = "0.14.0";
src = fetchFromGitHub {
owner = "n0-computer";
repo = pname;
rev = "v${version}";
-
hash = "sha256-lyDwvVPkHCHZtb/p5PixD31Rl9kXozHw/SxIH1MJPwo=";
+
hash = "sha256-r4sE/1RI/Y6gDMApwlr4Gf6Jvl0zNCAahduXyRtFboE=";
};
-
cargoHash = "sha256-yCI6g/ZTC5JLxwICRDmH4TzUYQtj3PJXdhBD7JSGO1s=";
+
cargoHash = "sha256-N9MsYz7QTm04k5eMdwqj4wTQ36SoaJBqvsty58Pg8tU=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks; [
+3 -3
pkgs/applications/terminal-emulators/kitty/default.nix
···
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
-
version = "0.34.0";
+
version = "0.34.1";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "refs/tags/v${version}";
-
hash = "sha256-IP1CWMHiWnBSbt+78EQ6hfX2A9FDhlwt0KLthXtO4dA=";
+
hash = "sha256-r7KZcSqREILMp0F9ajeHS5sglq/o88h2t+4BgbABjOY=";
};
goModules = (buildGo122Module {
···
];
platforms = platforms.darwin ++ platforms.linux;
mainProgram = "kitty";
-
maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens kashw2 ];
+
maintainers = with maintainers; [ tex rvolosatovs Luflosi kashw2 ];
};
}
+435 -203
pkgs/by-name/my/mycelium/Cargo.lock
···
"axum-core",
"bytes",
"futures-util",
-
"http 1.1.0",
-
"http-body 1.0.0",
+
"http",
+
"http-body",
"http-body-util",
-
"hyper 1.2.0",
+
"hyper",
"hyper-util",
"itoa",
"matchit",
···
"async-trait",
"bytes",
"futures-util",
-
"http 1.1.0",
-
"http-body 1.0.0",
+
"http",
+
"http-body",
"http-body-util",
"mime",
"pin-project-lite",
···
]
[[package]]
-
name = "encoding_rs"
-
version = "0.8.33"
+
name = "dlopen2"
+
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+
checksum = "09b4f5f101177ff01b8ec4ecc81eead416a8aa42819a2869311b3420fa114ffa"
dependencies = [
-
"cfg-if",
+
"libc",
+
"once_cell",
+
"winapi",
]
[[package]]
···
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
+
name = "foreign-types"
+
version = "0.3.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+
dependencies = [
+
"foreign-types-shared",
+
]
+
+
[[package]]
+
name = "foreign-types-shared"
+
version = "0.1.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+
[[package]]
name = "form_urlencoded"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "h2"
-
version = "0.3.24"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
-
dependencies = [
-
"bytes",
-
"fnv",
-
"futures-core",
-
"futures-sink",
-
"futures-util",
-
"http 0.2.11",
-
"indexmap",
-
"slab",
-
"tokio",
-
"tokio-util",
-
"tracing",
-
]
-
-
[[package]]
-
name = "h2"
-
version = "0.4.2"
+
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943"
+
checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069"
dependencies = [
"bytes",
"fnv",
"futures-core",
"futures-sink",
"futures-util",
-
"http 1.1.0",
+
"http",
"indexmap",
"slab",
"tokio",
···
checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
[[package]]
-
name = "http"
-
version = "0.2.11"
+
name = "hex"
+
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
-
dependencies = [
-
"bytes",
-
"fnv",
-
"itoa",
-
]
+
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "http"
···
[[package]]
name = "http-body"
-
version = "0.4.6"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-
dependencies = [
-
"bytes",
-
"http 0.2.11",
-
"pin-project-lite",
-
]
-
-
[[package]]
-
name = "http-body"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
dependencies = [
"bytes",
-
"http 1.1.0",
+
"http",
]
[[package]]
···
dependencies = [
"bytes",
"futures-util",
-
"http 1.1.0",
-
"http-body 1.0.0",
+
"http",
+
"http-body",
"pin-project-lite",
]
···
[[package]]
name = "hyper"
-
version = "0.14.28"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
-
dependencies = [
-
"bytes",
-
"futures-channel",
-
"futures-core",
-
"futures-util",
-
"h2 0.3.24",
-
"http 0.2.11",
-
"http-body 0.4.6",
-
"httparse",
-
"httpdate",
-
"itoa",
-
"pin-project-lite",
-
"socket2",
-
"tokio",
-
"tower-service",
-
"tracing",
-
"want",
-
]
-
-
[[package]]
-
name = "hyper"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
···
"bytes",
"futures-channel",
"futures-util",
-
"h2 0.4.2",
-
"http 1.1.0",
-
"http-body 1.0.0",
+
"h2",
+
"http",
+
"http-body",
"httparse",
"httpdate",
"itoa",
"pin-project-lite",
"smallvec",
"tokio",
+
"want",
]
[[package]]
···
checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
dependencies = [
"bytes",
+
"futures-channel",
"futures-util",
-
"http 1.1.0",
-
"http-body 1.0.0",
-
"hyper 1.2.0",
+
"http",
+
"http-body",
+
"hyper",
"pin-project-lite",
"socket2",
"tokio",
+
"tower",
+
"tower-service",
+
"tracing",
]
[[package]]
···
checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
dependencies = [
"generic-array",
+
]
+
+
[[package]]
+
name = "io-lifetimes"
+
version = "1.0.11"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+
dependencies = [
+
"hermit-abi",
+
"libc",
+
"windows-sys 0.48.0",
]
[[package]]
···
checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455"
dependencies = [
"hermit-abi",
-
"rustix",
+
"rustix 0.38.30",
"windows-sys 0.52.0",
]
···
[[package]]
name = "linux-raw-sys"
+
version = "0.1.4"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+
+
[[package]]
+
name = "linux-raw-sys"
version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
[[package]]
+
name = "lock_api"
+
version = "0.4.11"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+
dependencies = [
+
"autocfg",
+
"scopeguard",
+
]
+
+
[[package]]
name = "log"
version = "0.4.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
[[package]]
+
name = "memalloc"
+
version = "0.1.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1"
+
+
[[package]]
name = "memchr"
version = "2.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "mycelium"
-
version = "0.5.0"
+
version = "0.5.1"
dependencies = [
"aes-gcm",
-
"axum",
-
"base64 0.22.0",
"blake3",
"bytes",
-
"clap",
"etherparse",
"faster-hex",
"futures",
···
"left-right",
"libc",
"log",
-
"network-interface",
+
"netdev",
"nix 0.28.0",
-
"pretty_env_logger",
+
"openssl",
"quinn",
"rand",
"rcgen",
-
"reqwest",
"rtnetlink",
"rustls",
"serde",
-
"serde_json",
"tokio",
+
"tokio-openssl",
"tokio-stream",
"tokio-tun",
"tokio-util",
-
"toml",
"tun",
"wintun 0.4.0",
"x25519-dalek",
[[package]]
+
name = "myceliumd"
+
version = "0.5.1"
+
dependencies = [
+
"axum",
+
"base64 0.22.0",
+
"clap",
+
"log",
+
"mycelium",
+
"pretty_env_logger",
+
"prometheus",
+
"reqwest",
+
"serde",
+
"serde_json",
+
"tokio",
+
]
+
+
[[package]]
+
name = "netdev"
+
version = "0.25.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "fb353f5a5a852d5cc779c1c80bec0bd14a696ef832f3a761cb10091802c37109"
+
dependencies = [
+
"dlopen2",
+
"libc",
+
"memalloc",
+
"netlink-packet-core",
+
"netlink-packet-route 0.17.1",
+
"netlink-sys",
+
"once_cell",
+
"system-configuration",
+
"windows 0.54.0",
+
]
+
+
[[package]]
name = "netlink-packet-core"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "netlink-packet-route"
+
version = "0.17.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66"
+
dependencies = [
+
"anyhow",
+
"bitflags 1.3.2",
+
"byteorder",
+
"libc",
+
"netlink-packet-core",
+
"netlink-packet-utils",
+
]
+
+
[[package]]
+
name = "netlink-packet-route"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74c171cd77b4ee8c7708da746ce392440cb7bcf618d122ec9ecc607b12938bf4"
···
"libc",
"log",
"tokio",
-
]
-
-
[[package]]
-
name = "network-interface"
-
version = "1.1.2"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8ee524f98ddbe7772762a7477cfb22356df075cac4069bf81ac5082a46db742c"
-
dependencies = [
-
"cc",
-
"libc",
-
"thiserror",
-
"winapi",
[[package]]
···
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
+
name = "openssl"
+
version = "0.10.64"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+
dependencies = [
+
"bitflags 2.4.2",
+
"cfg-if",
+
"foreign-types",
+
"libc",
+
"once_cell",
+
"openssl-macros",
+
"openssl-sys",
+
]
+
+
[[package]]
+
name = "openssl-macros"
+
version = "0.1.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+
dependencies = [
+
"proc-macro2",
+
"quote",
+
"syn 2.0.48",
+
]
+
+
[[package]]
+
name = "openssl-src"
+
version = "300.2.3+3.2.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
+
dependencies = [
+
"cc",
+
]
+
+
[[package]]
+
name = "openssl-sys"
+
version = "0.9.102"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+
dependencies = [
+
"cc",
+
"libc",
+
"openssl-src",
+
"pkg-config",
+
"vcpkg",
+
]
+
+
[[package]]
name = "overload"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
+
name = "parking_lot"
+
version = "0.12.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+
dependencies = [
+
"lock_api",
+
"parking_lot_core",
+
]
+
+
[[package]]
+
name = "parking_lot_core"
+
version = "0.9.9"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+
dependencies = [
+
"cfg-if",
+
"libc",
+
"redox_syscall",
+
"smallvec",
+
"windows-targets 0.48.5",
+
]
+
+
[[package]]
name = "paste"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
+
name = "pkg-config"
+
version = "0.3.30"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+
[[package]]
name = "platforms"
version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
+
name = "procfs"
+
version = "0.14.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69"
+
dependencies = [
+
"bitflags 1.3.2",
+
"byteorder",
+
"hex",
+
"lazy_static",
+
"rustix 0.36.17",
+
]
+
+
[[package]]
+
name = "prometheus"
+
version = "0.13.3"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
+
dependencies = [
+
"cfg-if",
+
"fnv",
+
"lazy_static",
+
"libc",
+
"memchr",
+
"parking_lot",
+
"procfs",
+
"protobuf",
+
"thiserror",
+
]
+
+
[[package]]
+
name = "protobuf"
+
version = "2.28.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
+
+
[[package]]
name = "quinn"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
"ring 0.17.7",
"time",
"yasna",
+
]
+
+
[[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]]
···
[[package]]
name = "reqwest"
-
version = "0.11.23"
+
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
+
checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19"
dependencies = [
-
"base64 0.21.7",
+
"base64 0.22.0",
"bytes",
-
"encoding_rs",
"futures-core",
"futures-util",
-
"h2 0.3.24",
-
"http 0.2.11",
-
"http-body 0.4.6",
-
"hyper 0.14.28",
+
"http",
+
"http-body",
+
"http-body-util",
+
"hyper",
+
"hyper-util",
"ipnet",
"js-sys",
"log",
···
"serde",
"serde_json",
"serde_urlencoded",
-
"system-configuration",
+
"sync_wrapper 0.1.2",
"tokio",
"tower-service",
"url",
···
"futures",
"log",
"netlink-packet-core",
-
"netlink-packet-route",
+
"netlink-packet-route 0.19.0",
"netlink-packet-utils",
"netlink-proto",
"netlink-sys",
···
[[package]]
name = "rustix"
+
version = "0.36.17"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "305efbd14fde4139eb501df5f136994bb520b033fa9fbdce287507dc23b8c7ed"
+
dependencies = [
+
"bitflags 1.3.2",
+
"errno",
+
"io-lifetimes",
+
"libc",
+
"linux-raw-sys 0.1.4",
+
"windows-sys 0.45.0",
+
]
+
+
[[package]]
+
name = "rustix"
version = "0.38.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
···
"bitflags 2.4.2",
"errno",
"libc",
-
"linux-raw-sys",
+
"linux-raw-sys 0.4.13",
"windows-sys 0.52.0",
···
checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
[[package]]
+
name = "scopeguard"
+
version = "1.2.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+
[[package]]
name = "sct"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c"
dependencies = [
"itoa",
-
"serde",
-
]
-
-
[[package]]
-
name = "serde_spanned"
-
version = "0.6.5"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
-
dependencies = [
"serde",
···
[[package]]
name = "system-configuration"
-
version = "0.5.1"
+
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+
checksum = "658bc6ee10a9b4fcf576e9b0819d95ec16f4d2c02d39fd83ac1c8789785c4a42"
dependencies = [
-
"bitflags 1.3.2",
+
"bitflags 2.4.2",
"core-foundation",
"system-configuration-sys",
[[package]]
name = "system-configuration-sys"
-
version = "0.5.0"
+
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+
checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
dependencies = [
"core-foundation-sys",
"libc",
···
[[package]]
+
name = "tokio-openssl"
+
version = "0.6.4"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "6ffab79df67727f6acf57f1ff743091873c24c579b1e2ce4d8f53e47ded4d63d"
+
dependencies = [
+
"futures-util",
+
"openssl",
+
"openssl-sys",
+
"tokio",
+
]
+
+
[[package]]
name = "tokio-stream"
version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "tokio-tun"
-
version = "0.11.2"
+
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bf2efaf33e86779a3a68b1f1d6e9e13a346c1c75ee3cab7a4293235c463b2668"
+
checksum = "65d79912ba514490b1f5a574b585e19082bd2a6b238970c87c57a66bd77206b5"
dependencies = [
"libc",
-
"nix 0.27.1",
+
"nix 0.28.0",
"thiserror",
"tokio",
···
[[package]]
-
name = "toml"
-
version = "0.8.12"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
-
dependencies = [
-
"serde",
-
"serde_spanned",
-
"toml_datetime",
-
"toml_edit",
-
]
-
-
[[package]]
-
name = "toml_datetime"
-
version = "0.6.5"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
-
dependencies = [
-
"serde",
-
]
-
-
[[package]]
-
name = "toml_edit"
-
version = "0.22.8"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd"
-
dependencies = [
-
"indexmap",
-
"serde",
-
"serde_spanned",
-
"toml_datetime",
-
"winnow",
-
]
-
-
[[package]]
name = "tower"
version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
"tokio",
"tower-layer",
"tower-service",
+
"tracing",
[[package]]
···
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
dependencies = [
+
"log",
"pin-project-lite",
"tracing-attributes",
"tracing-core",
···
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
[[package]]
+
name = "vcpkg"
+
version = "0.2.15"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+
[[package]]
name = "version_check"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
dependencies = [
"windows-core 0.52.0",
-
"windows-targets 0.52.0",
+
"windows-targets 0.52.4",
+
]
+
+
[[package]]
+
name = "windows"
+
version = "0.54.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
+
dependencies = [
+
"windows-core 0.54.0",
+
"windows-targets 0.52.4",
[[package]]
···
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
-
"windows-targets 0.52.0",
+
"windows-targets 0.52.4",
+
]
+
+
[[package]]
+
name = "windows-core"
+
version = "0.54.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
+
dependencies = [
+
"windows-result",
+
"windows-targets 0.52.4",
+
]
+
+
[[package]]
+
name = "windows-result"
+
version = "0.1.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64"
+
dependencies = [
+
"windows-targets 0.52.4",
+
]
+
+
[[package]]
+
name = "windows-sys"
+
version = "0.45.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+
dependencies = [
+
"windows-targets 0.42.2",
[[package]]
···
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
-
"windows-targets 0.52.0",
+
"windows-targets 0.52.4",
+
]
+
+
[[package]]
+
name = "windows-targets"
+
version = "0.42.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+
dependencies = [
+
"windows_aarch64_gnullvm 0.42.2",
+
"windows_aarch64_msvc 0.42.2",
+
"windows_i686_gnu 0.42.2",
+
"windows_i686_msvc 0.42.2",
+
"windows_x86_64_gnu 0.42.2",
+
"windows_x86_64_gnullvm 0.42.2",
+
"windows_x86_64_msvc 0.42.2",
[[package]]
···
[[package]]
name = "windows-targets"
-
version = "0.52.0"
+
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+
checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
dependencies = [
-
"windows_aarch64_gnullvm 0.52.0",
-
"windows_aarch64_msvc 0.52.0",
-
"windows_i686_gnu 0.52.0",
-
"windows_i686_msvc 0.52.0",
-
"windows_x86_64_gnu 0.52.0",
-
"windows_x86_64_gnullvm 0.52.0",
-
"windows_x86_64_msvc 0.52.0",
+
"windows_aarch64_gnullvm 0.52.4",
+
"windows_aarch64_msvc 0.52.4",
+
"windows_i686_gnu 0.52.4",
+
"windows_i686_msvc 0.52.4",
+
"windows_x86_64_gnu 0.52.4",
+
"windows_x86_64_gnullvm 0.52.4",
+
"windows_x86_64_msvc 0.52.4",
[[package]]
name = "windows_aarch64_gnullvm"
+
version = "0.42.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+
[[package]]
+
name = "windows_aarch64_gnullvm"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
-
version = "0.52.0"
+
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+
+
[[package]]
+
name = "windows_aarch64_msvc"
+
version = "0.42.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_aarch64_msvc"
···
[[package]]
name = "windows_aarch64_msvc"
-
version = "0.52.0"
+
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+
+
[[package]]
+
name = "windows_i686_gnu"
+
version = "0.42.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_gnu"
···
[[package]]
name = "windows_i686_gnu"
-
version = "0.52.0"
+
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+
+
[[package]]
+
name = "windows_i686_msvc"
+
version = "0.42.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_i686_msvc"
···
[[package]]
name = "windows_i686_msvc"
-
version = "0.52.0"
+
version = "0.52.4"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+
+
[[package]]
+
name = "windows_x86_64_gnu"
+
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnu"
···
[[package]]
name = "windows_x86_64_gnu"
-
version = "0.52.0"
+
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+
+
[[package]]
+
name = "windows_x86_64_gnullvm"
+
version = "0.42.2"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_gnullvm"
···
[[package]]
name = "windows_x86_64_gnullvm"
-
version = "0.52.0"
+
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
[[package]]
name = "windows_x86_64_msvc"
-
version = "0.48.5"
+
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "windows_x86_64_msvc"
-
version = "0.52.0"
+
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
-
name = "winnow"
-
version = "0.6.5"
+
name = "windows_x86_64_msvc"
+
version = "0.52.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
-
dependencies = [
-
"memchr",
-
]
+
checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
[[package]]
name = "winreg"
-
version = "0.50.0"
+
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+
checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
dependencies = [
"cfg-if",
"windows-sys 0.48.0",
+9 -2
pkgs/by-name/my/mycelium/package.nix
···
, rustPlatform
, fetchFromGitHub
, stdenv
+
, openssl
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "mycelium";
-
version = "0.5.0";
+
version = "0.5.1";
src = fetchFromGitHub {
owner = "threefoldtech";
repo = "mycelium";
rev = "v${version}";
-
hash = "sha256-K82LHVXbSMIJQlQ/qUpdCBVlAEZWyMMG2eUt2FzNwRE=";
+
hash = "sha256-x3XqFKcOLwKhgF/DKo8Qp3QLyaE2hdCTjfLSE8K3ifQ=";
};
cargoLock = {
···
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];
+
+
env = {
+
OPENSSL_NO_VENDOR = 1;
+
OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib";
+
OPENSSL_DIR = "${lib.getDev openssl}";
+
};
meta = with lib; {
description = "End-2-end encrypted IPv6 overlay network";
+113 -112
pkgs/by-name/so/solana-cli/Cargo.lock
···
[[package]]
name = "gen-headers"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"log",
"regex",
···
[[package]]
name = "gen-syscall-list"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"regex",
···
[[package]]
name = "h2"
-
version = "0.3.24"
+
version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+
checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
dependencies = [
"bytes",
"fnv",
···
[[package]]
name = "proto"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"protobuf-src",
"tonic-build",
···
[[package]]
name = "rbpf-cli"
-
version = "1.17.28"
+
version = "1.17.31"
[[package]]
name = "rcgen"
···
[[package]]
name = "smallvec"
-
version = "1.11.1"
+
version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "smpl_jwt"
···
[[package]]
name = "solana-account-decoder"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"Inflector",
"assert_matches",
···
[[package]]
name = "solana-accounts-bench"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"clap 2.33.3",
"log",
···
[[package]]
name = "solana-accounts-cluster-bench"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"clap 2.33.3",
"log",
···
[[package]]
name = "solana-accounts-db"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"arrayref",
"assert_matches",
···
[[package]]
name = "solana-address-lookup-table-program"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bincode",
"bytemuck",
···
[[package]]
name = "solana-address-lookup-table-program-tests"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"bincode",
···
[[package]]
name = "solana-banking-bench"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"clap 3.2.23",
"crossbeam-channel",
···
[[package]]
name = "solana-banks-client"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"borsh 0.10.3",
"futures 0.3.28",
···
[[package]]
name = "solana-banks-interface"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"serde",
"solana-sdk",
···
[[package]]
name = "solana-banks-server"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bincode",
"crossbeam-channel",
···
[[package]]
name = "solana-bench-streamer"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"clap 3.2.23",
"crossbeam-channel",
···
[[package]]
name = "solana-bench-tps"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"clap 2.33.3",
"crossbeam-channel",
···
[[package]]
name = "solana-bloom"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bv",
"fnv",
···
[[package]]
name = "solana-bpf-loader-program"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"bincode",
···
[[package]]
name = "solana-bpf-loader-program-tests"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"bincode",
···
[[package]]
name = "solana-bucket-map"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bv",
"bytemuck",
···
[[package]]
name = "solana-cargo-build-bpf"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"log",
"solana-logger",
···
[[package]]
name = "solana-cargo-build-sbf"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_cmd",
"bzip2",
···
[[package]]
name = "solana-cargo-test-bpf"
-
version = "1.17.28"
+
version = "1.17.31"
[[package]]
name = "solana-cargo-test-sbf"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"cargo_metadata",
"clap 3.2.23",
···
[[package]]
name = "solana-clap-utils"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"chrono",
···
[[package]]
name = "solana-clap-v3-utils"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"chrono",
···
[[package]]
name = "solana-cli"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"bincode",
···
[[package]]
name = "solana-cli-config"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"anyhow",
"dirs-next",
···
[[package]]
name = "solana-cli-output"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"Inflector",
"base64 0.21.4",
···
[[package]]
name = "solana-client"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"async-trait",
"bincode",
···
[[package]]
name = "solana-client-test"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"futures-util",
"rand 0.8.5",
···
[[package]]
name = "solana-compute-budget-program"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"solana-program-runtime",
"solana-sdk",
···
[[package]]
name = "solana-config-program"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bincode",
"chrono",
···
[[package]]
name = "solana-connection-cache"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"async-trait",
"bincode",
···
[[package]]
name = "solana-core"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"base64 0.21.4",
···
[[package]]
name = "solana-cost-model"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"lazy_static",
"log",
···
[[package]]
name = "solana-dos"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bincode",
"clap 3.2.23",
···
[[package]]
name = "solana-download-utils"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"console",
"indicatif",
···
[[package]]
name = "solana-ed25519-program-tests"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"ed25519-dalek",
···
[[package]]
name = "solana-entry"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"bincode",
···
[[package]]
name = "solana-faucet"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bincode",
"byteorder",
···
[[package]]
name = "solana-frozen-abi"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"ahash 0.8.5",
"bitflags 2.3.3",
···
[[package]]
name = "solana-frozen-abi-macro"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"proc-macro2",
"quote",
···
[[package]]
name = "solana-genesis"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"base64 0.21.4",
"bincode",
···
[[package]]
name = "solana-genesis-utils"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"log",
"solana-accounts-db",
···
[[package]]
name = "solana-geyser-plugin-interface"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"log",
"solana-sdk",
···
[[package]]
name = "solana-geyser-plugin-manager"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bs58",
"crossbeam-channel",
···
[[package]]
name = "solana-gossip"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"bincode",
···
[[package]]
name = "solana-install"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"atty",
"bincode",
···
[[package]]
name = "solana-keygen"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bs58",
"clap 3.2.23",
···
[[package]]
name = "solana-ledger"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"bincode",
···
[[package]]
name = "solana-ledger-tool"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_cmd",
"bs58",
···
[[package]]
name = "solana-loader-v4-program"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bincode",
"log",
···
[[package]]
name = "solana-local-cluster"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"crossbeam-channel",
···
[[package]]
name = "solana-log-analyzer"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"byte-unit",
"clap 3.2.23",
···
[[package]]
name = "solana-logger"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"env_logger",
"lazy_static",
···
[[package]]
name = "solana-measure"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"log",
"solana-sdk",
···
[[package]]
name = "solana-memory-management"
-
version = "1.17.28"
+
version = "1.17.31"
[[package]]
name = "solana-merkle-root-bench"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"clap 2.33.3",
"log",
···
[[package]]
name = "solana-merkle-tree"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"fast-math",
"hex",
···
[[package]]
name = "solana-metrics"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"crossbeam-channel",
"env_logger",
···
[[package]]
name = "solana-net-shaper"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"clap 3.2.23",
"rand 0.8.5",
···
[[package]]
name = "solana-net-utils"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bincode",
"clap 3.2.23",
···
[[package]]
name = "solana-notifier"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"log",
"reqwest",
···
[[package]]
name = "solana-perf"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"ahash 0.8.5",
"assert_matches",
···
[[package]]
name = "solana-poh"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"bincode",
···
[[package]]
name = "solana-poh-bench"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"clap 3.2.23",
"log",
···
[[package]]
name = "solana-program"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"anyhow",
"ark-bn254",
···
[[package]]
name = "solana-program-runtime"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"base64 0.21.4",
···
[[package]]
name = "solana-program-test"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"async-trait",
···
[[package]]
name = "solana-pubsub-client"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"anyhow",
"crossbeam-channel",
···
[[package]]
name = "solana-quic-client"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"async-mutex",
"async-trait",
···
[[package]]
name = "solana-rayon-threadlimit"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"lazy_static",
"num_cpus",
···
[[package]]
name = "solana-remote-wallet"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"console",
···
[[package]]
name = "solana-rpc"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"base64 0.21.4",
"bincode",
···
[[package]]
name = "solana-rpc-client"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"async-trait",
···
[[package]]
name = "solana-rpc-client-api"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"base64 0.21.4",
"bs58",
···
[[package]]
name = "solana-rpc-client-nonce-utils"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"anyhow",
"clap 2.33.3",
···
[[package]]
name = "solana-rpc-test"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bincode",
"bs58",
···
[[package]]
name = "solana-runtime"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"arrayref",
"assert_matches",
···
[[package]]
name = "solana-sdk"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"anyhow",
"assert_matches",
···
[[package]]
name = "solana-sdk-macro"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bs58",
"proc-macro2",
···
[[package]]
name = "solana-send-transaction-service"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"crossbeam-channel",
"log",
···
[[package]]
name = "solana-stake-accounts"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"clap 2.33.3",
"solana-clap-utils",
···
[[package]]
name = "solana-stake-program"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"bincode",
···
[[package]]
name = "solana-storage-bigtable"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"backoff",
"bincode",
···
[[package]]
name = "solana-storage-proto"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bincode",
"bs58",
···
[[package]]
name = "solana-store-tool"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"clap 2.33.3",
"log",
···
[[package]]
name = "solana-streamer"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"async-channel",
···
"rand 0.8.5",
"rcgen",
"rustls",
+
"smallvec",
"solana-logger",
"solana-metrics",
"solana-perf",
···
[[package]]
name = "solana-system-program"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"bincode",
···
[[package]]
name = "solana-test-validator"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"base64 0.21.4",
"bincode",
···
[[package]]
name = "solana-thin-client"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bincode",
"log",
···
[[package]]
name = "solana-tokens"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"bincode",
···
[[package]]
name = "solana-tpu-client"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"async-trait",
"bincode",
···
[[package]]
name = "solana-transaction-dos"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bincode",
"clap 2.33.3",
···
[[package]]
name = "solana-transaction-status"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"Inflector",
"base64 0.21.4",
···
[[package]]
name = "solana-turbine"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"bincode",
···
[[package]]
name = "solana-udp-client"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"async-trait",
"solana-connection-cache",
···
[[package]]
name = "solana-upload-perf"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"serde_json",
"solana-metrics",
···
[[package]]
name = "solana-validator"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"chrono",
"clap 2.33.3",
···
[[package]]
name = "solana-version"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"log",
"rustc_version 0.4.0",
···
[[package]]
name = "solana-vote"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bincode",
"crossbeam-channel",
···
[[package]]
name = "solana-vote-program"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"assert_matches",
"bincode",
···
[[package]]
name = "solana-watchtower"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"clap 2.33.3",
"humantime",
···
[[package]]
name = "solana-zk-keygen"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bs58",
"clap 3.2.23",
···
[[package]]
name = "solana-zk-token-proof-program"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bytemuck",
"criterion",
···
[[package]]
name = "solana-zk-token-proof-program-tests"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"bytemuck",
"curve25519-dalek",
···
[[package]]
name = "solana-zk-token-sdk"
-
version = "1.17.28"
+
version = "1.17.31"
dependencies = [
"aes-gcm-siv",
"base64 0.21.4",
+2 -2
pkgs/by-name/so/solana-cli/package.nix
···
]
}:
let
-
version = "1.17.28";
-
sha256 = "y79zsUfYsX377ofsFSg9a2il99uJsA+qdCu3J+EU5nQ=";
+
version = "1.17.31";
+
sha256 = "sha256-5qPW199o+CVJlqGwiAegsquBRWEb5uDKITxjN5dQYAQ=";
inherit (darwin.apple_sdk_11_0) Libsystem;
inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security;
+20 -20
pkgs/by-name/ve/vencord/package-lock.json
···
{
"name": "vencord",
-
"version": "1.7.4",
+
"version": "1.7.8",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "vencord",
-
"version": "1.7.4",
+
"version": "1.7.8",
"license": "GPL-3.0-or-later",
"dependencies": {
"@sapphi-red/web-noise-suppressor": "0.3.3",
···
}
},
"node_modules/@csstools/selector-specificity": {
-
"version": "3.0.2",
-
"resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.2.tgz",
-
"integrity": "sha512-RpHaZ1h9LE7aALeQXmXrJkRG84ZxIsctEN2biEUmFyKpzFM3zZ35eUMcIzZFsw/2olQE6v69+esEqU2f1MKycg==",
+
"version": "3.0.3",
+
"resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.3.tgz",
+
"integrity": "sha512-KEPNw4+WW5AVEIyzC80rTbWEUatTW2lXpN8+8ILC8PiPeWPjwUzrPZDIOZ2wwqDmeqOYTdSGyL3+vE5GC3FB3Q==",
"dev": true,
"funding": [
{
···
}
},
"node_modules/@humanwhocodes/object-schema": {
-
"version": "2.0.2",
-
"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
-
"integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
+
"version": "2.0.3",
+
"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+
"integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
"dev": true
},
"node_modules/@nodelib/fs.scandir": {
···
"dev": true
},
"node_modules/@types/node": {
-
"version": "18.19.28",
-
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.28.tgz",
-
"integrity": "sha512-J5cOGD9n4x3YGgVuaND6khm5x07MMdAKkRyXnjVR6KFhLMNh2yONGiP7Z+4+tBOt5mK+GvDTiacTOVGGpqiecw==",
+
"version": "18.19.31",
+
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz",
+
"integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==",
"dev": true,
"dependencies": {
"undici-types": "~5.26.4"
···
"dev": true
},
"node_modules/@types/react": {
-
"version": "18.2.73",
-
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.73.tgz",
-
"integrity": "sha512-XcGdod0Jjv84HOC7N5ziY3x+qL0AfmubvKOZ9hJjJ2yd5EE+KYjWhdOjt387e9HPheHkdggF9atTifMRtyAaRA==",
+
"version": "18.2.79",
+
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.79.tgz",
+
"integrity": "sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w==",
"dev": true,
"dependencies": {
"@types/prop-types": "*",
···
}
},
"node_modules/@types/react-dom": {
-
"version": "18.2.23",
-
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.23.tgz",
-
"integrity": "sha512-ZQ71wgGOTmDYpnav2knkjr3qXdAFu0vsk8Ci5w3pGAIdj7/kKAyn+VsQDhXsmzzzepAiI9leWMmubXz690AI/A==",
+
"version": "18.2.25",
+
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.25.tgz",
+
"integrity": "sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA==",
"dev": true,
"dependencies": {
"@types/react": "*"
···
},
"node_modules/typescript": {
-
"version": "5.4.3",
-
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz",
-
"integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==",
+
"version": "5.4.5",
+
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+
"integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
"dev": true,
"bin": {
"tsc": "bin/tsc",
+4 -4
pkgs/by-name/ve/vencord/package.nix
···
, buildWebExtension ? false
}:
let
-
version = "1.7.4";
-
gitHash = "bdef47e";
+
version = "1.7.8";
+
gitHash = "97ce410";
in
buildNpmPackage rec {
pname = "vencord";
···
owner = "Vendicated";
repo = "Vencord";
rev = "v${version}";
-
hash = "sha256-Ub8VzeTkka0oq0CYN/UHjOIH2y3F7Oy9QZpTi6glehI=";
+
hash = "sha256-5kMBUdFupVxmlQ7NVJ7qzFoyQieDGHrFNkrzhlhEzJ0=";
};
ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: {
···
npmRebuildFlags = [ "|| true" ];
makeCacheWritable = true;
-
npmDepsHash = "sha256-/iUNvTk51aoh0TmDXgFG425I37xFuIddkrceF0pNBcE=";
+
npmDepsHash = "sha256-LdLPNM2yCUXh0PxAbzI2YNF6QoX1iG2TixMh6XdVuX0=";
npmFlags = [ "--legacy-peer-deps" ];
npmBuildScript = if buildWebExtension then "buildWeb" else "build";
npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];
+2 -2
pkgs/by-name/ve/vencord/update.sh
···
update-source-version vencord "${latestTag#v}"
-
sed -E 's#\bgitHash = ".*?"#gitHash = "'"${gitHash:0:7}"'"#' -i "$pkgDir/default.nix"
-
sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i "$pkgDir/default.nix"
+
sed -E 's#\bgitHash = ".*?"#gitHash = "'"${gitHash:0:7}"'"#' -i "$pkgDir/package.nix"
+
sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i "$pkgDir/package.nix"
cp "$tempDir/package-lock.json" "$pkgDir/package-lock.json"
+1 -1
pkgs/desktops/deepin/apps/deepin-terminal/default.nix
···
qttools
pkg-config
wrapQtAppsHook
-
lxqt.lxqt-build-tools
+
lxqt.lxqt-build-tools_0_13
];
buildInputs = [
+1 -1
pkgs/desktops/deepin/library/qt5integration/default.nix
···
qtsvg
qtx11extras
mtdev
-
lxqt.libqtxdg
+
lxqt.libqtxdg_3_12
xorg.xcbutilrenderutil
gtest
];
+1 -1
pkgs/desktops/gnome/extensions/buildGnomeExtension.nix
···
longDescription = description;
homepage = link;
license = lib.licenses.gpl2Plus; # https://wiki.gnome.org/Projects/GnomeShell/Extensions/Review#Licensing
-
maintainers = with lib.maintainers; [ piegames ];
+
maintainers = with lib.maintainers; [ ];
};
passthru = {
extensionPortalSlug = pname;
+12 -9
pkgs/desktops/lxqt/compton-conf/default.nix
···
-
{ stdenv
-
, lib
-
, mkDerivation
+
{ lib
+
, stdenv
, fetchFromGitHub
, cmake
+
, libconfig
+
, lxqt-build-tools
, pkg-config
, qtbase
, qttools
-
, lxqt
-
, libconfig
+
, qtx11extras
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "compton-conf";
version = "0.16.0";
···
nativeBuildInputs = [
cmake
+
lxqt-build-tools
pkg-config
-
lxqt.lxqt-build-tools
qttools
+
qtx11extras
+
wrapQtAppsHook
];
buildInputs = [
-
qtbase
libconfig
+
qtbase
];
preConfigure = ''
substituteInPlace autostart/CMakeLists.txt \
-
--replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
+
--replace-fail "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
'';
passthru.updateScript = gitUpdater { };
+47 -10
pkgs/desktops/lxqt/default.nix
···
-
{ pkgs, makeScope, libsForQt5, qt5 }:
+
{ pkgs, makeScope, kdePackages }:
+
let
packages = self: with self; {
···
libsysstat = callPackage ./libsysstat {};
liblxqt = callPackage ./liblxqt {};
qtxdg-tools = callPackage ./qtxdg-tools {};
+
libdbusmenu-lxqt = callPackage ./libdbusmenu-lxqt {};
### CORE 1
libfm-qt = callPackage ./libfm-qt {};
···
lxqt-sudo = callPackage ./lxqt-sudo {};
lxqt-themes = callPackage ./lxqt-themes {};
pavucontrol-qt = callPackage ./pavucontrol-qt {};
-
qtermwidget = callPackage ./qtermwidget {};
+
qtermwidget = callPackage ./qtermwidget {
+
lxqt-build-tools = lxqt-build-tools_0_13;
+
inherit (pkgs.libsForQt5) qtbase qttools;
+
};
### CORE 2
lxqt-panel = callPackage ./lxqt-panel {};
···
pcmanfm-qt = callPackage ./pcmanfm-qt {};
### OPTIONAL
-
qterminal = callPackage ./qterminal {};
-
compton-conf = callPackage ./compton-conf {};
+
qterminal = callPackage ./qterminal {
+
lxqt-build-tools = lxqt-build-tools_0_13;
+
inherit (pkgs.libsForQt5) qtbase qttools qtx11extras;
+
};
+
compton-conf = callPackage ./compton-conf {
+
lxqt-build-tools = lxqt-build-tools_0_13;
+
inherit (pkgs.libsForQt5) qtbase qttools qtx11extras;
+
};
obconf-qt = callPackage ./obconf-qt {};
lximage-qt = callPackage ./lximage-qt {};
qps = callPackage ./qps {};
screengrab = callPackage ./screengrab {};
-
qlipper = callPackage ./qlipper {};
+
qlipper = callPackage ./qlipper {
+
inherit (pkgs.libsForQt5) qtbase qttools;
+
};
lxqt-archiver = callPackage ./lxqt-archiver {};
xdg-desktop-portal-lxqt = callPackage ./xdg-desktop-portal-lxqt {};
+
### COMPATIBILITY
+
lxqt-build-tools_0_13 = callPackage ./lxqt-build-tools {
+
version = "0.13.0";
+
inherit (pkgs.libsForQt5) qtbase;
+
};
+
libqtxdg_3_12 = callPackage ./libqtxdg {
+
version = "3.12.0";
+
lxqt-build-tools = lxqt-build-tools_0_13;
+
inherit (pkgs.libsForQt5) qtbase qtsvg;
+
};
+
libfm-qt_1_4 = callPackage ./libfm-qt {
+
version = "1.4.0";
+
lxqt-build-tools = lxqt-build-tools_0_13;
+
inherit (pkgs.libsForQt5) qttools qtx11extras;
+
};
+
lxqt-qtplugin_1_4 = callPackage ./lxqt-qtplugin {
+
version = "1.4.1";
+
lxqt-build-tools = lxqt-build-tools_0_13;
+
libqtxdg = libqtxdg_3_12;
+
libfm-qt = libfm-qt_1_4;
+
inherit (pkgs.libsForQt5) qtbase qtsvg qttools libdbusmenu;
+
};
+
preRequisitePackages = [
-
libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
-
libsForQt5.libkscreen # provides plugins for screen management software
+
kdePackages.kwindowsystem # provides some QT plugins needed by lxqt-panel
+
kdePackages.libkscreen # provides plugins for screen management software
pkgs.libfm
pkgs.libfm-extra
pkgs.menu-cache
pkgs.openbox # default window manager
-
qt5.qtsvg # provides QT5 plugins for svg icons
+
kdePackages.qtsvg # provides QT plugins for svg icons
];
corePackages = [
···
libsysstat
liblxqt
qtxdg-tools
+
libdbusmenu-lxqt
### CORE 1
libfm-qt
···
screengrab
### Default icon theme
-
libsForQt5.breeze-icons
+
kdePackages.breeze-icons
### Screen saver
pkgs.xscreensaver
···
};
in
-
makeScope libsForQt5.newScope packages
+
makeScope kdePackages.newScope packages
+40
pkgs/desktops/lxqt/libdbusmenu-lxqt/default.nix
···
+
{ stdenv
+
, lib
+
, fetchFromGitHub
+
, cmake
+
, qtbase
+
, wrapQtAppsHook
+
, gitUpdater
+
}:
+
+
stdenv.mkDerivation rec {
+
pname = "libdbusmenu-lxqt";
+
version = "0.1.0";
+
+
src = fetchFromGitHub {
+
owner = "lxqt";
+
repo = pname;
+
rev = version;
+
hash = "sha256-fwYvU62NCmJ6HNrOqHPWKDas7LE1XF3squ0CBEFkNkk=";
+
};
+
+
nativeBuildInputs = [
+
cmake
+
wrapQtAppsHook
+
];
+
+
buildInputs = [
+
qtbase
+
];
+
+
passthru.updateScript = gitUpdater { };
+
+
meta = with lib; {
+
broken = stdenv.isDarwin;
+
description = "A Qt implementation of the DBusMenu protocol";
+
homepage = "https://github.com/lxqt/libdbusmenu-lxqt";
+
license = licenses.lgpl21Plus;
+
platforms = with platforms; unix;
+
maintainers = teams.lxqt.members;
+
};
+
}
+25 -17
pkgs/desktops/lxqt/libfm-qt/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
-
, pkg-config
+
, libXdmcp
+
, libexif
+
, libfm
+
, libpthreadstubs
+
, libxcb
, lxqt-build-tools
, lxqt-menu-data
+
, menu-cache
, pcre
-
, libexif
-
, xorg
-
, libfm
-
, menu-cache
-
, qtx11extras
+
, pkg-config
, qttools
+
, wrapQtAppsHook
, gitUpdater
+
, version ? "2.0.0"
+
, qtx11extras ? null
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "libfm-qt";
-
version = "1.4.0";
+
inherit version;
src = fetchFromGitHub {
owner = "lxqt";
repo = "libfm-qt";
rev = version;
-
hash = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
+
hash = {
+
"1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
+
"2.0.0" = "sha256-vWkuPdG5KaT6KMr1NJGt7JBUd1z3wROKY79otsrRsuI=";
+
}."${version}";
};
nativeBuildInputs = [
···
pkg-config
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
-
lxqt-menu-data
-
pcre
+
libXdmcp
libexif
-
xorg.libpthreadstubs
-
xorg.libxcb
-
xorg.libXdmcp
-
qtx11extras
libfm
+
libpthreadstubs
+
libxcb
+
lxqt-menu-data
menu-cache
-
];
+
pcre
+
] ++ (lib.optionals (lib.versionAtLeast "2.0.0" version) [qtx11extras])
+
;
passthru.updateScript = gitUpdater { };
+16 -16
pkgs/desktops/lxqt/liblxqt/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
+
, gitUpdater
+
, kwindowsystem
+
, libXScrnSaver
+
, libqtxdg
, lxqt-build-tools
-
, qtx11extras
-
, qttools
+
, polkit-qt-1
, qtsvg
-
, libqtxdg
-
, polkit-qt
-
, kwindowsystem
-
, xorg
-
, gitUpdater
+
, qttools
+
, wrapQtAppsHook
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "liblxqt";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-daD4okYc4J2nRrO6423W0IUK9173zcepCvvMtx7Vho4=";
+
hash = "sha256-ClAmREsPBb7i7T2aGgf0h3rk1ohUvWQvmSnrlprHzds=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
-
qtx11extras
-
qtsvg
-
polkit-qt
kwindowsystem
+
libXScrnSaver
libqtxdg
-
xorg.libXScrnSaver
+
polkit-qt-1
+
qtsvg
];
# convert name of wrapped binary, e.g. .lxqt-whatever-wrapped to the original name, e.g. lxqt-whatever so binaries can find their resources
···
postPatch = ''
# https://github.com/NixOS/nixpkgs/issues/119766
substituteInPlace lxqtbacklight/linux_backend/driver/libbacklight_backend.c \
-
--replace "pkexec lxqt-backlight_backend" "pkexec $out/bin/lxqt-backlight_backend"
+
--replace-fail "pkexec lxqt-backlight_backend" "pkexec $out/bin/lxqt-backlight_backend"
sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt
'';
+10 -4
pkgs/desktops/lxqt/libqtxdg/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
, qtbase
, qtsvg
, lxqt-build-tools
+
, wrapQtAppsHook
, gitUpdater
+
, version ? "4.0.0"
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "libqtxdg";
-
version = "3.12.0";
+
inherit version;
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
+
hash = {
+
"3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
+
"4.0.0" = "sha256-TTFgkAI3LulYGuqdhorkjNYyo942y1oFy5SRAKl9ZxU=";
+
}."${version}";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
+
wrapQtAppsHook
];
buildInputs = [
+5 -4
pkgs/desktops/lxqt/libsysstat/default.nix
···
{ stdenv
, lib
-
, mkDerivation
, fetchFromGitHub
, cmake
, qtbase
, lxqt-build-tools
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "libsysstat";
-
version = "0.4.6";
+
version = "1.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-dk3I+bkU2ztqIe33rTYneSUd8VFzrElTqVrjHQhAWXw=";
+
hash = "sha256-2rdhw67TPvy/QmyzbtStgiIuIgZ7ZSt07xjCvOywKF4=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
+
wrapQtAppsHook
];
buildInputs = [
+22 -19
pkgs/desktops/lxqt/lximage-qt/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
+
, libXdmcp
+
, libexif
+
, libfm-qt
+
, libpthreadstubs
+
, lxqt-build-tools
+
, menu-cache
, qtbase
+
, qtimageformats
+
, qtsvg
, qttools
-
, qtx11extras
-
, qtsvg
-
, qtimageformats
-
, xorg
-
, lxqt-build-tools
-
, libfm-qt
-
, libexif
-
, menu-cache
+
, qtwayland
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lximage-qt";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-Igfd8lhKDjdseQeARiirj+tEoJdcaeHuyd4mfQHOVg0=";
+
hash = "sha256-yjsdXVV/EOgpNI5kY12lNH9Wpru8A6eWxayslFdioiQ=";
};
nativeBuildInputs = [
···
pkg-config
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
-
qtbase
-
qtx11extras
-
qtsvg
-
qtimageformats # add-on module to support more image file formats
+
libXdmcp
+
libexif
libfm-qt
-
xorg.libpthreadstubs
-
xorg.libXdmcp
-
libexif
+
libpthreadstubs
menu-cache
+
qtbase
+
qtimageformats # add-on module to support more image file formats
+
qtsvg
+
qtwayland
];
passthru.updateScript = gitUpdater { };
+12 -10
pkgs/desktops/lxqt/lxqt-about/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
-
, lxqt-build-tools
-
, qtx11extras
-
, qttools
-
, qtsvg
, kwindowsystem
, liblxqt
, libqtxdg
+
, lxqt-build-tools
+
, qtsvg
+
, qttools
+
, qtwayland
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-about";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-FA9xvIi45qpD6iGxiiNKNlcLKzJtb0cWmvDBJRnJFwA=";
+
hash = "sha256-Y0OF4W0quQEet/QvntwGwFqaqJDDUchWYRh+OWZDS8w=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
-
qtx11extras
-
qtsvg
kwindowsystem
liblxqt
libqtxdg
+
qtsvg
+
qtwayland
];
passthru.updateScript = gitUpdater { };
+15 -13
pkgs/desktops/lxqt/lxqt-admin/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
-
, lxqt-build-tools
-
, qtx11extras
-
, qttools
-
, qtsvg
, kwindowsystem
, liblxqt
, libqtxdg
-
, polkit-qt
+
, lxqt-build-tools
+
, polkit-qt-1
+
, qtsvg
+
, qttools
+
, qtwayland
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-admin";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-wPK3TMBC359GnisjpdY2zU+Jnvr7Hdzb6r+HuUQC3mo=";
+
hash = "sha256-Ps+XiCA6OmnsYj0D+pxpvRxfIZfRGFBbZ0t/IPZjlv8=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
-
qtx11extras
-
qtsvg
kwindowsystem
liblxqt
libqtxdg
-
polkit-qt
+
polkit-qt-1
+
qtsvg
+
qtwayland
];
postPatch = ''
for f in lxqt-admin-{time,user}/CMakeLists.txt; do
-
substituteInPlace $f --replace \
+
substituteInPlace $f --replace-fail \
"\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" \
"$out/share/polkit-1/actions"
done
+8 -6
pkgs/desktops/lxqt/lxqt-archiver/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
···
, menu-cache
, qtbase
, qttools
-
, qtx11extras
+
, qtwayland
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-archiver";
-
version = "0.9.0";
+
version = "1.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = "lxqt-archiver";
rev = version;
-
hash = "sha256-8pfUpyjn01D8CL+2PjGkZqyHu+lpHZIXlXn67rZoxMY=";
+
hash = "sha256-32Wq0Faphu0uSG0RdOqrDD/igrNaP6l1mtuV+HcsdcQ=";
};
nativeBuildInputs = [
···
pkg-config
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
···
libfm-qt
menu-cache
qtbase
-
qtx11extras
+
qtwayland
];
hardeningDisable = [ "format" ];
+12 -12
pkgs/desktops/lxqt/lxqt-build-tools/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
···
, qtbase
, glib
, perl
+
, wrapQtAppsHook
, gitUpdater
+
, version ? "2.0.0"
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-build-tools";
-
version = "0.13.0";
+
inherit version;
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
+
hash = {
+
"0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
+
"2.0.0" = "sha256-ZFvnIumP03Mp+4OHPe1yMVsSYhMmYUY1idJGCAy5IhA=";
+
}."${version}";
};
postPatch = ''
# Nix clang on darwin identifies as 'Clang', not 'AppleClang'
# Without this, dependants fail to link.
substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \
-
--replace AppleClang Clang
-
-
# GLib 2.72 moved the file from gio-unix-2.0 to gio-2.0.
-
# https://github.com/lxqt/lxqt-build-tools/pull/74
-
substituteInPlace cmake/find-modules/FindGLIB.cmake \
-
--replace gio/gunixconnection.h gio/gunixfdlist.h
+
--replace-fail AppleClang Clang
'';
nativeBuildInputs = [
cmake
pkg-config
setupHook
+
wrapQtAppsHook
];
buildInputs = [
···
# We're dependent on this macro doing add_definitions in most places
# But we have the setup-hook to set the values.
postInstall = ''
-
rm $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake
-
cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake
+
cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt${lib.optionalString (lib.versionAtLeast version "2.0.0") "2"}-build-tools/modules/LXQtConfigVars.cmake
'';
passthru.updateScript = gitUpdater { };
+31 -24
pkgs/desktops/lxqt/lxqt-config/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
-
, pkg-config
, glib
-
, lxqt-build-tools
-
, lxqt-menu-data
-
, qtbase
-
, qtx11extras
-
, qttools
-
, qtsvg
, kwindowsystem
+
, libXScrnSaver
+
, libXcursor
+
, libXdmcp
, libkscreen
, liblxqt
+
, libpthreadstubs
, libqtxdg
+
, libxcb
+
, lxqt-build-tools
+
, lxqt-menu-data
+
, pkg-config
+
, qtbase
+
, qtsvg
+
, qttools
+
, qtwayland
+
, wrapQtAppsHook
+
, xf86inputlibinput
, xkeyboard_config
-
, xorg
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-config";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-ypHjUYRtrWx1Cp9KGSqsWpRHg7zoV0YDW6P4amJKapI=";
+
hash = "sha256-lFZTu6MqqWTjytYC7In/YJ38PYksZXduHvA/FRY4v0U=";
};
nativeBuildInputs = [
···
pkg-config
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
glib.bin
-
qtbase
-
qtx11extras
-
qtsvg
kwindowsystem
+
libXScrnSaver
+
libXcursor
+
libXdmcp
libkscreen
liblxqt
+
libpthreadstubs
libqtxdg
+
libxcb
lxqt-menu-data
-
xorg.libpthreadstubs
-
xorg.libXdmcp
-
xorg.libXScrnSaver
-
xorg.libxcb
-
xorg.libXcursor
-
xorg.xf86inputlibinput
-
xorg.xf86inputlibinput.dev
+
qtbase
+
qtsvg
+
qtwayland
+
xf86inputlibinput
+
xf86inputlibinput.dev
];
postPatch = ''
substituteInPlace lxqt-config-appearance/configothertoolkits.cpp \
-
--replace 'QStringLiteral("gsettings' \
+
--replace-fail 'QStringLiteral("gsettings' \
'QStringLiteral("${glib.bin}/bin/gsettings'
substituteInPlace lxqt-config-input/keyboardlayoutconfig.h \
-
--replace '/usr/share/X11/xkb/rules/base.lst' \
+
--replace-fail '/usr/share/X11/xkb/rules/base.lst' \
'${xkeyboard_config}/share/X11/xkb/rules/base.lst'
'';
+6 -6
pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
, qtbase
, qttools
-
, qtx11extras
, qtsvg
, kwindowsystem
, liblxqt
, libqtxdg
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-globalkeys";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-2S61d7BSuDPU1dNXLENpmpt6BB+CAeCtBVQS+ZGxrtU=";
+
hash = "sha256-24alERAnzlU/ZwIlRy9B+58zjRnF9eXunWeEO/lDVxM=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
qtbase
-
qtx11extras
qtsvg
kwindowsystem
liblxqt
+6 -4
pkgs/desktops/lxqt/lxqt-menu-data/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
, qttools
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-menu-data";
-
version = "1.4.1";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-I9jb2e57ZBvND27F5C1zMaoFtij5TetmN9zbJSjxiS4=";
+
hash = "sha256-CNY23xdFiDQKKJf9GccwDOuBWXwfc7WNI7vMv/zOM9U=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
passthru.updateScript = gitUpdater { };
+16 -12
pkgs/desktops/lxqt/lxqt-notificationd/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
-
, lxqt-build-tools
-
, qtbase
-
, qttools
-
, qtsvg
, kwindowsystem
+
, layer-shell-qt
, liblxqt
, libqtxdg
-
, qtx11extras
+
, lxqt-build-tools
+
, qtbase
+
, qtsvg
+
, qttools
+
, qtwayland
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-notificationd";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-Y3+ShGb1DKJw4zv3SCwEq2unJesI1q5OaTlSO8fP76A=";
+
hash = "sha256-zEoTjDD65bBJBbvAZVtov8HyiN1G6CqYkmcPH4T8Jhc=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
-
qtbase
-
qtsvg
kwindowsystem
+
layer-shell-qt
liblxqt
libqtxdg
-
qtx11extras
+
qtbase
+
qtsvg
+
qtwayland
];
passthru.updateScript = gitUpdater { };
+14 -12
pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
+
, kwindowsystem
+
, liblxqt
+
, libqtxdg
, lxqt-build-tools
, qtbase
+
, qtsvg
, qttools
-
, qtsvg
-
, qtx11extras
-
, kwindowsystem
-
, liblxqt
-
, libqtxdg
+
, qtwayland
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-openssh-askpass";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-o/hJdaGtjcJiwjqfvfwfcOUv4YdAeeW+rCxsmZZdJQ0=";
+
hash = "sha256-YDGKp8Fd6lEFSRWGAFUG7SUUFq7gEpJnKlr+ZFsBCRU=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
-
qtbase
-
qtx11extras
-
qtsvg
kwindowsystem
liblxqt
libqtxdg
+
qtbase
+
qtsvg
+
qtwayland
];
passthru.updateScript = gitUpdater { };
+19 -11
pkgs/desktops/lxqt/lxqt-panel/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, alsa-lib
+
, libdbusmenu-lxqt
, kguiaddons
, kwindowsystem
+
, layer-shell-qt
, libXdamage
+
, libXdmcp
+
, libXtst
, libdbusmenu
, liblxqt
+
, libpthreadstubs
, libpulseaudio
, libqtxdg
, libstatgrab
···
, lxqt-build-tools
, lxqt-globalkeys
, lxqt-menu-data
-
, gitUpdater
, menu-cache
, pcre
, qtbase
, qtsvg
, qttools
-
, qtx11extras
+
, qtwayland
, solid
-
, xorg
+
, wrapQtAppsHook
+
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-panel";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-LQq1XOA0dGXXORVr2H/gI+axvCAd4P3nB4zCFYWgagc=";
+
hash = "sha256-2I7I3AiLptKbBXiTPbbpcj16zuIx0e9SQnvbalpoFvM=";
};
nativeBuildInputs = [
···
pkg-config
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
alsa-lib
+
libdbusmenu-lxqt
kguiaddons
kwindowsystem
+
layer-shell-qt
libXdamage
+
libXdmcp
+
libXtst
libdbusmenu
liblxqt
+
libpthreadstubs
libpulseaudio
libqtxdg
libstatgrab
···
pcre
qtbase
qtsvg
-
qtx11extras
+
qtwayland
solid
-
xorg.libXdmcp
-
xorg.libXtst
-
xorg.libpthreadstubs
];
passthru.updateScript = gitUpdater { };
+19 -17
pkgs/desktops/lxqt/lxqt-policykit/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
-
, pkg-config
-
, lxqt-build-tools
-
, qtbase
-
, qttools
-
, qtx11extras
-
, qtsvg
-
, polkit
-
, polkit-qt
, kwindowsystem
, liblxqt
, libqtxdg
+
, lxqt-build-tools
, pcre
+
, pkg-config
+
, polkit
+
, polkit-qt-1
+
, qtbase
+
, qtsvg
+
, qttools
+
, qtwayland
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-policykit";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-w0o76oBFNy3syQqyFZdAbFUu8yX+uA6cMOHf3WfKPEU=";
+
hash = "sha256-oYKvQBilpD2RLhN1K6qgRNNAfohCOqmBrKcWy1fXZT8=";
};
nativeBuildInputs = [
···
pkg-config
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
-
qtbase
-
qtx11extras
-
qtsvg
-
polkit
-
polkit-qt
kwindowsystem
liblxqt
libqtxdg
pcre
+
polkit
+
polkit-qt-1
+
qtbase
+
qtsvg
+
qtwayland
];
passthru.updateScript = gitUpdater { };
+18 -16
pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
+
, kidletime
+
, kwindowsystem
+
, liblxqt
+
, libqtxdg
, lxqt-build-tools
+
, lxqt-globalkeys
, qtbase
+
, qtsvg
, qttools
-
, qtx11extras
-
, qtsvg
-
, kwindowsystem
+
, qtwayland
, solid
-
, kidletime
-
, liblxqt
-
, libqtxdg
-
, lxqt-globalkeys
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-powermanagement";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-1koP+ElW5e85TJqToaErnGkTn3uRHk45bDDrXG6Oy68=";
+
hash = "sha256-wtqVUXYQWIPhvHj7Ig9qR6sglCRQzcxG192DM3xq/mA=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
-
qtbase
-
qtx11extras
-
qtsvg
+
kidletime
kwindowsystem
-
solid
-
kidletime
liblxqt
libqtxdg
lxqt-globalkeys
+
qtbase
+
qtsvg
+
qtwayland
+
solid
];
passthru.updateScript = gitUpdater { };
+14 -9
pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
-
, libdbusmenu
+
, libdbusmenu-lxqt
+
, libdbusmenu ? null
, libfm-qt
, libqtxdg
, lxqt-build-tools
···
, qtbase
, qtsvg
, qttools
-
, qtx11extras
+
, wrapQtAppsHook
+
, version ? "2.0.0"
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-qtplugin";
-
version = "1.4.0";
+
inherit version;
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-0shNkM1AGAjzMQDGLOIP2DFx6goJGoD0U0Gr+rRRFrk=";
+
hash = {
+
"1.4.1" = "sha256-sp/LvQNfodMYQ4kNbBv4PTNfs38XjYLezuxRltZd4kc=";
+
"2.0.0" = "sha256-o5iD4VzsbN81lwDZJuFj8Ugg1RP752M4unu3J5/h8g8=";
+
}."${version}";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
-
libdbusmenu
+
(if lib.versionAtLeast version "2.0.0" then libdbusmenu-lxqt else libdbusmenu)
libfm-qt
libqtxdg
qtbase
qtsvg
-
qtx11extras
];
postPatch = ''
substituteInPlace src/CMakeLists.txt \
-
--replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix"
+
--replace-fail "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix"
'';
passthru.updateScript = gitUpdater { };
+17 -13
pkgs/desktops/lxqt/lxqt-runner/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
-
, pkg-config
-
, lxqt-build-tools
-
, qtbase
-
, qttools
-
, qtsvg
, kwindowsystem
+
, layer-shell-qt
, liblxqt
, libqtxdg
+
, lxqt-build-tools
, lxqt-globalkeys
-
, qtx11extras
, menu-cache
, muparser
, pcre
+
, pkg-config
+
, qtbase
+
, qtsvg
+
, qttools
+
, qtwayland
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-runner";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-NGytLQ2D5t1UdMGZoeHxHaXPwbRFDx+11ocjImXqZBU=";
+
hash = "sha256-r9rz6rJX60+1/+Wd5APobyZRioXzD1xveFIMToTvpXQ=";
};
nativeBuildInputs = [
···
pkg-config
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
-
qtbase
-
qtsvg
-
qtx11extras
kwindowsystem
+
layer-shell-qt
liblxqt
libqtxdg
lxqt-globalkeys
menu-cache
muparser
pcre
+
qtbase
+
qtsvg
+
qtwayland
];
passthru.updateScript = gitUpdater { };
+23 -18
pkgs/desktops/lxqt/lxqt-session/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
+
, kwindowsystem
+
, layer-shell-qt
+
, libXdmcp
+
, liblxqt
+
, libpthreadstubs
+
, libqtxdg
+
, lxqt-build-tools
, pkg-config
-
, lxqt-build-tools
+
, procps
, qtbase
-
, qttools
, qtsvg
-
, qtx11extras
-
, kwindowsystem
-
, liblxqt
-
, libqtxdg
+
, qttools
+
, qtwayland
, qtxdg-tools
-
, procps
-
, xorg
+
, wrapQtAppsHook
, xdg-user-dirs
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-session";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-kVDPJPYBwK7aXCIWGClwfM9J3067U8lPVWt0jFfqooY=";
+
hash = "sha256-IgpGtIVTcSs0O3jEniIuyIAyKBSkwN/jpGL6yZg3AVo=";
};
nativeBuildInputs = [
···
pkg-config
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
-
qtbase
-
qtsvg
-
qtx11extras
kwindowsystem
+
layer-shell-qt
+
libXdmcp
liblxqt
+
libpthreadstubs
libqtxdg
-
qtxdg-tools
procps
-
xorg.libpthreadstubs
-
xorg.libXdmcp
+
qtbase
+
qtsvg
+
qtwayland
+
qtxdg-tools
xdg-user-dirs
];
+14 -12
pkgs/desktops/lxqt/lxqt-sudo/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
+
, kwindowsystem
+
, liblxqt
+
, libqtxdg
, lxqt-build-tools
, qtbase
+
, qtsvg
, qttools
-
, qtx11extras
-
, qtsvg
-
, kwindowsystem
-
, liblxqt
-
, libqtxdg
+
, qtwayland
, sudo
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-sudo";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-J7jiap3qZD+P0kGzt+b3wa16pxbS2fr3OmalhV5O9ro=";
+
hash = "sha256-kDcOHqHuAyHTQ7ccsCelPOBieXdRLloEvSMjq9PIa30=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
-
qtbase
-
qtx11extras
-
qtsvg
kwindowsystem
liblxqt
libqtxdg
+
qtbase
+
qtsvg
+
qtwayland
sudo
];
+4 -4
pkgs/desktops/lxqt/lxqt-themes/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "lxqt-themes";
-
version = "1.3.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-bmkvg62lNFRhSerKFSo2POP8MWa1ZrdSi2E9nWDQSRQ=";
+
hash = "sha256-bAdwC1YrXCT4eJUafTK6kcfQ/YnMbBLHyyWvsBLIisA=";
};
nativeBuildInputs = [
+25 -12
pkgs/desktops/lxqt/obconf-qt/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
+
, fetchpatch
, cmake
-
, pkg-config
+
, libSM
+
, libXdmcp
+
, libpthreadstubs
+
, lxqt-build-tools
+
, openbox
, pcre
+
, pkg-config
, qtbase
, qttools
-
, qtx11extras
-
, xorg
-
, lxqt-build-tools
-
, openbox
+
, qtwayland
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "obconf-qt";
version = "0.16.4";
···
pkg-config
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
+
libSM
+
libXdmcp
+
libpthreadstubs
+
openbox
pcre
qtbase
-
qtx11extras
-
xorg.libpthreadstubs
-
xorg.libXdmcp
-
xorg.libSM
-
openbox
+
qtwayland
+
];
+
+
patches = [
+
(fetchpatch {
+
name = "obconf-qt.port-to-qt6";
+
url = "https://patch-diff.githubusercontent.com/raw/lxqt/obconf-qt/pull/230.patch";
+
hash = "sha256-XLt8+/4oMXeli07qTAGc73U9RD1fGYqxTX0QdhuXpII=";
+
})
];
passthru.updateScript = gitUpdater { };
+11 -7
pkgs/desktops/lxqt/pavucontrol-qt/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
-
, pkg-config
+
, libpulseaudio
, lxqt-build-tools
-
, libpulseaudio
+
, pkg-config
, qtbase
, qttools
+
, qtwayland
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "pavucontrol-qt";
-
version = "1.4.0";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-eNhoqY1pak96x0xCypvgHmgCYjw4CYH8ABtWjIZrD3w=";
+
hash = "sha256-dhFVVqJIX40oiHCcnG1166RsllXtfaO7MqM6ZNizjQQ=";
};
nativeBuildInputs = [
···
pkg-config
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
-
qtbase
libpulseaudio
+
qtbase
+
qtwayland
];
passthru.updateScript = gitUpdater { };
+17 -13
pkgs/desktops/lxqt/pcmanfm-qt/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
-
, pkg-config
+
, layer-shell-qt
, libexif
+
, libfm-qt
, lxqt-build-tools
, lxqt-menu-data
+
, menu-cache
+
, pkg-config
, qtbase
+
, qtimageformats
, qttools
-
, qtx11extras
-
, qtimageformats
-
, libfm-qt
-
, menu-cache
+
, qtwayland
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "pcmanfm-qt";
-
version = "1.4.1";
+
version = "2.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-Z3OivGlUZQVoeMWn8ZBvhajH5hrvVMIsjGKcrx5FkEE=";
+
hash = "sha256-PyCtcn+QHwX/iy85A3y7Phf8ogdSRrwtXrJYGxrjyLM=";
};
nativeBuildInputs = [
···
pkg-config
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
+
layer-shell-qt
libexif
+
libfm-qt
lxqt-menu-data
+
menu-cache
qtbase
-
qtx11extras
qtimageformats # add-on module to support more image file formats
-
libfm-qt
-
menu-cache
+
qtwayland
];
passthru.updateScript = gitUpdater { };
postPatch = ''
-
substituteInPlace config/pcmanfm-qt/lxqt/settings.conf.in --replace @LXQT_SHARE_DIR@ /run/current-system/sw/share/lxqt
+
substituteInPlace config/pcmanfm-qt/lxqt/settings.conf.in --replace-fail @LXQT_SHARE_DIR@ /run/current-system/sw/share/lxqt
'';
meta = with lib; {
+4 -2
pkgs/desktops/lxqt/qlipper/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
, qtbase
, qttools
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "qlipper";
version = "5.1.2";
···
nativeBuildInputs = [
cmake
qttools
+
wrapQtAppsHook
];
buildInputs = [
+11 -7
pkgs/desktops/lxqt/qps/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
, kwindowsystem
, liblxqt
, libqtxdg
, lxqt-build-tools
-
, gitUpdater
, qtbase
+
, qtsvg
, qttools
-
, qtx11extras
+
, qtwayland
+
, wrapQtAppsHook
+
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "qps";
-
version = "2.8.0";
+
version = "2.9.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-Xr+61t6LzoXASHuXrE5ro3eWGxMSDCVnck49dCtiaww=";
+
hash = "sha256-Jit1CdFZyhKOjNytTBH9T4NqqmhxoifXGgPUyVdzJ+4=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
···
liblxqt
libqtxdg
qtbase
-
qtx11extras
+
qtsvg
+
qtwayland
];
passthru.updateScript = gitUpdater { };
+6 -4
pkgs/desktops/lxqt/qterminal/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
, lxqt-build-tools
+
, qtbase
, qtermwidget
-
, qtbase
, qttools
, qtx11extras
+
, wrapQtAppsHook
, gitUpdater
, nixosTests
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "qterminal";
version = "1.4.0";
···
cmake
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
qtbase
-
qtx11extras
qtermwidget
+
qtx11extras
];
passthru.updateScript = gitUpdater { };
+3 -2
pkgs/desktops/lxqt/qtermwidget/default.nix
···
{ stdenv
, lib
-
, mkDerivation
, fetchFromGitHub
, cmake
, qtbase
, qttools
, lxqt-build-tools
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "qtermwidget";
version = "1.4.0";
···
cmake
lxqt-build-tools
qttools
+
wrapQtAppsHook
];
buildInputs = [
+10 -6
pkgs/desktops/lxqt/qtxdg-tools/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
-
, qtbase
, libqtxdg
, lxqt-build-tools
+
, qtbase
+
, qtsvg
+
, wrapQtAppsHook
, gitUpdater
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "qtxdg-tools";
-
version = "3.12.0";
+
version = "4.0.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-3i5SVhEMHar09xoSfVCxJtPXeR81orcNR7pSIJImipQ=";
+
hash = "sha256-w9pFHG+q2oT33Lfg88MUzfWSyvHUgC0Fi2V8XcueJ/Q=";
};
nativeBuildInputs = [
cmake
lxqt-build-tools
+
wrapQtAppsHook
];
buildInputs = [
-
qtbase
libqtxdg
+
qtbase
+
qtsvg
];
passthru.updateScript = gitUpdater { };
+18 -17
pkgs/desktops/lxqt/screengrab/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
-
, pkg-config
-
, qtbase
-
, qttools
-
, qtx11extras
-
, qtsvg
+
, autoPatchelfHook
+
, gitUpdater
, kwindowsystem
+
, libXdmcp
+
, libpthreadstubs
, libqtxdg
, perl
-
, xorg
-
, autoPatchelfHook
-
, gitUpdater
+
, pkg-config
+
, qtbase
+
, qtsvg
+
, qttools
+
, wrapQtAppsHook
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "screengrab";
-
version = "2.7.0";
+
version = "2.8.0";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-mmN3BQum7X0GWTUYauEN2mAo3GWdmtkIl2i84g5cp78=";
+
hash = "sha256-PMe2NyIoc12n4l/oWPi3GL6pemuHyxL2HFBLTIyD690=";
};
nativeBuildInputs = [
···
perl # needed by LXQtTranslateDesktop.cmake
qttools
autoPatchelfHook # fix libuploader.so and libextedit.so not found
+
wrapQtAppsHook
];
buildInputs = [
+
kwindowsystem
+
libXdmcp
+
libpthreadstubs
+
libqtxdg
qtbase
-
qtx11extras
qtsvg
-
kwindowsystem
-
libqtxdg
-
xorg.libpthreadstubs
-
xorg.libXdmcp
];
passthru.updateScript = gitUpdater { };
+8 -6
pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
···
{ lib
-
, mkDerivation
+
, stdenv
, fetchFromGitHub
, cmake
, kwindowsystem
···
, libfm-qt
, lxqt-qtplugin
, menu-cache
-
, qtx11extras
+
, qtbase
+
, wrapQtAppsHook
, gitUpdater
, extraQtStyles ? []
}:
-
mkDerivation rec {
+
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-lxqt";
-
version = "0.5.0";
+
version = "1.0.1";
src = fetchFromGitHub {
owner = "lxqt";
repo = pname;
rev = version;
-
hash = "sha256-6yfLjDK8g8cpeeyuFUEjERTLLn6h3meKjD2Eb7Cj9qY=";
+
hash = "sha256-JSbFZ7R1Cu5VPPb50fRVSAsaE0LE15BbbHpvJZP6+w0=";
};
nativeBuildInputs = [
cmake
+
wrapQtAppsHook
];
buildInputs = [
···
libfm-qt
lxqt-qtplugin
menu-cache
-
qtx11extras
+
qtbase
]
++ extraQtStyles;
+2 -2
pkgs/development/compilers/circt/default.nix
···
in
stdenv.mkDerivation rec {
pname = "circt";
-
version = "1.72.0";
+
version = "1.73.0";
src = fetchFromGitHub {
owner = "llvm";
repo = "circt";
rev = "firtool-${version}";
-
hash = "sha256-Jy+/nwb1CkbNjS0mZ244hG0Rzb/2QRYXrlki4yWZ1lk=";
+
hash = "sha256-C50PiToXrKf94Vg1yv++3xVhIuCW/KVPs0yLv5Fg0dY=";
fetchSubmodules = true;
};
+10
pkgs/development/python-modules/dask-mpi/default.nix
···
{ lib
, buildPythonPackage
, fetchPypi
+
, fetchpatch
, dask
, distributed
, mpi4py
···
inherit pname version;
hash = "sha256-CgTx19NaBs3/UGWTMw1EFOokLJFySYzhkfV0LqxJnhc=";
};
+
+
patches = [
+
# https://github.com/dask/dask-mpi/pull/123
+
(fetchpatch {
+
name = "fix-versioneer-on-python312.patch";
+
url = "https://github.com/dask/dask-mpi/pull/123/commits/0f3b0286b7e29b5d5475561a148dc398108fc259.patch";
+
hash = "sha256-xXADCSIhq1ARny2twzrhR1J8LkMFWFl6tmGxrM8RvkU=";
+
})
+
];
propagatedBuildInputs = [
dask
+5
pkgs/development/python-modules/jaraco-test/default.nix
···
pytestCheckHook
];
+
disabledTestPaths = [
+
# https://github.com/jaraco/jaraco.test/issues/6
+
"jaraco/test/cpython.py"
+
];
+
pythonImportsCheck = [
"jaraco.test"
];
+2 -2
pkgs/development/python-modules/litellm/default.nix
···
buildPythonPackage rec {
pname = "litellm";
-
version = "1.35.8";
+
version = "1.35.15";
pyproject = true;
disabled = pythonOlder "3.8";
···
owner = "BerriAI";
repo = "litellm";
rev = "refs/tags/v${version}";
-
hash = "sha256-/gj3WTsxFxw2VPqYCQdnSi83RjjPHZ/I1nR163u3pb0=";
+
hash = "sha256-cjOUInHaGD+E31D3BbwfgeA4229drOm69ltjU4x9F9o=";
};
postPatch = ''
+2 -2
pkgs/development/python-modules/timetagger/default.nix
···
buildPythonPackage rec {
pname = "timetagger";
-
version = "23.11.4";
+
version = "24.4.1";
format = "setuptools";
disabled = pythonOlder "3.6";
···
owner = "almarklein";
repo = pname;
rev = "refs/tags/v${version}";
-
hash = "sha256-YzS69Sapwbg29usIz93hSEPiDjulFdCTeXbX4I8ZW+Q=";
+
hash = "sha256-Qt6VKExigzMaEb5ZEEPHCe5DSYdx5KPIfVC0khx7pP4=";
};
propagatedBuildInputs = [
+224 -332
pkgs/development/python-modules/tokenizers/Cargo.lock
···
[[package]]
name = "aho-corasick"
-
version = "1.1.2"
+
version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+
checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
dependencies = [
"memchr",
]
[[package]]
name = "anstream"
-
version = "0.6.4"
+
version = "0.6.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
+
checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
dependencies = [
"anstyle",
"anstyle-parse",
···
[[package]]
name = "anstyle"
-
version = "1.0.4"
+
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+
checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
[[package]]
name = "anstyle-parse"
-
version = "0.2.2"
+
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
+
checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
-
version = "1.0.0"
+
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+
checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
dependencies = [
-
"windows-sys 0.48.0",
+
"windows-sys",
]
[[package]]
name = "anstyle-wincon"
-
version = "3.0.1"
+
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
+
checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
dependencies = [
"anstyle",
-
"windows-sys 0.48.0",
+
"windows-sys",
]
[[package]]
name = "autocfg"
-
version = "1.1.0"
+
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
[[package]]
name = "base64"
···
[[package]]
name = "bitflags"
-
version = "2.4.1"
+
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
[[package]]
name = "cc"
-
version = "1.0.83"
+
version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-
dependencies = [
-
"libc",
-
]
+
checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
[[package]]
name = "cfg-if"
···
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
-
name = "clap"
-
version = "4.4.8"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64"
-
dependencies = [
-
"clap_builder",
-
"clap_derive",
-
]
-
-
[[package]]
-
name = "clap_builder"
-
version = "4.4.8"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc"
-
dependencies = [
-
"anstream",
-
"anstyle",
-
"clap_lex",
-
"strsim",
-
]
-
-
[[package]]
-
name = "clap_derive"
-
version = "4.4.7"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
-
dependencies = [
-
"heck",
-
"proc-macro2",
-
"quote",
-
"syn 2.0.39",
-
]
-
-
[[package]]
-
name = "clap_lex"
-
version = "0.6.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
-
-
[[package]]
name = "colorchoice"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "console"
-
version = "0.15.7"
+
version = "0.15.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+
checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
dependencies = [
"encode_unicode",
"lazy_static",
"libc",
"unicode-width",
-
"windows-sys 0.45.0",
+
"windows-sys",
]
[[package]]
name = "crossbeam-deque"
-
version = "0.8.3"
+
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+
checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
dependencies = [
-
"cfg-if",
"crossbeam-epoch",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-epoch"
-
version = "0.9.15"
+
version = "0.9.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
dependencies = [
-
"autocfg",
-
"cfg-if",
"crossbeam-utils",
-
"memoffset",
-
"scopeguard",
]
[[package]]
name = "crossbeam-utils"
-
version = "0.8.16"
+
version = "0.8.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-
dependencies = [
-
"cfg-if",
-
]
+
checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
[[package]]
name = "darling"
-
version = "0.14.4"
+
version = "0.20.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
+
checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
dependencies = [
"darling_core",
"darling_macro",
···
[[package]]
name = "darling_core"
-
version = "0.14.4"
+
version = "0.20.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
+
checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim",
-
"syn 1.0.109",
+
"syn",
]
[[package]]
name = "darling_macro"
-
version = "0.14.4"
+
version = "0.20.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
+
checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
dependencies = [
"darling_core",
"quote",
-
"syn 1.0.109",
+
"syn",
]
[[package]]
name = "derive_builder"
-
version = "0.12.0"
+
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
+
checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7"
dependencies = [
"derive_builder_macro",
]
[[package]]
name = "derive_builder_core"
-
version = "0.12.0"
+
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
+
checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d"
dependencies = [
"darling",
"proc-macro2",
"quote",
-
"syn 1.0.109",
+
"syn",
]
[[package]]
name = "derive_builder_macro"
-
version = "0.12.0"
+
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
+
checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
dependencies = [
"derive_builder_core",
-
"syn 1.0.109",
+
"syn",
]
[[package]]
name = "either"
-
version = "1.9.0"
+
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
[[package]]
name = "encode_unicode"
···
checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
[[package]]
+
name = "env_filter"
+
version = "0.1.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
+
dependencies = [
+
"log",
+
"regex",
+
]
+
+
[[package]]
name = "env_logger"
-
version = "0.10.1"
+
version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
+
checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
dependencies = [
+
"anstream",
+
"anstyle",
+
"env_filter",
"humantime",
-
"is-terminal",
"log",
-
"regex",
-
"termcolor",
]
[[package]]
name = "errno"
-
version = "0.3.6"
+
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e"
+
checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
dependencies = [
"libc",
-
"windows-sys 0.48.0",
+
"windows-sys",
]
[[package]]
···
[[package]]
name = "fastrand"
-
version = "2.0.1"
+
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+
checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
[[package]]
name = "fnv"
···
[[package]]
name = "getrandom"
-
version = "0.2.11"
+
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+
checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
dependencies = [
"cfg-if",
"libc",
···
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
-
name = "hermit-abi"
-
version = "0.3.3"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
-
-
[[package]]
name = "humantime"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
···
[[package]]
name = "indicatif"
-
version = "0.17.7"
+
version = "0.17.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
+
checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
dependencies = [
"console",
"instant",
···
[[package]]
name = "indoc"
-
version = "1.0.9"
+
version = "2.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
+
checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
[[package]]
name = "instant"
···
]
[[package]]
-
name = "is-terminal"
-
version = "0.4.9"
+
name = "itertools"
+
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+
checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
dependencies = [
-
"hermit-abi",
-
"rustix",
-
"windows-sys 0.48.0",
+
"either",
]
[[package]]
name = "itertools"
-
version = "0.11.0"
+
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+
checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
dependencies = [
"either",
]
[[package]]
name = "itoa"
-
version = "1.0.9"
+
version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]]
name = "lazy_static"
···
[[package]]
name = "libc"
-
version = "0.2.150"
+
version = "0.2.153"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
[[package]]
name = "linux-raw-sys"
-
version = "0.4.11"
+
version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
+
checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
[[package]]
name = "lock_api"
···
[[package]]
name = "log"
-
version = "0.4.20"
+
version = "0.4.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
[[package]]
name = "macro_rules_attribute"
···
[[package]]
name = "memchr"
-
version = "2.6.4"
+
version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+
checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
[[package]]
name = "memoffset"
-
version = "0.9.0"
+
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
dependencies = [
"autocfg",
]
···
[[package]]
name = "monostate"
-
version = "0.1.9"
+
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "15f370ae88093ec6b11a710dec51321a61d420fafd1bad6e30d01bd9c920e8ee"
+
checksum = "a20fffcd8ca4c69d31e036a71abc400147b41f90895df4edcb36497a1f8af8bf"
dependencies = [
"monostate-impl",
"serde",
···
[[package]]
name = "monostate-impl"
-
version = "0.1.9"
+
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce"
+
checksum = "bf307cbbbd777a9c10cec88ddafee572b3484caad5cce0c9236523c3803105a6"
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.39",
+
"syn",
]
[[package]]
···
[[package]]
name = "num-complex"
-
version = "0.4.4"
+
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+
checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
dependencies = [
"num-traits",
]
[[package]]
name = "num-integer"
-
version = "0.1.45"
+
version = "0.1.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+
checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
dependencies = [
-
"autocfg",
"num-traits",
]
[[package]]
name = "num-traits"
-
version = "0.2.17"
+
version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+
checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
dependencies = [
"autocfg",
]
···
[[package]]
name = "numpy"
-
version = "0.19.0"
+
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "437213adf41bbccf4aeae535fbfcdad0f6fed241e1ae182ebe97fa1f3ce19389"
+
checksum = "ec170733ca37175f5d75a5bea5911d6ff45d2cd52849ce98b685394e4f2f37f4"
dependencies = [
"libc",
"ndarray",
···
[[package]]
name = "once_cell"
-
version = "1.18.0"
+
version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "onig"
···
[[package]]
name = "pkg-config"
-
version = "0.3.27"
+
version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+
checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
[[package]]
name = "portable-atomic"
-
version = "1.5.1"
+
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b"
+
checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
[[package]]
name = "ppv-lite86"
···
[[package]]
name = "proc-macro2"
-
version = "1.0.69"
+
version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+
checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
dependencies = [
"unicode-ident",
]
[[package]]
name = "pyo3"
-
version = "0.19.2"
+
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38"
+
checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
dependencies = [
"cfg-if",
"indoc",
"libc",
"memoffset",
"parking_lot",
+
"portable-atomic",
"pyo3-build-config",
"pyo3-ffi",
"pyo3-macros",
···
[[package]]
name = "pyo3-build-config"
-
version = "0.19.2"
+
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5"
+
checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
dependencies = [
"once_cell",
"target-lexicon",
···
[[package]]
name = "pyo3-ffi"
-
version = "0.19.2"
+
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9"
+
checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
dependencies = [
"libc",
"pyo3-build-config",
···
[[package]]
name = "pyo3-macros"
-
version = "0.19.2"
+
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1"
+
checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c"
dependencies = [
"proc-macro2",
"pyo3-macros-backend",
"quote",
-
"syn 1.0.109",
+
"syn",
]
[[package]]
name = "pyo3-macros-backend"
-
version = "0.19.2"
+
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536"
+
checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c"
dependencies = [
+
"heck",
"proc-macro2",
+
"pyo3-build-config",
"quote",
-
"syn 1.0.109",
+
"syn",
]
[[package]]
name = "quote"
-
version = "1.0.33"
+
version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
dependencies = [
"proc-macro2",
]
···
[[package]]
name = "rayon"
-
version = "1.8.0"
+
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+
checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
dependencies = [
"either",
"rayon-core",
···
checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9"
dependencies = [
"either",
-
"itertools",
+
"itertools 0.11.0",
"rayon",
]
[[package]]
name = "rayon-core"
-
version = "1.12.0"
+
version = "1.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+
checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
dependencies = [
"crossbeam-deque",
"crossbeam-utils",
···
[[package]]
name = "regex"
-
version = "1.10.2"
+
version = "1.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+
checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
dependencies = [
"aho-corasick",
"memchr",
"regex-automata",
-
"regex-syntax 0.8.2",
+
"regex-syntax",
]
[[package]]
name = "regex-automata"
-
version = "0.4.3"
+
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+
checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
dependencies = [
"aho-corasick",
"memchr",
-
"regex-syntax 0.8.2",
+
"regex-syntax",
]
[[package]]
name = "regex-syntax"
-
version = "0.7.5"
+
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
-
-
[[package]]
-
name = "regex-syntax"
-
version = "0.8.2"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
[[package]]
name = "rustc-hash"
···
[[package]]
name = "rustix"
-
version = "0.38.23"
+
version = "0.38.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ffb93593068e9babdad10e4fce47dc9b3ac25315a72a59766ffd9e9a71996a04"
+
checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
dependencies = [
-
"bitflags 2.4.1",
+
"bitflags 2.5.0",
"errno",
"libc",
"linux-raw-sys",
-
"windows-sys 0.48.0",
+
"windows-sys",
]
[[package]]
name = "ryu"
-
version = "1.0.15"
+
version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
[[package]]
name = "scopeguard"
···
[[package]]
name = "serde"
-
version = "1.0.192"
+
version = "1.0.198"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
+
checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-
version = "1.0.192"
+
version = "1.0.198"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
+
checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9"
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.39",
+
"syn",
]
[[package]]
name = "serde_json"
-
version = "1.0.108"
+
version = "1.0.116"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+
checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
dependencies = [
"itoa",
"ryu",
···
[[package]]
name = "smallvec"
-
version = "1.11.2"
+
version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "spm_precompiled"
···
[[package]]
name = "syn"
-
version = "1.0.109"
+
version = "2.0.60"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-
dependencies = [
-
"proc-macro2",
-
"quote",
-
"unicode-ident",
-
]
-
-
[[package]]
-
name = "syn"
-
version = "2.0.39"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+
checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
dependencies = [
"proc-macro2",
"quote",
···
[[package]]
name = "target-lexicon"
-
version = "0.12.12"
+
version = "0.12.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
+
checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
[[package]]
name = "tempfile"
-
version = "3.8.1"
+
version = "3.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+
checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
dependencies = [
"cfg-if",
"fastrand",
-
"redox_syscall",
"rustix",
-
"windows-sys 0.48.0",
-
]
-
-
[[package]]
-
name = "termcolor"
-
version = "1.4.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449"
-
dependencies = [
-
"winapi-util",
+
"windows-sys",
]
[[package]]
name = "thiserror"
-
version = "1.0.50"
+
version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+
checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-
version = "1.0.50"
+
version = "1.0.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+
checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
dependencies = [
"proc-macro2",
"quote",
-
"syn 2.0.39",
+
"syn",
]
[[package]]
name = "tokenizers"
-
version = "0.15.0"
+
version = "0.19.1-rc0"
dependencies = [
"aho-corasick",
-
"clap",
"derive_builder",
"esaxx-rs",
"getrandom",
"indicatif",
-
"itertools",
+
"itertools 0.12.1",
"lazy_static",
"log",
"macro_rules_attribute",
···
"rayon",
"rayon-cond",
"regex",
-
"regex-syntax 0.7.5",
+
"regex-syntax",
"serde",
"serde_json",
"spm_precompiled",
···
[[package]]
name = "tokenizers-python"
-
version = "0.15.0"
+
version = "0.19.1-rc0"
dependencies = [
"env_logger",
-
"itertools",
+
"itertools 0.12.1",
"libc",
"ndarray",
"numpy",
···
[[package]]
name = "unicode-segmentation"
-
version = "1.10.1"
+
version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
[[package]]
name = "unicode-width"
···
[[package]]
name = "unindent"
-
version = "0.1.11"
+
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
+
checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
[[package]]
name = "utf8parse"
···
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
-
name = "winapi"
-
version = "0.3.9"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-
dependencies = [
-
"winapi-i686-pc-windows-gnu",
-
"winapi-x86_64-pc-windows-gnu",
-
]
-
-
[[package]]
-
name = "winapi-i686-pc-windows-gnu"
-
version = "0.4.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-
[[package]]
-
name = "winapi-util"
-
version = "0.1.6"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
-
dependencies = [
-
"winapi",
-
]
-
-
[[package]]
-
name = "winapi-x86_64-pc-windows-gnu"
-
version = "0.4.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-
[[package]]
name = "windows-sys"
-
version = "0.45.0"
+
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
-
"windows-targets 0.42.2",
-
]
-
-
[[package]]
-
name = "windows-sys"
-
version = "0.48.0"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-
dependencies = [
-
"windows-targets 0.48.5",
-
]
-
-
[[package]]
-
name = "windows-targets"
-
version = "0.42.2"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-
dependencies = [
-
"windows_aarch64_gnullvm 0.42.2",
-
"windows_aarch64_msvc 0.42.2",
-
"windows_i686_gnu 0.42.2",
-
"windows_i686_msvc 0.42.2",
-
"windows_x86_64_gnu 0.42.2",
-
"windows_x86_64_gnullvm 0.42.2",
-
"windows_x86_64_msvc 0.42.2",
+
"windows-targets 0.52.5",
[[package]]
···
[[package]]
-
name = "windows_aarch64_gnullvm"
-
version = "0.42.2"
+
name = "windows-targets"
+
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+
dependencies = [
+
"windows_aarch64_gnullvm 0.52.5",
+
"windows_aarch64_msvc 0.52.5",
+
"windows_i686_gnu 0.52.5",
+
"windows_i686_gnullvm",
+
"windows_i686_msvc 0.52.5",
+
"windows_x86_64_gnu 0.52.5",
+
"windows_x86_64_gnullvm 0.52.5",
+
"windows_x86_64_msvc 0.52.5",
+
]
[[package]]
name = "windows_aarch64_gnullvm"
···
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
-
name = "windows_aarch64_msvc"
-
version = "0.42.2"
+
name = "windows_aarch64_gnullvm"
+
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
[[package]]
name = "windows_aarch64_msvc"
···
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
-
name = "windows_i686_gnu"
-
version = "0.42.2"
+
name = "windows_aarch64_msvc"
+
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
[[package]]
name = "windows_i686_gnu"
···
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
-
name = "windows_i686_msvc"
-
version = "0.42.2"
+
name = "windows_i686_gnu"
+
version = "0.52.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+
[[package]]
+
name = "windows_i686_gnullvm"
+
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
[[package]]
name = "windows_i686_msvc"
···
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
-
name = "windows_x86_64_gnu"
-
version = "0.42.2"
+
name = "windows_i686_msvc"
+
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
[[package]]
name = "windows_x86_64_gnu"
···
checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
-
name = "windows_x86_64_gnullvm"
-
version = "0.42.2"
+
name = "windows_x86_64_gnu"
+
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
[[package]]
name = "windows_x86_64_gnullvm"
···
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
-
name = "windows_x86_64_msvc"
-
version = "0.42.2"
+
name = "windows_x86_64_gnullvm"
+
version = "0.52.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+
[[package]]
+
name = "windows_x86_64_msvc"
+
version = "0.52.5"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+14 -6
pkgs/development/python-modules/tokenizers/default.nix
···
in
buildPythonPackage rec {
pname = "tokenizers";
-
version = "0.15.0";
-
format = "pyproject";
+
version = "0.19.1";
+
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "huggingface";
-
repo = pname;
-
rev = "v${version}";
-
hash = "sha256-+yfX12eKtgZV1OQvPOlMVTONbpFuigHcl4SjoCIZkSk=";
+
repo = "tokenizers";
+
rev = "refs/tags/v${version}";
+
hash = "sha256-sKEAt46cdme821tzz9WSKnQb3hPmFJ4zvHgBNRxjEuk=";
};
cargoDeps = rustPlatform.importCargoLock {
···
Security
];
-
propagatedBuildInputs = [
+
# Cargo.lock is outdated
+
# TODO: remove at next release
+
preConfigure = ''
+
cargo update --offline
+
'';
+
+
dependencies = [
numpy
];
···
disabledTests = [
# Downloads data using the datasets module
+
"test_encode_special_tokens"
+
"test_splitting"
"TestTrainFromIterators"
# Those tests require more data
"test_from_pretrained"
+8 -3
pkgs/development/python-modules/transformers/default.nix
···
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
+
, setuptools
# propagated build inputs
, filelock
, huggingface-hub
···
buildPythonPackage rec {
pname = "transformers";
-
version = "4.39.3";
-
format = "setuptools";
+
version = "4.40.0";
+
pyproject = true;
disabled = pythonOlder "3.8";
···
owner = "huggingface";
repo = "transformers";
rev = "refs/tags/v${version}";
-
hash = "sha256-MJZvPbj9ypr6YwFGkzwCp9fVuM3vEGpeXK+gEIFzwRA=";
+
hash = "sha256-k0AloOG7fRQhTW8IF6uQSfav8p1KC5633SaLNYZrZ2M=";
};
+
+
build-system = [
+
setuptools
+
];
propagatedBuildInputs = [
filelock
+3 -3
pkgs/development/tools/ruff/default.nix
···
rustPlatform.buildRustPackage rec {
pname = "ruff";
-
version = "0.3.7";
+
version = "0.4.1";
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ruff";
rev = "refs/tags/v${version}";
-
hash = "sha256-PS4YJpVut+KtEgSlTVtoVdlu6FVipPIzsl01/Io5N64=";
+
hash = "sha256-VTFwuNoqh0RLk0AHTPWEwrja0/aErmUlz82MnCc58jA=";
};
-
cargoHash = "sha256-kxzI/MlhboF0cWnyciK4vewWGXijPsOV0tPzfo1DHWc=";
+
cargoHash = "sha256-COZGGmc6v3WGh8NICoRZ5iYrVs0tML8gG2b1LqWbJs0=";
nativeBuildInputs = [
installShellFiles
+4 -4
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
···
# NOTE: When updating these, please also take a look at the changes done to
# kernel config in the xanmod version commit
ltsVariant = {
-
version = "6.6.27";
-
hash = "sha256-MYvt7QWRdUybbhva6B4MOYrwnJfuu/qvMlnaGKcO1Hw=";
+
version = "6.6.28";
+
hash = "sha256-0ld4pZIddfkGytxzqgC7AGD3gc2H9mhZbhpbFLD3G+s=";
variant = "lts";
};
mainVariant = {
-
version = "6.8.6";
-
hash = "sha256-7GsiIl3rcLm/u2zxrjpP6dTxn7w/6at22gaU//mLlzw=";
+
version = "6.8.7";
+
hash = "sha256-S9UooZhMtvfyL2BVUfMBxvPLkZvXm37duWSjcpk5dvY=";
variant = "main";
};
+3 -3
pkgs/servers/klipper/default.nix
···
stdenv.mkDerivation rec {
pname = "klipper";
-
version = "unstable-2024-04-05";
+
version = "unstable-2024-04-15";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
-
rev = "01c7befacb5b71643130433f2afb3f22ece68d71";
-
sha256 = "sha256-zFGFhO5EYyJ0qwQN+NOaKDlEu2LIbc9JAJVxFbMDJOU=";
+
rev = "2425a74638baa87efef3ca02253804d126101c8a";
+
sha256 = "sha256-ZGsMv4+Nv2G2bHRI5Vm1Uj+Uj6zee4oAVDMLrVrwurU=";
};
sourceRoot = "${src.name}/klippy";
+3 -3
pkgs/servers/redpanda/default.nix
···
, stdenv
}:
let
-
version = "23.3.11";
+
version = "23.3.12";
src = fetchFromGitHub {
owner = "redpanda-data";
repo = "redpanda";
rev = "v${version}";
-
sha256 = "sha256-/z8KkkjGxHgtKXsM0OaUHHYI1bpe79gf9KYvAGLAVR8=";
+
sha256 = "sha256-gkJlqyPDsWaXcbOGB7m70YuHY44xLNymf9laK30yr1k=";
};
server = callPackage ./server.nix { inherit src version; };
in
···
inherit doCheck src version;
modRoot = "./src/go/rpk";
runVend = false;
-
vendorHash = "sha256-sN21Y1e08gG8z/RfYIPGEeWW58YH66uB+16b2Bzb/3I=";
+
vendorHash = "sha256-B//qmqxS3g9u2yir8Z3iV2fjQ4XXPAjFujeOZjdt8PE=";
ldflags = [
''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''
+2 -5
pkgs/shells/nushell/plugins/formats.nix
···
, pkg-config
, IOKit
, Foundation
-
, libclang
, nix-update-script
}:
···
inherit (nushell) version src;
cargoHash = "sha256-mInMs0kAJn3/fgRAG0E8hgvaly2G68kT5O+D83pLq78=";
-
env = lib.optionalAttrs stdenv.cc.isClang {
-
LIBCLANG_PATH = "${libclang.lib}/lib";
-
};
-
nativeBuildInputs = [ pkg-config ];
+
nativeBuildInputs = [ pkg-config ]
+
++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
buildInputs = lib.optionals stdenv.isDarwin [ IOKit Foundation ];
cargoBuildFlags = [ "--package nu_plugin_formats" ];
+2 -5
pkgs/shells/nushell/plugins/gstat.nix
···
, nushell
, pkg-config
, Security
-
, libclang
, nix-update-script
}:
···
inherit (nushell) version src;
cargoHash = "sha256-1HfuMtjtUzwsIxkYV8azttnjEyAnC7X1aMIdw2N0yxQ=";
-
env = lib.optionalAttrs stdenv.cc.isClang {
-
LIBCLANG_PATH = "${libclang.lib}/lib";
-
};
-
nativeBuildInputs = [ pkg-config ];
+
nativeBuildInputs = [ pkg-config ]
+
++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
cargoBuildFlags = [ "--package nu_plugin_gstat" ];
+1 -4
pkgs/shells/nushell/plugins/query.nix
···
, nushell
, IOKit
, CoreFoundation
-
, libclang
, nix-update-script
}:
···
inherit (nushell) version src;
cargoHash = "sha256-takIDfMriDzZT/9JkqWPis10EaZhfwGpi7EkoOh4+vw=";
-
env = lib.optionalAttrs stdenv.cc.isClang {
-
LIBCLANG_PATH = "${libclang.lib}/lib";
-
};
+
nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];
cargoBuildFlags = [ "--package nu_plugin_query" ];
+18 -8
pkgs/tools/text/mdbook-cmdrun/default.nix
···
-
{ lib, rustPlatform, fetchFromGitHub }:
+
{ lib
+
, mdbook
+
, nodePackages
+
, python3
+
, util-linux
+
, rustPlatform
+
, fetchFromGitHub
+
}:
rustPlatform.buildRustPackage rec {
pname = "mdbook-cmdrun";
-
version = "unstable-2023-01-10";
+
version = "0.6.0-unstable-2024-04-15";
src = fetchFromGitHub {
owner = "FauconFan";
repo = pname;
-
rev = "3f6d243cd9de5659f166a5642eb46b2a6d8384e7";
-
hash = "sha256-JuKMAb3vwGTju9U1vaS9I39gObTz0JQQV4uol9SmsfM=";
+
rev = "d1fef67f100563c2a433b1f5dd5a71810db6b90d";
+
hash = "sha256-Q2h64XCyDxLmmCNC3wTw81pBotaMEUjY5y0Oq6q20cQ=";
};
-
# Tests are outdated currently, application works fine
-
# See for more info: https://github.com/FauconFan/mdbook-cmdrun/issues/2
-
doCheck = false;
+
nativeCheckInputs = [
+
mdbook # used by tests/book.rs
+
nodePackages.nodejs # used by tests/regression/inline_call/input.md
+
python3 # used by tests/regression/py_*
+
util-linux # used by tests/regression/shell/input.md
+
];
-
cargoHash = "sha256-h3xCnx6byToZx83uWNLz05F3VIDR0D1NVtSOKPuYeG4=";
+
cargoHash = "sha256-gT3DyQRJWn1HuR6fXeqk8aUPb+jmC+V1McdDN2JGXuI=";
meta = with lib; {
description = "mdbook preprocessor to run arbitrary commands";
+3 -2
pkgs/top-level/all-packages.nix
···
nu_scripts = callPackage ../shells/nushell/nu_scripts { };
nushellPlugins = recurseIntoAttrs (callPackage ../shells/nushell/plugins {
-
inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Foundation Security;
+
inherit (darwin.apple_sdk.frameworks) Security;
+
inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation Foundation;
});
nettools = if stdenv.isLinux
···
lxqt = recurseIntoAttrs (import ../desktops/lxqt {
inherit pkgs;
inherit (lib) makeScope;
-
inherit qt5 libsForQt5;
+
inherit kdePackages;
});
mate = recurseIntoAttrs (callPackage ../desktops/mate { });