diff options
Diffstat (limited to 'pkgs')
542 files changed, 6811 insertions, 9850 deletions
diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index fc24a87b30d1..a0a6ce024499 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.59.6"; + version = "2.60.3"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-Z/hAq6JlhlWBzWlodwQW/k9AkozVeMXmbVhkicNZ5os="; + sha256 = "sha256-kaKDZKs/UsrqYlGmGgpSRcqN7FypxLCcIF72klovD4k="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index be6f09514387..ef0385d5114e 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -25,13 +25,13 @@ let in mkDerivation rec { pname = "jamesdsp"; - version = "2.4"; + version = "2.5.1"; src = fetchFromGitHub rec { owner = "Audio4Linux"; repo = "JDSP4Linux"; fetchSubmodules = true; rev = version; - hash = "sha256-wD1JZQD8dR24cBN4QJCSrEsS4aoMD+MQmqnOIFKOeoE="; + hash = "sha256-osbRiUa/CKq4l3pV2MZYKcECEfa1ee3SAQ8RsiimbA4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/music-player/default.nix b/pkgs/applications/audio/music-player/default.nix new file mode 100644 index 000000000000..0a59f568f2bd --- /dev/null +++ b/pkgs/applications/audio/music-player/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, alsa-lib +, darwin +, fetchFromGitHub +, pkg-config +, protobuf +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "music-player"; + version = "0.2.0-alpha.13"; + + src = fetchFromGitHub { + owner = "tsirysndr"; + repo = "music-player"; + rev = "v${version}"; + hash = "sha256-LuO64E5kJdMgd5h0+Sb8Wg7hxUmS8E7bKT3NIyd9+Lc="; + }; + + cargoHash = "sha256-Xn0OUHMgKxzDvhO+xRv5jMa50OzEtl6yhHbJ1R/a56Y="; + + nativeBuildInputs = [ + protobuf + rustPlatform.bindgenHook + ] ++ lib.optionals stdenv.isLinux [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AudioUnit + ]; + + meta = with lib; { + description = "An extensible music player daemon written in Rust"; + homepage = "https://github.com/tsirysndr/music-player"; + changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 140fb9fef0c5..bc384f68a676 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - version = "0.9.10"; + version = "0.9.11"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally @@ -14,7 +14,7 @@ mkDerivation rec { owner = "rncbc"; repo = "qjackctl"; rev = "${pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-XF5v+VgSCqqV2ft9qw1NTNzeYOv1OuhljJGdgikPLEo="; + sha256 = "sha256-dZW9bZ17O/1DxBr5faYSE+YkSuz7NIJSc1vqxzOOxyg="; }; buildInputs = [ diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 35b1b26a1974..569c707b9370 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "qmmp"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2"; - hash = "sha256-+bHnvwXUmdBbQcO3Unybqou/MZgcf6CXhlAcBjNFCNQ="; + hash = "sha256-gbQkDZgyo22VTWpEixuS2WaiwwXgKDsnXbB6Q0U0OeM="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 7269e218f503..12230d060125 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-MkPPr9gvEeW94fXH8K9GVYdYpuG1LDgKD16l2pNFvkA="; + sha256 = "sha256-9HgxFqwmRG2mJy9aTT0MeWdtE+YKG6rU8g24IZFHSRY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 296b28fab360..87fdc02beb65 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "tidal-hifi"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "sha256-ZdEbGsGt1Z/vve3W/Z6Pw1+m5xoTY/l7Es03yM4T0tE="; + sha256 = "sha256-YGSHEvanWek6qiWvKs6g+HneGbuuqJn/DBfhawjQi5M="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index bcf81c8c81ea..5e00a016334f 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "yoshimi"; - version = "2.3.0"; + version = "2.3.0.2"; src = fetchFromGitHub { owner = "Yoshimi"; repo = pname; rev = version; - hash = "sha256-rVlwOxp8C/A56JDd6Bzi2smblJVqQWZiFqIP4oRhElM="; + hash = "sha256-zFwfKy8CVecGhgr48T+eDNHfMdctfrNGenc/XJctyw8="; }; sourceRoot = "source/src"; diff --git a/pkgs/applications/blockchains/atomic-swap/default.nix b/pkgs/applications/blockchains/atomic-swap/default.nix new file mode 100644 index 000000000000..3e8ebcc947a9 --- /dev/null +++ b/pkgs/applications/blockchains/atomic-swap/default.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub, nix-update-script }: + +let + pname = "atomic-swap"; + version = "0.4.0"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "AthanorLabs"; + repo = "atomic-swap"; + rev = "v${version}"; + hash = "sha256-wVLufTC7WcRELhzebzLgIUvIWklEY+8/C41FluPkya0="; + }; + + vendorSha256 = "sha256-igHuklt76r7MDxz8TAaFgFdQS7L3DJkMYarAMNVYTC4="; + + subPackages = [ + "cmd/swapcli" + "cmd/swapd" + "cmd/bootnode" + ]; + + # integration tests require network access + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://github.com/AthanorLabs/atomic-swap"; + description = "ETH-XMR atomic swap implementation"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 36bc0ebfb883..46f6b57859c2 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -9,6 +9,7 @@ , dpkg , writeScript , bash +, strip-nondeterminism , tor , zip , xz @@ -41,7 +42,15 @@ stdenv.mkDerivation rec { sha256 = "0jisxzajsc4wfvxabvfzd0x9y1fxzg39fkhap1781q7wyi4ry9kd"; }; - nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ]; + nativeBuildInputs = [ + copyDesktopItems + dpkg + imagemagick + makeWrapper + strip-nondeterminism + xz + zip + ]; desktopItems = [ (makeDesktopItem { @@ -64,8 +73,9 @@ stdenv.mkDerivation rec { mkdir -p native/linux/x64/ cp ${bisq-tor} ./tor - tar -cJf native/linux/x64/tor.tar.xz tor + tar --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cJf native/linux/x64/tor.tar.xz tor zip -r opt/bisq/lib/app/desktop-${version}-all.jar native + strip-nondeterminism opt/bisq/lib/app/desktop-${version}-all.jar ''; installPhase = '' diff --git a/pkgs/applications/blockchains/btcd/default.nix b/pkgs/applications/blockchains/btcd/default.nix index 34a6aa1dad83..ea4a120bcab7 100644 --- a/pkgs/applications/blockchains/btcd/default.nix +++ b/pkgs/applications/blockchains/btcd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "btcd"; - version = "0.23.3"; + version = "0.23.4"; src = fetchFromGitHub { owner = "btcsuite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LdK68Ianiyrs+HVMwrkiX2ruCWKkdpuY8ylxhNbm9qI="; + hash = "sha256-X1kfr6jrVArm0HK0XiN/93OPxqPo8J4U+qglJAf23+A="; }; - vendorSha256 = "sha256-3w8rb0sfAIFCXqPXOKb4QwoLd7WsbFv3phu/rJCEjeY="; + vendorHash = "sha256-3w8rb0sfAIFCXqPXOKb4QwoLd7WsbFv3phu/rJCEjeY="; subPackages = [ "." "cmd/*" ]; diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index c5dbb5741efd..aa5222a50e7e 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "nano-wallet"; - version = "25.0"; + version = "25.1"; src = fetchFromGitHub { owner = "nanocurrency"; repo = "nano-node"; rev = "V${version}"; fetchSubmodules = true; - hash = "sha256-VHefXHUj08k53+8mAAhbR31F5uDmIxBFR1hfGfrrugM="; + hash = "sha256-YvYEXHC8kxviZLQwINs+pS61wITSfqfrrPmlR+zNRoE="; }; cmakeFlags = let diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index e435e834e7e5..318c459dd21d 100644 --- a/pkgs/applications/editors/bonzomatic/default.nix +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "bonzomatic"; - version = "2022-08-20"; + version = "2023-06-15"; src = fetchFromGitHub { owner = "Gargaj"; repo = pname; rev = version; - sha256 = "sha256-AaUMefxQd00O+MAH4OLoyQIXZCRQQbt2ucgt7pVvN24="; + sha256 = "sha256-hwK3C+p1hRwnuY2/vBrA0QsJGIcJatqq+U5/hzVCXEg="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix index eaa2b0d9959c..718c3fdd20fd 100644 --- a/pkgs/applications/editors/cpeditor/default.nix +++ b/pkgs/applications/editors/cpeditor/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { substituteInPlace src/Core/Runner.cpp --replace "/bin/bash" "${runtimeShell}" ''; + env.NIX_CFLAGS_COMPILE = "-std=c++14"; + meta = with lib; { description = "An IDE specially designed for competitive programming"; homepage = "https://cpeditor.org"; diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index 117a261e957f..26929ffd71a3 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -61,10 +61,11 @@ with stdenv; lib.makeOverridable mkDerivation (rec { installPhase = '' runHook preInstall - mkdir -p $out/{bin,$pname,share/pixmaps,libexec/${pname}} + mkdir -p $out/{bin,$pname,share/pixmaps,libexec/${pname},share/icons/hicolor/scalable/apps} cp -a . $out/$pname [[ -f $out/$pname/bin/${loName}.png ]] && ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png - [[ -f $out/$pname/bin/${loName}.svg ]] && ln -s $out/$pname/bin/${loName}.svg $out/share/pixmaps/${pname}.svg + [[ -f $out/$pname/bin/${loName}.svg ]] && ln -s $out/$pname/bin/${loName}.svg $out/share/pixmaps/${pname}.svg \ + && ln -s $out/$pname/bin/${loName}.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg mv bin/fsnotifier* $out/libexec/${pname}/. jdk=${jdk.home} diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 9294e7423159..7dfbebb95df1 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv +{ lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack-c, libtermkey, libiconv , libuv, lua, ncurses, pkg-config , unibilium, gperf , libvterm-neovim @@ -66,7 +66,7 @@ in # https://github.com/luarocks/luarocks/issues/1402#issuecomment-1080616570 # and it's definition at: pkgs/development/lua-modules/overrides.nix lua.pkgs.libluv - msgpack + msgpack-c ncurses neovimLuaEnv tree-sitter diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6377a0160007..5832dca44786 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,12 +173,12 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-06-21"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "47111bd2db140aac32422752e07db7a1c5b74659"; - sha256 = "1c10kj7f3512j62nwhnlqxf8y4frx24k0j1vvyw226rv7cla0vyq"; + rev = "c3477ed81e8e26bce1eb53f9c04a8aa7adc1807a"; + sha256 = "1hga1b9zx8ygrpr7863x12pd3rh9c3k69lgg59jzpzxiasnm3wkj"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-06-21"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "4f96b7bb1a0d5973a249e654f02adf2973422dcc"; - sha256 = "0nc5sbdkhahyf80ng9g3gysp385m347lw2djr46fwcmkmlypllg2"; + rev = "7322390c9abff6f137774d9e04bddb3cd725afd1"; + sha256 = "1r9kqnhr3b14fs929xbh6qfrxmki961svlj2208vmlfmbsp7sx13"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -353,24 +353,24 @@ final: prev: SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2023-01-31"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "fab8e52ec7d67000c8d96028b2d643573a4289b1"; - sha256 = "0kk482si63v67a4086hk9va1lsjqpmbaf71y2cqyrw9vidbmy38g"; + rev = "3e37187e1e5731d7d36980db3f92e7332406813a"; + sha256 = "0akdf7zv9pywdnqf4zp345irsbdfhy2rqvx759n13d403hwwya6z"; }; meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-06-20"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "b737573667d1212ff4c76ed2a999c84c966da83d"; - sha256 = "10v89a853dakhgmmlpf6gig16764w481jy4acw0h7nrqn28y4qfr"; + rev = "bd4a67e98b2b3de690a288ae3af68232f2c41738"; + sha256 = "0l8p48zw0svcpn48v1qck6wfr5ljdfs5r96vchvbhnlg7bcivpi1"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-06-17"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "c30fb2c9bd09592351eed676f4c20e7a6411020e"; - sha256 = "07nkrlaar7j8bgby6bij50kxi17ha5jzl4bwvwkgrrlj08v96if3"; + rev = "c663d1b55f002930187a09b9eeb5bd0bad0ea23c"; + sha256 = "0rcf3wlzqb6a4y1jvr3w3yxpik5ykhrdzcnyxw39cr55h94i6xyz"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -847,12 +847,12 @@ final: prev: autoclose-nvim = buildVimPluginFrom2Nix { pname = "autoclose.nvim"; - version = "2023-05-29"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "m4xshen"; repo = "autoclose.nvim"; - rev = "2321727fd10a6b34624723bc4747d8c09c10b7a4"; - sha256 = "0bbf4lfs6li6mdifzlk9y2z4lgksl4xpvk0h1bd2l24x768mmm0k"; + rev = "469782b0456f0b4f764378ffda94c18599544e09"; + sha256 = "0qj2qvyjh4a70wykwlijj9h73i06npl8h88g7bb1vifsp5yyshzv"; }; meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; }; @@ -1399,12 +1399,12 @@ final: prev: cmp-conjure = buildVimPluginFrom2Nix { pname = "cmp-conjure"; - version = "2022-12-05"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "PaterJason"; repo = "cmp-conjure"; - rev = "d76e1fe5d724afe604dfa7b4b5ba93f3d3730617"; - sha256 = "026kmjrhfwqllr8qh0z4jgdl2fcxy4cqf33yy4lnalkgvapnja5s"; + rev = "d97816d5007be2b060f3a4e09f5b144d97d96fe8"; + sha256 = "0nl61si8las2lmx1mrds2csha1747lwnmv4jf0rm4qz0mqhfb4ij"; }; meta.homepage = "https://github.com/PaterJason/cmp-conjure/"; }; @@ -1591,12 +1591,12 @@ final: prev: cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2023-02-06"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "0e6b2ed705ddcff9738ec4ea838141654f12eeef"; - sha256 = "0gpwwc3rhfckaava83hpl7pw4rspicblxs7hy3y57gb560ymq6hg"; + rev = "44b16d11215dce86f253ce0c30949813c0a90765"; + sha256 = "1ny64ls3z9pcflsg3sd7xnd795mcfbqhyan3bk4ymxgv5jh2qkcr"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -1963,12 +1963,12 @@ final: prev: codeium-vim = buildVimPluginFrom2Nix { pname = "codeium.vim"; - version = "2023-06-20"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "c620cea17f898c6c66961f09d05cb2c0fa5ffcd8"; - sha256 = "1h2972cffs0qacjcsq3sl99935633bcg7rgygazg1qga96a47si3"; + rev = "23348d55415a0d1e227a36d4217a2751528aebf2"; + sha256 = "0j0w5m2xmzv6amj5hir9xyvq932yzisqhxnb3nmv9j63pwl06q7y"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2251,12 +2251,12 @@ final: prev: copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2023-04-28"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "1358e8e45ecedc53daf971924a0541ddf6224faf"; - sha256 = "171ypwb85ya8n63zykdnb8d4ni2jbn728x7r6ph1m67k06g0w4pb"; + rev = "98c293994f1bbebd5bade5d5840ead3b2feb5074"; + sha256 = "1wm36wba1pcmr0slmdvgjixm587sm13zcsdrc2cykra54p87ky2m"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2299,12 +2299,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-06-18"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "3d76374ab24a6730973ed6a93f9f7b3b6640cc50"; - sha256 = "1gkg2iiswnviq07dzpij62lzjsrlapg7c9v4psl25l727l1ddi8y"; + rev = "54b069140e1240f8f244d74636c0e911e1337520"; + sha256 = "0bplg5lcrb3bhpqpsw10z56wwfnkfvsr3fzm7747j3idlqspjy27"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2913,24 +2913,24 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2023-06-16"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "5fb5cce0cbfcedeadbcee43e5674e8c9a9f28d4a"; - sha256 = "0qjvmgpjpbxar8dyaz3wpp3pisgnwr3mi7ci4nk8zckd4jb11017"; + rev = "1cbc4eef2ef7d745aa1a559b22589e33860cf077"; + sha256 = "0nmb3wiyk21254z4jxnhw2agbg0mfx7kj9fk92zr482i71qz9rlc"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPluginFrom2Nix { pname = "dropbar.nvim"; - version = "2023-06-20"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "15f32c0b1c646b5608b52440599577799ce20425"; - sha256 = "05zhsjbndlklxlnb9dv3pj790r0ck91c4sv1svpclaim8mjhv9ch"; + rev = "b00ede8cbde4129249ce2476fed657fe3293edb7"; + sha256 = "0k1di9b0irqc9f2bvsyadbnk35wmd7sw71v50fz2p1fm05h53h5d"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3083,12 +3083,12 @@ final: prev: eyeliner-nvim = buildVimPluginFrom2Nix { pname = "eyeliner.nvim"; - version = "2023-04-26"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "jinh0"; repo = "eyeliner.nvim"; - rev = "fa3a0986cb072fe2ab29ef79e022514d2533f0db"; - sha256 = "072qnpn30sz72gwppsdg9npbr897a2xlh1wj0706n58lkd7nhl2v"; + rev = "214e6ff4a0c786b9facac9d2bd267f08cc5fc0bb"; + sha256 = "0fa5y8vgydi63xk99dgryhvcja0zq7jb004bm1fd3g4dd0jpvgar"; }; meta.homepage = "https://github.com/jinh0/eyeliner.nvim/"; }; @@ -3238,6 +3238,18 @@ final: prev: meta.homepage = "https://github.com/andviro/flake8-vim/"; }; + flash-nvim = buildVimPluginFrom2Nix { + pname = "flash.nvim"; + version = "2023-06-23"; + src = fetchFromGitHub { + owner = "folke"; + repo = "flash.nvim"; + rev = "188666c2d76347e46fc8527f9428fd48693b469c"; + sha256 = "190jjnwsl7nsf2zljwlrl14gpq2ragrx99ydhli7cgvnwiwwkcnq"; + }; + meta.homepage = "https://github.com/folke/flash.nvim/"; + }; + flatten-nvim = buildVimPluginFrom2Nix { pname = "flatten.nvim"; version = "2023-04-23"; @@ -3348,12 +3360,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-06-20"; + version = "2023-06-21"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "01f80274100fe3ff6c9183b9c0674a520141be4d"; - sha256 = "1pxbbdjq25ri5jhwl953020xwbzhy564m35xz9vhnv8i2wz8kg2l"; + rev = "5749f093759c29e3694053d048ceb940fe12c3d3"; + sha256 = "1shzw4886qifn90n5kpjhz9iqckqmfgfwmfk9ahkggd6l5844rw9"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -4523,12 +4535,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-06-19"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "c1aad95243f0d180f41348be26b2417547fb168b"; - sha256 = "0w4a2c6yxnf6q589sc7gmmsq2i76isr6pz8pyc75aj6isq3r4jrn"; + rev = "b7043f2983d7aead78ca902f3f2053907081859a"; + sha256 = "1dc8mc9lghxxbk94c8qwny55f7190zwlvip18zajj4bf9a116kpb"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4583,24 +4595,24 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-06-21"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "2d7d35ea0da1b4478436dfbbb7440be91605b503"; - sha256 = "0ihy5xpxzdg603dd31vbzcdj48gc5khr2d72r97ryc57afmriy28"; + rev = "0e5a8b684b577a1d1af53499007e9b84f6323e45"; + sha256 = "14mqp0l6gwhgg6sz592cdzkrh82gv2wa6l094spyyhz6f598rz62"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2023-06-21"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "6530106e93a0196437111678d6681c3121be7362"; - sha256 = "0ybzk88xs1095216ipki8s4ws4h3bpbrpi1cqqndclpxplhn06wg"; + rev = "d6166169f3cc2214398a6f516f2f2a0ccc2472c4"; + sha256 = "0rva1qwjjklfxjr7bn3vxv4ma4hrhjg469ynws1y69q5475vbj2v"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4631,12 +4643,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2022-11-28"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "36781e59099b9b46eed564283b95938f90cd852d"; - sha256 = "1p9x56iw26kkkv3dk6z8kf1bhsysr72gsc2x1ki2mhlf2i15axbn"; + rev = "1f5dd656018f83ad03bddda216bd5c04d23ba57d"; + sha256 = "12q0pv1lax8xkmy54dlvd5c7ibq4gkbd1zlangsqc4xiq7nnq7jg"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -5175,8 +5187,8 @@ final: prev: src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "e706d305fbcc8701bd30e31dd727aee2853b9db9"; - sha256 = "0kibx5p9f7zc4mp4rpihablfrrzrahhj777pjhjb0i46p3y0hx4r"; + rev = "664c987c3b14d2262a4e580f993a3e5045baded0"; + sha256 = "0pvxp5zdd2jxy0gkz913rny0p7k9zam5dzsdvgv8ihcdwn0c5mdg"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5255,12 +5267,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-06-15"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "3a11a130bac227462dd226669d260c4bbe33fb5b"; - sha256 = "0xrggd6a7g05n168624k19ga05cd35fv6imhz40dznrxkqbrp7cd"; + rev = "f51265b17b8753420372a6a8d3f865fe79630513"; + sha256 = "14dvlma230mjvjvz6vfv1vgxssk776hkdjmlsavch5p2z5l97j89"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5651,12 +5663,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-06-20"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "78f1c370173e7689bd58d64229b4d92c5dfb2793"; - sha256 = "00lmk9dnpvp6qd8ymav6z0i07fg0pbnmf0xrhvlrbglxl09dg4ym"; + rev = "412776d881d7aa2bedbe8a2572e700f740440cad"; + sha256 = "157l5lbgsacd1b7qvf9fnj8ssdq78bgpgvr15z7rmxm40i25pqrp"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5963,12 +5975,12 @@ final: prev: neotest-rust = buildVimPluginFrom2Nix { pname = "neotest-rust"; - version = "2023-06-21"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "e4baa0b02be7a7b9271da0a98eb82fb278a0c1e7"; - sha256 = "0rdl0a93qp01ldrmb98bz93yadadving2isksxz0m015cijrdf2s"; + rev = "3394e385cd33397d04ac703c5004ce7924ddcd99"; + sha256 = "02zk00b51jj4cxc6c5lxcppg2ayq48scqgkn41457w8zhzfj7bvb"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; @@ -5999,12 +6011,12 @@ final: prev: neotest-vitest = buildVimPluginFrom2Nix { pname = "neotest-vitest"; - version = "2023-04-16"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "f9efe9524ccba1284d5f4e41d0dc6ff91951cfcc"; - sha256 = "09bhg1g2r4nc0jr41v5j07wgfcqgfnjw4nbmhz8pizshiyqq0rah"; + rev = "41bf2f6b743f2ac5c5e9bd0949cee77ca7f2372c"; + sha256 = "0bz6h0mh8cyjf2xdnykyiijwmw9vgwvlb9nfzzjvxba8nqzgb4rq"; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; @@ -6227,12 +6239,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-06-19"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "39461475d9de676bccc338876689c9e5b44bc932"; - sha256 = "11b4bv0dhy8y478p1gfw2ic47bg0x9v073ljndvcz5qcdh3qpsv9"; + rev = "7d01b45174d0d642302518275ab7cedf73e2690b"; + sha256 = "1712kai7n0cgz1gq9lxka2x83zh647y1gsvp58mh6hbv8cbv9g14"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -6323,12 +6335,12 @@ final: prev: nvchad = buildVimPluginFrom2Nix { pname = "nvchad"; - version = "2023-06-18"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "11c839f870cfa8b75a9f847cba11fdfee7690856"; - sha256 = "17kjwwcbx0lwyn6f8zc3nl9v0wpmx7yif8rp32hzxinkz0pg35h8"; + rev = "4aa283119ac8abe8e8c4932c3f5ceb026052eebd"; + sha256 = "0xd0axz96z4a6snpdw814w56703kznmdvq8mzwp6aichd5g765rs"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6443,12 +6455,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2023-06-21"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "8a1694ff330ed58ed29716686fcef79c28090354"; - sha256 = "00zxvwc244njvkbwbvxffrcqam37xi93r0pvcvzin4kc9npaygaq"; + rev = "e1f1b40790a8cb7e64091fb12cc5ffe350363aa0"; + sha256 = "1gz02cy11r5bdrr0bz0xl0cmph6kpb3fv4xdnsbnxzq5jwia24m9"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -6695,12 +6707,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-06-18"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "da2f0934f08f01d9c0d348814860cb3413d4ab23"; - sha256 = "057wn6drnynrkbddgm9p8rnmzh3mqrlgy739wx3mvfax26fmg6xd"; + rev = "3ff82ebfbec4846d07ce442fb31f21f9785e87a9"; + sha256 = "1cp45lli0y5i41ws3hh888szn6vmbjqqppkm1cadkkhcw36j1kcv"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6731,12 +6743,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-06-13"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "aebfc22877ab143f907e90889e3903557183a22c"; - sha256 = "0r76y5qz86w55q0sx2jm5ps3j3nm7v5b60w4ln7vk59jz1m01a35"; + rev = "c6a3c47a0c57c6c0c9b5fb92d3770bb59e92d9c6"; + sha256 = "0239v4y3hr3g8njd14ii79ndrk56i494nfp1rx4lzj3a2jmx0b4r"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -6791,12 +6803,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-06-11"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "ed93c624e91b575f00d0834f2fecbdc6d3918096"; - sha256 = "17n8k151cf570fjxjivkkakb0ganb8iz56bj2088ifjrj50phsjf"; + rev = "0b99416769e87231ce37aec64b4ed91feb43a98e"; + sha256 = "0skmm7j2js0idqprns1jhknqnfvm88xxx3k0z3il0n2fibnd7kf3"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6815,12 +6827,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-06-20"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "a51892484c2002c083a8b0a9dfcefb3a569be36d"; - sha256 = "02yxlfqlvv8nprk9mbxhw2mh52plcjka5kwbn4h8s4d49dzp396w"; + rev = "b6b34b9acf84949f0ac1c00747765e62b81fb38d"; + sha256 = "12p1flmk9qp71kmy9sgv8a5izdwk1n4fggdpmiz42wyg7znzjxmp"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7031,12 +7043,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2023-06-20"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "8a04e2043f1d2582a5de1a7d97ff53e9e87c9d5f"; - sha256 = "123mxy80fmjvnk2bcaddkbnbf855xjqqzn2c69z5ym0bbydlkjld"; + rev = "251c5b9b15f7937bfe9a24bf3066a9944936c32d"; + sha256 = "0ii5ipxijlfbq1dx2sy027ypj006h6b8d6q4gb0gkgjp6kyb3dnb"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7067,12 +7079,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2023-06-10"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "8adb05dbfbd36862d700b5c3d1c26f0febf3f10d"; - sha256 = "1swpwr78g1ygw1k5a881qnrv9dk728637a90m44f44ip5g51v95l"; + rev = "f4dc98ec45ecded2344aa3aac2d7cc43ad236858"; + sha256 = "1p2s7a18d13irrf5yg1c4hq3ffqd8a7vqr4iw70rzvllr2mwzlbm"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -7151,12 +7163,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-06-21"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "c9d5812ba358ce9e5ae2df322550cc6bc1678538"; - sha256 = "1s6gxdg0f1wq8kw2x0frjbqq78h7ymdm91jv14ldsasagn7szmjb"; + rev = "f26596386f31d5bd74b85b7d1ab0fd90c5b98608"; + sha256 = "19ixpk7dsdyb99w41zy72j18amfw7vif6gdp2hvxrmwj0wqhwlmd"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -7235,12 +7247,12 @@ final: prev: nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2023-04-18"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3"; - sha256 = "194v4vp3fjwmhiyy6gf7465m9c7yhhyvwvyih6gxls0bq5jmdzjs"; + rev = "7f625207f225eea97ef7a6abe7611e556c396d2f"; + sha256 = "0rr0kqr4v2pf9r31sw5mk8xhrlp1nq8bhbmghi18gxxg2qc58p65"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; @@ -7354,12 +7366,12 @@ final: prev: oceanic-material = buildVimPluginFrom2Nix { pname = "oceanic-material"; - version = "2022-08-17"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "nvimdev"; repo = "oceanic-material"; - rev = "9f2d002398d1ef0cd52315fa767b138719536c5d"; - sha256 = "1c9sbprivdhjyzxni3xzmk3lc56icd61azzvl9bb961iaag6r1c9"; + rev = "d0bb88707f4f9e6918a958c5a80aeddf6db5c652"; + sha256 = "133ylp1ji3ff9pi8446772q3afxvrmc848wf31fk5d9as4izm47p"; }; meta.homepage = "https://github.com/nvimdev/oceanic-material/"; }; @@ -7390,12 +7402,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-06-21"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "2a63f9224f8cb1349da4cf89844a161a285b18e9"; - sha256 = "0ipyc8frgfk1mhmmn78nix264bdcn9fcsz39syv61ay20iljm8fk"; + rev = "8882f6c89eccb3754221cab942904780ed6b3e62"; + sha256 = "1x91qxgj84a7ywgyfwanzxjji5ffblln8p83rfybd6jfcnir6f28"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7451,12 +7463,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-06-21"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "47fbac24ecf4e75e5860c93242fbfc71234c3d4f"; - sha256 = "08zwnvw20afb574ksr89vkndf88fc5qif1942pn0rv56d0i7ppaw"; + rev = "f97db0e46ea5e55874892ac3e3cb2fc619d74c7f"; + sha256 = "10n7a19gmakv1nk96b2zsc5d3dnzasacg53iz620s0wkixrl8lsv"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8209,12 +8221,12 @@ final: prev: satellite-nvim = buildVimPluginFrom2Nix { pname = "satellite.nvim"; - version = "2023-06-20"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "22c8cc5283c9533677e4b86b9d25d3beeca04667"; - sha256 = "1s1y3z7kw5w2gnq96zfah3zy6m43rwvd9gaxpy5a2nr1alniwcjw"; + rev = "5ae27c87f1da3fd0c0924b5adb8e2dd42268b4fe"; + sha256 = "1ymvzjzdrv4li8vhy7k3aj1sa4cvvn6nrq7qr2jxzlwrz7q58sjr"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -8345,8 +8357,8 @@ final: prev: src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "11b21cdefab45895c2b585fa816dbf98831ff0f9"; - sha256 = "0ql4rrv2z36y2md12nqj5bydvymf6kkqwjj9ipnrh4c5ywbyh65x"; + rev = "f1fa0cf7f1c8d73b2631aaed9c73f706da8be4b5"; + sha256 = "1firdr23l58zdb9kvhar5ksc88ix6iy5pgifp4r9wks88k16gbr0"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -9307,12 +9319,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-06-13"; + version = "2023-06-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "00cf15074a2997487813672a75f946d2ead95eb0"; - sha256 = "0zfdcgs67nvhx73nmhv3ppilh9wkf2lv88pniwmf67pnks9x94i3"; + rev = "ffe35cb433192fcb5080b557c1aef14d37092035"; + sha256 = "1kac34kiwnnz3r80pyfx87r730jryqflh3f12hr8z8crzpz262yk"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9644,12 +9656,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-06-08"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "2af0dd9767526410c88c628f1cbfcb6cf22dd683"; - sha256 = "1wyiyijs7cjmn7qq2x6fgwm12zrr2sn3w5ray3d8rmrvzl0059ni"; + rev = "a3372bd2ba3a91882a6e54ed35da13a441d7c167"; + sha256 = "05cwzc2sskyijg2j2m82j0yvbh35cyabq8ms7zxi34kv2jm2pqm5"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -9776,12 +9788,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-06-20"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "677c4d935007bbe1e016f858d3e1f951b00796c5"; - sha256 = "148kwk9q5rp2pmcc4cnir8aaiq4y7r62dxggis12nk13lnpmrbxn"; + rev = "17fc0db0d876e2e8ce8522a3c4cb56429208c8b3"; + sha256 = "12hgg4jzb4ra3cnmvphzcklimf87x9fcmf1dvfn4pmcd2hnj542z"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11372,12 +11384,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2023-06-18"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "54c1b1c0762762065736ab82b1f50ec069b50475"; - sha256 = "1j8miaw8hj6wv245sb2a9p4w54yac7b60zlsqzyqvj89qbkcq61x"; + rev = "72f80973021957741ceca35e488fce5b430faeea"; + sha256 = "1q7svpk0hq3rn335dxqz0l2nqxfgq5xid12955q2kxgvnq2nhc81"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -11576,12 +11588,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2023-06-19"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "397a9c5796a5082b55b71dd3b55152dcf53261de"; - sha256 = "1nhcbzi80k9x2g8cf3l7072ln5b9a5vgfplpzhjj9q7iqswhg4bg"; + rev = "12de6c0bc0efce3cedc5e28d4fe0ecc3a4aaeb77"; + sha256 = "0y576h385h9m7d8wic2b2743v8l4vvpcly6fk5siwziqbq2j082h"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -12406,12 +12418,12 @@ final: prev: vim-lsp-settings = buildVimPluginFrom2Nix { pname = "vim-lsp-settings"; - version = "2023-06-04"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "b986f8c10056faf289d692ea816bfc22b780e425"; - sha256 = "0kz39yg96284fa33zsblg8bqb5snwx39slm8dv58w3mrifc1bkh1"; + rev = "da214dcc8d56ff1aa91f0661c8d16f6771e2231b"; + sha256 = "00wvfi39fpmn2zmn2hnamvi9m6fwp2vb12y73fjqldn483ml1hjl"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -13703,12 +13715,12 @@ final: prev: vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2023-06-08"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "69fd61ba2b1fe1e0c13d09fef24290ba5ed6a85f"; - sha256 = "1fzka877p9clfhh8jdf99c2d1wlyizgqdw6lzx1nrgsv53ayhd7l"; + rev = "a096a2969fcb807fd5c6a75d943c6227dd9e6a38"; + sha256 = "1jhkrir48kbdhd95659b7rmbavb75c05zqjvzz4f633i33j32bf3"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -14460,12 +14472,12 @@ final: prev: vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2023-03-12"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "1930f0fc234521945afd48db2bff09d925211571"; - sha256 = "1am4r68awdvjk51r6cyvvkkzj9zpiz394kn6qbjgz9qdc3xbsf1k"; + rev = "6bb0fff309b0e87509915c6101808f41a16d6f48"; + sha256 = "0n0mxynfy176yn8nm7aafhmwvfg0l409cnf8d2ix1fa8c74b8lk6"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -14821,12 +14833,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-06-21"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "2b31261b20e44c4b3c79ca7e42e2f9a5cdbe8cd3"; - sha256 = "1iv1qmbbz1q48x04l2d9cm10wrb4kf8xw9qnp2z2s4niy36w5345"; + rev = "efd8248abf7f2cdee13dd27c1d506ddfa788587c"; + sha256 = "09vnqcg52fnasdx2f3vqira0qph6icssf6kzg8gysjrbbg9kypxb"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -14845,12 +14857,12 @@ final: prev: vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2023-06-16"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "88620a2be0d47e74639b15c71f7e170bb3b2d432"; - sha256 = "1hw19wkrv98qvynak6ag79dffxafiv574bg52886wglrrimhl1y1"; + rev = "942da42b96251b5b9bef4e54bb79884ebf86c1f4"; + sha256 = "1kmjr26wyn1na9g7m6607vjk4g5yhdapsmlcv62myb9g58r0knpl"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -15266,12 +15278,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-06-21"; + version = "2023-06-22"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "d32b0bb5b1033920de5026e326869838aba856ee"; - sha256 = "15yc9ld6nybs9cfb2gncygxif1qd0g69nfppp2qcwgyhw7kynnij"; + rev = "506a4aa13443e0104ea49b99947cc09488d0791d"; + sha256 = "0694njpibbmnvlllvf42c7l350m33fxbjzdx9fjv6jz42a6zqwr5"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -15290,12 +15302,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-06-18"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "260312b5c60f5fc3299da4357690ba6bf4485387"; - sha256 = "0zcrq7hlmsjhcj0y5wjipafsxll5q8vj86cf1hcknvnq341sccxk"; + rev = "128b0f8fe46db9b696a747b7c70088ebfc0e0044"; + sha256 = "1ll2ihi42lvshxi7n7lmydyp32aglfsanqa72xa3b16say1y6a0q"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 90f0bd93e9f9..371db86f3940 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,12 +27,12 @@ }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=2caedf3"; + version = "0.0.0+rev=da8cae9"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "2caedf3e9eb314551a3a6cc9d3b6c4fcdee37747"; - hash = "sha256-YLBgsYPx2nv0mTZ3KqNeeZ09ZqzPeiJ6i3VR3+iW/p0="; + rev = "da8cae9ce365a81dcba25256f76c713674121017"; + hash = "sha256-axsaq4znP4A57oGKZJrjLrq+Yx4zVV2IssjMYVCQ2cI="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -137,12 +137,12 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=8acd38d"; + version = "0.0.0+rev=1648e21"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "8acd38dae01bea4157f729325f5c69d0b47a75f2"; - hash = "sha256-BaFM4bN0yAEKyYF0wQ+ZBDsSK1ObdOXA3sZ/9ZlD88w="; + rev = "1648e21b4f087963abf0101ee5221bb413107b07"; + hash = "sha256-WvkHtw8t14UNqiJvmS9dbGYQSVVzHS9mcWzxq+KLMnU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -247,12 +247,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=2e29f23"; + version = "0.0.0+rev=0e7b7a0"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "2e29f23abcb5f92ddffb22de8b292f09ed78db01"; - hash = "sha256-qIblqwUpQNfW7v5EugXck8UucGU4n+OWsS8+KgEDtkM="; + rev = "0e7b7a02b6074859b51c1973eb6a8275b3315b1d"; + hash = "sha256-s5QRDs4W8TpB+kWtwXIvanP+Ii7hQgUI/yu0rvDUIg4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -986,12 +986,12 @@ }; lalrpop = buildGrammar { language = "lalrpop"; - version = "0.0.0+rev=7744b56"; + version = "0.0.0+rev=b7431e4"; src = fetchFromGitHub { owner = "traxys"; repo = "tree-sitter-lalrpop"; - rev = "7744b56f03ac1e5643fad23c9dd90837fe97291e"; - hash = "sha256-xz+D1lS/bpHHu2rJEjalpMajSKl3yn+bQI9JN0Bm7tU="; + rev = "b7431e4b64183a5d0d094895a4cd5daf51ed3103"; + hash = "sha256-P7A/MFmnCHq5rn+QSogbRD3joT7OxC+F9v2oMQ+DZBE="; }; meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop"; }; @@ -1096,36 +1096,36 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=231f316"; + version = "0.0.0+rev=936cc84"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "231f3163cd27d48f91a4517cfdf72d167a9ef164"; - hash = "sha256-Fcq99HcTOcZwXs0V2zpTiDDQVcGocZQ0we5On9p+Uck="; + rev = "936cc84289f6de83c263ae8e659fb342867ceb16"; + hash = "sha256-fDpZs/supQ4Mdlm3+birKodclcwPdsytB3+cRHM4NkM="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=231f316"; + version = "0.0.0+rev=936cc84"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "231f3163cd27d48f91a4517cfdf72d167a9ef164"; - hash = "sha256-Fcq99HcTOcZwXs0V2zpTiDDQVcGocZQ0we5On9p+Uck="; + rev = "936cc84289f6de83c263ae8e659fb342867ceb16"; + hash = "sha256-fDpZs/supQ4Mdlm3+birKodclcwPdsytB3+cRHM4NkM="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=138f2ee"; + version = "0.0.0+rev=26c5255"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "138f2ee2eaadcff53ef1fce944713942af92c097"; - hash = "sha256-fVAchZULNxp8Jtl632hRClaR2FKWF5C5OW0QpjihGf0="; + rev = "26c525577c7349b8d9805d244cacd8ef98807b78"; + hash = "sha256-nvjqmyVcVfTkuMFyDWWJLZNN/SeiNwLrQU6qfvQqpmw="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1231,24 +1231,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=2da4930"; + version = "0.0.0+rev=82e103c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "2da49308381b91e19e5d270ec5117616d0e4b135"; - hash = "sha256-seyVqMGRLM1aD+863AvGaDFAhFYLCbQx4eitBcohbWQ="; + rev = "82e103cee0ffb61ee59f9b654b8e1d4b8e9cab74"; + hash = "sha256-ukfW16Se3HH5n0NRPhp0oaCHULDpUqvOlvgeTMQUVwE="; }; location = "ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=2da4930"; + version = "0.0.0+rev=82e103c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "2da49308381b91e19e5d270ec5117616d0e4b135"; - hash = "sha256-seyVqMGRLM1aD+863AvGaDFAhFYLCbQx4eitBcohbWQ="; + rev = "82e103cee0ffb61ee59f9b654b8e1d4b8e9cab74"; + hash = "sha256-ukfW16Se3HH5n0NRPhp0oaCHULDpUqvOlvgeTMQUVwE="; }; location = "interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -1377,12 +1377,12 @@ }; pony = buildGrammar { language = "pony"; - version = "0.0.0+rev=5fd795a"; + version = "0.0.0+rev=16f930b"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-pony"; - rev = "5fd795ae7597b568b0a356c5d243cc92162bc00c"; - hash = "sha256-uwxqbWK3Zy5heGQ3aSX73X6wY0FY3ewqjsQXgDl8nb0="; + rev = "16f930b250433cfcd4fb4144df92bb98ad344c20"; + hash = "sha256-UamgLmI1aI5e/JlGVZzFCPgDol8MnFomncrFKhQYLsk="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-pony"; }; @@ -1608,12 +1608,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=a5c4c29"; + version = "0.0.0+rev=cda0de8"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "a5c4c29b95aca29dea71f34bf046ad0b36499045"; - hash = "sha256-R7503gLEWdktp/OKBc2hCAf6YzS4RInzYU99ohLJZ+g="; + rev = "cda0de8a038b0e4ad79a97f7aa281250fcf88560"; + hash = "sha256-739c8THPQchATVQqaE5sAAg2aW5x8NXyn7OUT5yDRQs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1696,12 +1696,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=7cbac04"; + version = "0.0.0+rev=d38db87"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "7cbac0472e5b8f8486ce64ffbcf1982d5cd5fc8d"; - hash = "sha256-jUetr81AvJr2igJqCKG1Mt6REDTeeyFpgQNRRRwMJXw="; + rev = "d38db87c3e979a692cd542be44524f7f5e46f965"; + hash = "sha256-PT7joV3kA8LqB6t/bhahxNsp8zfOKNWQIT8gQ4UnqY4="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -1910,12 +1910,12 @@ }; twig = buildGrammar { language = "twig"; - version = "0.0.0+rev=2457993"; + version = "0.0.0+rev=779ee5a"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-twig"; - rev = "2457993b13a06dec2706e6a6c3d5b65bb23024b8"; - hash = "sha256-8H2luJtjSZt2AWP1L0A64jm+DeEH8cFaC+yvIDLKk4o="; + rev = "779ee5ab1e065dcef7f51f253030dc875445b25f"; + hash = "sha256-4De6ETY0oqbvMXtTDyd1vwheJdfuIusNHjyqyspsz2A="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-twig"; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ecf5dd7e018c..33669a2a0d88 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -271,6 +271,7 @@ https://github.com/j-hui/fidget.nvim/,, https://github.com/bogado/file-line/,, https://github.com/glacambre/firenvim/,HEAD, https://github.com/andviro/flake8-vim/,, +https://github.com/folke/flash.nvim/,HEAD, https://github.com/willothy/flatten.nvim/,HEAD, https://github.com/ggandor/flit.nvim/,HEAD, https://github.com/ncm2/float-preview.nvim/,, diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index a1508e7a3b62..de3f1801ef9c 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-fBwxc6n4sNNRiKcax96Tl3cFD+Ryvmj+XizB3z2s4+Q="; + sha256 = "sha256-fTrvHf7iA3qexxdebSgzLXlngAOkdraW3KiVTVYodrY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix index 59ccbea496cd..a46c02304416 100644 --- a/pkgs/applications/emulators/pcsx2/default.nix +++ b/pkgs/applications/emulators/pcsx2/default.nix @@ -23,6 +23,7 @@ , rapidyaml , SDL2 , soundtouch +, strip-nondeterminism , vulkan-headers , vulkan-loader , wayland @@ -58,7 +59,13 @@ stdenv.mkDerivation rec { "-DDISABLE_BUILD_DATE=TRUE" ]; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook zip ]; + nativeBuildInputs = [ + cmake + pkg-config + strip-nondeterminism + wrapQtAppsHook + zip + ]; buildInputs = [ curl @@ -95,6 +102,7 @@ stdenv.mkDerivation rec { install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/* + strip-nondeterminism $out/bin/resources/patches.zip ''; qtWrapperArgs = [ diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 5da2ad763187..8da558bfbeb0 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -426,6 +426,14 @@ in }; }; + fuse = mkLibretroCore { + core = "fuse"; + meta = { + description = "A port of the Fuse Unix Spectrum Emulator to libretro"; + license = lib.licenses.gpl3Only; + }; + }; + gambatte = mkLibretroCore { core = "gambatte"; meta = { @@ -970,6 +978,14 @@ in }; }; + twenty-fortyeight = mkLibretroCore { + core = "2048"; + meta = { + description = "Port of 2048 puzzle game to the libretro API"; + license = lib.licenses.unlicense; + }; + }; + vba-m = mkLibretroCore { core = "vbam"; src = getCoreSrc "vba-m"; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index e18361c0d35d..903708aabd69 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -1,4 +1,10 @@ { + "2048": { + "owner": "libretro", + "repo": "libretro-2048", + "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2", + "sha256": "gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA=" + }, "atari800": { "owner": "libretro", "repo": "libretro-atari800", @@ -180,6 +186,12 @@ "rev": "9a65ec6e31d48ad0dae1f381c1ec61c897f970cb", "sha256": "ZeWw/K6i04XRympqZ6sQG/yjN8cJglVcIkxpyRHx424=" }, + "fuse": { + "owner": "libretro", + "repo": "fuse-libretro", + "rev": "847dbbd6f787823ac9a5dfacdd68ab181063374e", + "sha256": "jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM=" + }, "gambatte": { "owner": "libretro", "repo": "gambatte-libretro", diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index 4ed9dbf34080..bd325e5739a7 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -12,6 +12,7 @@ SCRIPT_PATH = Path(__file__).absolute().parent HASHES_PATH = SCRIPT_PATH / "hashes.json" GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8)) CORES = { + "2048": {"repo": "libretro-2048"}, "atari800": {"repo": "libretro-atari800"}, "beetle-gba": {"repo": "beetle-gba-libretro"}, "beetle-lynx": {"repo": "beetle-lynx-libretro"}, @@ -42,6 +43,7 @@ CORES = { "flycast": {"repo": "flycast"}, "fmsx": {"repo": "fmsx-libretro"}, "freeintv": {"repo": "freeintv"}, + "fuse": {"repo": "fuse-libretro"}, "gambatte": {"repo": "gambatte-libretro"}, "genesis-plus-gx": {"repo": "Genesis-Plus-GX"}, "gpsp": {"repo": "gpsp"}, diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 8265da3213da..690f2cbc89db 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -28,13 +28,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.898"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.900"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "649d372f7da8559f8b6d74ca44af64ba7d7853c4"; - sha256 = "0vi87qd99dzshg4raiw158b3d5l62y359kandfabjqbjn7614bpp"; + rev = "d604e982276105db043ca495a16f1b047bb2d0f6"; + sha256 = "0fsl2cw0y7jfj9b75w4x213x9hsxkfprvb6riin87yrdhmjkwa4r"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index db3aae01c6b4..19b42b6b7ad7 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw -, cairo, readline, ffmpeg, makeWrapper, wxGTK32, libiconv, netcdf, blas +, cairo, readline, ffmpeg, makeWrapper, wxGTK32, libiconv, libxml2, netcdf, blas , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python3Packages, proj-datumgrid , zstd, pdal, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "grass"; - version = "8.2.1"; + version = "8.3.0"; src = with lib; fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = version; - hash = "sha256-U3PQd3u9i+9Bc7BSd0gK8Ss+iV9BT1xLBDrKydtl3Qk="; + hash = "sha256-YHQtvp/AYMWme46yIc4lE/izjqVePnPxn3GY5RRfPq4="; }; nativeBuildInputs = [ @@ -21,11 +21,10 @@ stdenv.mkDerivation rec { geos # for `geos-config` netcdf # for `nc-config` libmysqlclient # for `mysql_config` - pdal # for `pdal-config`; remove with next version, see https://github.com/OSGeo/grass/pull/2851 ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]); buildInputs = [ - cairo zlib proj libtiff libpng fftw sqlite + cairo zlib proj libtiff libpng libxml2 fftw sqlite readline ffmpeg postgresql blas wxGTK32 proj-datumgrid zstd gdal diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 2bdd5b75ddb6..4e4d6211b823 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -1,9 +1,9 @@ { stdenv -, mkDerivation , lib , fetchurl # native , cmake +, desktopToDarwinBundle , pkg-config # not native , gdal @@ -29,13 +29,13 @@ , fftw }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "saga"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "sha256-8S8Au+aLwl8X0GbqPPv2Q6EL98KSoT665aILc5vcbpA="; + url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; + sha256 = "sha256-dyqunuROQlF1Lo/XsNj9QlN7WbimksfT1s8TrqB9PXE="; }; sourceRoot = "saga-${version}/saga-gis"; @@ -43,7 +43,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ]; + ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ curl @@ -79,9 +79,9 @@ mkDerivation rec { meta = with lib; { description = "System for Automated Geoscientific Analyses"; - homepage = "http://www.saga-gis.org"; + homepage = "https://saga-gis.sourceforge.io"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ michelk mpickering ]; + maintainers = with maintainers; teams.geospatial.members ++ [ michelk mpickering ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 34936b799ca6..2e56e8b691e5 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -14,19 +14,19 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "21.4.0"; + version = "21.5.0"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-wiLeRku8/v7bB/Ml6rKPdZRtxJYFMAt3Xz9MixXhHnw="; + hash = "sha256-Eh3QRVeWd/RDEBnuYpFeNF96bt7bGpNkNFwWaTdYeCE="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-phB/KPIkgCJT4wEDmUWvaXj0ZPih0EQY40LbRfA58Ro="; + hash = "sha256-PcE3PhK4jIRx089A8nnZBvYwWpjeTtGFwAMGwbfVS5E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/applications/graphics/eyedropper/default.nix index d217ab9e47d2..2cfd3d7adfa2 100644 --- a/pkgs/applications/graphics/eyedropper/default.nix +++ b/pkgs/applications/graphics/eyedropper/default.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation rec { pname = "eyedropper"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "FineFindus"; repo = pname; rev = "v${version}"; - hash = "sha256-kc/UREQpmw3suA6bYEr9fCIwMzNMrEY9E5qf+rhKsC4="; + hash = "sha256-ZlqRTTSQHmsOhQNg8W2hKL2/zCOu2ECEUrTQ507WN90="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-/eas1PObrj9IuDIzlBVbfhEhH8eDyZ7CD871JmAqnyY="; + hash = "sha256-/CIheSIFrymYcCip3NmozAS8ojPnF0qO+oXI15zttkE="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A powerful color picker and formatter"; + description = "Pick and format colors"; homepage = "https://github.com/FineFindus/eyedropper"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/figma-agent/default.nix b/pkgs/applications/graphics/figma-agent/default.nix index 31dbf9b13526..d0569d828bf1 100644 --- a/pkgs/applications/graphics/figma-agent/default.nix +++ b/pkgs/applications/graphics/figma-agent/default.nix @@ -8,7 +8,7 @@ let inherit (rustPlatform) buildRustPackage bindgenHook; - version = "0.2.7"; + version = "0.2.8"; in buildRustPackage { pname = "figma-agent"; @@ -18,10 +18,10 @@ buildRustPackage { owner = "neetly"; repo = "figma-agent-linux"; rev = version; - sha256 = "sha256-Cq1hWNwJLBY9Bb41WFJxnr9fcygFZ8eNsn5cPXmGTyw="; + sha256 = "sha256-GtbONBAXoJ3AdpsWGk4zBCtGQr446siMtuj3or27wYw="; }; - cargoSha256 = "sha256-Gc94Uk/Ikxjnb541flQL7AeblgU/yS6zQ/187ZGRYco="; + cargoHash = "sha256-EmBeRdnA59PdzSEX2x+sVYk/Cs7K3k0idDjbuEzI9j4="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index 14a22bfbfe17..24732eee9e3a 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitLab { owner = "postmarketOS"; repo = "megapixels"; rev = version; - hash = "sha256-xrO9Xr9DPjlDs4yaKy32yb4X8wFqLKfy8rsjtBuN+Rg="; + hash = "sha256-ZkTDHDL5nhpR8PKqia12pbrEZLnRXEm8DwBYdYrP5Qo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/oculante/Cargo.lock b/pkgs/applications/graphics/oculante/Cargo.lock index dd7d2300e497..00d5904445a1 100644 --- a/pkgs/applications/graphics/oculante/Cargo.lock +++ b/pkgs/applications/graphics/oculante/Cargo.lock @@ -276,6 +276,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded" + +[[package]] name = "bitreader" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -363,7 +369,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -394,7 +400,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "log", "nix 0.25.1", "slotmap", @@ -431,9 +437,9 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfg-expr" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a" +checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" dependencies = [ "smallvec", "target-lexicon", @@ -473,9 +479,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_lex", - "indexmap", + "indexmap 1.9.3", "strsim", "termcolor", "textwrap", @@ -541,7 +547,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", "core-foundation", @@ -557,7 +563,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-foundation", "core-graphics-types", @@ -642,7 +648,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", "foreign-types 0.3.2", @@ -651,13 +657,12 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", - "foreign-types 0.3.2", "libc", ] @@ -979,6 +984,12 @@ dependencies = [ ] [[package]] +name = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + +[[package]] name = "errno" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1062,7 +1073,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59ae66425802d6a903e268ae1a08b8c38ba143520f227a205edf4e9c7e3e26d5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "winapi", ] @@ -1201,7 +1212,7 @@ dependencies = [ "memmap2 0.6.2", "slotmap", "tinyvec", - "ttf-parser 0.19.0", + "ttf-parser 0.19.1", ] [[package]] @@ -1231,7 +1242,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -1261,7 +1272,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "freetype-sys", "libc", ] @@ -1361,7 +1372,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -1576,7 +1587,7 @@ version = "0.30.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b0385782048be65f0a9dd046c469d6a758a53fe1aa63a8111dea394d2ffa2f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg_aliases", "cgl", "core-foundation", @@ -1713,7 +1724,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1722,10 +1733,11 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "9906a89f1724975a455316ae0554ceaa45ad83bb336f1125a87bfbdb9197cfa0" dependencies = [ + "cfg-if 1.0.0", "crunchy", ] @@ -1745,6 +1757,12 @@ dependencies = [ ] [[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1918,6 +1936,16 @@ dependencies = [ ] [[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] name = "indicatif" version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2572,7 +2600,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", "ndk-sys", "num_enum", @@ -2636,7 +2664,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.6.5", @@ -2649,7 +2677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.6.5", @@ -2706,7 +2734,7 @@ dependencies = [ "futures", "futures-util", "hashbrown 0.13.2", - "indexmap", + "indexmap 1.9.3", "js-sys", "log", "notan_core", @@ -3118,7 +3146,7 @@ dependencies = [ [[package]] name = "oculante" -version = "0.6.65" +version = "0.6.66" dependencies = [ "anyhow", "arboard", @@ -3156,7 +3184,7 @@ dependencies = [ "serde", "serde_json", "strum", - "strum_macros", + "strum_macros 0.25.0", "tiff 0.9.0", "tiny-skia 0.9.1", "turbojpeg", @@ -3164,6 +3192,7 @@ dependencies = [ "webbrowser", "windres", "winres", + "zune-png", ] [[package]] @@ -3209,7 +3238,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" dependencies = [ - "ttf-parser 0.19.0", + "ttf-parser 0.19.1", ] [[package]] @@ -3230,7 +3259,7 @@ dependencies = [ "approx", "fast-srgb8", "palette_derive", - "phf 0.11.1", + "phf 0.11.2", ] [[package]] @@ -3241,7 +3270,7 @@ checksum = "3c02bfa6b3ba8af5434fa0531bf5701f750d983d4260acd6867faca51cdc4484" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -3310,12 +3339,12 @@ dependencies = [ [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros 0.11.1", - "phf_shared 0.11.1", + "phf_macros 0.11.2", + "phf_shared 0.11.2", ] [[package]] @@ -3330,11 +3359,11 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.11.1", + "phf_shared 0.11.2", "rand", ] @@ -3354,15 +3383,15 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ - "phf_generator 0.11.1", - "phf_shared 0.11.1", + "phf_generator 0.11.2", + "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.22", ] [[package]] @@ -3376,9 +3405,9 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] @@ -3406,7 +3435,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -3445,7 +3474,7 @@ version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", @@ -3459,7 +3488,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "concurrent-queue", "libc", @@ -3522,9 +3551,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ "unicode-ident", ] @@ -3716,7 +3745,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3725,7 +3754,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3927,7 +3956,7 @@ version = "0.37.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -3978,7 +4007,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytemuck", "smallvec", "ttf-parser 0.18.1", @@ -4105,14 +4134,14 @@ checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] name = "serde_json" -version = "1.0.97" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" dependencies = [ "itoa", "ryu", @@ -4121,9 +4150,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -4246,7 +4275,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" dependencies = [ - "bitflags", + "bitflags 1.3.2", "calloop", "dlib", "lazy_static", @@ -4334,7 +4363,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros", + "strum_macros 0.24.3", ] [[package]] @@ -4351,6 +4380,19 @@ dependencies = [ ] [[package]] +name = "strum_macros" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9f3bd7d2e45dcc5e265fbb88d6513e4747d8ef9444cf01a533119bce28a157" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.22", +] + +[[package]] name = "svgfilters" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4383,9 +4425,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" dependencies = [ "proc-macro2", "quote", @@ -4394,22 +4436,22 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.7.4", + "toml 0.7.5", "version-compare", ] [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" [[package]] name = "tempfile" @@ -4457,7 +4499,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -4610,9 +4652,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" dependencies = [ "serde", "serde_spanned", @@ -4622,20 +4664,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -4682,9 +4724,9 @@ checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" [[package]] name = "ttf-parser" -version = "0.19.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44dcf002ae3b32cd25400d6df128c5babec3927cd1eb7ce813cfff20eb6c3746" +checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33" [[package]] name = "turbojpeg" @@ -4878,12 +4920,11 @@ dependencies = [ [[package]] name = "v_frame" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "148c23ce3c8dae5562911cba1c264eaa5e31e133e0d5d08455409de9dd540358" +checksum = "e3753f70d50a77f5d381103ba2693a889fed0d84273dd5cbdf4eb8bda720f0c6" dependencies = [ "cfg-if 1.0.0", - "new_debug_unreachable", "noop_proc_macro", "num-derive", "num-traits 0.2.15", @@ -4966,7 +5007,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", "wasm-bindgen-shared", ] @@ -5000,7 +5041,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5017,7 +5058,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" dependencies = [ - "bitflags", + "bitflags 1.3.2", "downcast-rs", "libc", "nix 0.24.3", @@ -5056,7 +5097,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "wayland-client", "wayland-commons", "wayland-scanner", @@ -5398,7 +5439,7 @@ version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cocoa", "core-foundation", "core-graphics", @@ -5548,6 +5589,15 @@ dependencies = [ ] [[package]] +name = "zune-core" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ca36c2e02af0d8d7ee977542bfe33ed1c516be73d3c1faa4420af46e96ceee" +dependencies = [ + "bitflags 2.3.2", +] + +[[package]] name = "zune-inflate" version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5555,3 +5605,15 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" dependencies = [ "simd-adler32", ] + +[[package]] +name = "zune-png" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee5abc36f78f32bf5ffb5f070a69cb7beffa7cb393817d3a30f9fe7c1ea57655" +dependencies = [ + "bytemuck", + "log", + "zune-core", + "zune-inflate", +] diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index 8c1ebad81fb9..e293254faef7 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -21,13 +21,13 @@ rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.6.65"; + version = "0.6.66"; src = fetchFromGitHub { owner = "woelper"; repo = pname; rev = version; - hash = "sha256-99wA8BELw/FsiwGtWmbZedANjHamK1IHnl4wHwPAGIE="; + hash = "sha256-kpJ4eWSvgvmW8I1O9TzgQ0K6ELbAk7fhfVFPhWtClkw="; }; cargoLock = { diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 15cf51e1d382..27021eab2132 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -17,7 +17,7 @@ , git , autoconf , libtool -, nodePackages +, typescript , ApplicationServices , Carbon , Cocoa @@ -65,7 +65,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake git - nodePackages.typescript + typescript makeWrapper ] ++ lib.optionals stdenv.isLinux [ pkg-config diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 591dc738e916..0dbcf051c3c9 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -9,15 +9,15 @@ }: buildDotnetModule rec { - pname = "archisteamfarm"; + pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "5.4.6.3"; + version = "5.4.7.3"; src = fetchFromGitHub { - owner = "justarchinet"; - repo = pname; + owner = "JustArchiNET"; + repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-TAGb3LPS0Jpm3dGGkQbrtTBFCE/xos2ZbNq5UwnrGZY="; + hash = "sha256-xxHNMqFHxFVbKpy9JHHif4GZ/jk9CUUwgyPWmlTXgcc="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; @@ -56,7 +56,7 @@ buildDotnetModule rec { buildPlugin() { echo "Publishing plugin $1" dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ - --output $out/lib/${pname}/plugins/$1 --configuration Release \ + --output $out/lib/archisteamfarm/plugins/$1 --configuration Release \ -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore \ --framework=net7.0 } diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 8c4bbf9c686b..40c6bf53a7c0 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -2,8 +2,8 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AngleSharp"; version = "0.17.1"; sha256 = "038idg33ydy72362qplsd7y8ldifi9zg02dhjli6wy4p47hyqcph"; }) - (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.1"; sha256 = "0sdxqjwvyf0l1cp4n4i84g7rly8z7ramq0y7vsgqvf6hzx7dnk5i"; }) + (fetchNuGet { pname = "AngleSharp"; version = "1.0.2"; sha256 = "0808lnbggp3dl116amxj1hz8cfh1a3hi8q10qwgdiwhqx919jslb"; }) + (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.3"; sha256 = "1z6j171ffw2w5c44j2d7kqki6c8j229i3xbi6pgpk9pas41mdrxx"; }) (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; }) (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) @@ -61,7 +61,7 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.0"; sha256 = "02s98d8nwz5mg4mymcr86qdamy71a29g2091xg452czmd3s3x2di"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.2"; sha256 = "1wwmg6hn4dp2mvwn2bm81wccdw149lq17xdnpz17mvg4zcwmax7g"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) @@ -71,14 +71,14 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.0"; sha256 = "1bnwpwg7k72z06027ip4yi222863r8sv14ck9nj8h64ckiw2r256"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.2"; sha256 = "1a658bnh5q3lfkrr81h3lyx1mc3hggnjr1bpmim71rr2s42ad70v"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.0"; sha256 = "1rz22chnis11dwjrqrcvvmfw80fi2a7756a7ahwy6jlnr250zr61"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.0"; sha256 = "16vpicp4q2kbpgr3qwpsxg7srabxqszx23x6smjvvrvz7qmr5v8i"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.2"; sha256 = "0asbrbdyyig1p034smf79lszzbfv1cn6q181i7d4p2vsiqpjp9sj"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.2"; sha256 = "0lcj8kkcnxbwiaw6j0xf4fxqpa6z0s41nq52spvckfg4367lg4fg"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.3"; sha256 = "12f5h28115vv7j17whq7f9fwnww3p7iwfbkq3m24m0si303cgqbw"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.3"; sha256 = "0d9nmgj97qpd4w8x609amcawmcywm2q0r2w1p2hvyah0p5s9m0f3"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.4"; sha256 = "02jffh6kmkccakr51v3iwwq3281sypdilpjjf845dwrsl9ksf73k"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.4"; sha256 = "0dz0mn6bp3bb650k992mr2lga7xn1xc3qfbdfivgknfccyy8d6k8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) @@ -86,10 +86,10 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.1.3"; sha256 = "0r09pd9cax95gn5bxskfhmalfd5qi3xx5j14znvryd1vn2vy6fln"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.3"; sha256 = "0p3zj9l45iv4khmrp5wx0ry9pc8yg3n3ml73mrckhjjw0p5f2lw2"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.3"; sha256 = "059h8r09jk84mbpljfqfbpp19w1wn3bs2nr9wdfg1p8z6mqawm01"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) + (fetchNuGet { pname = "NLog"; version = "5.2.0"; sha256 = "1j27wrjxjpfy10s5182d477y6qb50fdak6r0vx44bbsakmv0zv3s"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.0"; sha256 = "08rlrag6ilxn1wyd5ivsny0rgidsn3imsx5bqjwv5dlwdjh5acfh"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.0"; sha256 = "1fmdp6bjzcj1nfpnlzcyszl8jnmr35gd79ngqx6cikpg8xpyczhr"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.16"; sha256 = "0pwlqlq2p8my2sr8b0cvdav5cm8wpwf3s4gy7s1ba701ac2zyb9y"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.16"; sha256 = "00znhikq7valr3jaxg66cwli9hf75wkmmpf6rf8p790hf8lxq0c5"; }) (fetchNuGet { pname = "SteamKit2"; version = "2.5.0-beta.1"; sha256 = "0691285g4z12hv5kpv72l36h45086n14rw56x3dnixcvrjzg2q01"; }) @@ -99,7 +99,6 @@ (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.5.0"; sha256 = "1s6axf6fin8sss3bvzp0s039rxrx71vx4rl559miw12bz3lld8kc"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.5.0"; sha256 = "0hq93gy5vyrigpdk9lhqwxglxwkbxa8ydllwcqs4bwfcsspzrs83"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.5.0"; sha256 = "17hx7kc187higm0gk67dndng3n7932sn3fwyj48l45cvyr3025h7"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) (fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; }) @@ -115,6 +114,6 @@ (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.1"; sha256 = "1nq9ngkqha70rv41692c79zq09cx6m85wkp3xj9yc31s62afyl5i"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) (fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; }) ] diff --git a/pkgs/applications/misc/ArchiSteamFarm/update.sh b/pkgs/applications/misc/ArchiSteamFarm/update.sh index 857474c483e3..84e25328fbfd 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/update.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts nix-prefetch prefetch-npm-deps set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 783a9fe3b6bc..7d04f3bb9ef7 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -9,11 +9,11 @@ buildNpmPackage { repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "3078d92e8b8d79571b771f452a53d1789330c541"; - hash = "sha256-K3YTgsde9aqtmKuFKjXpoWe6USGpKBlC6eeazuOYTqk="; + rev = "0dc9b31a571fe840ac1661b9e9777f253304529d"; + hash = "sha256-gY+4H6roqqoRFTwyNboXKg8LM7BfxQYYij/eilohFNY="; }; - npmDepsHash = "sha256-L+aWsGMUmIsPJRQ4XPg8WOWOqHKcfDQTqUK+vGBHi0Y="; + npmDepsHash = "sha256-3sRjlFuFyG8j8CPKG8Gj5QhE4YD9DJ5qaTJlNJT2Oao="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/brewtarget/default.nix b/pkgs/applications/misc/brewtarget/default.nix index 118245034500..13a5681ebd37 100644 --- a/pkgs/applications/misc/brewtarget/default.nix +++ b/pkgs/applications/misc/brewtarget/default.nix @@ -3,26 +3,28 @@ , fetchFromGitHub , bash , cmake +, boost +, xercesc +, xalanc , qtbase , qttools , qtmultimedia -, qtwebkit , qtsvg }: mkDerivation rec { pname = "brewtarget"; - version = "2.3.1"; + version = "3.0.5"; src = fetchFromGitHub { owner = "Brewtarget"; repo = pname; rev = "v${version}"; - sha256 = "14xmm6f8xmvypagx4qdw8q9llzmyi9zzfhnzh4kbbflhjbcr7isz"; + sha256 = "sha256-PqaiZ2eLH8+qRRkIolnQClTL9O9EgHMqFH/nUffosV8="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qttools qtmultimedia qtwebkit qtsvg ]; + nativeBuildInputs = [ cmake boost xercesc xalanc ]; + buildInputs = [ qtbase qttools qtmultimedia qtsvg ]; preConfigure = '' chmod +x configure diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index cda685c971dc..0cdd77b4293c 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cobalt"; - version = "0.18.5"; + version = "0.19.0"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; rev = "v${version}"; - sha256 = "sha256-Y1rWKoh4cjLOvBJy4bXIHsvGtLmTu9n0aqf6PdflH6E="; + sha256 = "sha256-cW9Pj4dTBZ0UmHvrWpx0SREBBaEIb2aaX2cdCUdlFLw="; }; - cargoHash = "sha256-r0nxsDcdXNiZn9dVMTOAxlI/kd0nZFh7JvB2JYDR2aw="; + cargoHash = "sha256-/xkZuGyinQdUGWix/SRtJMJ5nmpXJu39/LxJoTHnT4Q="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/comodoro/default.nix b/pkgs/applications/misc/comodoro/default.nix index c036b2aa2c7d..1ce6195aaec5 100644 --- a/pkgs/applications/misc/comodoro/default.nix +++ b/pkgs/applications/misc/comodoro/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "comodoro"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "soywod"; repo = "comodoro"; rev = "v${version}"; - sha256 = "rGnVXyfWJkPHfpf1gRGbDJ6Y1ycKOOcCZ+Jx35fUo6M="; + hash = "sha256-pxe3Nv1N85uWsiv4s0wtD++zlZZgMADH51f5RMK9huA="; }; - cargoSha256 = "jpshuavywCLN03xD/gFgQeGbKtmHq5pULbxd+RUbaDk="; + cargoSha256 = "E5oHeMow9MrVrlDX+v0tX9Nv3gHUxDNUpRAT5jPa+DI="; nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles; diff --git a/pkgs/applications/misc/eos-installer/default.nix b/pkgs/applications/misc/eos-installer/default.nix index 5200907ff0db..67e6b2bc97ad 100644 --- a/pkgs/applications/misc/eos-installer/default.nix +++ b/pkgs/applications/misc/eos-installer/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { description = "Installer UI which writes images to disk"; license = licenses.gpl2Plus; maintainers = with maintainers; [ qyliss ]; + mainProgram = "gnome-image-installer"; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gnome-solanum/default.nix b/pkgs/applications/misc/gnome-solanum/default.nix index 7e1c5b1eba12..a93f55683b6f 100644 --- a/pkgs/applications/misc/gnome-solanum/default.nix +++ b/pkgs/applications/misc/gnome-solanum/default.nix @@ -5,6 +5,8 @@ , rustPlatform , cargo , desktop-file-utils +, appstream-glib +, blueprint-compiler , meson , ninja , pkg-config @@ -20,29 +22,20 @@ stdenv.mkDerivation rec { pname = "solanum"; - version = "3.0.1"; + version = "4.0.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Solanum"; - rev = "v${version}"; - sha256 = "0cga6cz6jfbipzp008rjznkz7844licdc34lk133fcyqil0cg0ap"; + rev = version; + hash = "sha256-ohUwxwhPxZlKoP5Nq/daD9z5Nj37C7MnFzyvQKp7R8E="; }; - patches = [ - # Fix build with meson 0.61, can be removed on next update - # https://gitlab.gnome.org/World/Solanum/-/merge_requests/49 - (fetchpatch { - url = "https://gitlab.gnome.org/World/Solanum/-/commit/e5c5d88f95b0fe4145c9ed346b8ca98a613d7cfe.patch"; - sha256 = "j84P9KzMr0o38u4OD4ZPst+yqw1LCRoa1awT3nelFDI="; - }) - ]; - cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "10kzv98b2fiql9f6n2fv6lrgq4fdzxq0h4nzcq9jrw3fsggzl0wb"; + hash = "sha256-eDwMBxMmj246tplZfREJkViCDbKmuWSUZyM+tChNQDA="; }; postPatch = '' @@ -57,6 +50,8 @@ stdenv.mkDerivation rec { python3 git desktop-file-utils + appstream-glib + blueprint-compiler rustPlatform.cargoSetupHook cargo rustc diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index c30ac28863f4..4505aceee869 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.114.0"; + version = "0.114.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - hash = "sha256-ofHBpRXgfT8nadAtW0RWbuHhjtANX7gXqZoLLBrRarU="; + hash = "sha256-kez84MWr/ld74S2Pv0U4WyeZAbdAdrjg8eOsISeuzbg="; }; - vendorHash = "sha256-sogMGgBXB1cHbDbapbX/PvvOHRgzzT8s4h2xsX4irpM="; + vendorHash = "sha256-dE2mWCfBr0Ss6I42b+cZAXuK63fxWad1vuZETW59cXI="; doCheck = false; diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix index d1f609475398..d3c073e5663a 100644 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "k4dirstat"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = "jeromerobert"; repo = pname; rev = version; - hash = "sha256-nedtCa3h62pAmJYGIYp9jkNYiqe9WevVjwNAqVaaFuc="; + hash = "sha256-TXMUtiPS7qRLm6cCy2ZntYrcNJ0fn6X+3o3P5u7oo08="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/misc/mainsail/default.nix b/pkgs/applications/misc/mainsail/default.nix index 97d61eaabc49..e986b5b4b35c 100644 --- a/pkgs/applications/misc/mainsail/default.nix +++ b/pkgs/applications/misc/mainsail/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "mainsail"; - version = "2.5.1"; + version = "2.6.0"; src = fetchzip { url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip"; - hash = "sha256-xdmi1Q2j2gG4ajh57mBsjH3qCBwpsZCQbh0INFKifg4="; + hash = "sha256-zTlM02brIiXWKkRQ4zW+BEp+66iCelNsd+uN6yWfqYM="; stripRoot = false; }; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 37fab1403219..ad940a77f99a 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -34,6 +34,9 @@ mkDerivation rec { }) ]; + # HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qt5.qtbase` + sandboxProfile = toString qtbase.__propagatedSandboxProfile; + qmakeFlags = [ # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too: "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" diff --git a/pkgs/applications/misc/therion/default.nix b/pkgs/applications/misc/therion/default.nix index 295cd860b03e..f0ea721f1279 100644 --- a/pkgs/applications/misc/therion/default.nix +++ b/pkgs/applications/misc/therion/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "therion"; - version = "6.1.7"; + version = "6.1.8"; src = fetchFromGitHub { owner = "therion"; repo = "therion"; rev = "v${version}"; - hash = "sha256-q+p1akGfzBeZejeYiJ8lrSbEIMTsX5YuIG/u35oh0JI="; + hash = "sha256-bmp0IZ4uAqDpe2e8UeIDUdFaaocx4OBIYuhnaHirqGc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index af0691c415da..c5584492f7ff 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "115.0.5790.24", - "sha256": "1lrq9v5lsnq4cawc8fk396c5r12ckb8isknri49qrr2vkrbhqq1k", - "sha256bin64": "02l1in8jz3xwjxhk45y802p9dnk4czx8cyv22f2h8839gzfafmgl", + "version": "115.0.5790.32", + "sha256": "1zy4f57j047aw164s4x0904yazq6nvyy2wjjk9amiav9qyrfxzr6", + "sha256bin64": "0qgciqrjnsb9vxnvvcaqn728x9l0s72v78a6f7zffjxps87rbaz5", "deps": { "gn": { "version": "2023-05-19", @@ -32,15 +32,15 @@ } }, "dev": { - "version": "116.0.5817.0", - "sha256": "0256ffzf21f2i0isxpir0pb4xxafmq2abw4jikgyzxjy0xhswp9z", - "sha256bin64": "0lqbranc7gp9xjnins4xicidk0wxdhryji47wmr4hvkg2nq72y4z", + "version": "116.0.5829.0", + "sha256": "0ip0wha705nr7yr4fn25psb6r41a703b9n87v6q8k8vzax5492y6", + "sha256bin64": "1fa2l7n8vdcnf6p0m7qqh05fimbwdh7p8a142l0vi8l9kx4n9z54", "deps": { "gn": { - "version": "2023-05-26", + "version": "2023-06-08", "url": "https://gn.googlesource.com/gn", - "rev": "e3978de3e8dafb50a2b11efa784e08699a43faf8", - "sha256": "17hwbcxmqsq3yfnafl4bbysdkk957mvqsn34iipzb61gyjbj7i6j" + "rev": "1cd35c1b722472e714c30d12031af81443bb20ae", + "sha256": "09y8jkxzkz87zp2js1j7yvqnck9n0182lm7c3x330d8agwrmdkrj" } } }, diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 354075926989..1503b2e91db5 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,1015 +1,1015 @@ { - version = "115.0b7"; + version = "115.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ach/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ach/firefox-115.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "122514763d09bf7579ae4ba6acdb81deb24304c8a1dbbac57cb57f65583ebbc7"; + sha256 = "3261783b345a17fdf1c009e232f505accf9602f5b99926c9165966f658c10660"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/af/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/af/firefox-115.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "904b6d2fcafd4bf9964ee9f7821d3a0cddb58d54a0ba551c1ebf29e698b3d6a8"; + sha256 = "a5ed1f6021a0429105958f06370cd769a410fef428647c2f0b70b0d211b700ea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/an/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/an/firefox-115.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "c0bee1f77504cb5146e20ac8f1be69eb1f411137a824bd361dd2f13b01a5872a"; + sha256 = "5ff1bf05623c7f56e4b6ab9d6f42c8083f16c0a318e3d69603846a6755e5a6c1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ar/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ar/firefox-115.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "b89cc1ff73a2bb666d388bf94d57b31631f3668aee0b563d47df314c5de37916"; + sha256 = "3cfae66a420b4aef85b686ec70899399d73e3a249667b1d59dbde60a5c76a7e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ast/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ast/firefox-115.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "5dc80a963225af8fecc52f3b54d5d8bd66c47c6d275cc4538e7cc740ab63ae6b"; + sha256 = "fb68e1f04a6ad253bea73de6a67ddc0f6bef9c33b601834e5e962bc26e382120"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/az/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/az/firefox-115.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "c98d4ad6b5ccafd9443d3e83adc914e42958c0055461627eb5bc5d24c3157297"; + sha256 = "841f885ca7d9ae6341006d6f555ee28277ad43b62c7412578ca28c0d8fd72a3c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/be/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/be/firefox-115.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "818a63af8e5c956c11d7d752b39a51d2f44f8f7b80b99a5ac5ab6b1734c00e68"; + sha256 = "a46ea40c5797c4d20aa5a50ef0a518cea2aa94b649928cd348f8bd162dc7cf6e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/bg/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/bg/firefox-115.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "9cc2ac8238c8be89bcd58bb1e7318990f25b3f67f0145bfce4ec8f871173e9ba"; + sha256 = "ecbaf41f86ae3876399a48e25096ddccb84898bf48f960614b532a7585fe816d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/bn/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/bn/firefox-115.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "cbccfe6021ba4a5a9d86078b84a775cda721cf06266f430bff6134c94418534f"; + sha256 = "c4ff91b49b3bd419376d5aafcf7ab8b9561c6b5a65e9c039d913a7f07a13fc13"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/br/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/br/firefox-115.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2b1d595fbcb04a0f2ff0315b0d9c32513d308c2d39bc693d5ce052d22e9748c9"; + sha256 = "fb3698d73576880729816a9ab786db2ce88de0cea13de31abadeedf0a7a303e3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/bs/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/bs/firefox-115.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "8e685061063661d8d9f923de7637eeab76a5e4f3fde92c2c87897df66475d2f3"; + sha256 = "77d55350ee16af38a6351ab9eded24a58fc4d8af7ad05def70790ae331a869f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ca-valencia/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ca-valencia/firefox-115.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "41ffc401beaf6b690c4b8407382dbef4150d7959f927185fd1d66ef12342345b"; + sha256 = "6fe09c62fd6dc516ddd973ac3ec465f27b32da7052f683c612acc6983c44e12a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ca/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ca/firefox-115.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "469deb711f4f3d3f31c30e63bfa2e4e0792a9c69ab06edb887cf461528de6d00"; + sha256 = "bf8b9384f059a6f1787e8e866c06b5abbaf54e21884f0d7eaba19594990b40b0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/cak/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/cak/firefox-115.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "190b997583df2b0941abca64cc9ef248829b114aaf7324a7865ab7e87e145870"; + sha256 = "8fe435548760c72c5ec18481362a4afc2b7612a051764678a7e91856ba44d1f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/cs/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/cs/firefox-115.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "b440439cf0ba533332b84306c0a65d9a0b544ed0cdb72254513ebed39a2d89be"; + sha256 = "f08ff7c335ac64f9659457b230d40df0b0cfe5846649cd312a7f7d97e904bf2e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/cy/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/cy/firefox-115.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "29921d84845813b5b0b492569f461ddead2154ee53c16fcbf7d8945992186ea0"; + sha256 = "ee243dc918d8e871c4b8f4724dd0dd967d3a7bc687fa3e43ca2612c28d7716ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/da/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/da/firefox-115.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "808d3a0e00160415934c282a61cf31a261d2e00607cec1ff2e30f3f1099ce869"; + sha256 = "bc198336b743bae036d0cb497669b1c4c2050b6d18759cc2a1b9dbd49415a096"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/de/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/de/firefox-115.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "17dac31b776bdfa6628df42db716c577a7d0b13f97f6f5df79a88d9985d92fd2"; + sha256 = "3209f6815500cb55ec563bab6623b253799c23b6b8ee1866e45a58b9ff3ca15c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/dsb/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/dsb/firefox-115.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "065aae1bf40bf141a7bfb3c0424418874b61f6374f138f3b3fd80039984a33d5"; + sha256 = "7587640a7f87461e02f86951edc01d3ed9e30cffc5650582248ae0fd203c35ea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/el/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/el/firefox-115.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "dd0e120d769ae13ed8dc977426376dc9e7e6c61e308d2649de0547357511ed94"; + sha256 = "e8600328f45b2eeeacb23598b04365bb0167a5ca8436ae3704849d40d2989c12"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/en-CA/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/en-CA/firefox-115.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "8a74bb56574c143e6c98c2e64e9d414963cabe09fdb17af04bf1c4d35cd6606b"; + sha256 = "6b88cb7ac6bec45da66eb4eed6ee25d3d2cc1d0b6b575648a48c056ebba877d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/en-GB/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/en-GB/firefox-115.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "69de0e17e5959683eaae357884d467c16203ca0cb84b03a76080feb7f86e0020"; + sha256 = "4d9716f7d8442e51f5abedda746fd8b4b49dd0ba7282469911322a5ece60ade9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/en-US/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/en-US/firefox-115.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e402244a4ae93ee272e3d39d15d891ab17d6e77101506201aa664335c110b685"; + sha256 = "bd4d35be16a99e1d27e3a7798c833d33d68eab75c05f0254ec9b578dab46ee2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/eo/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/eo/firefox-115.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "85b2b3d035084dbb04dea0c9397ad42d1fa8d2c7516ddba2ef9e4ce9f5bf4cc3"; + sha256 = "06d2f67f746effebe5057e7cca882825fd3704093f1da74e498e2086513f6b80"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/es-AR/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/es-AR/firefox-115.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ece4ab12d660a629dba5149f3b34afca81047178a9ded433f1cf50ddfeb17132"; + sha256 = "2ee76dddd83129e0134ebcc26173690c2d07f8a41209ed59b1eee7ed84c326e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/es-CL/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/es-CL/firefox-115.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "f70665d28a7bfa257830c6e54317cd617ae2088a9610ea5838303e7e433cbc05"; + sha256 = "0762e5068bfda380d21d503be376de9450892fc8d97921305ee859b2fafe3c10"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/es-ES/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/es-ES/firefox-115.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a268ebe720b8f8a1ac375b035dfb3372dc6f2bb5e040583fcfba77748f61b5c6"; + sha256 = "546dd436b0a79c0aa5d2302726df9b39530d3e1598929a023083f64bcda5ad02"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/es-MX/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/es-MX/firefox-115.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "d510da5318fadc8731ac469a00c0991aa21281bd8b024f139f3a19c711b81509"; + sha256 = "89a4c2060e67052bc593dd5c60e5d66c58a905d9e815549613180201c06528c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/et/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/et/firefox-115.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "127f2fffd7397cd08f248d1b33ad3255d1c637cb1508bef94383efc1c4b91566"; + sha256 = "daff14a8dc34d4afaf755c7594602832e563449979aa28ccf23657910e0cb30a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/eu/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/eu/firefox-115.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2ed7466c942a91aa975d9133d2153c13ddd32facaf030b6c5ba5da46c1df1290"; + sha256 = "4fea1330e1e478e9c9ce7b413783ad5765e6e2bff9315ad4478d6fcefc0b942e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/fa/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/fa/firefox-115.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "b3f69b8bd137f76e0a6e81673791ab6f702f55fc677b145c4bdaa1cbdb76b7b2"; + sha256 = "d03038fe91c470e996240d02777e1b38f1437eb011975bba2d5996f61c3980d6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ff/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ff/firefox-115.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "de2aea7b91ff3c6901b988df82a232dc3758b0991762474f19d148a416f3593a"; + sha256 = "748129d502dd7488143ce801f5aeac1e71bd36af42fb73a6bb9a617fe0d08b43"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/fi/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/fi/firefox-115.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "cf7921ea0984f20dabbf05e06c0b8fc48ddaab8f26f2bc075f10ce01748bcea6"; + sha256 = "6ef0793728d28d5a36d60391b62f0712d0c606b6dede4b5d9004d9a6d6fa29a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/fr/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/fr/firefox-115.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "fe4c4b5bcc6966a11f31312f8f7fba69428afd7b176a738c4dba9b8928cd2609"; + sha256 = "c24aae6472eb6636ab9ebb5967ff9c8fa16f28a53e72d8dfdb8335de8c1b49b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/fur/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/fur/firefox-115.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "527d85a087e83f9d41297c0dfc3416764a3171e6206338b4ef02005ec0832197"; + sha256 = "ff3cb1ab8085d085c95b0759dae1665c395340ac055060b0dc51b46206c69a3c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/fy-NL/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/fy-NL/firefox-115.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f1ae19d25063c41eb657148cefeb03e1747d8402537feb65328b1c23b4ce01e0"; + sha256 = "429a023342f6502d6d9e9df68a84208d77381e8e8cd7bc5edc9f78b9f6acbe38"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ga-IE/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ga-IE/firefox-115.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "09799ddd69e9a2bff1b48a0aac9cff07b456980b2dd2cc8a51fedf3a614762c5"; + sha256 = "2ef0cba881e1f67a60ca8faa54d8b9743dcec988d107a1cb3f9e49c346dfb2e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/gd/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/gd/firefox-115.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "d0d6322d0d36c1575da178d24473ab58bdaef487abd93fb632890c5c8f690898"; + sha256 = "c66225d3f91755f7e47d33d16a4452e31f8f421fc8fbc27aec1d48aef80732b4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/gl/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/gl/firefox-115.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d2cf62ddb2e9869daaec8fca514a9f3e8a2d612f5ace1a666f185937a9e51ad8"; + sha256 = "0614fe4ea1ff3497937cb3b0cc0dc70bbb44a60c6b0cf1cb6ba010883c2a6bd5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/gn/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/gn/firefox-115.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "35015ccaa1b57e4ab115104854fd9e48a2028f0f5cba6d149c6b055d336aba24"; + sha256 = "2932db546f27e6baa685b2ce07dfa5354ed79d9294e4da98411feda650907eee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/gu-IN/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/gu-IN/firefox-115.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3f52af5b750787b6481c6aea6dac60d5400d1cdd4f8568d67a7199cda4c08998"; + sha256 = "91ea1884c84ee2facfb93906fec602b744f33251462ca66e182766ec0dfbd4e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/he/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/he/firefox-115.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "ef047afbacd6813fd90d4f2e2fb6a95a0044b98a68d768194f78f890da773c1c"; + sha256 = "b33baafbd6c1e5872cff7b25da6656f907890ba701b112bee71d6ec33664f344"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/hi-IN/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/hi-IN/firefox-115.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "300d14c88bfba6844c465a74f9e01c0f1abbfe0e9d3a4ba3e7d54c4db361e63c"; + sha256 = "ce6d162d80fe56790a123659540132d208cbbb1dda98e0af9112c1a12b74448a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/hr/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/hr/firefox-115.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ded7ce7143b232f8f73152ab2b6a7322ba668045d6ea8765331ddd77c04318ea"; + sha256 = "45cebe7715ffb22bec28d861c064b726658478f5b3ecdb8581e46666b33e6d0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/hsb/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/hsb/firefox-115.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "7ae5b81c5f3b434ec4335d8ad8b7f87aadbc6684fd8ac80cbb23ea940d34afaf"; + sha256 = "cf7e0e79171581d162d78d9ce1666281e99690ae18eacc8c8b8b14b53366bb65"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/hu/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/hu/firefox-115.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4e2055f60081dc47f441c5dbde77a05625de8052e583d38f21f431b8d8338570"; + sha256 = "cb02162c8aeb7c9dcbb4f07ab2ce7ff5243eac1fb7e925725d330534bbda1d49"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/hy-AM/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/hy-AM/firefox-115.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "af041f39f9c6e9f01f57f68521d4487c3bc7866834f7087cb68b8b7e77bf5308"; + sha256 = "57c970229bfad215f41110197ca38d19d7663ad58031b793c1e07211f9a6915e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ia/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ia/firefox-115.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "6f106b9e05b13365d2b706c549e1e2c06cdcec6d169ca2af36a677fcd94d3e18"; + sha256 = "a4aae8cd7e9f957dc492b4d3a8abf9297b16c8af18dd72c14d199be382952670"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/id/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/id/firefox-115.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "7351554145c01f6eb58e386afdda62d62143c0beb4c06068fdccd8de561ad188"; + sha256 = "ee71cf8b893709781d3202123496b40467be8e647e998041c1835a5f0c7bae1c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/is/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/is/firefox-115.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1fdf7e0c5ce813d24f39b477a09d5516d3b04f735258e019fb48a642fc3995a9"; + sha256 = "7b0ef6b4c632be9abcdad58505e979b8be1e51c6087152361abc93c77ea4e054"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/it/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/it/firefox-115.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "bbe16791acaa2286975e881a9e216e640939d6aa6e8fd6a5860d5639a800a6f1"; + sha256 = "7f2bfe2b6d18f3193497811045657f11aebe36ddc717288bf9e0a1b723d54b38"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ja/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ja/firefox-115.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "8d07b5d24b7cf634e171ae373ac1427d94936536d4891cf4913229716f24c8a5"; + sha256 = "00575f2011885bd6521675480318ec87b2f589cccc1acaa1029073392bb95505"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ka/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ka/firefox-115.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "c4fb2eb926da09fe89231e904b7c70e918a4fccdf46741b22322341a8ad477c5"; + sha256 = "d4c472bbb7815f30bf17e8608e64484d00cca4dc53bfb8561aa49c0632937bbd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/kab/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/kab/firefox-115.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d1e09821b1505f9883a5f9fc5afb4469a32fa11b20522675308cfdd095737096"; + sha256 = "a9fdd041f034da4aadfaa5605938c972de29f74aeab0d7d162f45cff9d6c6b08"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/kk/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/kk/firefox-115.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4ad0d7cfc930419421393cfc52198922a6412ff856986c0ceb781bab5bf3e71d"; + sha256 = "e47883bedc5f0defc89137ab73942b6f7dbbd30454c74907dda29dc3c2910d46"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/km/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/km/firefox-115.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "575b8d6d63b1cb466bd9a125301412e34a5c1b117c9658594b98d0bca4031fa3"; + sha256 = "a0f69970c8918b2039fd80eb9d607a1daa0182a7b257a2aa4539239b74ea7a9d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/kn/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/kn/firefox-115.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8e9129886c22f96285d80ef88a4dd06fac84f7cd729c9129d3df90cd89234cdf"; + sha256 = "04ea63c7c94f791ec573b6a517a621093592d8c66ceb26222b948af615195bc7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ko/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ko/firefox-115.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "fff40d603d8032410a41182cd18b87319f30293499cc44e8dec72191c4341652"; + sha256 = "5169a1ae59680553f95d500ef0bac522013c3d5d807b7a35fb50e6ec5ce1580e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/lij/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/lij/firefox-115.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "7c991cefdd82ced1175fd5a2b6cde335ca3498124d0d25485c48a75d518b90fe"; + sha256 = "2ed0611e24cebed0571aa013d53b47bf251e06e99452da7d979175edc2ae3efe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/lt/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/lt/firefox-115.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f11932255c50c7e8ec2346bcaf6066d7f6622be0470d49245a342fea13e0cafa"; + sha256 = "4a7653f0dc9ca981458f2efe35b5b47a1b7d172694cb0355e4513e4c7e1bbc56"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/lv/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/lv/firefox-115.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "354361e574a71f9a38bf662f476fea8f2e1f0cffffe8f0407a0af841b5d17a33"; + sha256 = "12e9894131c393938d5b9c21f73d5adf37dc88eafa7e2e293de2f610ec3e88d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/mk/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/mk/firefox-115.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "bed4a99caac6a736f8ac7926611390d6ed5f3a41803210d9eb0f821588f1c0c7"; + sha256 = "7e43b77516241a85f9b3db188aa26e7acce59a36980aaf25f2ff9621c4ee6cb0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/mr/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/mr/firefox-115.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "2aebefb7f785db786314b999791b9ce1d51a724dff6a869cfc9d79b1c7bcaa0c"; + sha256 = "a49d84347d28eb5365c4ef2a7fe76aa64de0f54332f084cd85ae5621efd3c686"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ms/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ms/firefox-115.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "3198469f7df6cd7e995dc8d4ffc67b67456fbaf18b3cf6e98bec886f185ba908"; + sha256 = "3ff2ffb215f866c6fa5adac7ec7a7fc0a39ed401974c172d93fc4b4d3d57bffc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/my/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/my/firefox-115.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "65acb1cb85e1605ef34d4d6c3c8f7ab9f7869a2674457bfcacf414850e8bfac7"; + sha256 = "ecbd63710a8fe280f6fef60dc54a425685001badd65be1031552e02f85a0fc68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/nb-NO/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/nb-NO/firefox-115.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "cf1e6001d8b0a4868fc3a65a6c478aebd3a9fbe93270e5fc63d339163381ebff"; + sha256 = "bb29ed3c0fe4233e367f6ad661f89ea126c2be352e1067fbbc9ec9dcfcd72504"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ne-NP/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ne-NP/firefox-115.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d70be6b3d6ed56d4c69cdb0cc13388c99e9b3ba3b1c911dc5faee9e2837b823d"; + sha256 = "ed3a3e0dbe0072e86d75a69d51c03bcc73a10629e86da688cbd2396fc682b937"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/nl/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/nl/firefox-115.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "946314bb95a600d0e14565cde387493224a4832d68e5773729194e86ac445899"; + sha256 = "2f902587282a5b16c817c11768d8ce16ef81f1470f8d5612e6913b75bb15b6ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/nn-NO/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/nn-NO/firefox-115.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4db45b58ccac4e8677fb0c714d5426f87545738678aa15bc180713b3241da4a4"; + sha256 = "138890e225c83672cd9815f863da6c4c74355149c3c291eceff19292eefeca85"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/oc/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/oc/firefox-115.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "e292675fc6de21e9cb9d500c8ed5607708eb712491496ed7fb4e9ebe94829d09"; + sha256 = "a89e607861ebf85db19162459f4eed4be56e9eea50fbd3fdf2a8ab4d21fc9c81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/pa-IN/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/pa-IN/firefox-115.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a32bd566a2716398721061f39e0bf091c1ffee6d0c21e0078d341cecd104ce9e"; + sha256 = "271267b605d6be613a486c583726457dda2950bba5cc90014556576d3bbe77db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/pl/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/pl/firefox-115.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "94b292f2ae66fac9edd774ea61200fa6cf40e5052b1a8e32f74503b82d2fbe94"; + sha256 = "474ef435db1e6ee7e6742efd9c04786b13f9b5ef448c1982bf7c7ff1167bb8a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/pt-BR/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/pt-BR/firefox-115.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "644ae31a6d0e45b250d08a4754d5a51646d3419c9815e520b32260368ffa01d0"; + sha256 = "52b33a56bdad6f8332a408c7b0fc85465c61632feaefc1ce8e4abcf2d78de554"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/pt-PT/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/pt-PT/firefox-115.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2ea948ac5e9c0ac096f1493f19d199de475010dd18153adec5eb0504de6fb36f"; + sha256 = "c70aeec5a8cdb6ed9743dbcc838773afc4a32701c5b2f7b8b74697226f5291ae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/rm/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/rm/firefox-115.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "c6e7478d5df741621f864f1faa981d15862a6dd0678cfefe166226da271b6105"; + sha256 = "da6cdfb1287575c11b8f6b88924200be69507a676668401d5cf0a87c9cd27b62"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ro/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ro/firefox-115.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "0f83dd8852fd1c66f482854ac3c44744ec2ad601179e001e9709bff43037d532"; + sha256 = "6a3e1380df08c65de203b8c49e8513fdd30f8e2d7cfcb458cf7aac9c02d65c43"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ru/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ru/firefox-115.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "5d8b83c9f05251dfd9c190b8acedc44ff9f6d5980984ade0bc5fc11bf7544d32"; + sha256 = "04ec9801aa9ef740479d2964092f1d37314d9f5608dcdbc271f75c845c223468"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/sc/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/sc/firefox-115.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "966a9dfb0e95fdb587cdfdce973084f8b010bb02ca680ccf51f5a37afeaa0980"; + sha256 = "bac95c057c7cb5dcdc03ef91a28cee391d8cd8ee33695141eebb2a1d4747a655"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/sco/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/sco/firefox-115.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "e7d1875db9080579d23eff236ea27df5376beee8102ab73bc083e02bed6074d1"; + sha256 = "dc99f46f47f4f3f845c08df2c1d26ec903d4887d070f8654cf8282672fef44d0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/si/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/si/firefox-115.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "ef542ddb73a903aa602ad49560c4db55967ecee82c4523c2a53c9d79ec0d7df1"; + sha256 = "5c548f2550040e223a2b41260ad0dbe13b4b7232667ae8ee03052b5735b3c684"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/sk/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/sk/firefox-115.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "c2535ff13c6fadeb58eb8311fc4d508e68c1da15f6269a08b0a1d7c8872f43d5"; + sha256 = "65cb7a04e00ff54bc1953b2141140d205416d6cd266ca5248df55287d444455e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/sl/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/sl/firefox-115.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c2aaa30acc6ba35e6b982c352182fde7e9c13e38acdbd403bc098a717c0e12e6"; + sha256 = "21c521e1c9d0d00c98ad41fc1facdba382c9a3cec18675f2c6d3738483f44541"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/son/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/son/firefox-115.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "a6e5340f68eabcf22013bcb0a13ee23158b70f8b89e18b6c6d023cf3bc3ae266"; + sha256 = "f76c060927d2221f280211695cc9e0e50355c92ccbb5f8e6c690b588361b9f52"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/sq/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/sq/firefox-115.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "5b28edd11ae13beb02c233d8801d264f783d83fe0bc92b5a4c39c00054d998ff"; + sha256 = "835c28cb504d6f8e5e228f4d95d587f94108d0ba8b17c52ee078c50d725c8eec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/sr/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/sr/firefox-115.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "1337a560e49651b79027d03c660eb3c156d89bda9796513ed559bb875c317a7a"; + sha256 = "3ed73b58da534050f3dc07b3e29e32bd9344a0d168bd1409d422aff161dc52d0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/sv-SE/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/sv-SE/firefox-115.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "c2eca0314f7281713359c855bf859b627c89bbb9ffb7fb2fdb0766a970b846a7"; + sha256 = "cb546c00cd1ea3a1b04f490eeb0ea4fa4586d91db70c1840e3be83a99c208785"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/szl/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/szl/firefox-115.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "2328a0fd772949705858256985c75b519a8fa79773a30fc996a8747b62ca7511"; + sha256 = "266b4fd89775ff8fe86865be9985308b3ba8b0d9e6b285b0a0a8426de0689358"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ta/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ta/firefox-115.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "8d5da66309669987c08b33ca2c2c25aadc0b8ddfa21cb27936ec2839a16868a0"; + sha256 = "15e1e659b27371d13ac61ed22e647d21f9ac6a7f700aab6b568e7c999da07cfe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/te/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/te/firefox-115.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "3dfe3f18d1f74b7820c08d897f89347b04c6d32d13050a5e8f3c981c430649b7"; + sha256 = "61fb6db588bd72e126845fa068555ae56261f84561ac7a2e9c123d8c5a928c5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/tg/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/tg/firefox-115.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "ff6608ba3d74afa9c2ff71cd59e7811e34d7d459f436916f56ef6e83fcb8a0da"; + sha256 = "4437b55d295bf1a608272babbeb61849105760f61de96cbc0590f7b0697c2175"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/th/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/th/firefox-115.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "69d87203c7efb4b3ccc89e5c75b245e1e2ce4d3c2487b92dd8bafb5f590d4753"; + sha256 = "76fbab23a314327b53526a15ae516b5a0b978b91c124ab66d109d3182388f449"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/tl/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/tl/firefox-115.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9c5d9b3e7da4314a19c521ada717e3c79f93767878efabcc7d16a70e35eb0227"; + sha256 = "42995f3a32f241d80cc2cf8038929a6b8f9bc344c68886421edb7f61bd418d0d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/tr/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/tr/firefox-115.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "31e16254eaf7f989339d53e1628a4e7fbd3f5aff643dc00d20e81a660ae5dc84"; + sha256 = "f667f5d068bbbd7f4280ee19faf0577cc53c488d70487b11f3e4cf1a094a1d22"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/trs/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/trs/firefox-115.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "2fc1065103cd904a80e19025cbd2371916649e970731d45007354b8da0790c5f"; + sha256 = "c76e652062d738b4f5ab0687b2b95d9aa8d296a4fd8ec04e992be8c84be53bfd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/uk/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/uk/firefox-115.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "10e5e8200aebd70002da84b225c7b1addfcbb27d7d2ea873c46abee5521419ed"; + sha256 = "4ad6b1290d4dfd25eef07ea9a5d0ee4293be2c250c389cefa08e25217544b4eb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/ur/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/ur/firefox-115.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "8a6172109767166b030555bca6ed3d33f7529f1b4f13f1df3eb15fd8b872b30c"; + sha256 = "5bef46dd6cf29b22cd536bbe37e6fee900b6d8e84ba8442384952b1f306786b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/uz/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/uz/firefox-115.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "331fe36d19f99fc6dcad54603e33fc22f70b637db503e428dcb8be814a931bbe"; + sha256 = "9767a07f1ebfcc680373cd47109135a30145ea324e629967e2d1c36075ad78a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/vi/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/vi/firefox-115.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d5f218abefb0fbbf4e20a6dd3343d5e039be48eb142e922779159b6080f8b2cd"; + sha256 = "ead52311bbb4add4da56254e1d3acdd935a9883532655e44118d4f7f5aae057e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/xh/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/xh/firefox-115.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "b9f2e4441e95995bf10ca64c1c4d525260260f1ad7b3b4242f42cbf23683c176"; + sha256 = "3b452c31cb53d02fa1bd5f219580ebe7a3d11ebde176af1c0ab6ae5e346141f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/zh-CN/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/zh-CN/firefox-115.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "61c974be7866df1e9943584aeef0308f35b01220af52a9075036b8cb6089b831"; + sha256 = "3fd731abc57c1faf186f8cb3323b90c381bb628639c4ed5c129b18ef567dc328"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-x86_64/zh-TW/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-x86_64/zh-TW/firefox-115.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "83c29f71d3c4cc70ecc143a1de9c6c6d4a75c2867ee2522025d0db80b8885b46"; + sha256 = "a67576592777894c0b2641e9b932119d5406256426284feabacdba039bdbd12a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ach/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ach/firefox-115.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "766f80671cbe04fbfc67e624a956ce29f954ceaee5d0ddf4241932848780da79"; + sha256 = "17e7a543f336ec7f0811f9c926c064e06fa7eee57f32fc8de46bd78604b48d86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/af/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/af/firefox-115.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "75d1bb061978aab04f10949cf8c2137ceead5bb8665666bc7dd32579e8fd9801"; + sha256 = "bca35181175d9b345371fb2182050fb1a5614e8664d06b693891d8d6f6b69da9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/an/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/an/firefox-115.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "a3f0cc844a02473ce3ebb664ce7a900b356c3ac90ec3661300d73d55e94bae0e"; + sha256 = "26e48a5f8fb5edb64e69ba4ae8f5439c2528686cbaa0c90e41c273340b9c0e80"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ar/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ar/firefox-115.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "bfcca8582181c95e368b56b3f6c6081fea3713ac8bd299040e5f1ecd0d8dff66"; + sha256 = "1e93158883208d127608406754f714f6f612d07d772083157b3cf6b92622c062"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ast/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ast/firefox-115.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "75b5af037d45ddff395b3860b23544a26af6c368859020791682df02adc8b6e4"; + sha256 = "6bee4565718962573f4d10417bf95671014bb7ca468f8d187f51a82cda132abc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/az/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/az/firefox-115.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0c4affed92a86027df30734650ed288285ad4069078fb9ac62b53dac2ed4258f"; + sha256 = "7525dfcde4b31d8c73a381b7fbc89cc65b71cd26027cea9145d62df19677c07a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/be/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/be/firefox-115.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "97153254ad6ca81111f3ae19eb8de9bb4de72bf4537b24aa9e3dd01e94f439f4"; + sha256 = "a3a5a5b2747909ea8126915838975eea54967a3f40371c551d948392097174b1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/bg/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/bg/firefox-115.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "6afa075d73580afac23de00c40eb2a3b0bd24c8f2cd621229f4d59feb975248a"; + sha256 = "b080ab6182685723a0bd78d2e2904d3e774cb2e65385a1da69e27d5e7ad25058"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/bn/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/bn/firefox-115.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "e266ead9a8510954e0f7c4f9ad46847cdaf1cd5387b3146e86ce1a452fe1517b"; + sha256 = "198c12fd8933b9359a01ddacca2d93670e9b516b0e35fb47800e7f8002b985bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/br/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/br/firefox-115.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "ea2dfd9c080db569f7b47b3d2dcb30344a075b3bc84160bf494119dff36d22e7"; + sha256 = "da5dc615e9a7cb4b18c72cc464ef4131cf067987b4a79e24ec403f2ce67f22f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/bs/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/bs/firefox-115.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "d8e107e4c66fc31a525487e127a313fc747bb425ed4e4a241aa20302ac6fcb4d"; + sha256 = "61a1ea85bec18d8ecd72e251c41e87dec15fb196346eec3748122ad7bab3bd24"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ca-valencia/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ca-valencia/firefox-115.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "78479255d3b60f9891173e0e4923f925540864bf62b194bf223fd6b9395739b9"; + sha256 = "89f3c62ab1b27dd2e442ea6a02bd543948a320848aa990eca774f3b383de509f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ca/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ca/firefox-115.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d0471c522d73edc1710de9e9d209bdc61c292cf9f1a0811b07deb586ea585f0d"; + sha256 = "d0bb93b0b39121e17826068bccaac6c5a6cb74efe1db55d712ad55bd6c9f360b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/cak/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/cak/firefox-115.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "1776b0ada0643e6854ff815079cc73b1a0c6e6b05329f75b7d641ae090d1eb9d"; + sha256 = "fba20a8efcc5436a67ebfcf3401ddf90d5477c17275db29ad1f8c018d86b968b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/cs/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/cs/firefox-115.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "2606c6a8da7d0b64e4f531f70a01b29c93c6d04caaa3214f79457635b3d9c45c"; + sha256 = "8343c999dd10fd6a211ac7487bdc83ccba7e134c24b5eaa569ed31aca506f3fa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/cy/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/cy/firefox-115.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "09bc95a8b4059ae1c64d20b3f3588588f8e92f4f8aa09e2ead2c5fa1a42b3a1c"; + sha256 = "1f58c87d68014200fed16032e5ca4c9e485f4e91787ddaf738d2fdb7514e4e4d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/da/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/da/firefox-115.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3e4c76dfdf3b345144894efcfd6cada1ca0a0c73375049eaa2665bac22eb2011"; + sha256 = "7db8b21b73c3004f3531cf32827629644a7358ef1bf3271fd7bb172bef8e2882"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/de/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/de/firefox-115.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ca36dd0eb8a9ec4ff4498f6d3bce316ccece46464762a8acc2ccab5cdb546caf"; + sha256 = "f88123a6b5184dc178e502ec6093e2718fc3f99f0d3176d38ff029f34bb11a63"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/dsb/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/dsb/firefox-115.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "698749896235b4c4ec620594cf323e33b8c46f4b79d7c0a475b1212ec670ca9b"; + sha256 = "6c74b469f77bafe18d59b22bdf9151cb476f7c1ea247fb32b9dbc218845eae80"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/el/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/el/firefox-115.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a9be42f9abe53862543febe9749146ba9dc7d6cf9b193ea112c8e2b69d36b1c3"; + sha256 = "83519c3e685b934b25a5956f895fe162c2c63aff15daa6172bba6b8aed8361bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/en-CA/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/en-CA/firefox-115.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "353a82f2ff7d2379c48502bf78325326f7315f8a36d729c4b9ca9b9024784345"; + sha256 = "cfbc22627e3fb441b068c76ed0ec394235ac04687f36827fcd19d3465b506bc9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/en-GB/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/en-GB/firefox-115.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "00c7893222755ed929e62a6af53a3533fef9061f7e540ebd91408e490b611e07"; + sha256 = "211ca3ecb60ce08229c48694f9e98383a405a1169757993093023c6958bd83c5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/en-US/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/en-US/firefox-115.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "66867368b6703d0d98cad37f2d79ff4d8d1e957a5574e692e8fa68f443dd2802"; + sha256 = "b76efdd3ed4fe4b229bd34c09d5a8b4874a5d2b933ce11c805dcc9e214a13167"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/eo/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/eo/firefox-115.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "b72c950fe71929acc6f026cd24ad035958912baee7e137dab1b5764330ba59f9"; + sha256 = "89107d910464e4ebb5d096dc6c5f8a535a890f6e5815f099d1d322033f1c6346"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/es-AR/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/es-AR/firefox-115.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "d7292b6702b9197176e8698bafa483a773d17b795d1cb9f3631d2355f32d8860"; + sha256 = "3c922a252466678b458d55b54f076c34be8fa75f47aeda4a76b41bbb52f60e7b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/es-CL/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/es-CL/firefox-115.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "60d87b67c78bd83d778114fe3c9ab541c62de2941bf45cd73b86dec3c456a7a8"; + sha256 = "b9d2ad41cbe7f0cb55137e909a62eadb4f0423d3d9c67ccf6a5a411d88f03fac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/es-ES/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/es-ES/firefox-115.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "511193c69fb2505c9e3eab11ffb297fd977374b2363afb48fa532c9672766959"; + sha256 = "19c3d36eb45111879afc3e04694410926a70935ff1842679f9b7ba215dc3c966"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/es-MX/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/es-MX/firefox-115.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "4cc7c4dc8ddb20d518caff66a0c7610fb579e02ceee68a671e71a0e8e58ebaa6"; + sha256 = "049a2be51c829f74d5dc678fcde872f859a1296585f0a40b33da336c4afeeff9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/et/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/et/firefox-115.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "60ad867801e303318e64a8683972800517b589ffe28c50cbeb7b783e55857e0e"; + sha256 = "274a363c208a5897b0c6ac91ee929a95a7fdb21b38da4f2ef1874e08f3a5aa00"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/eu/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/eu/firefox-115.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "842e0720f6c8d1007424360e18c1efa0ffcc7f4859f0786b60c9bc0869ceeeb7"; + sha256 = "306d13490def48de3d270d42c30b4e170fbb5bc897f16f50a52833863f11fbc1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/fa/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/fa/firefox-115.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "9a08eb4457b763d9b0ee80d457e78db0fbfd72ed2c8cd82fa1257db8bb80eadb"; + sha256 = "7908985e1e1f80174ec42e17b34c099b31230f687f2f30a1e3e6a0d862a86b85"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ff/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ff/firefox-115.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "de3b2516f729a8adb44cc48cd7e10f3ccf3dd2732c62b3762003656e68a81e3b"; + sha256 = "36fb5af5cb9a38da54eb7f67b53e67ec1bb1028dfe72a84bacba7e0b25da7510"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/fi/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/fi/firefox-115.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "85a474f3b862339dde6326c08649c0b725a53cf435bd321895803df256263000"; + sha256 = "dd454e28cdfae46cb6718a9412c690e294e913850ca3ba267636194978f9a185"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/fr/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/fr/firefox-115.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e65a5b55d56590a33f11965b9216241164e73f4420ef98b8c10b054c13031171"; + sha256 = "67c6a33df93f763115ba238e246ffee4e0e1fa77ee99d3c806b908d29eebf2e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/fur/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/fur/firefox-115.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "ad6de2291db9c70b3300aea38d900cbef498a883e2501c18b2059cd6c62b7a4f"; + sha256 = "6487d3fa0ff5dc685c40eedb6ad27a5d32791c99419981a3d0164e9c3f8a5a1c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/fy-NL/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/fy-NL/firefox-115.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "237b65fb160ac3c1bcc1322cef20f61a4805bbd479ce6fc6bcef3223d24de876"; + sha256 = "f98063953936a4262156a98c502956718798aafc595c1de78ce6d3da8b05addc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ga-IE/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ga-IE/firefox-115.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "e826759c8a9a3e598e752731040ca13592a50c756fa7901307af2d2872f8af52"; + sha256 = "6ff07a2e79bfe63bae5267ccd564856b78319d51d3e28e78a4ccd27e719d63fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/gd/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/gd/firefox-115.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "7faaaa95ba7327c6d6af322f08f92c87b4e4d53236a26530fa27a58bc5cf10a3"; + sha256 = "ef006a9142e00519ec26b3d5763d5d97f4c183cd8bd75830432a216ac0269b77"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/gl/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/gl/firefox-115.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "332a5004f455c7acb473d54a888471725383342f1a655e37a7edb87cb622a32b"; + sha256 = "77cb4df6e9792a24385f2187d29a741dc35e174e94921199d106a124914081af"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/gn/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/gn/firefox-115.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "c418d37b8c3330aca72cc9e77ed157a734d2b97d575e518d9253a8ae5ccaa5be"; + sha256 = "63d23044b70d6441e16a9c54cfee67b0717367eefa30aaed1c437951ad48077c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/gu-IN/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/gu-IN/firefox-115.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "aa39556e59573ead2ff607d59aa4568d727b32bd8a0ba412bde30ca002b6f04e"; + sha256 = "41c2b7c389452c795196cc833e1606cef182044e2fe7156c3c0f2314dd13620d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/he/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/he/firefox-115.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "b5e0e651b673d0b48959125bd82933bb2b2d459e640691b8a947097f8e85caf6"; + sha256 = "c4a96fa30e331396823822a7fa817ef605fee22aa7a9d6f1586a8ef10e95353b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/hi-IN/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/hi-IN/firefox-115.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "fc50dae40101df14d9e3c5fac8e517e40114c9c2655ec7d382364a0200fec2c0"; + sha256 = "b1e6ef21d8e2065bc2c45d0158e57b76c9941e2b765773d804561509de1e3d90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/hr/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/hr/firefox-115.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f5d5d31a2d6a5106f0f1bd1f92bff2fc4f884cffff1a4d01cd56c704a2406fb6"; + sha256 = "83c4777c249e646cd8f5447ffb2b2c481481bc02234b44c8138f2c75bc635b7e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/hsb/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/hsb/firefox-115.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "9a4b66696d56b4fb00de5da9d1adb95c63615b5c95844ed775d022d2b3cdf2ad"; + sha256 = "e257a64be5b2038d54b88dff7ec9b8b122388a202c9a882cd579a9b1dfd8d25a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/hu/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/hu/firefox-115.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "18c1a825605311c284a39dd98be577eabd084edf6a2763675a41eb11005b61c3"; + sha256 = "feaa3d8f0db374c210e09e6342952d0c28553bed9f0ec0bbbb44d2b35997c390"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/hy-AM/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/hy-AM/firefox-115.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "ddd868aba059b01235abc51bc7845b2e8e2661501376d1a7f9e057805610c6af"; + sha256 = "0ed7080b2e9ba21be5478287ecf73668bda820a277be2e54178bf0fab4f34c94"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ia/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ia/firefox-115.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "1ece208c87df53b1eea98a86f81d283d4c65f39da7e33100dfa45ef54e4fb17e"; + sha256 = "3f2f25773b9b73bd8d1e341911e93354a1dc097b253b57700cb815f82144e8fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/id/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/id/firefox-115.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "cbbf691bd10e1c51885e090708896521d1b530454b7fcdda643ea789e800b533"; + sha256 = "d205ef5ded567eea9fe80171d05ac280699608bf4d6eb5ba7f6c63919d55bcaf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/is/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/is/firefox-115.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "15ce697b391e285b40a2915e866097886ac8878af9940e9f16bb12d9feb33188"; + sha256 = "af7491d89927bf7f1bf565b96c1b62c0b2cbbe25899fbb32fd66c83e888fd068"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/it/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/it/firefox-115.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "a1f4c30734bcc8885e0ad1f6b1207b11a49281990ce8fa0ec417a325247ac701"; + sha256 = "77e5f9bdab83443dd9981edd8caddbf0790803e46a76b850d4a4b8e7ad351701"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ja/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ja/firefox-115.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "dc325041fd7844628201436a6c51cb48e573d19d37cac1a5828b8e13543b6212"; + sha256 = "39ecaed499e93eb14d92159cf8f497dd2d2fd19902c91091156ab77f10f9afdc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ka/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ka/firefox-115.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "501a166313bde6e858f4573a1ce04d694dfdc49b31e871021365de27158a4c30"; + sha256 = "d7db4f86389f08bcddf9ee5219785d21b90bb1b7b6869d885c30e58f1190fd80"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/kab/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/kab/firefox-115.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "aa8de7d888f12946f204f9b6c0e564d837ec6c4bf41ce9c75b5b2d7162f641cb"; + sha256 = "74e2f57f13d98618b7eba06ab7bd18fd16fd30d62b6e2e115ee024b2606ee42d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/kk/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/kk/firefox-115.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "618f63b1f9bd340d2df30f58bf69a2851031034c32f45640f228e701cecabd1c"; + sha256 = "6ccd6f7dc14e82921e5d5f1d9142c78452efd5734d3155a42334cdc20a1fc778"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/km/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/km/firefox-115.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "7fc94e906558352871b41f72a700e1ac4b583abc422796b5477f9250c4c44791"; + sha256 = "52fd3969ed3aa96706a6ba4dde7d21e087e9332bcd9b6aad09eec52ce86481ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/kn/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/kn/firefox-115.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "87a410b6ae3966cf84a8e1002d84567cf761b5fcd667aae2e5664be68d9afd27"; + sha256 = "ccf849109d9137fd6076aca1692f0f5e42b0b1e8de57a026ccc476725fbe1b3b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ko/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ko/firefox-115.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "a299aa07f8ef801a3d9fb9e77b488b967b34cc5e8cdf935a22aaa9716474edef"; + sha256 = "a38bad7452a970aeba3ba8acd785406369e14c17b39a2c80a8659b8d5b4a6c59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/lij/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/lij/firefox-115.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "3915c22d264c36f7e9cbb7d99174ec0bddde12c7174a87c140b0b61f3eb22b79"; + sha256 = "7ca32c5449c87c56f8ae02876541dcad44624894e8aa53e98b86c68efdb2a9a4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/lt/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/lt/firefox-115.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "17ee70412c6ae1cb2866dea9ddedb96b1295e3a82c20a7428bfd53f6227fb10e"; + sha256 = "ca025cedb7346f0d893424a6f8d8f72f366299bb458e8ed276e9c4ada4adeb3d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/lv/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/lv/firefox-115.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "fa2c43b4785aa2955d6edb5aceedc74424a5532b5bd1dd72c69a5487afd9ce77"; + sha256 = "e3f8f33ac314b00084717ac95cd1cb9693b66d594672f2fc8d7ac40e12faaabf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/mk/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/mk/firefox-115.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "7d05fbb0e6427b0f6b7ec7891aa1c43b8453eb9e0ca16769e11153216f5d4d24"; + sha256 = "910e29ee4f001e793dd2107d5dc4710a55c48b6c6e7c7ce868d5b6d7b26a32f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/mr/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/mr/firefox-115.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "be9ec1ef87c1fc0a8846b5c2d13ab9418251b0124602dbace17fe2adb9837054"; + sha256 = "c0f66431a89b9e58a061fbc686c3b4f5eafe73109c6d42c1e33a1476af2bcd96"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ms/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ms/firefox-115.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "91b5cd6538e769d540bdbdeea13228ef1e203327228dca131b03a54748bfc00b"; + sha256 = "62f879313be865df6a36a04b7c58e6ac2a8aca9a78a31778a836109c12ae0049"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/my/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/my/firefox-115.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "2f333838aad3aef86ee3f7c1c7ef3b864eb961599558bfa5c90b042fd704918f"; + sha256 = "aa580077aa2225a34fc3474526cf0d4a9133eea2dacea334a1860d0d42133ec9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/nb-NO/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/nb-NO/firefox-115.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "20ec4989f7dbf8e815c304d69cbc5b589fa2d598e128798b9088c5bd9c47ad00"; + sha256 = "38df96dfa748102005423e1eb005f3b2ed7fbdbef0c43fa63a67a97843660ab5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ne-NP/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ne-NP/firefox-115.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "ab4b6dd5d5c80f2e9396dae33820aa752469abd63f8a49f640a70433028abd5a"; + sha256 = "08eccf2f4731f361ade7e44b9ef3a86daa24f8982976df8fb774981108336c0a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/nl/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/nl/firefox-115.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "88a9fc8dbab36defb43100a0b9a4c0251050d0511507911f883afb86f34a3f9c"; + sha256 = "a0f29ac57ddc99ceebfc88f3256bc60bf208e191feb41e7a4908807d4939cf7c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/nn-NO/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/nn-NO/firefox-115.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "cae591940e48901b8d04440a040587d290de0f001590dca011b3a37d0b083ae9"; + sha256 = "501b1b2e1eceb3ccc78be39f7661546df7fcd9718b1f7471b1ba439c72696b5f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/oc/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/oc/firefox-115.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "5ca57dd54a4026d13175ab6b0bb670f1141c4444e82594b364f98718cdab15a9"; + sha256 = "41aac014749b1608f0988b35a5dd8e5740288ec5c75fad88fced807d5181d286"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/pa-IN/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/pa-IN/firefox-115.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "5e8d395fddc21c0539fd8c7a32daf3a2ccf814f46356ba71e75afb3598f3351d"; + sha256 = "5643262e38794224210f9cd74e223f20855131fe8874ed0fb14bea9ec2e625b1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/pl/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/pl/firefox-115.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "da98f688a22e7a8bdb7beb09414ffab345490a2c53cc39efa597ab0e1a83db33"; + sha256 = "53526a4d5a6fbf37def22d67ede8b5a3f50991d0fc5bd009afe70833a829d9c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/pt-BR/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/pt-BR/firefox-115.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "79e21f7fe4e6482e6601f72ba5497eecb0cd3e0e46bf9065ae7174102d1f8cc8"; + sha256 = "a8f8984833753dfbd62383de25e26ac19caaf4d0f6cab7fc2414ef1f25b0dcdb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/pt-PT/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/pt-PT/firefox-115.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "108f6cedee686bcd812bba13ecaea0ee15e43721c2869b70e65989bf4d95e408"; + sha256 = "8c2ebf9314ed42a283b80928f849bd6c6121951df02c583dd2b128e8a1df0a40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/rm/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/rm/firefox-115.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "104b098afc8b72520c563a9bb8e7498fc567ef7ce78a837f747874d9df13b1b9"; + sha256 = "4f9ab0819b18687f4179f3518066687d669b0a18ed4669f89ae6091c122a1eaf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ro/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ro/firefox-115.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "d30e3778196be42250b4676dfaac46fcff90c15ee0789660a55f6527ed91b953"; + sha256 = "f65d82895f64938f38642f9f71c2e60fdf4b8003abf6b8bbad3ab5e2b930211c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ru/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ru/firefox-115.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "58c96bd756e3ad2c26e638915025b08e695015e37cbaff2e9f3155c5b4dec016"; + sha256 = "a7fee511ffd3534b5ced0bb7e2aacebe44ca00542bff070013e17927dbfd0fbd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/sc/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/sc/firefox-115.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "d55b42a82a2aff14ee2991dfa10d3b9f4807b6886d71d3e9b1c364693a2fa1d0"; + sha256 = "40e9ccaf48ec845f137f2e3c728d1d489952ff97c3215363afe1a2dde8056826"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/sco/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/sco/firefox-115.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "4b7cccd707f614ca67b7a75b58c0a968ac3d449074f58e62d530c0461951cba3"; + sha256 = "d3597779d604b2dc7d06c2ac78bd4b9664d3570bc2996e7e4dd2e4965a025c94"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/si/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/si/firefox-115.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "a8243c2ac65eaae4559e4d1230f67fdccf2620d4db1f47b99a72d6a426768d51"; + sha256 = "a7028a84812664639d92c7f555b235cbed91df548893b5871c691e3944f54dd1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/sk/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/sk/firefox-115.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "4389010fca2b09bc8776a3d6b8490d1f6aa6fc19ce8fab6a65a5261f8526424b"; + sha256 = "2eac153bbea200ea378a16a512ad9fbc3a1002467c62424256601d742d85d41f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/sl/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/sl/firefox-115.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "10aae36750f15e0695b1b2180a9fd87d21af2ac98ec32e1503bda7e41d8fc5c7"; + sha256 = "d5f42957d54527771ee5fd370c7dea232ee7691a6fb4127219e726c83095653f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/son/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/son/firefox-115.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "5ab5c15d581093ff28d2fbb2ec12e2ede5183595b8483a3c45f246c749ba1218"; + sha256 = "3b622be3bf8e54bafa9e6e1db61d1cd819a3f4bd4bd4bc57390c1e2850c8d715"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/sq/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/sq/firefox-115.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6d5fc4466f878d8a27add0c9f8a2f1b19e48333ae677b49009bd5bcff8932d10"; + sha256 = "2950857920ad1e2b378954c5508300641f544d38e9bb6d9aa553de2fe376a605"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/sr/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/sr/firefox-115.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c8c2ccc4d0d30313e0b4f4a884c472fb89fa3a358aeef84fcc96a8d44d6e2bfe"; + sha256 = "42199dac4518948e260132a0c59178490070a85f7b94f96bbb0c22977cb83781"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/sv-SE/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/sv-SE/firefox-115.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "3eac437f4cff68387f569ec21ff0dd93b89b37e7c8379ea92260eca5c7b9fafc"; + sha256 = "3423cfbf26cf6f7518a97a13d9e1aaaeac61d02d3e620390365093bc1d0be2c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/szl/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/szl/firefox-115.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "151a34d816d841f562084ae415c61d2ed66eb2ea56a347baef107104fabb08c0"; + sha256 = "bbf4e142d570dd877cbafa84680fd71d507d412ace7b6b2bddd70e5d209dc083"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ta/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ta/firefox-115.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "014a7d5adb807326292a13de4962e6f6aea0933adb04b11b1c6104b07d74d07f"; + sha256 = "8e92f220d85f7f8fa0608861089dfb2fe746dcfc6302071d05e31d27cf6c1dee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/te/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/te/firefox-115.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "53fddd1f56e96c6d4925b16d0dd65ca38f38cb0031a0c61bf240792e08caef86"; + sha256 = "f1e10ae0f6fba48b9a3440edf688a3b7b40688b9616454a6b01c732cf0520884"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/tg/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/tg/firefox-115.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "2fc96000ab02c184fb22d11bf3c513fab354643bf901acebc3fc2a6095436fe9"; + sha256 = "54e40ac4c4a69943aba21131fce4701f4fa63959789790ecfcdcd65d8b9018b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/th/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/th/firefox-115.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "cf48e41648b12f180d32341242ebdbd01d8bbb3b515c7ba3d80f3eca53169582"; + sha256 = "f936481ede653c9214aa625f6bc1f723dc7188493f380dbc6561d43ac58bf950"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/tl/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/tl/firefox-115.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "0ab2d2adcdbb1d444ae2c0d07bc129390d71f6dbf7e3b4df32e08b9c435e4d28"; + sha256 = "1a67c0707b407d86a1410a148cb81c087199c70197233c8d3b2bc1d9f6384c51"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/tr/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/tr/firefox-115.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "68c0538ff7ab0ef6d013a9b17550f5794a50c7e593a1445cb49170df57a4497d"; + sha256 = "91e5b5524934c63f90394a7320d7a726079f72ef9ce75ac0ce3393a13d9bcfd0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/trs/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/trs/firefox-115.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "8776aa1cafc7979602dc23e6e02c002445ae61ae2dc01cc017e87da3e2784bf1"; + sha256 = "31b009a17aa3c9439b26d2ade3fbb74256ccb79402c258d9975c79d3ec3023a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/uk/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/uk/firefox-115.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "64822eb5673bbf4e5ddbac17f0a67b875791a3c3eb1a10451e45a11341e1581e"; + sha256 = "8559ba5e0776ae7d2cfd8384d45b76fddcf39fd6364f2d748f6e8e791eca5158"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/ur/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/ur/firefox-115.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "4dda75e77d1ae72160638bdf56fb4b7cc566192d324d391b3d5584d0df1e3c9d"; + sha256 = "236f401e8dbfa78eb6d87712c1e84c0481d2681cbad0cac25e3e5395c9fc3ac5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/uz/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/uz/firefox-115.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "670c6308a8a9229cc63b2027e60b328365e8c919bc26ec67951e5fb6ea8224e5"; + sha256 = "39ae3db99d7bb50bdf5238382fbdf59c40ad748a99bd9bde39c1025e5afcecb0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/vi/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/vi/firefox-115.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "60d005d6f23dd45447b09c71a9c8a28cac4b0e737c9b7e27807f713a9268e569"; + sha256 = "4d16eaddc4489c19224feddfa53edbf0736f2447a804316ad25e68bd131ee1d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/xh/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/xh/firefox-115.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "84928fe9bfd10591698284e99745782cc1ccc91aba38397605655a4012bb26e9"; + sha256 = "40103ad901ce03622b63b49b59c875d08a8827a9a75b0d3068520dc36a61e4ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/zh-CN/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/zh-CN/firefox-115.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4def26d090635e24922c2c2911f4df8d7845d937e1c1e4e54f72e88b5b4ba4a9"; + sha256 = "19c65f89c860e42de97f19e543c530113c8fe876bd28af62fafe572d7dc1c33b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b7/linux-i686/zh-TW/firefox-115.0b7.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/115.0b9/linux-i686/zh-TW/firefox-115.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "3223daa71996d8acb8035b1fabba0e36ba807136c0a6129d6a2cb08e4e702673"; + sha256 = "b49b074f7ae19a0da9a7c9e0cebb4048a7d75e44c695804a78ea3c450e62c5ad"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/mobile-config.nix b/pkgs/applications/networking/browsers/firefox/mobile-config.nix new file mode 100644 index 000000000000..6e43295697ea --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/mobile-config.nix @@ -0,0 +1,113 @@ +{ stdenv, lib, runCommand, fetchFromGitLab, wrapFirefox, firefox-unwrapped }: + +let + pkg = fetchFromGitLab { + owner = "postmarketOS"; + repo = "mobile-config-firefox"; + rev = "ff2f07873f4ebc6e220da0e9b9f04c69f451edda"; + sha256 = "sha256-8wRz8corz00+0qROMiOmZAddM4tjfmE91bx0+P8JNx4="; + }; + userChrome = runCommand "userChrome.css" {} '' + cat ${pkg}/src/userChrome/*.css > $out + ''; + userContent = runCommand "userContent.css" {} '' + cat ${pkg}/src/userContent/*.css > $out + ''; +in wrapFirefox firefox-unwrapped { + # extraPolicies = (lib.importJSON "${pkg}/src/policies.json").policies; + extraPoliciesFiles = [ "${pkg}/src/policies.json" ]; + extraPrefs = '' + // Copyright 2022 Arnaud Ferraris, Oliver Smith + // SPDX-License-Identifier: MPL-2.0 + + // This is a Firefox autoconfig file: + // https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig + + // Import custom userChrome.css on startup or new profile creation + const {classes: Cc, interfaces: Ci, utils: Cu} = Components; + Cu.import("resource://gre/modules/Services.jsm"); + Cu.import("resource://gre/modules/FileUtils.jsm"); + + var updated = false; + + // Create <profile>/chrome/ directory if not already present + var chromeDir = Services.dirsvc.get("ProfD", Ci.nsIFile); + chromeDir.append("chrome"); + if (!chromeDir.exists()) { + chromeDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY); + } + + // Create nsIFile objects for userChrome.css in <profile>/chrome/ and in /etc/ + var chromeFile = chromeDir.clone(); + chromeFile.append("userChrome.css"); + var defaultChrome = new FileUtils.File("${userChrome}"); + + // No auto-upgrade. Should this be replaced with symlinking? + // // Remove the existing userChrome.css if older than the installed one + // if (chromeFile.exists() && defaultChrome.exists() && + // chromeFile.lastModifiedTime < defaultChrome.lastModifiedTime) { + // chromeFile.remove(false); + // } + + // Copy userChrome.css to <profile>/chrome/ + if (!chromeFile.exists()) { + defaultChrome.copyTo(chromeDir, "userChrome.css"); + updated = true; + } + + // Create nsIFile objects for userContent.css in <profile>/chrome/ and in /etc/ + var contentFile = chromeDir.clone(); + contentFile.append("userContent.css"); + var defaultContent = new FileUtils.File("${userContent}"); + + // No auto-upgrade. Should this be replaced with symlinking? + // // Remove the existing userContent.css if older than the installed one + // if (contentFile.exists() && defaultContent.exists() && + // contentFile.lastModifiedTime < defaultContent.lastModifiedTime) { + // contentFile.remove(false); + // } + + // Copy userContent.css to <profile>/chrome/ + if (!contentFile.exists()) { + defaultContent.copyTo(chromeDir, "userContent.css"); + updated = true; + } + + // Restart Firefox immediately if one of the files got updated + if (updated === true) { + var appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup); + appStartup.quit(Ci.nsIAppStartup.eForceQuit | Ci.nsIAppStartup.eRestart); + } + + defaultPref('general.useragent.override', 'Mozilla/5.0 (Android 11; Mobile; rv:96.0) Gecko/96.0 Firefox/96.0'); + defaultPref('browser.urlbar.suggest.topsites', false); + defaultPref('browser.urlbar.suggest.engines', false); + defaultPref('browser.newtabpage.enabled', true); + + // Enable android-style pinch-to-zoom + pref('dom.w3c.touch_events.enabled', true); + pref('apz.allow_zooming', true); + pref('apz.allow_double_tap_zooming', true); + + // Save vertical space by hiding the titlebar + pref('browser.tabs.inTitlebar', 1); + + // Disable search suggestions + pref('browser.search.suggest.enabled', false); + + // Empty new tab page: faster, less distractions + pref('browser.newtabpage.enabled', false); + + // Allow UI customizations with userChrome.css and userContent.css + pref('toolkit.legacyUserProfileCustomizations.stylesheets', true); + + // Select the entire URL with one click + pref('browser.urlbar.clickSelectsAll', true); + + // Disable cosmetic animations, save CPU + pref('toolkit.cosmeticAnimations.enabled', false); + + // Disable download animations, save CPU + pref('browser.download.animateNotifications', false); + ''; +} diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 998f35aac576..1b4a6236c94e 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -29,11 +29,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "115.0b7"; + version = "115.0b9"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "4ae6b74e7a47c06c3630c911d5bbcd6c390f1462f4335c8fd084cf455675c88872864390e22847da16564484b70fbac09625015fc6a4cf10a01ed8052016991e"; + sha512 = "26e030143c09daef8fcdde55ebd020828025694d354e5f1e51308275af07b4c44aef325bb74e5e289b89d469822b2380a4abf47103972f46f12dfd9ac8fad830"; }; meta = { @@ -56,12 +56,12 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "115.0b7"; + version = "115.0b9"; applicationName = "Mozilla Firefox Developer Edition"; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "f360ca7c5eb69d16a54b37a95195f4981c19e7e081cf7d494dafc1838ec69f2beabae5eaed23b0b551e71b32e3d0213383bc43e63416d390aa453bfa8b0f1993"; + sha512 = "8d2a0dc2c64f8fc846077165ea0c97cae04a85db9ffcd23fbf933b25f165ecd85727ba2f432842f2d2f41c5b5bef5eb4ae2536d8492888c334aba0dcec278c47"; }; meta = { diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 4cf598d49f3e..0208b62f414f 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "114.0.1-2", + "packageVersion": "114.0.2-1", "source": { - "rev": "114.0.1-2", - "sha256": "1di8kfzc27wz89cfq8xgs17lyayikpmqwn5npdzllzppp0dx0894" + "rev": "114.0.2-1", + "sha256": "0snwwr15kd69p6xjbwcika8w04q0qgx6qmv5gy01y9gjc0hcv10q" }, "firefox": { - "version": "114.0.1", - "sha512": "d422982e0271a68aa8064977b3a6b6f9412a30e7261ba06385c416e00e8ba0eb488d81a8929355fc92d35469d3308ec928f00e4de7248ed6390d5d900d7bce8f" + "version": "114.0.2", + "sha512": "1d514d09c6b964b96c6d52d54b89a89a92d53a6fe669e16a6370346c980db4d0ac6c502fa89219c71b680566b9eb982e9b3191c21f81d7326f34f6c837c0a872" } } diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index e1ae76735b15..17f1331e4612 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.26.0"; + version = "3.26.1"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-1wAFdzIReyL+mfuPKQdPrTjLmiGWoFCxtnT2ftBUlU0="; + hash = "sha256-QSebSc4V8DFSKufSB6M4YSuwDJ9rn/6IR6Fr38F8BBQ="; }; - vendorHash = "sha256-epmXf78DMHnyrAkf0V4wpFsfGvd8Hm+yXB9ODJDljys="; + vendorHash = "sha256-SuV7OEt0ZlVt0i8L5rgQd0HJn63XuDHi7+pe+bq+6Yw="; inherit doCheck subPackages; diff --git a/pkgs/applications/networking/cluster/falcoctl/default.nix b/pkgs/applications/networking/cluster/falcoctl/default.nix index 3b6be17357b1..1c582447fa8a 100644 --- a/pkgs/applications/networking/cluster/falcoctl/default.nix +++ b/pkgs/applications/networking/cluster/falcoctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "falcoctl"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "falcosecurity"; repo = "falcoctl"; rev = "v${version}"; - hash = "sha256-+6q7U/ipyIuoOPVo+yFuj2r3WAA2AozSqxjj4f5of68="; + hash = "sha256-X4fZBTEbOIQbfmuxDODEkYW43ntVIkwFDULYq+ps+9s="; }; - vendorHash = "sha256-12n5OZtrPSl+XUm+wsaTI5SVfJz/aGEhNQdMyEOGhkw="; + vendorHash = "sha256-26EXoXMWK/zPX4M7kG3QRAb4aqtIWgSnSgXcxKUwfZk="; ldflags = [ diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix index 481ac09c751e..c0c718197441 100644 --- a/pkgs/applications/networking/cluster/karmor/default.nix +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -1,20 +1,33 @@ -{ buildGoModule, fetchFromGitHub, installShellFiles, lib }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, testers +, karmor +}: buildGoModule rec { pname = "karmor"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-IKvWS1c7u1a3Fm2+uyhhgyuM680ZYiq9Xq2Tg/Y6HJo="; + hash = "sha256-BhGe4CMd0YgWc4EAyig5wmLgHJxNc8ppsUMBeRaIJEE="; }; - vendorHash = "sha256-xBtKKq6oUjazRac1FozRXBNRv1rFXYAulWu0Rs8ETvQ="; + vendorHash = "sha256-VT0CiaG5AODAL6nhoPmpulPApgTUiH0mXI6mS1eK14k="; nativeBuildInputs = [ installShellFiles ]; + ldflags = [ + "-s" + "-w" + "-X=github.com/kubearmor/kubearmor-client/selfupdate.BuildDate=1970-01-01" + "-X=github.com/kubearmor/kubearmor-client/selfupdate.GitSummary=${version}" + ]; + # integration tests require network access doCheck = false; @@ -26,6 +39,13 @@ buildGoModule rec { --zsh <($out/bin/karmor completion zsh) ''; + passthru.tests = { + version = testers.testVersion { + package = karmor; + command = "karmor version || true"; + }; + }; + meta = with lib; { description = "A client tool to help manage KubeArmor"; homepage = "https://kubearmor.io"; diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index 46a848513f93..7bed01e39d28 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-J5eEyLoeYC4JhreuN+ymeVMfnyf9ADL08FpnpmRy1vI="; + sha256 = "sha256-mrWE1MwcS0KYEQmJ8DSP5Sp5w6jpsDxvU03+KqfPDx4="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index 808d0208989a..1e2ed8c17bc0 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeshark"; - version = "40.5"; + version = "41.1"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = version; - sha256 = "sha256-Xm8Tx1m3k+Vz5GlSIGJw8W2PVkZav9U5A52X9HUJFno="; + sha256 = "sha256-Etf/zYw/ymA6//sNyCTZYXSTLUJ5QyAor80MoQ2o9zI="; }; - vendorHash = "sha256-ckIjmrXkn1AVBQRwM6+wdRwwYHytxKm3rKEe+csORdU="; + vendorHash = "sha256-CCkRL6pzwV45whYwCX/vcKllpz4qrUhZpNwVa69elVA="; ldflags = let t = "github.com/kubeshark/kubeshark"; in [ "-s" "-w" diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 81b9afda709d..56823696c03a 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.13.4"; - sha256 = "094i9a5l5nmygja1q73ipi01m6w1jsnr6l04g5629na72568zh6w"; + version = "2.13.5"; + sha256 = "0mjb0wcwyd51ap0kvkfmykh6zqijg4z2g5yxvp9aq67l984wh7sb"; vendorSha256 = "sha256-5T3YrYr7xeRkAADeE24BPu4PYU4mHFspqAiBpS8n4Y0="; } diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index d5c31a94bf88..086ea97c4b6a 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.5.1"; - sha256 = "0zb0vyvrx5fbr2ixqnm7qk7bivdljakjw25zgq19hv4bv6khilqv"; - vendorSha256 = "sha256-mcxG60HHgKRWgJLRO7q2O6PL4qxW6CD0qbqJ/fSrIlk="; + version = "23.6.2"; + sha256 = "1jvvywd1m87ivdcwzmi6cc9k4a53wsvmxac4v80rlqvmhaj1jq62"; + vendorSha256 = "sha256-fBpF4UZaO7EtCzjzF3lg6Hea/tEOmmwRVEwNono32LU="; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1896bafd9031..c3ad7f546551 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -164,13 +164,13 @@ "vendorHash": null }, "bitbucket": { - "hash": "sha256-T9e3IQHe6uCdllRTctJg/aG1QmPFR6V4ryw79yX2k/o=", + "hash": "sha256-Sby7Dvu4UWzdbQWa/GLMkDzlK7foaFApy4yLNBOJgck=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.33.0", + "rev": "v2.34.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ebkUF+Xv9diwUYXYt/WK+0tWheqL1cgA665VbGLmvvo=" + "vendorHash": "sha256-AcUw5i3st7VfAnpy/6nTYfTv3rOAN2jm4rUmEKcSrXM=" }, "brightbox": { "hash": "sha256-yKoYjrZs6EOX1pdDuF+LOu/jZ3fidZJBU7yhSp6qSFU=", @@ -363,11 +363,11 @@ "vendorHash": "sha256-2iVEcpESaEdgTcmlQ6Wynuxv8RmPFlhF+BVDSjHmclM=" }, "exoscale": { - "hash": "sha256-DD6CkdZ9KCCkPCgPyWXaAvHfHyn9rYXRsXg9BVJkELM=", + "hash": "sha256-dLA9BWW4ghD1OSZaZtFfv8ipS+2lTeNRr1YD3E8ewpI=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.49.0", + "rev": "v0.50.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -474,13 +474,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-5V0TW80GQKa2JHrSf9SlsCrT9jTTQK+SMRa/OCIrthE=", + "hash": "sha256-J5Fn3JGp7jXAA04RJ3FFKqLpB4hekd0yFA8zkfPPQ+4=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.41.0", + "rev": "v1.42.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-CRqUSPXap8lXRa/yIDnG11F/D+IdylY3JzkV6bXmzwY=" + "vendorHash": "sha256-8FgjFIgEx3pA6vKo7m9e6gASrpp5cPtN7A2US2GASy8=" }, "gridscale": { "hash": "sha256-OzOI//WXMHzHSbsqLSAfVpt756SbF3Uv0r/7MsVMjzY=", @@ -1234,11 +1234,11 @@ "vendorHash": null }, "vsphere": { - "hash": "sha256-XVMTKYb9RuK5sErVHsP0j5otUEioxp6C7GV7/J6OYVA=", + "hash": "sha256-lWMtsBRAirNI7dNXI7APzS1AbPmkz5fsbpCdd/0XBRc=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.4.0", + "rev": "v2.4.1", "spdx": "MPL-2.0", "vendorHash": "sha256-wKKrBSJkbdqqnDLoS+jhvI26rOzvMWjjsN8wh67Le5U=" }, diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index f5c00a2257e6..779fa891b44a 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-WkSZ+7ygg2dkotv3vwTrWaVsSQvgmPJ0xhPCqZdQit8="; + hash = "sha256-4eaoTcbb7ddcSRWng3GsgK8JdFRMxxb0V7V1G7WV9tg="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-nQfb94IileWTkSZOliDT6B6o7qQ8aQ0MdY0jzc84VIM="; + vendorHash = "sha256-wOD/Iuks32TiBOFVsuaLzYe3vlOtz6MCI9abscZMxJc="; ldflags = [ "-s" @@ -41,9 +41,5 @@ buildGoModule rec { changelog = "https://github.com/ava-labs/coreth/releases/tag/v${version}"; license = licenses.lgpl3Only; maintainers = with maintainers; [ urandom ]; - # In file included from ../go/pkg/mod/github.com/zondax/hid@v0.9.1-0.20220302062450-5552068d2266/hid_enabled.go:38: - # ./hidapi/mac/hid.c:693:34: error: use of undeclared identifier 'kIOMainPortDefault' - # entry = IORegistryEntryFromPath(kIOMainPortDefault, path); - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix b/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix index a8245af52ec6..b0bce2b71c5e 100644 --- a/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix +++ b/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix @@ -11,6 +11,12 @@ buildGoModule rec { sha256 = "sha256-Qtpg8DvIFkba+Do8IwemBF0rt85wS4Tq7yOLsdpQFCs="; }; + ldflags = [ + "-s" "-w" + "-X github.com/Necoro/feed2imap-go/pkg/version.version=${version}" + "-X github.com/Necoro/feed2imap-go/pkg/version.commit=nixpkgs" + ]; + vendorHash = "sha256-WFbfSzU1N2RAOMfCM7wqiAQ6R1HRaT0EfX4KYhstHJU="; # The print-cache tool is not an end-user tool (https://github.com/Necoro/feed2imap-go/issues/94) diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index a042276c217a..e30d09004546 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.67.1"; + version = "8.71.0"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - sha256 = "sha256-ms2mTmme+vaMa1uh9CDb4gxt2RCk9JSdHceYgmdc9kg="; + sha256 = "sha256-xq/Qs31kUEgCpGWE3M9yg1JeayXzlSpRVn3fdNl68Zc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/Cargo.lock b/pkgs/applications/networking/instant-messengers/deltachat-desktop/Cargo.lock deleted file mode 100644 index 24a4c1819856..000000000000 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/Cargo.lock +++ /dev/null @@ -1,5827 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "abao" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2daa0989489b05a455a9707adbbbc17443edf7bbc902ce499cd3b84148d68a40" -dependencies = [ - "arrayref", - "arrayvec", - "blake3", - "futures", - "tokio", -] - -[[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aes" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.8", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anes" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anstyle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" - -[[package]] -name = "anyhow" -version = "1.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" -dependencies = [ - "backtrace", -] - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "ascii_utils" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a" - -[[package]] -name = "asn1-rs" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time 0.3.20", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "async-channel" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-compression" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-imap" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da93622739d458dd9a6abc1abf0e38e81965a5824a3b37f9500437c82a8bb572" -dependencies = [ - "async-channel", - "base64 0.21.2", - "byte-pool", - "chrono", - "futures", - "imap-proto", - "log", - "nom", - "once_cell", - "pin-utils", - "self_cell", - "stop-token", - "thiserror", - "tokio", -] - -[[package]] -name = "async-mutex" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-native-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9343dc5acf07e79ff82d0c37899f079db3534d99f189a1837c8e549c99405bec" -dependencies = [ - "native-tls", - "thiserror", - "tokio", - "url", -] - -[[package]] -name = "async-smtp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8709c0d4432be428a88a06746689a9cb543e8e27ef7f61ca4d0455003a3d8c5b" -dependencies = [ - "anyhow", - "base64 0.13.1", - "futures", - "hostname", - "log", - "nom", - "pin-project", - "thiserror", - "tokio", -] - -[[package]] -name = "async-trait" -version = "0.1.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] -name = "async_zip" -version = "0.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2105142db9c6203b9dadc83b0553394589a6cb31b1449a3b46b42f47c3434d0" -dependencies = [ - "async-compression", - "crc32fast", - "log", - "pin-project", - "thiserror", - "tokio", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "axum" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" -dependencies = [ - "async-trait", - "axum-core", - "base64 0.21.2", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http", - "http-body", - "hyper", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sha1", - "sync_wrapper", - "tokio", - "tokio-tungstenite", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "backtrace" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base16ct" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" - -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bitfield" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" - -[[package]] -name = "blake3" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", - "digest 0.10.6", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-buffer" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blowfish" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" -dependencies = [ - "byteorder", - "cipher", -] - -[[package]] -name = "brotli" -version = "3.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "buffer-redux" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2886ea01509598caac116942abd33ab5a88fa32acdf7e4abfa0fc489ca520c9" -dependencies = [ - "memchr", - "safemem", -] - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "byte-pool" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f1b21189f50b5625efa6227cf45e9d4cfdc2e73582df2b879e9689e78a7158" -dependencies = [ - "crossbeam-queue", - "stable_deref_trait", -] - -[[package]] -name = "bytemuck" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "camellia" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3264e2574e9ef2b53ce6f536dea83a69ac0bc600b762d1523ff83fe07230ce30" -dependencies = [ - "byteorder", - "cipher", -] - -[[package]] -name = "camino" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6031a462f977dd38968b6f23378356512feeace69cef817e1a4475108093cec3" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", -] - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cast5" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b07d673db1ccf000e90f54b819db9e75a8348d6eb056e9b8ab53231b7a9911" -dependencies = [ - "cipher", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfb-mode" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738b8d467867f80a71351933f70461f5b56f24d5c93e0cf216e59229c968d330" -dependencies = [ - "cipher", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "charset" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46" -dependencies = [ - "base64 0.13.1", - "encoding_rs", -] - -[[package]] -name = "chrono" -version = "0.4.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "time 0.1.45", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "ciborium" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" - -[[package]] -name = "ciborium-ll" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "cipher" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clap" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980" -dependencies = [ - "anstyle", - "bitflags 1.3.2", - "clap_lex", -] - -[[package]] -name = "clap_lex" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" - -[[package]] -name = "clipboard-win" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" -dependencies = [ - "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "cobs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "concurrent-queue" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "const-oid" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" - -[[package]] -name = "const_format" -version = "0.2.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7309d9b4d3d2c0641e018d449232f2e28f1b22933c137f157d3dbc14228b8c0e" -dependencies = [ - "const_format_proc_macros", -] - -[[package]] -name = "const_format_proc_macros" -version = "0.2.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f47bf7270cf70d370f8f98c1abb6d2d4cf60a6845d30e05bfb90c6568650" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "constant_time_eq" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "convert_case" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "crc24" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd121741cf3eb82c08dd3023eb55bf2665e5f60ec20f89760cf836ae4562e6a0" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "criterion" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" -dependencies = [ - "anes", - "cast", - "ciborium", - "clap", - "criterion-plot", - "futures", - "is-terminal", - "itertools", - "num-traits", - "once_cell", - "oorandom", - "plotters", - "rayon", - "regex", - "serde", - "serde_derive", - "serde_json", - "tinytemplate", - "tokio", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" -dependencies = [ - "cast", - "itertools", -] - -[[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.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crypto-bigint" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" -dependencies = [ - "generic-array", - "rand_core 0.6.4", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto-bigint" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7" -dependencies = [ - "generic-array", - "rand_core 0.6.4", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "curve25519-dalek" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek" -version = "4.0.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d928d978dbec61a1167414f5ec534f24bea0d7a0d24dd9b6233d3d8223e585" -dependencies = [ - "cfg-if", - "digest 0.10.6", - "fiat-crypto", - "packed_simd_2", - "platforms", - "subtle", - "zeroize", -] - -[[package]] -name = "cxx" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 1.0.109", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - -[[package]] -name = "darling" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8" -dependencies = [ - "darling_core 0.14.3", - "darling_macro 0.14.3", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core 0.13.4", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" -dependencies = [ - "darling_core 0.14.3", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "data-encoding" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" - -[[package]] -name = "default-net" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4898b43aed56499fad6b294d15b3e76a51df68079bf492e5daae38ca084e003" -dependencies = [ - "dlopen2", - "libc", - "memalloc", - "netlink-packet-core", - "netlink-packet-route", - "netlink-sys", - "once_cell", - "system-configuration", - "windows", -] - -[[package]] -name = "deltachat" -version = "1.117.0" -dependencies = [ - "ansi_term", - "anyhow", - "async-channel", - "async-imap", - "async-native-tls", - "async-smtp", - "async_zip", - "backtrace", - "base64 0.21.2", - "brotli", - "chrono", - "criterion", - "deltachat_derive", - "email", - "encoded-words", - "escaper", - "fast-socks5", - "format-flowed", - "futures", - "futures-lite", - "hex", - "humansize", - "image", - "iroh", - "kamadak-exif", - "lettre_email", - "libc", - "log", - "mailparse", - "mime", - "num-derive", - "num-traits", - "num_cpus", - "once_cell", - "parking_lot", - "percent-encoding", - "pgp", - "pretty_assertions", - "pretty_env_logger", - "proptest", - "qrcodegen", - "quick-xml", - "rand 0.8.5", - "ratelimit", - "regex", - "reqwest", - "rusqlite", - "rust-hsluv", - "sanitize-filename", - "serde", - "serde_json", - "sha-1", - "sha2 0.10.6", - "smallvec", - "strum", - "strum_macros", - "tagger", - "tempfile", - "testdir", - "textwrap", - "thiserror", - "tokio", - "tokio-io-timeout", - "tokio-stream", - "tokio-tar", - "tokio-util", - "toml", - "trust-dns-resolver", - "url", - "uuid", -] - -[[package]] -name = "deltachat-jsonrpc" -version = "1.117.0" -dependencies = [ - "anyhow", - "async-channel", - "axum", - "base64 0.21.2", - "deltachat", - "env_logger", - "futures", - "log", - "num-traits", - "sanitize-filename", - "schemars", - "serde", - "serde_json", - "tempfile", - "tokio", - "typescript-type-def", - "walkdir", - "yerpc", -] - -[[package]] -name = "deltachat-repl" -version = "1.117.0" -dependencies = [ - "ansi_term", - "anyhow", - "deltachat", - "dirs", - "log", - "pretty_env_logger", - "rusqlite", - "rustyline", - "tokio", -] - -[[package]] -name = "deltachat-rpc-server" -version = "1.117.0" -dependencies = [ - "anyhow", - "deltachat", - "deltachat-jsonrpc", - "env_logger", - "futures-lite", - "log", - "serde", - "serde_json", - "tokio", - "tokio-util", - "yerpc", -] - -[[package]] -name = "deltachat_derive" -version = "2.0.0" -dependencies = [ - "quote", - "syn 2.0.18", -] - -[[package]] -name = "deltachat_ffi" -version = "1.117.0" -dependencies = [ - "anyhow", - "deltachat", - "deltachat-jsonrpc", - "human-panic", - "libc", - "num-traits", - "once_cell", - "rand 0.8.5", - "serde_json", - "thiserror", - "tokio", - "yerpc", -] - -[[package]] -name = "der" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" -dependencies = [ - "const-oid", - "der_derive", - "pem-rfc7468 0.6.0", - "zeroize", -] - -[[package]] -name = "der" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0" -dependencies = [ - "const-oid", - "pem-rfc7468 0.7.0", - "zeroize", -] - -[[package]] -name = "der-parser" -version = "8.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-bigint", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "der_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ef71ddb5b3a1f53dee24817c8f70dfa1cb29e804c18d88c228d4bc9c86ee3b9" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling 0.14.3", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2", - "quote", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "des" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdd80ce8ce993de27e9f063a444a4d53ce8e8db4c1f00cc03af5ad5a9867a1e" -dependencies = [ - "cipher", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer 0.10.3", - "const-oid", - "crypto-common", - "subtle", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "displaydoc" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "dlopen2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b121caccfc363e4d9a4589528f3bef7c71b83c6ed01c8dc68cbeeb7fd29ec698" -dependencies = [ - "dlopen2_derive", - "libc", - "once_cell", - "winapi", -] - -[[package]] -name = "dlopen2_derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a09ac8bb8c16a282264c379dffba707b9c998afc7506009137f3c6136888078" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "dyn-clone" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" - -[[package]] -name = "ecdsa" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" -dependencies = [ - "der 0.6.1", - "elliptic-curve 0.12.3", - "rfc6979 0.3.1", - "signature 1.6.4", -] - -[[package]] -name = "ecdsa" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644d3b8674a5fc5b929ae435bca85c2323d85ccb013a5509c2ac9ee11a6284ba" -dependencies = [ - "der 0.7.1", - "elliptic-curve 0.13.2", - "rfc6979 0.4.0", - "signature 2.0.0", -] - -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "serde", - "signature 1.6.4", -] - -[[package]] -name = "ed25519" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be522bee13fa6d8059f4903a4084aa3bd50725e18150202f0238deb615cd6371" -dependencies = [ - "pkcs8 0.10.1", - "signature 2.0.0", -] - -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek 3.2.0", - "ed25519 1.5.3", - "rand 0.7.3", - "serde", - "serde_bytes", - "sha2 0.9.9", - "zeroize", -] - -[[package]] -name = "ed25519-dalek" -version = "2.0.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "798f704d128510932661a3489b08e3f4c934a01d61c5def59ae7b8e48f19665a" -dependencies = [ - "curve25519-dalek 4.0.0-rc.2", - "ed25519 2.2.0", - "serde", - "sha2 0.10.6", - "zeroize", -] - -[[package]] -name = "educe" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0188e3c3ba8df5753894d54461f0e39bc91741dc5b22e1c46999ec2c71f4e4" -dependencies = [ - "enum-ordinalize", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "elliptic-curve" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" -dependencies = [ - "base16ct 0.1.1", - "crypto-bigint 0.4.9", - "der 0.6.1", - "digest 0.10.6", - "ff 0.12.1", - "generic-array", - "group 0.12.1", - "rand_core 0.6.4", - "sec1 0.3.0", - "subtle", - "zeroize", -] - -[[package]] -name = "elliptic-curve" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d" -dependencies = [ - "base16ct 0.2.0", - "crypto-bigint 0.5.1", - "digest 0.10.6", - "ff 0.13.0", - "generic-array", - "group 0.13.0", - "hkdf", - "pem-rfc7468 0.7.0", - "pkcs8 0.10.1", - "rand_core 0.6.4", - "sec1 0.7.1", - "subtle", - "zeroize", -] - -[[package]] -name = "email" -version = "0.0.21" -source = "git+https://github.com/deltachat/rust-email?branch=master#25702df99254d059483b41417cd80696a258df8e" -dependencies = [ - "base64 0.11.0", - "chrono", - "encoded-words", - "encoding", - "lazy_static", - "rand 0.7.3", - "time 0.1.45", - "version_check", -] - -[[package]] -name = "encoded-words" -version = "0.2.0" -source = "git+https://github.com/async-email/encoded-words?branch=master#d55366b36f96e383f39c432aedce42ee8b43f796" -dependencies = [ - "base64 0.12.3", - "charset", - "encoding_rs", - "hex", - "lazy_static", - "regex", - "thiserror", -] - -[[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "entities" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" - -[[package]] -name = "enum-as-inner" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "enum-ordinalize" -version = "3.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bb1df8b45ecb7ffa78dca1c17a438fb193eb083db0b1b494d2a61bcb5096a" -dependencies = [ - "num-bigint", - "num-traits", - "proc-macro2", - "quote", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "errno" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.45.0", -] - -[[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 = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "escaper" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53eb97b7349ba1bdb31839eceafe9aaae8f1d8d944dc589b67fb0b26e1c1666" -dependencies = [ - "entities", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fast-socks5" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961ce1761191c157145a8c9f0c3ceabecd3a729d65c9a8d443674eaee3420f7e" -dependencies = [ - "anyhow", - "log", - "thiserror", - "tokio", - "tokio-stream", -] - -[[package]] -name = "fast_chemail" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495a39d30d624c2caabe6312bfead73e7717692b44e0b32df168c275a2e8e9e4" -dependencies = [ - "ascii_utils", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fd-lock" -version = "3.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9799aefb4a2e4a01cc47610b1dd47c18ab13d991f27bbcaed9296f5a53d5cbad" -dependencies = [ - "cfg-if", - "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "ff" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" -dependencies = [ - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "ff" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" -dependencies = [ - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "fiat-crypto" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ace6ec7cc19c8ed33a32eaa9ea692d7faea05006b5356b9e2b668ec4bc3955" - -[[package]] -name = "filetime" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.16", - "windows-sys 0.45.0", -] - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", - "spin 0.9.8", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "format-flowed" -version = "1.0.0" - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", - "zeroize", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" - -[[package]] -name = "group" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" -dependencies = [ - "ff 0.12.1", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "group" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" -dependencies = [ - "ff 0.13.0", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "h2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashlink" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hkdf" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest 0.10.6", -] - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "human-panic" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c16465f6227e18e5a64eba488245d7b2974d4db0c4404ca5a69b550defa18d0a" -dependencies = [ - "backtrace", - "os_info", - "serde", - "serde_derive", - "toml", - "uuid", -] - -[[package]] -name = "humansize" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" -dependencies = [ - "libm 0.2.6", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[package]] -name = "idea" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "075557004419d7f2031b8bb7f44bb43e55a83ca7b63076a8fb8fe75753836477" -dependencies = [ - "cipher", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "image" -version = "0.24.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif", - "jpeg-decoder", - "num-rational", - "num-traits", - "png", -] - -[[package]] -name = "imap-proto" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73b1b63179418b20aa81002d616c5f21b4ba257da9bca6989ea64dc573933e0" -dependencies = [ - "nom", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" -dependencies = [ - "libc", - "windows-sys 0.45.0", -] - -[[package]] -name = "ipconfig" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" -dependencies = [ - "socket2", - "widestring", - "winapi", - "winreg", -] - -[[package]] -name = "ipnet" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" - -[[package]] -name = "iroh" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4fb9858c8cd3dd924a5da5bc511363845a9bcfdfac066bb2ef8454eb6111546" -dependencies = [ - "abao", - "anyhow", - "base64 0.21.2", - "blake3", - "bytes", - "default-net", - "der 0.6.1", - "derive_more", - "dirs-next", - "ed25519-dalek 1.0.1", - "futures", - "hex", - "num_cpus", - "portable-atomic", - "postcard", - "quic-rpc", - "quinn", - "rand 0.7.3", - "rcgen", - "ring", - "rustls", - "serde", - "serde-error", - "ssh-key", - "tempfile", - "thiserror", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", - "tracing-futures", - "tracing-subscriber", - "walkdir", - "webpki", - "x509-parser", - "zeroize", -] - -[[package]] -name = "is-terminal" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" - -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kamadak-exif" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077" -dependencies = [ - "mutate_once", -] - -[[package]] -name = "keccak" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" -dependencies = [ - "cpufeatures", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] - -[[package]] -name = "lettre" -version = "0.9.2" -source = "git+https://github.com/deltachat/lettre?branch=master#2ffdb5347f1255b4aed51cf87cda1f8207160f36" -dependencies = [ - "fast_chemail", - "log", -] - -[[package]] -name = "lettre_email" -version = "0.9.2" -source = "git+https://github.com/deltachat/lettre?branch=master#2ffdb5347f1255b4aed51cf87cda1f8207160f36" -dependencies = [ - "base64 0.11.0", - "email", - "lazy_static", - "lettre", - "mime", - "regex", - "time 0.1.45", - "uuid", -] - -[[package]] -name = "libc" -version = "0.2.146" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - -[[package]] -name = "libm" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" - -[[package]] -name = "libm" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" - -[[package]] -name = "libsqlite3-sys" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" -dependencies = [ - "cc", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" - -[[package]] -name = "lru-cache" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "mailparse" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b56570f5f8c0047260d1c8b5b331f62eb9c660b9dd4071a8c46f8c7d3f280aa" -dependencies = [ - "charset", - "data-encoding", - "quoted_printable", -] - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "matchit" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" - -[[package]] -name = "md-5" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" -dependencies = [ - "digest 0.10.6", -] - -[[package]] -name = "memalloc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", -] - -[[package]] -name = "mutate_once" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "netlink-packet-core" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5cf0b54effda4b91615c40ff0fd12d0d4c9a6e0f5116874f03941792ff535a" -dependencies = [ - "anyhow", - "byteorder", - "libc", - "netlink-packet-utils", -] - -[[package]] -name = "netlink-packet-route" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea993e32c77d87f01236c38f572ecb6c311d592e56a06262a007fd2a6e31253c" -dependencies = [ - "anyhow", - "bitflags 1.3.2", - "byteorder", - "libc", - "netlink-packet-core", - "netlink-packet-utils", -] - -[[package]] -name = "netlink-packet-utils" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" -dependencies = [ - "anyhow", - "byteorder", - "paste", - "thiserror", -] - -[[package]] -name = "netlink-sys" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" -dependencies = [ - "bytes", - "libc", - "log", -] - -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "static_assertions", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "ntapi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" -dependencies = [ - "winapi", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-bigint-dig" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" -dependencies = [ - "byteorder", - "lazy_static", - "libm 0.2.6", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.5", - "serde", - "smallvec", - "zeroize", -] - -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", - "libm 0.2.6", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "object" -version = "0.30.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" -dependencies = [ - "memchr", -] - -[[package]] -name = "oid-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" -dependencies = [ - "asn1-rs", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl" -version = "0.10.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "111.25.1+1.1.1t" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef9a9cc6ea7d9d5e7c4a913dc4b48d0e359eddf01af1dfec96ba7064b4aba10" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" -dependencies = [ - "autocfg", - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "os_info" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c424bc68d15e0778838ac013b5b3449544d8133633d8016319e7e05a820b8c0" -dependencies = [ - "log", - "serde", - "winapi", -] - -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "p256" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" -dependencies = [ - "ecdsa 0.14.8", - "elliptic-curve 0.12.3", - "sha2 0.10.6", -] - -[[package]] -name = "p256" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7270da3e5caa82afd3deb054cc237905853813aea3859544bc082c3fe55b8d47" -dependencies = [ - "ecdsa 0.16.2", - "elliptic-curve 0.13.2", - "primeorder", - "sha2 0.10.6", -] - -[[package]] -name = "p384" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" -dependencies = [ - "ecdsa 0.14.8", - "elliptic-curve 0.12.3", - "sha2 0.10.6", -] - -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa 0.16.2", - "elliptic-curve 0.13.2", - "primeorder", - "sha2 0.10.6", -] - -[[package]] -name = "packed_simd_2" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" -dependencies = [ - "cfg-if", - "libm 0.1.4", -] - -[[package]] -name = "parking" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - -[[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.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "windows-sys 0.45.0", -] - -[[package]] -name = "paste" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" - -[[package]] -name = "pem" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "pem-rfc7468" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" -dependencies = [ - "base64ct", -] - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pgp" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a79d6411154d1a9908e7a2c4bac60a5742f6125823c2c30780c7039aef02f0" -dependencies = [ - "aes", - "base64 0.21.2", - "bitfield", - "block-padding", - "blowfish", - "bstr", - "buffer-redux", - "byteorder", - "camellia", - "cast5", - "cfb-mode", - "chrono", - "cipher", - "crc24", - "derive_builder", - "des", - "digest 0.10.6", - "ed25519-dalek 2.0.0-rc.2", - "elliptic-curve 0.13.2", - "flate2", - "generic-array", - "hex", - "idea", - "log", - "md-5", - "nom", - "num-bigint-dig", - "num-derive", - "num-traits", - "p256 0.13.0", - "p384 0.13.0", - "rand 0.8.5", - "ripemd", - "rsa 0.9.0-pre.0", - "sha1", - "sha2 0.10.6", - "sha3", - "signature 2.0.0", - "smallvec", - "thiserror", - "twofish", - "x25519-dalek", - "zeroize", -] - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkcs1" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff33bdbdfc54cc98a2eca766ebdec3e1b8fb7387523d5c9c9a2891da856f719" -dependencies = [ - "der 0.6.1", - "pkcs8 0.9.0", - "spki 0.6.0", - "zeroize", -] - -[[package]] -name = "pkcs1" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "178ba28ece1961eafdff1991bd1744c29564cbab5d803f3ccb4a4895a6c550a7" -dependencies = [ - "der 0.7.1", - "pkcs8 0.10.1", - "spki 0.7.0", - "zeroize", -] - -[[package]] -name = "pkcs8" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" -dependencies = [ - "der 0.6.1", - "spki 0.6.0", -] - -[[package]] -name = "pkcs8" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d2820d87d2b008616e5c27212dd9e0e694fb4c6b522de06094106813328cb49" -dependencies = [ - "der 0.7.1", - "spki 0.7.0", -] - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "platforms" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" - -[[package]] -name = "plotters" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" - -[[package]] -name = "plotters-svg" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" -dependencies = [ - "plotters-backend", -] - -[[package]] -name = "png" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "portable-atomic" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c00c8683a03bd4fe7db7dd64ab4abee6b42166bc81231da983486ce96be51a" - -[[package]] -name = "postcard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00" -dependencies = [ - "cobs", - "const_format", - "postcard-derive", - "serde", -] - -[[package]] -name = "postcard-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4b01218787dd4420daf63875163a787a78294ad48a24e9f6fa8c6507759a79" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "pretty_assertions" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" -dependencies = [ - "ctor", - "diff", - "output_vt100", - "yansi", -] - -[[package]] -name = "pretty_env_logger" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" -dependencies = [ - "env_logger", - "log", -] - -[[package]] -name = "primeorder" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7613fdcc0831c10060fa69833ea8fa2caa94b6456f51e25356a885b530a2e3d0" -dependencies = [ - "elliptic-curve 0.13.2", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proptest" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "lazy_static", - "num-traits", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_xorshift", - "regex-syntax 0.6.29", - "unarray", -] - -[[package]] -name = "qrcodegen" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" - -[[package]] -name = "quic-rpc" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d453504fc3e456160ae3b9ebe4d83c1f6477af167aa9b67e2d7bf11a096f179d" -dependencies = [ - "bincode", - "flume", - "futures", - "pin-project", - "quinn", - "serde", - "tokio", - "tokio-serde", - "tokio-util", - "tracing", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "quick-xml" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "quinn" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "thiserror", - "tokio", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-proto" -version = "0.9.2" -source = "git+https://github.com/quinn-rs/quinn?branch=main#11b34a7b2652010cdbbd08b5dfa407832baff927" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring", - "rustc-hash", - "rustls", - "rustls-native-certs", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-udp" -version = "0.3.2" -source = "git+https://github.com/quinn-rs/quinn?branch=main#11b34a7b2652010cdbbd08b5dfa407832baff927" -dependencies = [ - "libc", - "quinn-proto", - "socket2", - "tracing", - "windows-sys 0.45.0", -] - -[[package]] -name = "quote" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "quoted_printable" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24039f627d8285853cc90dcddf8c1ebfaa91f834566948872b225b9a28ed1b6" - -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core 0.6.4", -] - -[[package]] -name = "ratelimit" -version = "1.0.0" - -[[package]] -name = "rayon" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "rcgen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" -dependencies = [ - "pem", - "ring", - "time 0.3.20", - "yasna", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[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 = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.8", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.7.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" - -[[package]] -name = "reqwest" -version = "0.11.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" -dependencies = [ - "base64 0.21.2", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "resolv-conf" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" -dependencies = [ - "hostname", - "quick-error", -] - -[[package]] -name = "rfc6979" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" -dependencies = [ - "crypto-bigint 0.4.9", - "hmac", - "zeroize", -] - -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "ripemd" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" -dependencies = [ - "digest 0.10.6", -] - -[[package]] -name = "rsa" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c" -dependencies = [ - "byteorder", - "digest 0.10.6", - "num-bigint-dig", - "num-integer", - "num-iter", - "num-traits", - "pkcs1 0.4.1", - "pkcs8 0.9.0", - "rand_core 0.6.4", - "signature 1.6.4", - "smallvec", - "subtle", - "zeroize", -] - -[[package]] -name = "rsa" -version = "0.9.0-pre.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7bc1d34159d63536b4d89944e9ab5bb952f45db6fa0b8b03c2f8c09fb5b7171" -dependencies = [ - "byteorder", - "digest 0.10.6", - "num-bigint-dig", - "num-integer", - "num-iter", - "num-traits", - "pkcs1 0.7.1", - "pkcs8 0.10.1", - "rand_core 0.6.4", - "signature 2.0.0", - "subtle", - "zeroize", -] - -[[package]] -name = "rusqlite" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" -dependencies = [ - "bitflags 2.0.2", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rust-hsluv" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efe2374f2385cdd8755a446f80b2a646de603c9d8539ca38734879b5c71e378b" - -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[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 = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", -] - -[[package]] -name = "rustix" -version = "0.37.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" -dependencies = [ - "base64 0.21.2", -] - -[[package]] -name = "rustversion" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" - -[[package]] -name = "rustyline" -version = "11.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfc8644681285d1fb67a467fb3021bfea306b99b4146b166a1fe3ada965eece" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "clipboard-win", - "dirs-next", - "fd-lock", - "libc", - "log", - "memchr", - "nix", - "radix_trie", - "scopeguard", - "unicode-segmentation", - "unicode-width", - "utf8parse", - "winapi", -] - -[[package]] -name = "ryu" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "sanitize-filename" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c502bdb638f1396509467cb0580ef3b29aa2a45c5d43e5d84928241280296c" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "schemars" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" -dependencies = [ - "dyn-clone", - "schemars_derive", - "serde", - "serde_json", -] - -[[package]] -name = "schemars_derive" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 1.0.109", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "sec1" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" -dependencies = [ - "base16ct 0.1.1", - "der 0.6.1", - "generic-array", - "pkcs8 0.9.0", - "subtle", - "zeroize", -] - -[[package]] -name = "sec1" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" -dependencies = [ - "base16ct 0.2.0", - "der 0.7.1", - "generic-array", - "pkcs8 0.10.1", - "subtle", - "zeroize", -] - -[[package]] -name = "security-framework" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "self_cell" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" - -[[package]] -name = "semver" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-error" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e988182713aeed6a619a88bca186f6d6407483485ffe44c869ee264f8eabd13f" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_bytes" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] -name = "serde_derive_internals" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "serde_json" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.6", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.6", -] - -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.6", -] - -[[package]] -name = "sha3" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" -dependencies = [ - "digest 0.10.6", - "keccak", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -dependencies = [ - "digest 0.10.6", - "rand_core 0.6.4", -] - -[[package]] -name = "signature" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" -dependencies = [ - "digest 0.10.6", - "rand_core 0.6.4", -] - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "smawk" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spki" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" -dependencies = [ - "base64ct", - "der 0.6.1", -] - -[[package]] -name = "spki" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0445c905640145c7ea8c1993555957f65e7c46d0535b91ba501bc9bfc85522f" -dependencies = [ - "base64ct", - "der 0.7.1", -] - -[[package]] -name = "ssh-encoding" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19cfdc32e0199062113edf41f344fbf784b8205a94600233c84eb838f45191e1" -dependencies = [ - "base64ct", - "pem-rfc7468 0.6.0", - "sha2 0.10.6", -] - -[[package]] -name = "ssh-key" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "288d8f5562af5a3be4bda308dd374b2c807b940ac370b5efa1c99311da91d9a1" -dependencies = [ - "ed25519-dalek 1.0.1", - "p256 0.11.1", - "p384 0.11.2", - "rand_core 0.6.4", - "rsa 0.7.2", - "sec1 0.3.0", - "sha2 0.10.6", - "signature 1.6.4", - "ssh-encoding", - "zeroize", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "stop-token" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af91f480ee899ab2d9f8435bfdfc14d08a5754bd9d3fef1f1a1c23336aad6c8b" -dependencies = [ - "async-channel", - "cfg-if", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[package]] -name = "sysinfo" -version = "0.26.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c18a6156d1f27a9592ee18c1a846ca8dd5c258b7179fc193ae87c74ebb666f5" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "winapi", -] - -[[package]] -name = "system-configuration" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tagger" -version = "4.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aaa6f5d645d1dae4cd0286e9f8bf15b75a31656348e5e106eb1a940abd34b63" - -[[package]] -name = "tempfile" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "testdir" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45fc921e7c4ad1aedb3484811514f3e5cd187886e0bbf1302c175f7578ef552" -dependencies = [ - "anyhow", - "backtrace", - "cargo_metadata", - "once_cell", - "sysinfo", - "whoami", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" -dependencies = [ - "smawk", - "unicode-linebreak", - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -dependencies = [ - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" -dependencies = [ - "time-core", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" -dependencies = [ - "autocfg", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-serde" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "911a61637386b789af998ee23f50aa30d5fd7edcec8d6d3dedae5e5815205466" -dependencies = [ - "bincode", - "bytes", - "educe", - "futures-core", - "futures-sink", - "pin-project", - "serde", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-tar" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a50188549787c32c1c3d9c8c71ad7e003ccf2f102489c5a96e385c84760477f4" -dependencies = [ - "filetime", - "futures-core", - "libc", - "redox_syscall 0.2.16", - "tokio", - "tokio-stream", - "xattr", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" -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" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "trust-dns-proto" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.2.3", - "ipnet", - "lazy_static", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static", - "lru-cache", - "parking_lot", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "tungstenite" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" -dependencies = [ - "base64 0.13.1", - "byteorder", - "bytes", - "http", - "httparse", - "log", - "rand 0.8.5", - "sha1", - "thiserror", - "url", - "utf-8", -] - -[[package]] -name = "twofish" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78e83a30223c757c3947cd144a31014ff04298d8719ae10d03c31c0448c8013" -dependencies = [ - "cipher", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "typescript-type-def" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6b74ffbd5684d318252bb7182051df8c4ecc098b542f63fddf792e7f42aa02" -dependencies = [ - "serde_json", - "typescript-type-def-derive", -] - -[[package]] -name = "typescript-type-def-derive" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10a4f5dd87c279f90beef31edb7055bfd1ceb66e73148de107a5c9005e9f864" -dependencies = [ - "darling 0.13.4", - "ident_case", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - -[[package]] -name = "unicode-bidi" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" - -[[package]] -name = "unicode-ident" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" - -[[package]] -name = "unicode-linebreak" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown", - "regex", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna 0.3.0", - "percent-encoding", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" - -[[package]] -name = "uuid" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" -dependencies = [ - "getrandom 0.2.8", - "serde", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -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 = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[package]] -name = "whoami" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45dbc71f0cdca27dc261a9bd37ddec174e4a0af2b900b890f378460f745426e3" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "widestring" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -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" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec" -dependencies = [ - "windows_aarch64_msvc 0.32.0", - "windows_i686_gnu 0.32.0", - "windows_i686_msvc 0.32.0", - "windows_x86_64_gnu 0.32.0", - "windows_x86_64_msvc 0.32.0", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", -] - -[[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.1", -] - -[[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.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winnow" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "x25519-dalek" -version = "2.0.0-pre.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" -dependencies = [ - "curve25519-dalek 3.2.0", - "rand_core 0.6.4", - "zeroize", -] - -[[package]] -name = "x509-parser" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" -dependencies = [ - "asn1-rs", - "base64 0.13.1", - "data-encoding", - "der-parser", - "lazy_static", - "nom", - "oid-registry", - "rusticata-macros", - "thiserror", - "time 0.3.20", -] - -[[package]] -name = "xattr" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" -dependencies = [ - "libc", -] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "yasna" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" -dependencies = [ - "time 0.3.20", -] - -[[package]] -name = "yerpc" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30fc983d32883ecb563227a2dcdcbe8567decd9c533b5ecca7e3099e2f7d4c96" -dependencies = [ - "anyhow", - "async-channel", - "async-mutex", - "async-trait", - "axum", - "futures", - "futures-util", - "log", - "schemars", - "serde", - "serde_json", - "tokio", - "tracing", - "typescript-type-def", - "yerpc_derive", -] - -[[package]] -name = "yerpc_derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d6b8ce490e8719fe84d7d80ad4d58572b2ea9d7a83d156f6afd6ab3ad5cfb94" -dependencies = [ - "convert_case 0.5.0", - "darling 0.14.3", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "zeroize" -version = "1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 81107f12a7e6..3dd30751cd0d 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -5,7 +5,6 @@ , buildGoModule , esbuild , fetchFromGitHub -, fetchpatch , libdeltachat , makeDesktopItem , makeWrapper @@ -13,31 +12,12 @@ , pkg-config , python3 , roboto -, rustPlatform , sqlcipher , stdenv , CoreServices }: let - libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.117.0"; - src = fetchFromGitHub { - owner = "deltachat"; - repo = "deltachat-core-rust"; - rev = "v${version}"; - hash = "sha256-zKOhjV2q+jKoh5KVb+izbRzq0kAFp3pXdnPTf9PAhGs="; - }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "email-0.0.21" = "sha256-Ys47MiEwVZenRNfenT579Rb17ABQ4QizVFTWUq3+bAY="; - "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk="; - "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk="; - "quinn-proto-0.9.2" = "sha256-N1gD5vMsBEHO4Fz4ZYEKZA8eE/VywXNXssGcK6hjvpg="; - }; - }; - }); esbuild' = esbuild.override { buildGoModule = args: buildGoModule (args // rec { version = "0.14.54"; @@ -50,7 +30,8 @@ let vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); }; -in buildNpmPackage rec { +in +buildNpmPackage rec { pname = "deltachat-desktop"; version = "1.38.1"; @@ -72,7 +53,7 @@ in buildNpmPackage rec { ]; buildInputs = [ - libdeltachat' + libdeltachat ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index d7b0a675bb52..7c2b89ede0a9 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -24,7 +24,7 @@ , libpulseaudio , libupnp , yaml-cpp -, msgpack +, msgpack-cxx , openssl , restinio , secp256k1 @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { libpulseaudio libupnp yaml-cpp - msgpack + msgpack-cxx opendht-jami openssl pjsip-jami diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 1b5e32cd7603..7efd99b8152d 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230615"; + version = "20230626"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-mt9bs5GtBMVc0PZap+vKXFURoUe5zIfHwtj5OVfN8hE="; + hash = "sha256-5FdiWmD7Z/Dk39om2NneckINQ2stw7EobmpcuzSC+5c="; }; postPatch = '' diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index ad460fe6c778..9fdf4f222718 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.8"; + version = "4.0.0"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { - url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - hash = "sha256-objxAUGvBhTkbQl4GshDP3RsCkAW4z917L9WyaVoYj4="; + url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; + hash = "sha256-W9de4V8zkqCtF07nxUUY2uzjh4R3ZwwH8Q1uv5iCQPk="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; @@ -51,6 +51,7 @@ let cmakeFlags = with lib; [ "-DENABLE_MAN=ON" "-DENABLE_DOC=ON" + "-DENABLE_DOC_INCOMPLETE=ON" "-DENABLE_TESTS=${if enableTests then "ON" else "OFF"}" ] ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] @@ -84,7 +85,7 @@ let ''; meta = { - homepage = "http://www.weechat.org/"; + homepage = "https://weechat.org/"; description = "A fast, light and extensible chat client"; longDescription = '' You can find more documentation as to how to customize this package diff --git a/pkgs/applications/networking/mailreaders/caeml/default.nix b/pkgs/applications/networking/mailreaders/caeml/default.nix new file mode 100644 index 000000000000..54b4c7f60cdb --- /dev/null +++ b/pkgs/applications/networking/mailreaders/caeml/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +buildGoModule rec { + pname = "caeml"; + version = "unstable-2023-05-24"; + + src = fetchFromGitHub { + owner = "ferdinandyb"; + repo = pname; + rev = "25dbe10e99aac9b0ce3b80787c162628104f5cd2"; + sha256 = "UIQCNkUyrtMF0IiAfkDvE8siqxNvfFc9TZdlZiTxCVc="; + }; + + vendorHash = "sha256-SDJsRLIGlLv/6NUctCrn6z1IDEmum1Wn5I8RFuwcOe8="; + + meta = with lib; { + description = "cat eml files"; + longDescription = '' + Reads an email file from either STDIN or from a file passed as the first + argument, digests it and outputs it to STDOUT in a more human readable + format. This means only From, To, Cc, Bcc, Date and Subject headers are + kept and these are decoded and of all the parts only text/plain is returned. + ''; + homepage = "https://github.com/ferdinandyb/caeml"; + license = licenses.mit; + maintainers = with maintainers; [ emilytrau ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index 20f3597b1517..a7b51585e3a0 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -2,12 +2,12 @@ let pname = "electron-mail"; - version = "5.1.6"; + version = "5.1.8"; name = "ElectronMail-${version}"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-lsXVsx7U43czWFWxAgwTUYTnUXSL4KPFnXLzUklieAo="; + sha256 = "sha256-btqlxFrQUyb728i99IE65A9jwEFNvJ5b6zji0kwwATU="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 943a6a3b92a3..61180ba9be65 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-1h/UQXaLcc962IMw9Vt79GR0qx1rYcmy5E+duisi0ck="; + hash = "sha256-oxXGNmec5s4yN2SAjAUrvF2gJ9XkafwK98kDroIIssQ="; }; - vendorHash = "sha256-0iByCr//nOaEjfGT2alxZpzSl57x2GxXAOIiza4gnGQ="; + vendorHash = "sha256-p/MnieYNLq+mleqhqCYL9PBV2dVm+Zs945RwbdKjrus="; inherit subPackages; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index c3461bb57040..68b007fa53ef 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -11,13 +11,13 @@ assert trackerSearch -> (python3 != null); mkDerivation rec { pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; - version = "4.5.3"; + version = "4.5.4"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - hash = "sha256-d3WYNMeM6ccn0M+EuCm4OBEq8NKU0Nx276Av5cobzfU="; + hash = "sha256-c/ZJ83kxxFo/iI7Tjo3ZY0/vmVanjoJXBOu8XTnFm+Q="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index adda284a6b8c..faa6304c38a8 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,26 +1,45 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools -, seafile-shared, jansson, libsearpc -, withShibboleth ? true, qtwebengine }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, qtbase +, qttools +, libuuid +, seafile-shared +, jansson +, libsearpc +, withShibboleth ? true +, qtwebengine +, wrapQtAppsHook +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "seafile-client"; - version = "8.0.7"; + version = "9.0.2"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; - # Tag v8.0.7 used to point to this commit, but was re-tagged later to a state - # that fails to link properly - rev = "8b96abf64e6aa19e3beeff6b322bcd6d28120bdd"; - sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj"; + rev = "v${version}"; + sha256 = "sha256-6AsvqlXDmTr3yBvYlV/0qjH+KnZ03S5TU7yzGt0MqiI="; }; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ] - ++ lib.optional withShibboleth qtwebengine; + nativeBuildInputs = [ + libuuid + pkg-config + cmake + wrapQtAppsHook + qttools + ]; + + buildInputs = [ + seafile-shared + jansson + libsearpc + ] ++ lib.optional withShibboleth qtwebengine; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] - ++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON"; + cmakeFlags = lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON"; qtWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ seafile-shared ]}" diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index f80467d827d7..504cd6d0b5c5 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "5.1"; + version = "5.2"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-imWB3ffHQJ22NlEGATUa9yTto2OrWbHV2o2YEDPyb3I="; + hash = "sha256-SCYXa35wu4ifmcIG+v+t2JJijXhSVxXp9xKOz0ixRoA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 4ca0f4bdecd9..6d1d8ebc842b 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.6.5"; + version = "23.6.6"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - hash = "sha256-FTGptp6RWVJYdLXtDI5cymt1bNr+0yHk0wLCOuTbxlE="; + hash = "sha256-UXEnoe8TovzghKtEXDis5Gk93oDEyJhhNXMnGaK5VXI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/applications/radio/sdrplay/default.nix index 699389dd2d34..8e7c14ec5e24 100644 --- a/pkgs/applications/radio/sdrplay/default.nix +++ b/pkgs/applications/radio/sdrplay/default.nix @@ -1,20 +1,36 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, udev }: +{ stdenv, lib, fetchurl, autoPatchelfHook, udev, libusb1 }: let - arch = if stdenv.isx86_64 then "x86_64" - else if stdenv.isi686 then "i686" + arch = + if stdenv.isx86_64 then "x86_64" + else if stdenv.isi686 then "i686" + else if stdenv.isAarch64 then "aarch64" else throw "unsupported architecture"; -in stdenv.mkDerivation rec { - pname = "sdrplay"; + version = "3.07.1"; - src = fetchurl { - url = "https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-${version}.run"; - sha256 = "1a25c7rsdkcjxr7ffvx2lwj7fxdbslg9qhr8ghaq1r53rcrqgzmf"; + srcs = rec { + aarch64 = { + url = "https://www.sdrplay.com/software/SDRplay_RSP_API-ARM64-${version}.run"; + hash = "sha256-GJPFW6W8Ke4mnczcSLFYfioOMGCfFn2/EIA07VnmVGY="; + }; + + x86_64 = { + url = "https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-${version}.run"; + sha256 = "1a25c7rsdkcjxr7ffvx2lwj7fxdbslg9qhr8ghaq1r53rcrqgzmf"; + }; + + i686 = x86_64; }; +in +stdenv.mkDerivation rec { + pname = "sdrplay"; + inherit version; + + src = fetchurl srcs."${arch}"; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ udev stdenv.cc.cc.lib ]; + buildInputs = [ libusb1 udev stdenv.cc.cc.lib ]; unpackPhase = '' sh "$src" --noexec --target source @@ -46,7 +62,7 @@ in stdenv.mkDerivation rec { homepage = "https://www.sdrplay.com/downloads/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = [ maintainers.pmenke ]; + maintainers = with maintainers; [ pmenke zaninime ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 76ef4b7784c4..9f47a9f0e4c5 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diamond"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; rev = "v${version}"; - sha256 = "sha256-5AjP7zH0WZhJqhcjgQjeK/WPCqy1Tl1gXXqRsHbqkys="; + sha256 = "sha256-6L/eS3shfJ33bsXo1BaCO4lKklh2KbOIO2tZsvwcjnA="; }; diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 7b6689a358a8..b4560728e35d 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1453"; + version = "1456"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-r8bWk1+weSyQ5QPGKKwdAzMkzh3DgzTUr5YCMUq5UUM="; + hash = "sha256-9DkmqqovVqaahoHoY30CfINEHTKn3Rqb9yVtU4fIgKw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index 6cfa3017e39d..c4c1e798dd51 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "horizon-eda"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - sha256 = "sha256-R827l7WxyeCPQFXSzFcn4nE4AZBAOQ7s5QylDpxbw3U="; + sha256 = "sha256-UcjbDJR6shyETpanNkRoH8LF8r6gFjsyNHVSCMHKqS8="; }; buildInputs = [ diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix index d2898ebc7540..9da94aa609be 100644 --- a/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/pkgs/applications/science/electronics/qucs-s/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "qucs-s"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucs_s"; rev = version; - sha256 = "sha256-2YyVeeUnLBS1Si9gwEsQLZVG98715dz/v+WCYjB3QlI="; + sha256 = "sha256-cQ9UNCTwRW61dOQYJX0mPNtCTk0qXKx8VQ6BIXl6Fa8="; }; nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ]; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 7600ecf7bacd..597efbf49bd1 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-KCRKVVNC2tJZWgqdQ8NPUzJHPexhF58cuO8Iyx81UJo="; + sha256 = "sha256-+GCmPT7dtd+XvmJv19XllZ6G4rB0+CYUt+lorr44aEQ="; }; - cargoHash = "sha256-nFaDWDmDskZ0TKFG5KZk/vLn6ZzU3+mPD6y1wFxhLXg="; + cargoHash = "sha256-iWZutcYyBVujwjMHFUwwE/xDk6o5tPng1ZQ2mHgTbVk="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index abbcd417693e..2d2542a607a5 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, adoptopenjdk-bin, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { pname = "tlaplus"; @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ adoptopenjdk-bin ]; dontUnpack = true; installPhase = '' @@ -33,6 +32,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ florentc thoughtpolice ]; + maintainers = with lib.maintainers; [ florentc thoughtpolice mgregson ]; }; } diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index f36b26d9a398..9fe39c8cef89 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -80,6 +80,7 @@ let common = { version, sha256, patches ? [ ], tag ? "z3" }: meta = with lib; { description = "A high-performance theorem prover and SMT solver"; homepage = "https://github.com/Z3Prover/z3"; + changelog = "https://github.com/Z3Prover/z3/releases/tag/z3-${version}"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ttuegel ]; @@ -88,12 +89,12 @@ let common = { version, sha256, patches ? [ ], tag ? "z3" }: in { z3_4_12 = common { - version = "4.12.1"; - sha256 = "sha256-7cuUf29TMpX62PwO1ab3ZuzmzlcrRjTKB1CyXnYgYus="; + version = "4.12.2"; + sha256 = "sha256-DTgpKEG/LtCGZDnicYvbxG//JMLv25VHn/NaF307JYA="; }; z3_4_11 = common { - version = "4.11.0"; - sha256 = "sha256-ItmtZHDhCeLAVtN7K80dqyAh20o7TM4xk2sTb9QgHvk="; + version = "4.11.2"; + sha256 = "sha256-OO0wtCvSKwGxnKvu+AfXe4mEzv4nofa7A00BjX+KVjc="; }; z3_4_8 = common { version = "4.8.17"; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index f9bcfa5df73c..c5434c869909 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" "-DOpenMVG_BUILD_EXAMPLES=${if enableExamples then "ON" else "OFF"}" "-DOpenMVG_BUILD_DOC=${if enableDocs then "ON" else "OFF"}" "-DTARGET_ARCHITECTURE=generic" diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index aad630f384ec..958f87a6c311 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "380"; + version = "382"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-DB3B+oAPpktcWNFt25BecAsnylOKZb6MA7K6V2EQbDg="; + hash = "sha256-DNC889CqdGqEDqPxNm6imnQmNpTVNbXHd/J+tl1/zu0="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 18b83d8e4400..05e21b641e94 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.17.4"; + version = "3.17.6"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-g3SEUVcyr6+nt0zMHB1F4drCwmQvPYQErOwSl9I+1Tg="; + hash = "sha256-o3Z1xPu5RcspU4m3Bb6ydZkXOMgOMJPN/+TLekwe/wI="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-relevant-history/default.nix b/pkgs/applications/version-management/git-relevant-history/default.nix new file mode 100644 index 000000000000..c4cb223d253b --- /dev/null +++ b/pkgs/applications/version-management/git-relevant-history/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, python3, git, git-filter-repo }: + +python3.pkgs.buildPythonApplication rec { + pname = "git-relevant-history"; + version = "2022-09-15"; + src = fetchFromGitHub { + owner = "rainlabs-eu"; + repo = pname; + rev = "84552324d7cb4790db86282fc61bf98a05b7a4fd"; + hash = "sha256-46a6TR1Hi3Lg2DTmOp1aV5Uhd4IukTojZkA3TVbTnRY="; + }; + propagatedBuildInputs = [ + git git-filter-repo + python3.pkgs.docopt + ]; + + meta = with lib; { + description = "Extract only relevant history from git repo"; + homepage = "https://github.com/rainlabs-eu/git-relevant-history"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.bendlas ]; + }; +} diff --git a/pkgs/applications/version-management/gut/default.nix b/pkgs/applications/version-management/gut/default.nix index 954b47f478bd..ced7717a2cee 100644 --- a/pkgs/applications/version-management/gut/default.nix +++ b/pkgs/applications/version-management/gut/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gut"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitHub { owner = "julien040"; repo = "gut"; rev = version; - hash = "sha256-zi0Hqf9fuZIh0GlP1Qf3dq5z1+eR1mO+Ybagehyif9g="; + hash = "sha256-y6GhLuTqOaxAQjDgqh1ivDwGhpYY0a6ZNDdE3Pox3is="; }; - vendorHash = "sha256-hsZEWGA+sHZJ3S15OkfLOIALmHJeYVxxg3vKgTGtiJE="; + vendorHash = "sha256-91iyAFD/RPEkMarKKVwJ4t92qosP2Db1aQ6dmNZNDwU="; ldflags = [ "-s" "-w" "-X github.com/julien040/gut/src/telemetry.gutVersion=${version}" ]; diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 15d1ec20250e..c2dc0d8bd2be 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - hash = "sha256-o6BX8NnBdHQ5FMD3Dm8gfHHtzvG+irn1wWAwswKKXQY="; + hash = "sha256-pnlbMU/uoP9ZK8kzTRYTMY9+X9VIKJHwW2qMXXD8Udg="; }; - cargoHash = "sha256-WXHgJPOgGC8+/kgekiUmQv+1Z1+Y3mPw5MaaMVZlToA="; + cargoHash = "sha256-+m8WJMn1aq3FBDO5c/ZwbcK2G+UE5pSwHTgOl2s6pDw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/applications/video/kodi/addons/joystick/default.nix b/pkgs/applications/video/kodi/addons/joystick/default.nix index 506bbf5f0f12..9da9d8bb7b59 100644 --- a/pkgs/applications/video/kodi/addons/joystick/default.nix +++ b/pkgs/applications/video/kodi/addons/joystick/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = namespace; namespace = "peripheral.joystick"; - version = "20.1.0"; + version = "20.1.9"; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "sha256-LdagiN0bVanmGkAy9APbP1TW68KES7BIy5PXgUzksJQ="; + sha256 = "sha256-xJh9Rj+PcxrgGomEsKnQcO/yZDQCnG6gNBwfK2JGuNA="; }; extraBuildInputs = [ tinyxml udev ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix index 499f07fccd7a..37c03a6a5cbb 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "obs-vaapi"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "fzwoch"; repo = pname; rev = version; - hash = "sha256-wrbVuqIe+DY3R+Jp3zCy2Uw3fv5ejYHtRV2Sv+y/n0w="; + hash = "sha256-lKDZ0YJjcbfHr1MoTbdOaYk6Dhl2bUVUImuoWWwFC1U="; }; nativeBuildInputs = [ pkg-config meson ninja ]; @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OBS Studio VAAPI support via GStreamer"; homepage = "https://github.com/fzwoch/obs-vaapi"; + changelog = "https://github.com/fzwoch/obs-vaapi/releases/tag/${version}"; maintainers = with maintainers; [ ahuzik pedrohlc ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/virtualization/stratovirt/default.nix b/pkgs/applications/virtualization/stratovirt/default.nix index 2c27b2f3cf46..b9fbc191d9c1 100644 --- a/pkgs/applications/virtualization/stratovirt/default.nix +++ b/pkgs/applications/virtualization/stratovirt/default.nix @@ -13,6 +13,7 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "sha256-K99CmaBrJu30/12FxnsNsDKsTyX4f2uQSO7cwHsPuDw="; }; + patches = [ ./micro_vm-allow-SYS_clock_gettime.patch ]; cargoSha256 = "sha256-SFIOGGRzGkVWHIXkviVWuhDN29pa0uD3GqKh+G421xI="; diff --git a/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch b/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch new file mode 100644 index 000000000000..6aa0da30c44a --- /dev/null +++ b/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch @@ -0,0 +1,25 @@ +From af3001b1b2697ae3165e2fdf47a560fd9ab19a68 Mon Sep 17 00:00:00 2001 +From: Astro <astro@spaceboyz.net> +Date: Sun, 18 Jun 2023 23:10:23 +0200 +Subject: [PATCH] micro_vm: allow SYS_clock_gettime + +--- + machine/src/micro_vm/syscall.rs | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/machine/src/micro_vm/syscall.rs b/machine/src/micro_vm/syscall.rs +index 89ce5c29..2a6aa0cc 100644 +--- a/machine/src/micro_vm/syscall.rs ++++ b/machine/src/micro_vm/syscall.rs +@@ -128,6 +128,8 @@ pub fn syscall_whitelist() -> Vec<BpfRule> { + #[cfg(all(target_env = "gnu", target_arch = "x86_64"))] + BpfRule::new(libc::SYS_readlink), + BpfRule::new(libc::SYS_getrandom), ++ #[cfg(target_env = "gnu")] ++ BpfRule::new(libc::SYS_clock_gettime), + madvise_rule(), + ] + } +-- +2.41.0 + diff --git a/pkgs/applications/virtualization/youki/default.nix b/pkgs/applications/virtualization/youki/default.nix index 61ac6e36f627..808f91351506 100644 --- a/pkgs/applications/virtualization/youki/default.nix +++ b/pkgs/applications/virtualization/youki/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "youki"; - version = "0.0.5"; + version = "0.1.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-00eSXRPy0lQKEabl569gY770viPyB2sEnq1uaT3peE0="; + sha256 = "sha256-Nz3paJiR5Jtv8gLBq6mBUyLDfIFJCpnc/RMsDLT09Vg="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p" "youki" ]; cargoTestFlags = [ "-p" "youki" ]; - cargoSha256 = "sha256-9EgexnsxHxLTXGRbUJZtJEoCeD425zRLfCiIqrXQJkU="; + cargoHash = "sha256-luzKyN09lauflAict9zqVdGPbDLFAfe5P8121a5YBsA="; meta = with lib; { description = "A container runtime written in Rust"; diff --git a/pkgs/applications/window-managers/eww/Cargo.lock.patch b/pkgs/applications/window-managers/eww/Cargo.lock.patch deleted file mode 100644 index 571592b1d698..000000000000 --- a/pkgs/applications/window-managers/eww/Cargo.lock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -406,7 +406,7 @@ dependencies = [ - - [[package]] - name = "eww" --version = "0.3.0" -+version = "0.4.0" - dependencies = [ - "anyhow", - "bincode", diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix index 4e74fcd26e77..1a728f39f8b5 100644 --- a/pkgs/applications/window-managers/eww/default.nix +++ b/pkgs/applications/window-managers/eww/default.nix @@ -11,25 +11,25 @@ rustPlatform.buildRustPackage rec { pname = "eww"; - version = "0.4.0"; + version = "unstable-2023-06-10"; src = fetchFromGitHub { owner = "elkowar"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-wzgWx3QxZvCAzRKLFmo/ru8hsIQsEDNeb4cPdlEyLxE="; + repo = "eww"; + rev = "25e50eda46379bccd8a7887c18ee35833e0460e8"; + hash = "sha256-8e6gHSg6FDp6nU5v89D44Tqb1lR5aQpS0lXOVqzoUS4="; }; - cargoSha256 = "sha256-9RfYDF31wFYylhZv53PJpZofyCdMiUiH/nhRB2Ni/Is="; - - cargoPatches = [ ./Cargo.lock.patch ]; + cargoHash = "sha256-dC7yVJdR7mO0n+sxWwigM1Q4tbDv5ZuOINHHlUIPdA0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 gdk-pixbuf ] ++ lib.optional withWayland gtk-layer-shell; - buildNoDefaultFeatures = withWayland; - buildFeatures = lib.optional withWayland "wayland"; + buildNoDefaultFeatures = true; + buildFeatures = [ + (if withWayland then "wayland" else "x11") + ]; cargoBuildFlags = [ "--bin" "eww" ]; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index d1192e700c50..f8efab159c28 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -2,7 +2,7 @@ , meson, ninja, pkg-config, wayland-scanner, scdoc , wayland, libxkbcommon, pcre2, json_c, libevdev , pango, cairo, libinput, gdk-pixbuf, librsvg -, wlroots_0_16, wayland-protocols, libdrm +, wlroots, wayland-protocols, libdrm , nixosTests # Used by the NixOS module: , isNixOS ? false @@ -11,21 +11,15 @@ , trayEnabled ? systemdSupport }: -# The "sd-bus-provider" meson option does not include a "none" option, -# but it is silently ignored iff "-Dtray=disabled". We use "basu" -# (which is not in nixpkgs) instead of "none" to alert us if this -# changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761 -assert trayEnabled -> systemdSupport; -let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sway-unwrapped"; version = "1.8.1"; + inherit enableXWayland isNixOS systemdSupport trayEnabled; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; - rev = version; + rev = finalAttrs.version; hash = "sha256-WxnT+le9vneQLFPz2KoBduOI+zfZPhn1fKlaqbPL6/g="; }; @@ -42,11 +36,11 @@ stdenv.mkDerivation rec { url = "https://github.com/swaywm/sway/commit/dee032d0a0ecd958c902b88302dc59703d703c7f.diff"; hash = "sha256-dx+7MpEiAkxTBnJcsT3/1BO8rYRfNLecXmpAvhqGMD0="; }) - ] ++ lib.optionals (!isNixOS) [ + ] ++ lib.optionals (!finalAttrs.isNixOS) [ # References to /nix/store/... will get GC'ed which causes problems when # copying the default configuration: ./sway-config-no-nix-store-references.patch - ] ++ lib.optionals isNixOS [ + ] ++ lib.optionals finalAttrs.isNixOS [ # Use /run/current-system/sw/share and /etc instead of /nix/store # references: ./sway-config-nixos-paths.patch @@ -65,15 +59,23 @@ stdenv.mkDerivation rec { wayland libxkbcommon pcre2 json_c libevdev pango cairo libinput gdk-pixbuf librsvg wayland-protocols libdrm - (wlroots_0_16.override { inherit enableXWayland; }) - ] ++ lib.optionals enableXWayland [ + (wlroots.override { inherit (finalAttrs) enableXWayland; }) + ] ++ lib.optionals finalAttrs.enableXWayland [ xorg.xcbutilwm ]; - mesonFlags = + mesonFlags = let + # The "sd-bus-provider" meson option does not include a "none" option, + # but it is silently ignored iff "-Dtray=disabled". We use "basu" + # (which is not in nixpkgs) instead of "none" to alert us if this + # changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761 + # assert trayEnabled -> systemdSupport && dbusSupport; + + sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; + in [ "-Dsd-bus-provider=${sd-bus-provider}" ] - ++ lib.optional (!enableXWayland) "-Dxwayland=disabled" - ++ lib.optional (!trayEnabled) "-Dtray=disabled" + ++ lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled" + ++ lib.optional (!finalAttrs.trayEnabled) "-Dtray=disabled" ; passthru.tests.basic = nixosTests.sway; @@ -95,4 +97,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ primeos synthetica ]; }; -} +}) diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 42384fa06ae2..b4e9289f19a5 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -16,7 +16,7 @@ assert extraSessionCommands != "" -> withBaseWrapper; with lib; let - sway = sway-unwrapped.override { inherit isNixOS enableXWayland; }; + sway = sway-unwrapped.overrideAttrs (oa: { inherit isNixOS enableXWayland; }); baseWrapper = writeShellScriptBin "sway" '' set -o errexit if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index acc433496b0e..adaf80dcd916 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -388,8 +388,8 @@ stdenv.mkDerivation { }; meta = - let bintools_ = if bintools != null then bintools else {}; in - (if bintools_ ? meta then removeAttrs bintools.meta ["priority"] else {}) // + let bintools_ = lib.optionalAttrs (bintools != null) bintools; in + (lib.optionalAttrs (bintools_ ? meta) (removeAttrs bintools.meta ["priority"])) // { description = lib.attrByPath ["meta" "description"] "System binary utilities" bintools_ + " (wrapper script)"; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index ffde44c538e3..5e919bc212bd 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -611,8 +611,8 @@ stdenv.mkDerivation { }; meta = - let cc_ = if cc != null then cc else {}; in - (if cc_ ? meta then removeAttrs cc.meta ["priority"] else {}) // + let cc_ = lib.optionalAttrs (cc != null) cc; in + (lib.optionalAttrs (cc_ ? meta) (removeAttrs cc.meta ["priority"])) // { description = lib.attrByPath ["meta" "description"] "System C compiler" cc_ + " (wrapper script)"; diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix index 8f824f4e1a57..b8bd4584e322 100644 --- a/pkgs/build-support/emacs/buffer.nix +++ b/pkgs/build-support/emacs/buffer.nix @@ -73,7 +73,5 @@ rec { haskell-package-env = builtins.head haskell-package.env.nativeBuildInputs; in - if is-haskell-package - then withPackages [ haskell-package-env ] - else {}; + lib.optionalAttrs is-haskell-package (withPackages [ haskell-package-env ]); } diff --git a/pkgs/build-support/fetchfirefoxaddon/default.nix b/pkgs/build-support/fetchfirefoxaddon/default.nix index fe9ff5c469ba..41eaa550ea27 100644 --- a/pkgs/build-support/fetchfirefoxaddon/default.nix +++ b/pkgs/build-support/fetchfirefoxaddon/default.nix @@ -1,7 +1,13 @@ -{stdenv, unzip, jq, zip, fetchurl,writeScript, ...}: +{ stdenv +, fetchurl +, jq +, strip-nondeterminism +, unzip +, writeScript +, zip +}: -{ - name +{ name , url ? null , md5 ? "" , sha1 ? "" @@ -14,7 +20,8 @@ let extid = if fixedExtid == null then "nixos@${name}" else fixedExtid; - source = if url == null then src else fetchurl { + source = if url == null then src else + fetchurl { url = url; inherit md5 sha1 sha256 sha512 hash; }; @@ -38,7 +45,14 @@ stdenv.mkDerivation { echo "$NEW_MANIFEST" > "$out/$UUID/manifest.json" cd "$out/$UUID" zip -r -q -FS "$out/$UUID.xpi" * + strip-nondeterminism "$out/$UUID.xpi" rm -r "$out/$UUID" ''; - nativeBuildInputs = [ unzip zip jq ]; + + nativeBuildInputs = [ + jq + strip-nondeterminism + unzip + zip + ]; } diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 2f12be0a897d..2546b8e6dc99 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -175,12 +175,6 @@ "https://download.qt.io/" ]; - # Roy marples mirrors - roy = [ - "https://roy.marples.name/downloads/" - "https://cflags.cc/roy/" - ]; - # Sage mirrors (https://www.sagemath.org/mirrors.html) sageupstream = [ # Africa (HTTPS) diff --git a/pkgs/build-support/kernel/compress-firmware-xz.nix b/pkgs/build-support/kernel/compress-firmware-xz.nix index 6a797226aa67..cfb06a5c0f15 100644 --- a/pkgs/build-support/kernel/compress-firmware-xz.nix +++ b/pkgs/build-support/kernel/compress-firmware-xz.nix @@ -1,8 +1,12 @@ -{ runCommand }: +{ runCommand, lib }: firmware: -runCommand "${firmware.name}-xz" {} '' +let + args = lib.optionalAttrs (firmware ? meta) { inherit (firmware) meta; }; +in + +runCommand "${firmware.name}-xz" args '' mkdir -p $out/lib (cd ${firmware} && find lib/firmware -type d -print0) | (cd $out && xargs -0 mkdir -v --) diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index f68597662608..f409ca3a7d4b 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -119,8 +119,8 @@ stdenv.mkDerivation { }; meta = - let pkg-config_ = if pkg-config != null then pkg-config else {}; in - (if pkg-config_ ? meta then removeAttrs pkg-config.meta ["priority"] else {}) // + let pkg-config_ = lib.optionalAttrs (pkg-config != null) pkg-config; in + (lib.optionalAttrs (pkg-config_ ? meta) (removeAttrs pkg-config.meta ["priority"])) // { description = lib.attrByPath ["meta" "description"] "pkg-config" pkg-config_ + " (wrapper script)"; diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix index 24d5b2e1cafc..37c5f8c7ee86 100644 --- a/pkgs/build-support/release/binary-tarball.nix +++ b/pkgs/build-support/release/binary-tarball.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation ( test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name) ''; - meta = (if args ? meta then args.meta else {}) // { + meta = (lib.optionalAttrs (args ? meta) args.meta) // { description = "Build of a generic binary distribution"; }; diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 6e08caf0a4e5..ab84a504b54c 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -86,7 +86,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( eval "$postInstall" ''; - meta = (if args ? meta then args.meta else {}) // { + meta = (lib.optionalAttrs (args ? meta) args.meta) // { description = "Deb package for ${diskImage.fullName}"; }; } diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 83e521bb65c7..583831d4821d 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -146,7 +146,7 @@ stdenv.mkDerivation ( postPhases = postPhases ++ ["finalPhase"]; - meta = (if args ? meta then args.meta else {}) // { + meta = (lib.optionalAttrs (args ? meta) args.meta) // { description = if doCoverageAnalysis then "Coverage analysis" else "Nix package for ${stdenv.hostPlatform.system}"; }; diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index 8f4711470509..ccbbd57107bd 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -46,7 +46,7 @@ vmTools.buildRPM ( done ''; - meta = (if args ? meta then args.meta else {}) // { + meta = (lib.optionalAttrs (args ? meta) args.meta) // { description = "RPM package for ${diskImage.fullName}"; }; } diff --git a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix index e15390c3ffa8..ed273c01d26d 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/rcgen-crates.nix @@ -24,9 +24,7 @@ , release ? true # Additional crate2nix configuration if it exists. , crateConfig - ? if builtins.pathExists ./crate-config.nix - then pkgs.callPackage ./crate-config.nix {} - else {} + ? lib.optionalAttrs (builtins.pathExists ./crate-config.nix) (pkgs.callPackage ./crate-config.nix {}) }: rec { diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh index 7503fae4cd7f..af94e02e38ae 100644 --- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -5,6 +5,10 @@ cargoBuildHook() { runHook preBuild + # Let stdenv handle stripping, for consistency and to not break + # separateDebugInfo. + export "CARGO_PROFILE_${cargoBuildType@U}_STRIP"=false + if [ ! -z "${buildAndTestSubdir-}" ]; then # ensure the output doesn't end up in the subdirectory export CARGO_TARGET_DIR="$(pwd)/target" diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index 4932e934ec16..11b332bfc3eb 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -166,11 +166,11 @@ makeShellWrapper() { elif [[ "$p" == "--add-flags" ]]; then flags="${params[$((n + 1))]}" n=$((n + 1)) - flagsBefore="$flagsBefore $flags" + flagsBefore="${flagsBefore-} $flags" elif [[ "$p" == "--append-flags" ]]; then flags="${params[$((n + 1))]}" n=$((n + 1)) - flagsAfter="$flagsAfter $flags" + flagsAfter="${flagsAfter-} $flags" elif [[ "$p" == "--argv0" ]]; then argv0="${params[$((n + 1))]}" n=$((n + 1)) @@ -183,7 +183,7 @@ makeShellWrapper() { done echo exec ${argv0:+-a \"$argv0\"} \""$original"\" \ - "$flagsBefore" '"$@"' "$flagsAfter" >> "$wrapper" + "${flagsBefore-}" '"$@"' "${flagsAfter-}" >> "$wrapper" chmod +x "$wrapper" } diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index 21321d83af34..72aac21ea694 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "ibm-plex"; - version = "6.2.0"; + version = "6.3.0"; src = fetchzip { url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; - hash = "sha256-RvD/aeZrvltJiuAHqYMNaRsjLgTdcC1/5zqlcd4qKAA="; + hash = "sha256-VwJyZMH10FXDxc7T7m8sl7raUlrarSM0Snjruo1ICHU="; }; installPhase = '' diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/data/icons/apple-cursor/default.nix index 90898333b45c..46b4b37f78df 100644 --- a/pkgs/data/icons/apple-cursor/default.nix +++ b/pkgs/data/icons/apple-cursor/default.nix @@ -8,7 +8,7 @@ let name = variant; url = "https://github.com/ful1e5/apple_cursor/releases/download/v${version}/${variant}.${suffix}"; hash = hash; - } // (if suffix == "zip" then { stripRoot = false; } else {})); + } // (lib.optionalAttrs (suffix == "zip") { stripRoot = false; })); version = "2.0.0"; srcs = [ diff --git a/pkgs/data/icons/graphite-cursors/default.nix b/pkgs/data/icons/graphite-cursors/default.nix new file mode 100644 index 000000000000..357ebcd9a6b3 --- /dev/null +++ b/pkgs/data/icons/graphite-cursors/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "graphite-cursors"; + version = "2021-11-26"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = "${version}"; + sha256 = "sha256-Kopl2NweYrq9rhw+0EUMhY/pfGo4g387927TZAhI5/A="; + }; + + installPhase = '' + install -dm 755 $out/share/icons + mv dist-dark $out/share/icons/graphite-dark + mv dist-light $out/share/icons/graphite-light + mv dist-dark-nord $out/share/icons/graphite-dark-nord + mv dist-light-nord $out/share/icons/graphite-light-nord + ''; + + meta = with lib; { + description = "Graphite cursor theme"; + homepage = "https://github.com/vinceliuice/Graphite-cursors"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ oluceps ]; + }; +} diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 04d907d4707a..4daf0cb07831 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "23.06.11"; + version = "23.06.21"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-pm3sEx3OJkS4sz+sg09HeTSdQZTdjyxJCsjYWCA4mN0="; + sha256 = "sha256-eJELv8lRgV687vu0PQfvZoSTaPtVyTniRINRxIIVjJg="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/data/icons/tela-icon-theme/default.nix index 2b98e09eca29..f77ab73032c3 100644 --- a/pkgs/data/icons/tela-icon-theme/default.nix +++ b/pkgs/data/icons/tela-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "tela-icon-theme"; - version = "2023-02-03"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "vinceliuice"; - repo = pname; + repo = "tela-icon-theme"; rev = version; - sha256 = "sha256-W3gGn4ioTg/iOWTa5hfwx6FWzpFilpG8IXwaO5/YAvk="; + hash = "sha256-tv0C4mW2A3dScUXBWa7a3lkG4lPIjZTsj5b1/oEVuiw="; }; nativeBuildInputs = [ gtk3 jdupes ]; @@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "A flat colorful Design icon theme"; homepage = "https://github.com/vinceliuice/tela-icon-theme"; + changelog = "https://github.com/vinceliuice/Tela-icon-theme/releases/tag/${src.rev}"; license = licenses.gpl3Only; # darwin systems use case-insensitive filesystems that cause hash mismatches platforms = subtractLists platforms.darwin platforms.unix; diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix index 57da762b9d64..f0f28776d358 100644 --- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "kde-rounded-corners"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; rev = "v${version}"; - hash = "sha256-5b23QCyjPMC6iba84Y2WEar5uXzxg2GonRv3e4mLQlQ="; + hash = "sha256-mjZWfh00A0J6ijuLqW6frPH4AYbRI/BlVHblGCCmNEo="; }; postConfigure = '' diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix index 4211864139df..d211a99ef080 100644 --- a/pkgs/data/themes/rose-pine-gtk/default.nix +++ b/pkgs/data/themes/rose-pine-gtk/default.nix @@ -32,11 +32,13 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/themes - mv gtk3/rose-pine-gtk $out/share/themes/rose-pine - mv gtk3/rose-pine-moon-gtk $out/share/themes/rose-pine-moon - mv gtk3/rose-pine-dawn-gtk $out/share/themes/rose-pine-dawn - mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine-moon + mkdir -p $out/share/themes/rose-pine{,-dawn,-moon}/gtk-4.0 + + variants=("rose-pine" "rose-pine-dawn" "rose-pine-moon") + for n in "''${variants[@]}"; do + cp -r $src/gtk3/"''${n}"-gtk/* $out/share/themes/"''${n}" + cp -r $src/gtk4/"''${n}".css $out/share/themes/"''${n}"/gtk-4.0/gtk.css + done runHook postInstall ''; diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 417cd6b717f6..e1f0009ba472 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -72,13 +72,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.8.2"; + version = "5.8.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-KY5ctByMYKxigiZ0X/blaHJuyiAUNB6B2gpGtC/k100="; + hash = "sha256-PvU5lcoIDguWiLdI+uIiJHqS1ae436Xc7TfRVytR02k="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix index cc7f7e7cdcf6..b889d7ff6a70 100644 --- a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix +++ b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix @@ -7,14 +7,14 @@ stdenvNoCC.mkDerivation rec { pname = "folder-color-switcher"; - version = "1.5.7"; + version = "1.5.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # They don't really do tags, this is just a named commit. - rev = "03311d62a62e2cd7d0592b241c287091161ec6b6"; - sha256 = "sha256-HQv9vSpRSBjqbncGFv+O5XQtRJ+4Cq0aWZHoj5BhKYE="; + rev = "f167627cffaf8b34e27b0515153b669b980fd62e"; + sha256 = "sha256-u8Lv0OTxKgjIp1q5WR0NXULhnwFfEDYGRlBpFMVHCBY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index ed7d011bc4f7..05b743904ff0 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Y+KmSKuREn2E3FySsScjL+oSpSFnyEqhoXQfU++86JY="; + hash = "sha256-ouqhksy3999pi8v4f64W4X/h655ZVi8dR22g4LlYwMI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 18b2aff557ff..13963f386dfb 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.8.2"; + version = "5.8.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-Be67TOA1gLwSYx8y2iyfvY0QCpWOFutpXMDaPiTRQGg="; + sha256 = "sha256-/GwtTklOkhCkbBMQLl4dKUnlZwN6FX2kqxN7cJVaVwE="; }; patches = [ diff --git a/pkgs/desktops/gnome/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix index c3b41ca3cace..7404b90082a1 100644 --- a/pkgs/desktops/gnome/extensions/paperwm/default.nix +++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix @@ -1,17 +1,18 @@ { lib , stdenv , fetchFromGitHub +, gitUpdater }: stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extension-paperwm"; - version = "44.0.0-beta.1"; + version = "44.3.0"; src = fetchFromGitHub { owner = "paperwm"; repo = "PaperWM"; rev = "v${finalAttrs.version}"; - hash = "sha256-YRIaSD22bvzXo/wla178GeXIhvIwW6xLacjAQDC2P40="; + hash = "sha256-zVxsfoIMTBhd2eXI+mP3FWe68UGiCIh+5RsXBKk16jE="; }; dontConfigure = true; @@ -26,12 +27,14 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = gitUpdater { url = finalAttrs.meta.homepage; }; + meta = { homepage = "https://github.com/paperwm/PaperWM"; description = "Tiled scrollable window management for Gnome Shell"; changelog = "https://github.com/paperwm/PaperWM/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ hedning AndersonTorres ]; + maintainers = with lib.maintainers; [ hedning AndersonTorres cab404 ]; platforms = lib.platforms.all; }; diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix index 8d8966357092..e40689348625 100644 --- a/pkgs/desktops/gnome/extensions/pop-shell/default.nix +++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, glib, nodePackages, gjs }: +{ stdenv, lib, fetchFromGitHub, glib, gjs, typescript }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-pop-shell"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-w6EBHKWJ4L3ZRVmFqZhCqHGumbElQXk9udYSnwjIl6c="; }; - nativeBuildInputs = [ glib nodePackages.typescript gjs ]; + nativeBuildInputs = [ glib gjs typescript ]; buildInputs = [ gjs ]; diff --git a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix index 11aa53b77b5c..04cfcc1ca343 100644 --- a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix +++ b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix @@ -15,5 +15,5 @@ stdenv.mkDerivation (args // { maintainers = with lib.maintainers; [ ashalkhakov matthewbauer ]; platforms = lib.platforms.linux; - } // (if builtins.hasAttr "meta" args then args.meta else {}); + } // (lib.optionalAttrs (builtins.hasAttr "meta" args) args.meta); }) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 54b75e8e73c7..18b8e683bc94 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -6,10 +6,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "327b3bfd1c14e15bf6c7fb4d0c6c3f9406c1282a16e24b1424215d764f687cb6", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "7", + "sha256": "45f56d75da2f55b29e7307cc790958e379abbe6b5f160a3824dc26e320c718e5", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } } }, @@ -18,10 +18,10 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "4cdebb54ead80e6dff562ad51db850244b1b419ba72062782156df59854a6b22", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.16.1%2B1/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.16.1_1.tar.gz", - "version": "11.0.16" + "build": "7", + "sha256": "b5d71cdf3032040e7d2a577712bf525e32e87686af3430219308a39878b98851", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } } } @@ -30,36 +30,36 @@ "jdk": { "hotspot": { "aarch64": { - "build": "101", - "sha256": "79572f5172c6a040591d34632f98a20ed148702bbce2f57649e8ac01c0d2e3db", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "0c7763a19b4af4ef5fbae831781b5184e988d6f131d264482399eeaf51b6e254", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "armv6l": { - "build": "101", - "sha256": "f4d53a1753cdde830d7872c6a1279df441f3f9aeb5d5037a568b3a392ebce9c2", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "armv7l": { - "build": "101", - "sha256": "f4d53a1753cdde830d7872c6a1279df441f3f9aeb5d5037a568b3a392ebce9c2", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_arm_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "packageType": "jdk", "powerpc64le": { - "build": "101", - "sha256": "9750e11721282a9afd18a07743f19c699b2b71ce20d02f3f0a906088b9ae6d9a", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "1e3704c8e155f8f894953c2a6708a52e6f449bbf5a85450be6fbb2ec76581700", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "43fb84f8063ad9bf6b6d694a67b8f64c8827552b920ec5ce794dfe5602edffe7", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } }, "openj9": { @@ -88,36 +88,36 @@ "jre": { "hotspot": { "aarch64": { - "build": "101", - "sha256": "6426ce7dfdacaa798ec7779e0bec30ec8510df491fb2c965e8e6bf2f88af27e9", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "1fe4b20d808f393422610818711c728331992a4455eeeb061d3d05b45412771d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "armv6l": { - "build": "101", - "sha256": "964a5d3c1f63209e5ad908a302220b3ba2e81a6574b7b7a5020f736e1496835f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "armv7l": { - "build": "101", - "sha256": "964a5d3c1f63209e5ad908a302220b3ba2e81a6574b7b7a5020f736e1496835f", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_arm_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "packageType": "jre", "powerpc64le": { - "build": "101", - "sha256": "8c9efc13680f43b742a54ecb3be614efd62749d401e780143fef3ac5403a6284", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "8019d938e5525938ec8e68e2989c4413263b0d9b7b3f20fe0c45f6d967919cfb", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" }, "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "b5a6960bc6bb0b1a967e307f908ea9b06ad7adbbd9df0b8954ab51374faa8a98", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_x64_linux_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "32dcf760664f93531594b72ce9226e9216567de5705a23c9ff5a77c797948054", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } }, "openj9": { @@ -147,13 +147,19 @@ "mac": { "jdk": { "hotspot": { + "aarch64": { + "build": "7", + "sha256": "f3b416ecccf51f45cc8c986975eb7bd35e7e1ad953656ab0a807125963fcf73b", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" + }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "8c69808f5d9d209b195575e979de0e43cdf5d0f1acec1853a569601fe2c1f743", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_mac_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "fc34c4f0e590071dcd65a0f93540913466ccac3aa8caa984826713b67afb696d", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } }, "openj9": { @@ -169,13 +175,19 @@ }, "jre": { "hotspot": { + "aarch64": { + "build": "7", + "sha256": "78a07bd60c278f65bafd0df93890d909ff60259ccbd22ad71a1c3b312906508e", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" + }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "1b2f792ad05af9dba876db962c189527e645b48f50ceb842b4e39169de553303", - "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jre_x64_mac_hotspot_11.0.14.1_1.tar.gz", - "version": "11.0.14" + "build": "7", + "sha256": "87e439b2193e1a2cf1a8782168bba83b558f54e2708f88ea8296184ea2735c89", + "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.19_7.tar.gz", + "version": "11.0.19" } }, "openj9": { @@ -852,10 +864,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "1a1706304c26da0d8d2e05127c5aa7dba00e5401b2c0228c8ae894d2812beee0", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "build": "7", + "sha256": "b6edac2fa669876ef16b4895b36b61d01066626e7a69feba2acc19760c8d18cb", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } } }, @@ -864,10 +876,10 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "101", - "sha256": "cd0300449a26b3141e313f6ab55b20edfa4b289dc44a7a3989fa2c29152bf7fb", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.4.1%2B1/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.4.1_1.tar.gz", - "version": "17.0.4" + "build": "7", + "sha256": "711f837bacf8222dee9e8cd7f39941a4a0acf869243f03e6038ca3ba189f66ca", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } } } @@ -876,60 +888,72 @@ "jdk": { "hotspot": { "aarch64": { - "build": "8", - "sha256": "302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "0084272404b89442871e0a1f112779844090532978ad4d4191b8d03fc6adfade", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "armv6l": { - "build": "8", - "sha256": "544936145a4a9b1a316ed3708cd91b3960d5e8e87578bea73ef674ca3047158e", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "armv7l": { - "build": "8", - "sha256": "544936145a4a9b1a316ed3708cd91b3960d5e8e87578bea73ef674ca3047158e", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_arm_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "packageType": "jdk", + "powerpc64le": { + "build": "7", + "sha256": "8f4366ff1eddb548b1744cd82a1a56ceee60abebbcbad446bfb3ead7ac0f0f85", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" + }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } } }, "jre": { "hotspot": { "aarch64": { - "build": "8", - "sha256": "6ef7a28d0d844fe347ab18f65a91db744547321fe8a101d883bd80722183ab64", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "2ff6a4fd1fa354047c93ba8c3179967156162f27bd683aee1f6e52a480bcbe6a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "armv6l": { - "build": "8", - "sha256": "4fd1d11f3008aba1c6c17e1d1c1cf15e2a54e68275ad0874b47a781eaf73450e", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "armv7l": { - "build": "8", - "sha256": "4fd1d11f3008aba1c6c17e1d1c1cf15e2a54e68275ad0874b47a781eaf73450e", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_arm_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "packageType": "jre", + "powerpc64le": { + "build": "7", + "sha256": "cc25e74c0817cd4d943bba056b256b86e0e9148bf41d7600c5ec2e1eadb2e470", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" + }, "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "292ed702d95f5690e52e171afe9f3050b9d2fb803456b155c831735fad0f17c0", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_x64_linux_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "bb025133b96266f6415d5084bb9b260340a813968007f1d2d14690f20bd021ca", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } } } @@ -938,36 +962,36 @@ "jdk": { "hotspot": { "aarch64": { - "build": "8", - "sha256": "157518e999d712b541b883c6c167f8faabbef1d590da9fe7233541b4adb21ea4", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "1d6aeb55b47341e8ec33cc1644d58b88dfdcce17aa003a858baa7460550e6ff9", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "3630e21a571b7180876bf08f85d0aac0bdbb3267b2ae9bd242f4933b21f9be32", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "50d0e9840113c93916418068ba6c845f1a72ed0dab80a8a1f7977b0e658b65fb", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } } }, "jre": { "hotspot": { "aarch64": { - "build": "8", - "sha256": "f2f23d6629060eb1692c714bfda27dd5f100cc560578c7cdd9df920a8ac1d453", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "625d070a297a3c856badbaa5c65adaaa1adb3ea3813363fb8335c47709b69140", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "4e2e5e9c079ccc48b056959b2808a96398ebbc92d6b13ee5beb3159b89469aa8", - "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jre_x64_mac_hotspot_17.0.2_8.tar.gz", - "version": "17.0.2" + "build": "7", + "sha256": "62559a927a8dbac2ea1d7879f590a62fea87d61bfaa92894e578d2045b8d921b", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.7_7.tar.gz", + "version": "17.0.7" } } } @@ -980,10 +1004,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "e5dcb8f947b687597f92fa80c008a2a17ce86f739dd6dce7ca741921621acb21", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "7", + "sha256": "cfdf8e07c8eeb087b7a2895b90fc0a19986bcff85006f1e2b708e3964909aa8e", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } } }, @@ -992,10 +1016,10 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "1", - "sha256": "6352a4d55373266af90b2f2ec13f4397ada58f5cdc57944ea046c9c538341fd3", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u345b01.tar.gz", - "version": "8.0.345" + "build": "7", + "sha256": "95d8cb8b5375ec00a064ed728eb60d925d44c1a79fe92f6ca7385b5863d4f78c", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } } } @@ -1004,36 +1028,36 @@ "jdk": { "hotspot": { "aarch64": { - "build": "6", - "sha256": "42ed3ff5a859f9015a1362fb7e650026b913d688eab471714f795651120be173", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "195808eb42ab73535c84de05188914a52a47c1ac784e4bf66de95fe1fd315a5a", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_aarch64_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "armv6l": { - "build": "6", - "sha256": "0666c466b8aefcc66ab25aea9c0605f5c6eda3b174b1b817a4e4e74da0de0365", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "armv7l": { - "build": "6", - "sha256": "0666c466b8aefcc66ab25aea9c0605f5c6eda3b174b1b817a4e4e74da0de0365", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "packageType": "jdk", "powerpc64le": { - "build": "6", - "sha256": "c7cc9c5b237e9e1f1e3296593aba427375823592e4604fadf89a8c234c2574e1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "bb85303848fe402d4f1004f748f80ccb39cb11f356f50a513555d1083c3913b8", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "vmType": "hotspot", "x86_64": { - "build": "6", - "sha256": "3d62362a78c9412766471b05253507a4cfc212daea5cdf122860173ce902400e", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } }, "openj9": { @@ -1062,36 +1086,36 @@ "jre": { "hotspot": { "aarch64": { - "build": "6", - "sha256": "22496d5e677aaccc5a85e90584d0a012c51a08898f0e09e259eabe67ed81da2b", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "f8e440273c8feb3fcfaca88ba18fec291deae18a548adde8a37cd1db08107b95", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_aarch64_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "armv6l": { - "build": "6", - "sha256": "48181f17b85a13c0e2f260c8f4b39483e61664cf07ea00e6210a666fb5210492", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_arm_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "armv7l": { - "build": "6", - "sha256": "48181f17b85a13c0e2f260c8f4b39483e61664cf07ea00e6210a666fb5210492", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_arm_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "packageType": "jre", "powerpc64le": { - "build": "6", - "sha256": "f15b536a97c27d114c0b59c86de07ca80a271d3979ed0aa056318ea329e31e5d", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_ppc64le_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "ba5f8141a16722e39576bf42b69d2b8ebf95fc2c05441e3200f609af4dd9f1ea", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_ppc64le_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" }, "vmType": "hotspot", "x86_64": { - "build": "6", - "sha256": "9c4607cee01919a21c57a36e8c009a7aca7aefd63010c64d7a3023fe8590ebe1", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_x64_linux_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "b6fdfe32085a884c11b31f66aa67ac62811df7112fb6fb08beea61376a86fbb4", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_linux_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } }, "openj9": { @@ -1124,10 +1148,10 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "6", - "sha256": "96a3124bf0f5ca777954239893cc89ea34c4bc9a9b7c1559aa2c69baa0ee84e3", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "9c33db312cc46b6bfe705770fdc5c08edb7d790ba70be4e8b12a98e79da5f4a1", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_mac_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } }, "openj9": { @@ -1146,10 +1170,10 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "6", - "sha256": "42d4ada88e39b0f222ffdcf3c833f442af22852687992997eca82c573e65b86f", - "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jre_x64_mac_hotspot_8u322b06.tar.gz", - "version": "8.0.322" + "build": "7", + "sha256": "6c876ea7bfa778ae78ec5a976e557b2b981a592a3639eb0d3dc3c8d3dda8d321", + "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_mac_hotspot_8u372b07.tar.gz", + "version": "8.0.372" } }, "openj9": { diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 73f32af28e19..11716893e0f7 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "112"; + version = "113"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - hash = "sha256-xVumVmiLMHJp3SItE8eL8OBPeq58HtOOiK9LL8SP4CQ="; + hash = "sha256-w93LIlLRn3PmVNytjFg6KI4CQ9zQUUM9kySiWAtPbOA="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix index 0016c8a2c7d9..d75d4eeeef16 100644 --- a/pkgs/development/compilers/blueprint/default.nix +++ b/pkgs/development/compilers/blueprint/default.nix @@ -1,23 +1,27 @@ -{ fetchFromGitLab +{ dbus +, fetchFromGitLab , gobject-introspection , gtk4 , lib +, libadwaita +, makeFontsConf , meson , ninja , python3 , stdenv , testers +, xvfb-run }: stdenv.mkDerivation (finalAttrs: { pname = "blueprint-compiler"; - version = "0.6.0"; + version = "0.8.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jwestman"; repo = "blueprint-compiler"; rev = "v${finalAttrs.version}"; - hash = "sha256-L6EGterkZ8EB6xSnJDZ3IMuOumpTpEGnU74X3UgC7k0="; + hash = "sha256-3lj9BMN5aNujbhhZjObdTOCQfH5ERQCgGqIAw5eZIQc="; }; nativeBuildInputs = [ @@ -26,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + libadwaita (python3.withPackages (ps: with ps; [ pygobject3 ])) @@ -36,12 +41,34 @@ stdenv.mkDerivation (finalAttrs: { gobject-introspection ]; - doCheck = true; - nativeCheckInputs = [ + xvfb-run + dbus gtk4 ]; + env = { + # Fontconfig error: Cannot load default config file: No such file: (null) + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + }; + + doCheck = true; + + preBuild = '' + # Fontconfig error: No writable cache directories + export XDG_CACHE_HOME="$(mktemp -d)" + ''; + + checkPhase = '' + runHook preCheck + + xvfb-run dbus-run-session \ + --config-file=${dbus}/share/dbus-1/session.conf \ + meson test --no-rebuild --print-errorlogs + + runHook postCheck + ''; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; @@ -51,6 +78,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/jwestman/blueprint-compiler"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ benediktbroich ranfdev ]; - platforms = platforms.unix; + platforms = platforms.linux; }; }) diff --git a/pkgs/development/compilers/cudatoolkit/redist/extension.nix b/pkgs/development/compilers/cudatoolkit/redist/extension.nix index 32215b1360c8..308397d7b063 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/extension.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/extension.nix @@ -26,9 +26,7 @@ final: prev: let in lib.mapAttrs buildCudaToolkitRedistPackage attrs; # All cudatoolkit redist packages for the current cuda version - cudaToolkitRedistPackages = if - lib.hasAttr cudaVersion cudaToolkitRedistManifests - then buildCudaToolkitRedistPackages { version = cudaVersion; manifest = cudaToolkitRedistManifests.${cudaVersion}; } - else {}; + cudaToolkitRedistPackages = lib.optionalAttrs (lib.hasAttr cudaVersion cudaToolkitRedistManifests) + (buildCudaToolkitRedistPackages { version = cudaVersion; manifest = cudaToolkitRedistManifests.${cudaVersion}; }); in cudaToolkitRedistPackages diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index 20cc97864789..57b420f93baa 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -3,177 +3,177 @@ # v6.0 (active) { aspnetcore_6_0 = buildAspNetCore { - version = "6.0.18"; + version = "6.0.19"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/503c4325-104f-41e0-8dc6-1a8b55e0651a/3dcd8a5d03d3a04bb4111296b12cd11d/aspnetcore-runtime-6.0.18-linux-x64.tar.gz"; - sha512 = "8adbd7c6f303d69410c34ebc4a8df0afb340c6283ee18ca5e213ad502c8df15ef4db35023a5f9ef88a20ec41c733ec5006ad80dc4d31df5c32e5665f7f8b0563"; + url = "https://download.visualstudio.microsoft.com/download/pr/fb0913f6-79a8-40b6-b604-bda42b60d0c2/eb98e78d3d75c16326a54cd0277b5406/aspnetcore-runtime-6.0.19-linux-x64.tar.gz"; + sha512 = "537e4b1be4fcaa5e69013b99c86808e0a13994c87d7542367b3eb18196206d1c27e46a865d89784229a04f69dadbe0b283d7adf1e7848c8d3c7998ee80c9e765"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f60912b4-b50d-4d85-b3aa-3b69504a426b/190ebc4012cd4da240e4d5247b484b15/aspnetcore-runtime-6.0.18-linux-arm64.tar.gz"; - sha512 = "f39b5d333eb096e681fd2b6481a41fe3a1b794c2655d56d84dc79321f767a67d968718b6cf08cf14574af9ff7625c76728be5c70a860fd3df14e40463a8ac6db"; + url = "https://download.visualstudio.microsoft.com/download/pr/86b5e7ea-d316-4b44-a543-95cbfeafadd9/7e7b8ed4c007d9290c2099b5bcd144af/aspnetcore-runtime-6.0.19-linux-arm64.tar.gz"; + sha512 = "739acf3966e32092243f9a2ede241a16b2ae7c26bccdbcd53e63149429c4fad7d7166beca8c54ef1e79f18b43d3a5334bab42128a534aae7499cd137b833e888"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/29f05258-1233-44dd-8810-89401619064b/9e3ab81867221289c6ef76216fcc0a70/aspnetcore-runtime-6.0.18-osx-x64.tar.gz"; - sha512 = "82205097e4d2c4a17ce3d6997bfc05c3aaa28359dd71807eb0d2bf3f4c5b2142e05f21a50e5b2f994b62836cd5f4c73d1c98b1f8f2662afc43b5e70040d9ef3f"; + url = "https://download.visualstudio.microsoft.com/download/pr/ff5fcf0c-64a2-4b7c-a406-06ac6e0369ec/7edc4ca9309235eb554cfd580aa6ca37/aspnetcore-runtime-6.0.19-osx-x64.tar.gz"; + sha512 = "405f3ef158ae0d8bbf755628b6d3131618255170885164422107955d94ee8483adbd6cedf4e5b414413cefcb15945efa2b44675b1f851647ffb4d92eea7505b0"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8727a27f-8715-4651-89d9-dd8f431928fa/4f11488f22cbe8a052991b00ba2a99df/aspnetcore-runtime-6.0.18-osx-arm64.tar.gz"; - sha512 = "ccdf62da6470d1b74f0c866a69503e63ebca2f580156a64a3f82c1a8663e9003088eab0740654f2f0119107ec25d204c5b279cf036b1067ef110fc3eda84794b"; + url = "https://download.visualstudio.microsoft.com/download/pr/af7c7c1e-4bcc-494e-b454-fcca9577426f/53d486a54766bc79208f72bb60beda29/aspnetcore-runtime-6.0.19-osx-arm64.tar.gz"; + sha512 = "6cff56c4da0d55eafb334775792b92ff22d1b3b6aea85375f90e55e4f850330f70eccab3d8bc8755c8a5895df4d7db9c3099f63982a1ec58ada196d2fcb574f5"; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.18"; + version = "6.0.19"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/53fce0ba-88f8-44e0-8174-16fb7d6f1a33/7e4ee56d0aa754deed6cf4db31dd9e25/dotnet-runtime-6.0.18-linux-x64.tar.gz"; - sha512 = "bcfc88238f901c14d203a33eff036106fcbcfc40de7e3717f61434dffd86b5444c176dec5beeddcf80e7193f77bf793ab1e2284c91d54b93931a4668ba77c634"; + url = "https://download.visualstudio.microsoft.com/download/pr/59b2fb63-9075-4ee8-9120-d6d048226aa0/fe92c70fec406174fa2585c9b668900b/dotnet-runtime-6.0.19-linux-x64.tar.gz"; + sha512 = "6e8e1db8b247c92c8de4b476e06ad464b0bd664919394afd5fb3962db477490e54865abd2510c29457efdef3be23f0ea4683d6caabcc74a6d7abddce4b4a154d"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/29fb12f4-03c2-450c-99d4-6c94fb47a6b2/18e308e40e503f02696f00b719ce581a/dotnet-runtime-6.0.18-linux-arm64.tar.gz"; - sha512 = "7c9006feb7fcc22510ef99841e55b0737fc3cb7404f3aa0f56eb4dfd82da62dcdae3fecf0125ba1f1b5d17607ed595741e802dc2234c79ef1047a9e99e61b6ec"; + url = "https://download.visualstudio.microsoft.com/download/pr/5428b024-2cca-483c-b103-429b04611e0c/8db2a6abdd0abbb00714d700e8acccd8/dotnet-runtime-6.0.19-linux-arm64.tar.gz"; + sha512 = "7698ae2a9f7bc32f99cb2a945cc58b47e173720412604807c09c682cc03edec8e4a7cf19d73e087733437da77e7f05ecc8618296f7f9165ac8ff5dfe51dda346"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8b68e217-8a0a-4398-9559-7767c973b26c/e322082fa4280a2b1f0904d74750aeec/dotnet-runtime-6.0.18-osx-x64.tar.gz"; - sha512 = "67d7a3a5ef59ae16c76c82fdefbdf5dad8920500f03bf868eed30aa21029ae06e3951a7a5337638cb7449ffe643a6e7307bf94984ba7dcab5c50f4194c484ca2"; + url = "https://download.visualstudio.microsoft.com/download/pr/a9559a9f-3e72-4fde-bc55-b5fd2260ad5f/f501dba0830e7cfdbf73c7d9780abaac/dotnet-runtime-6.0.19-osx-x64.tar.gz"; + sha512 = "c0b7738b198789ba0fe4e2b301aed2b129eb8b09e826c35b6e56b9a205d4d7650841cc0870bb3629c3aef58e03b59cbc37da6495bea4ad674b62d81240639b4d"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/9dc8fb0b-74d4-4c1e-8eea-b4cf02151db9/e5e72a0e4773f5542d3bedc735736774/dotnet-runtime-6.0.18-osx-arm64.tar.gz"; - sha512 = "3183a2ac94c2e33637e8e193dacedadafd49e7b39b10a9429f0d9b4f1b7beca1eb72539574edbc2a9c6f97b36c157635bb4b765adb791fdbc4a477ed890aeeab"; + url = "https://download.visualstudio.microsoft.com/download/pr/9e22fdfd-02df-4b83-ae80-933ab45da241/678caea6e30c0c4673f398cd42288f2f/dotnet-runtime-6.0.19-osx-arm64.tar.gz"; + sha512 = "9a7d0d2c493dcb0cccfd2ff9dcb234a6886f7c261a1a403aa896ccb3e6d76be6d7ad865e18e8f040f769833cc41f1caad7cce2909f9c4ded5ba3bba219c76071"; }; }; }; sdk_6_0 = buildNetSdk { - version = "6.0.410"; + version = "6.0.411"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ac5809b0-7930-4ae9-9005-58f2fd7912f3/4cf0cb18d22a162b33149b1f28a8e045/dotnet-sdk-6.0.410-linux-x64.tar.gz"; - sha512 = "8c85f5b10eb786c8cf31bf268131a2345a295d88d318310dc8457d831f0a587ec1600e43beb7f55aec2248483b9a95e905a468b592f0c910443b4aaa9baeb2e3"; + url = "https://download.visualstudio.microsoft.com/download/pr/1f26cd3a-af60-4140-9cab-b661cfe0a1ed/4d533d26ef5d55fa17f23c207f6d3330/dotnet-sdk-6.0.411-linux-x64.tar.gz"; + sha512 = "dc8aa1f84ad97cf25a979bfc243c200b7a8e73b930b68d5eed782743d88aad823c32c267c83d7a19d3c4f910a8fae7f12d07ea5a35a1d3a97e13a8674d29037b"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/bf758689-351e-4857-8e9d-b2f155577bcf/759401b27c3c68d3ae344d2112bf9057/dotnet-sdk-6.0.410-linux-arm64.tar.gz"; - sha512 = "75776b101672714f4e919b71313c3abba6f9b8a14d36751b31fb5400106e87d55e3aa45c1bf25be26a40847637f583815e40d61a837bebda66f30b88294f7e49"; + url = "https://download.visualstudio.microsoft.com/download/pr/43eb599e-df6d-4303-b266-b96a9f77a8ca/a5c595017960d21f6d7b89530bff173f/dotnet-sdk-6.0.411-linux-arm64.tar.gz"; + sha512 = "e10aed4470087f30e48bf2c3d7e98a680cb7b5f5cfaaf2f7e5029c648e4df9ab140bfcef3b84195f6f8984b56b4156b7afde957b3695e68e9ed24934414a62d9"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/190b69f8-f50a-4d68-bd44-8bfc5271265a/a29b1769b5e5d73366cb34ba3bccf9d9/dotnet-sdk-6.0.410-osx-x64.tar.gz"; - sha512 = "dc9aa3a04b3da513311b385f28e2982879432a79e6de3da8d7e339fcb02e2a6684e12be35c6b193cda1ce02a9979c91eda5d2e7295cdd264f1e09ae5651d1b22"; + url = "https://download.visualstudio.microsoft.com/download/pr/d53a8cc3-7c70-4374-8072-5ddd6a75ff5b/0b64e3ca7c14755bd4d806ca235a2760/dotnet-sdk-6.0.411-osx-x64.tar.gz"; + sha512 = "11068da9ae996d0f0c2410ab2fc0a6637d5daa25ef9c152cbd509ee9ef51e452134a787b5214e8122a797b3cd00771fa3bd54c2e4aacbb3cf8ef103dc85b0a99"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c9f8cecc-df92-4720-bb4f-273c55762b68/7abd1ebeb6241949dae538dc72532190/dotnet-sdk-6.0.410-osx-arm64.tar.gz"; - sha512 = "c52d9bcf96605b2cd76eaa7c09455d8fea29bce119c7072c94b4c51dacc171ffd3ee3d38ffa4a84f1d1c750ac8d957447aa4c77c71c4a90af4407ac9a1afa6ad"; + url = "https://download.visualstudio.microsoft.com/download/pr/5288044c-41cd-43f1-af79-9aa29f6e5a10/aaf4fa836481a4ff3a0f9bf79c4ffffc/dotnet-sdk-6.0.411-osx-arm64.tar.gz"; + sha512 = "0095606938cf1b6d5c54516ccc4d9ff276c567e569d2644dfc2f00c8a20c88ca8b09cfa1bb1254c04463887cb9c2bc057e62afde026948ca326998048c4d5d0d"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.18"; sha256 = "1k7hqyyg12478kq0y2r44vqm8xbdci7hpqgs7aa1yxs4n9i4iqjx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.18"; sha256 = "0g3hyhafmhyp58plsw4vzirpjy854qn1hmnwkq53hg7rbxwqyz6r"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.18"; sha256 = "1yrw2wpxhvb9l4xbzs3f4ykapav4van5ibv6bpqnq1f4l5l7vm0g"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.18"; sha256 = "1kgzlasbsjpkc2q08hh7ck02d3ib3yjfgir2q9vxm8k9np20i3w1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.18"; sha256 = "002jll4a28j1rxn1sbhnfp0rlkx70hh0i91y2yzxj10hbnpvylbq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.18"; sha256 = "0n8xf6znd4sr0gc29s234hgdviygwzpsn13nh8czkvrpy1cnl2qs"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.18"; sha256 = "0zwh8rp233kd0z7ldbgr9hv5xgcv7rm4kak6z2m99r8k7qfs2n0p"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.18"; sha256 = "0s2n8l206cjvzkvjqbzrnfwzpd0x8xgarw9hqrda7vj9yy7a0x80"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.18"; sha256 = "0qhnlwksn0ijaqlk8n9yhf6r0g1i73kdizmmndibbqynnl2vci5c"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.18"; sha256 = "0hn9kdcmbbpzi2kmjancarq42in77f14jfjn3axj869x5w205lgf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.18"; sha256 = "16rydr6kc2hhnn9ws1kf4rqm0a001i56f3ayv5l4bn3z95rvdm0l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.18"; sha256 = "1ls4xcsx7s635kj6mdffrabrn8gwyz0lnqdfbc90pmnh4ddaf7il"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.18"; sha256 = "06vgbl96pqrd39wdxypvm3nr9gzp4ddwqxryv5z97dp9prc5kmn0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.18"; sha256 = "1f9f8vz65fkv65m4p36wlisl7vzw6s27g4pzmcp5gliv8cb8bjbq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.18"; sha256 = "1qal9m4q24rfx4qps2x9b8ivl0kkfy7jwi4x6cm8zwhlk79zkdr5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.18"; sha256 = "0mcyyxji1kpw92svgag6lvgg8x0h50p8gnganrcw6fhp1xfrd2wf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.18"; sha256 = "04by204995rwhsp868sc4zbrfx73zffjd5pcmzdvqywyp9dh5cgg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.18"; sha256 = "1mhs8f7k7rc562yrr9h320jfbjlys3715d60x1h6822ywrc4qfv4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.18"; sha256 = "1y5p2jq8v26nqzblapkblpmnc5hlanvqn68dpi1nd3j9n34ixjws"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.18"; sha256 = "16sq63639mp1vp2cjm7nnwjyw6r0xparwdx672hrjyml19k5h4fx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.18"; sha256 = "14yi7ks31lmb7y4j393pgcjfm5wsz7v5a6l90lnqxlmfp99whmgf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.18"; sha256 = "0r1l8x2v0i4s2yv8n8fzj9nbpcpjd8fcvkx1df12lgscjzh72dvn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.18"; sha256 = "1r68bsj35pjlxb1gizq004g4yv2dc4hfz96i4d7i9dvi9i8smr9y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.18"; sha256 = "01mimhz0vnbhz4w7rpx21qchql4jb2lzgl6ij9n4ifa69dl936vj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.18"; sha256 = "12vzd75hfy433l9y2mncybbffsk93rcbvbfmb9rs354yan9phjsw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.18"; sha256 = "1hwkh1525gb20xybcx2fwk3ycqhjkafgmyczgp7p76y4l3can6fb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.18"; sha256 = "1fvcqnxrishcyrgix02ib86wgsjqmld5nhxspjb29j64f6ywgdsq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.18"; sha256 = "0p77flwzh7002yl88270b05l549mk708h4bqpaa28j556l9jri2b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.18"; sha256 = "1bkiv4b18zz399zk4sa8gnfl5vmm8an24q9llmic13svfcv1k7ag"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.18"; sha256 = "09v7zm429mafbsa8a0sqaawbvzf52bl2fb51v40k8vdznwn9791b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.18"; sha256 = "16whips03k4gczvsga5yfhg2g5vpc80zwnlz6wgs53wx7lbpl37l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.18"; sha256 = "1p8827cj7jl4g72fapvkzf27077v127x46r9g94qh7m69r292bl4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.18"; sha256 = "1pc9b2fvv7fl72x8ckf5n00998ip2wagw3sxfx8jsqf74d2j8qih"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.18"; sha256 = "0cs10j6g6r3k3zrwpfz4h0jn68pdl88ik9xbsdlvfv6v73npyfwf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.18"; sha256 = "0lh8a1ch6pd2gfn48kwbpaca6ry1rk7l25m5k8hpgbaw0qq0sw92"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.18"; sha256 = "0bv4dyzhy288j22x16x5qrjh8m9va4kxmbjhlhc2ql9bhw1g000m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.18"; sha256 = "0ljnajylmyc5b9s2zb5khrzniq0qqrrcy6apkkd51x6fqyyn3cb9"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.18"; sha256 = "01sfdl4a6mwisicpf7by3b3kyhp2i0zc30s7jrkwx8zd5kjxb49b"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.18"; sha256 = "06lsffnpa104mn1scqrcbxpb3wiri73vz2msnanfljnhdyssk29p"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.18"; sha256 = "1assfk42xn1fwkj39lqv2z57rcqj88wk4w81f5y2xjmrzrdcxmka"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.18"; sha256 = "094vxdlj5pq83vvai9vfrp1d5fz8wddy17nhcs0h6wrfnznkvz1y"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.18"; sha256 = "054hfb98wmmaanz2z7kfjmw5xjdf6lwhxzg6d6lbr4x81l2mgs1z"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.18"; sha256 = "11di1pk966j9dlzdfmhl5h3h1cjng2mjjwh7mpddnj96pxpkc4hk"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.18"; sha256 = "1nbyk4fbrv1aad0n77a4ha1csrp9zlcwqjx5536vpiaqjf5sfbvl"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.18"; sha256 = "1rdnqhn984vvci076g9w1im8mjxay9dvbjnxj87kwl41mvnljk9g"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.18"; sha256 = "0cxg0fymvzrghfwilbrgqxmk4xp5cp7395y9f2jaxz22jdnv7kpv"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.18"; sha256 = "05bx3zdsahfbvrk36hyxbqc08d72222pvz8g87cafxif8md7fkl9"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.18"; sha256 = "1j9rk58g2my11f0pna7gd97l40wfklkmmlj0qsklbxjqjl3xk5qa"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.18"; sha256 = "113fxlvg4k9jiy0ycwafwn8grxjl695r46z5gm4d6i9cp659h9c0"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.18"; sha256 = "1fzqyxp53jf8yqslv9y068pf6id0dkrfz7jiv1qjgiypkanp8ynj"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.18"; sha256 = "0d1m71j9p846bgcw6wcqc0dx8v9p66a0z69pfkqkrra0r9lp1qn3"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.18"; sha256 = "0p6ggwq33vsdglcl3ws13l1lqjymqpn716impk44lbrnbyrm9k83"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.18"; sha256 = "11v94hivxl6qczc92g6xihlzm0dphj7alr5q691sdlix1jswxjyb"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.18"; sha256 = "09y96wran7cx4wyyhkf1vbmsfd8934ichbaa410p9m4ncqhnrk9p"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.18"; sha256 = "0b18v2fxalvbsk5s30nlj3xxph2iwr06n2dh2ixas5f835xx1wfp"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.18"; sha256 = "1jp0xhd18y5ghkbzbghl5nn7wzvg58if8rh867h4r7m1qhv67vnn"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.18"; sha256 = "17nc83sb16k6dzlawp1hpfc050gqhdngndzr131fsay9iwmzir7m"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.18"; sha256 = "0g88jm1n0ydnf5zflmsf526dyjqhs470y5rg2xl7v00l63m7ad2w"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.18"; sha256 = "09nmx6fx49x459k7mycpg12jkkpgfrmss83byqwlisl333dzm11q"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.18"; sha256 = "0054vq9vc6469yk2z7mdr6yklkjmmzkl07kpf8h2i5crdpwk36jj"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.18"; sha256 = "10pvb6l3zfdqxibh3v510yb2n4p8c557dk69jfdv6s2zi1qy120m"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.18"; sha256 = "1d0jaz4cbzk7jc2f0x3sikm9l4j3d67nsnyrakz4vlb8jlwwzs0v"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.18"; sha256 = "02r2z3f6dzagkfs2zdlsfwmff8hps0kw32a7dqj8mfcadv6wsalw"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.18"; sha256 = "1z65b6gch6pa7gsnc7vqy5xarx040a5zh5brq5sinh18hayl4npj"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.18"; sha256 = "0fivivvxah8k868hwh2knldbl75wamhagvjjys4s1jhqq4zbyd3f"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.18"; sha256 = "15gf2xc93lnqcrxfknf5yi7qpm2k8j7i15l977rnjf4nk83v9jvm"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.18"; sha256 = "0dhnqgjfz0qkci6s3s5ffv5616d1mqnn0c9n2ny4ky4p898z4yg1"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.18"; sha256 = "11mla7ryfw2iff7zl9bj3hv3cwgxdy6r091l7pg46m140ygskrd5"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.18"; sha256 = "130p2d546zjfdzw8ffjbx67z5kdw4psmk8qqxcyl2337sb5nliyd"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.18"; sha256 = "1k7l5aa0kwfhp7910d7kniibpj1injc5wplpi1ij91w1m061q2j0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.18"; sha256 = "0x89vimghn10ba6xj7h6wbg8l58lya1wzay5cpqv41dfl6670dsi"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.18"; sha256 = "05597cq78zw5fvza47gwb70rmv8ipq75197fs84p436w6x7kvs5q"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.18"; sha256 = "0dqvdrv0kza7d9bajnxfgryymhjx7ili28j0a6dkqmyrxhppyx35"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.18"; sha256 = "0kxks9v18r87hjl5bbk868zl90fyq8ln8dkkg7mp5d4xyfbc8kjl"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.18"; sha256 = "08qnzlcn8r2njll6c9bzvn8kx7zhaa8rx4f189161jlnxkaajcwv"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.18"; sha256 = "1viy6i3zxjljyfkjm8djkjzqs4943kcj0x4kim5nwwc1b0ra98qy"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.18"; sha256 = "0xddz7bb8f8a1hiynvyjfbiw4gvacl5gm86024z1rbxqdvbd33b4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.18"; sha256 = "0vkgishankfvynr2lpxmjygiba7pzpk10vkbq0vv97qj07pr6jg6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.18"; sha256 = "0wgkcqfp4f8fvfynjmwxyqk7qi59xyz5gl64kkfav3l8mhh0fc7w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.18"; sha256 = "1j0vyig0ycl5b1g527jjd8901s0qqsc9i9k71bjvjfixlj5n2r2d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.18"; sha256 = "04h09mdr2bgh9sx8134sdxk29h41lj0ss6ds7p7x6pvi7x5358wk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.18"; sha256 = "077z0m9mysp1qnx4wy2iaf71zah92fh4r1ipivx57gp6588jm3mh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.18"; sha256 = "1riq1f8ah0lmaxxnqhw9hdlwlxg8q4dqzkqvkain0sxjxzky7akz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.18"; sha256 = "1ngdjryqk8nrxvhk6hmwl2x8hgc8mxqhdkh55y55vd1kzivd21sv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.18"; sha256 = "0xlpqnn98sjmr9lr9kb1whi7mb3y2rjzx4kw6zdbksax87riwsfv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.18"; sha256 = "1iwr7cxpc9i460r39adcxlic9axcf1llhhrkhika7pwc0b8x170i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.18"; sha256 = "0nmf8i3vn9sbcfl4szdgvqp3jqzbys0lm45fsasyddw8q7mxgds3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.18"; sha256 = "01gvxwqz52f00hfb36np36wvj52rdwmx8yl42hahym9y74nficwv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.18"; sha256 = "0346jb9g6m0ycd39wkl5bn3djrd9jh9jw0n86cb51nm031b2cbpp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.18"; sha256 = "1slmdnw7skplp7wz3vfn9yc5qqp92j3xl68accxv3xlf33l7nc65"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.18"; sha256 = "1pxvx13jxcywjc23lcy3aw5khjyakyxizy4acmb2qq23rkpsgi7r"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.18"; sha256 = "1drxcbsdq094vskmxdja5s63wvd7ifj27ccahb42hn7qgskkklrv"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.18"; sha256 = "1ngall365y0ya501hv3gszj7x5rwpgyxmv82v7y2zgs2fjmi7jyx"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.18"; sha256 = "0iva4c7y2bxypn06k8x74pia98lx1sda2w47m74mnw22bqchvgjb"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.18"; sha256 = "1g6x9815l1pidg1hxhv0pdqq27bksq7fwrx3r0zkd6bggfpdjrf0"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.18"; sha256 = "1kjnksa602dc3j16zgck3dlbrd6sp7mwsc65f4ps3s8b1yjf3khq"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.18"; sha256 = "0c95g1kapwsrbz51myhzpd1wviwlhvknhyfl3q5jy03z1kymxscj"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.18"; sha256 = "1iy2n5b3wwarsrkhm937f87rir7md45m5hm51qfzr5i3bx5vabcg"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.18"; sha256 = "09f5dcdvnfs9ax5i4b6kqpj7frhw66madla71i2m3azayqd0kis1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.18"; sha256 = "1wx2kpgprpzm95h314hxjwfx3qglsy1g3ssrk34n4znswxf68czd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.18"; sha256 = "07yfp1mn4pk81ispcxz513vkgzjc0295wvlhb2lyfly70j5221vh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.18"; sha256 = "0fw1i6zc9jzbsk5gkz3ns9qcsi58mjn6g8wq2y67amacc3m918aw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.18"; sha256 = "1yfxlcxrrpmgn5m415wxnca4xd6gy9z0wqrlhk8v6n33gzhyr84y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.18"; sha256 = "0yqwq66fnbylgwxvrin3qkmhza1ciq73x4sl54dgq7vj4sz7r0q3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.18"; sha256 = "12661jkck5wqwc6cr8vq71lqn7k0jm0q86qxw51a0vph24m77irj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.18"; sha256 = "16x0mlckhlaqq9lm8d50mg4fhb7290vc4kp6gdk6bxg9j1nl9pza"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.18"; sha256 = "0k30ck2gkv09g8jgalnrdiz39i6lpsq9ky1c9y35dvg0mclcixc3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.19"; sha256 = "00y8riq5mvgyazbp7x9wijn3kxv7r88hwlyfv9f6a7vkp7w1d011"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.19"; sha256 = "0djzym7lil7p0v4h3x077vjbbh7k8dvij6swn7dk83xmyf87bfca"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.19"; sha256 = "0gy5r2p9l0wwc7lz4pn4ja2wcaw1cwy4w1j4qf0iv6057xmqbikq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.19"; sha256 = "1rmngjkdq9f7zflxy3fgznchjh67g3zd5wv9a7vdl7b6z07psjnk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.19"; sha256 = "1izm1kx4rwi6cp6r6qzjn9h1lmqdcx87yj4gnf291gnabgwpdg9i"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.19"; sha256 = "0z4f9jwb6g7xix9xiwldadxr00scbl7qcyvs5j7xsidmwk9dcaiv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.19"; sha256 = "0av7ia56k22scyy0s45v6sv584n6mcpbyibn76pka2ah6jhq7dnl"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.19"; sha256 = "1lnqljdakd8hrrq2hxay2ycagpbdlpbj3ck2j41vyddlnn53vf6b"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.19"; sha256 = "1c8g5gy0x8bp75ff0nssvcsq2axwvi26jkzxip30y3r12jh6jw52"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.19"; sha256 = "0vm7d5dp8rgy5ic4qdvj59hifyy8g1b45j1w40w0sbrqbmak89na"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.19"; sha256 = "1r41m93kacyyhgjxmhx84n9wv9c2ckwa8295qa4kj8rn73gg4x28"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.19"; sha256 = "12zmayccdmhwci83xgvmylp13xl96ddw85r6cyccqxfk21x1dhd8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.19"; sha256 = "1wsjgz3kgxifzc8f6jrgyb89rbngffj9skadqacy4bw158aklps9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.19"; sha256 = "0bv39s9854b7kp9w5068qq5dgyzdfbr5hq0i80cbpj6srxndf9im"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.19"; sha256 = "0ixizxdp0hg98frrka85x37ly0ji006ix9a52dxas3463hdmcazb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.19"; sha256 = "0bdprwa1vklf32w2hpnb0h316pqihy9gfx9z1xgiwljfkdjhin6k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.19"; sha256 = "1a062b09klc0xxkgb7qlxxpl52cmh7vmicy1227ch8qdkwf82nia"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.19"; sha256 = "0xf920dcy92gyf1a4ply370m1k82ja9srql5sq7wm2prl1y77wxp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.19"; sha256 = "0ib7fyl91av9vv734k73l9i37b3iph1gidvg37s556f09s61xg4g"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.19"; sha256 = "0lbnhfh3xh92gzpgpvmbyk1af3rcva7annayd65v4m27pcixdszv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.19"; sha256 = "04vnz3izwk42igr6p569yas08g6j0ims0ryfsi3qbma095117lq6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.19"; sha256 = "1xl4xrijlkia4vxqyg77sf2gb0r5bgwrzc6yidivwxijmaxmvx3z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.19"; sha256 = "1148n1shzmyxyqq1fqr7f55z6r0z55vjzyj4px80vjf46rs97h8h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.19"; sha256 = "1635s0h8z55blb8bd1y8ppwac6w19f0w6hmx2nqz433968w74fk4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.19"; sha256 = "0448b8lfv770qijzxxn3mv4xlw7cp00z52i7qqmmzf2b3vgwcr1i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.19"; sha256 = "1cx8vkwdgh9ai85ps46yb43x5mvxzk579mkyblxsn4b0nm5gqmsc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.19"; sha256 = "0xjiny4vmk621f8h35vl6wlikzjq9xrhw0j6sgrs0k0ylphwmp2a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.19"; sha256 = "0slhgkjlwcmz4xjl0x6rwhhcdc6f7hz0vb4lg5ak85inl5m98xa9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.19"; sha256 = "01hhi86mh3wjr6i31p5kbcqn6ks7kyhc06gfg1xaqyjrf0hkiiwc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.19"; sha256 = "04pjx9r8ahv3c73l6rl5vm9sj7qml1yiav9w5v5kiyvk6sz8agk0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.19"; sha256 = "1rf27fgqz4xyqi8kxn3hcxwzngdpdpcyjhxc512z21f914pvfz4q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.19"; sha256 = "1j9hp3a74spw9srhyxx36lkgvyqvyckmssl7q72vwamwih4jkdbp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.19"; sha256 = "10irl9p2vszfrxn9s0x1kdcgdjzqvk365452632g9adpz0m96wkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1bq00ff77dj8a87paxxhg9qg3x44hs93vmddms2z2rbcv49wh2ra"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1dk2sqd4j2lr4xaidl99q1gygly52dz5hjpfqhvzkwq5rhm1q2sx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1iarfzmjb6rdwkp4s0j8zqk0jjmllii1hhrfkmgjhrf9j7zz4qli"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0d3l3bbfzqzxrwgif6z7a4h0788nm68m5viz9r3jk4cpkc1p8l5r"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1qxcsdixcf66pg8hyjwb5k2yl1srnm4l6ylhs4nbv9s86kfbafp4"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "0s34svz8dm533nl6g8cbpia6ap0rbimifwraswc20lgj1vi0f30p"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0mxwikpy61b4kqa8a01gfzzy5nymyk9z6r4br51y43dzqrmi461k"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0k5mv3m91r19gv3f8hgn558694szpag9d2a5w29xvdy8h3mm6vp2"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0ipq0a9ij6jn469wd37pnc7np38hxip7452lkm07f6nkihvkg0m3"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1ps5imiyxcy7rf6cgpkn9p6mz74w606nxb2sbs675yrn3c473kls"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1729vshl38927sy4bcbx48l3037x9hwjnxjnpp22v31fzjj1gr2x"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "1wv9lqa3lgzqlhqkgcbr0w70g7g3la9j5i84wa6rqsc21y276gqq"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0lknp6kpb09k6flnv887nv4y7q4nhbblk5bdv4wz6gpswd1b8mck"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "0yl201gy9bilz6zn0xa3lybv3lcpnycmrp8r5kjc6yh73qc32p26"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1fzawxv0nql0i62najx9gsq396w60cnairxysfm9312m4x5bfcxp"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0jjnzhqxv00lnmjp49w998rrjhjm1ca7vlir0yv7jpbvhpx2c3g0"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0gvin96ly03zik2wxabi9m1q3xg20myankp18awmwydmvma5my8f"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1dgd764pic3s6y4kzy2amxi42rb8bgbkknmg7gc5yz4wi8k2rm7g"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "11lbnzqdzalmqmbqkd4xn2nhx5n8kfjpv2akj76476dhanxfb0l8"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "082jyxig3v9ah4f5rz6d4flwqm20dn999zsy6kp8ri6bkvmap2ww"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0ky58h37lprp3idwayvrcyn613pdzli24fx472iql5qvhgcgxg5y"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "0g2dhi7sh7gbwrwcinlkzpal6mys12rw6114scyh8xghfswggshi"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1nrijf8czcbjpkd3ay2czwxa26cl07mv7sbbz9q32ywfqdw16xpj"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0flz92scm9a3m08fgq99axh02qjhy14dzivzzf702xm9ipa37gds"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0cwqwlhbvc310hkqkfq1kx0vv77lkj1s4mda2ks4w05s3il42k1l"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1qwzh3rq4xg44kgyhqxnhddr9d1nmcm11nhj73m091xk0mnz26p9"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0l66w1h3w6vqd9a8jag4dah6x929sc6684h8321mwy9d5wldx03w"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "15483p2z4lyp2wir0lwlsjk5009nvp0j348ffnhqq115xadb1zz9"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1q08v78m9z02zmrrq19bjpbsfjzw4am82shj6mnkvhqy6r4aafh6"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1fh221gf6bl7qcmklhhv58i81h6q33ivh6g46hx70hl96gz62dp9"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0y6pwh3psknbf2wz03fh1kamyc2xjgazncg76z7msj1sbm3898ac"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "117qw21q6xbvnji6nz79yfqi2i1wdk7kln02102vkl5gficz75y4"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1qypjwc7918v8qgzz3w2ypl6bsr3anqgb92bajbx4ha0cfrjmmfa"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1ybqpy5p7424allxgiqjccqx2wyidgylxy368d0n70w3jysyyxg7"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "11xmb1gilncaj1d3i5ry7kbsszjyrqjlaws6n7nnr7rgw26jixrk"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "10nphwf6iibkx37z0prwww6bxi0ks22rm48k4sjksif7rp54mzrl"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "16vpwyp3z1k9f58i9w8k6dfgdw9y4vqb9jb1qvgr6fdvaz40vnxa"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "0whr0rkd9izqhm0bggj27xirwsi8sajiz8imvz34s65ka7q3vsz0"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0a0sx27pjq282f9iky4djvlfhi3isnfy3fa033xv4in4lsml47gr"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "0p0s6i2s5xqdzcpb0xb1xb0lg8jnn2v91yyawgckj5c0bhvxl5jv"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "130r44f2if0mgjjknbrbqs02gjvaqnixc1hgpj52gm1fpwmydh46"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1m1z7sl9ivz7ks5clsa7mgwx7ak41a3gg1rap4c4q24w5avk08m3"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "10pq2smssbny6nbgrhb97mnhxqz0xh7rhscx18isqcammkpk4hsg"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "17xk04myv6j3ij28frg2vkr3y35s501gx1c8dngzd30k3n029icw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.19"; sha256 = "1mm2czg8mczkdayx0z58qs91xbrqh9frmlmfd64b7424rayayrfd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.19"; sha256 = "03y87q5mx0bz0lc63barh0r4gymfv11190jgfdxph2cvd4ir7bdn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.19"; sha256 = "11wpx1386cjg78c5jqqh2jgwkp597yrnvy92icyh6ibiy0107wfb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.19"; sha256 = "1lpx76v6113jppqn56pwqan9lgkqw7xd0x95fpyilczc52l3s46i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.19"; sha256 = "1ww8w5r3yvps19sc0nj2giqpsn64y807zw0ayshzn9shpba4gbbn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.19"; sha256 = "0r0q5jd7a0dbc2w767clz460pn6lhvrmimsrn3jqw9irgm7g2xns"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.19"; sha256 = "1k4m171nsb9m407izsnkayzalhdq6g5kwy5s8f7d2hd53azisb0z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.19"; sha256 = "1q977pxaxnm79lm9ma2hbbll7jnrpkp89pbb41jr4aywp34x151b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.19"; sha256 = "0j6h8w3vrgr4fps3bhycqpzlajyqlrm467p0gpq98ali07ckfrb0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.19"; sha256 = "0r3zdg1rapknp94m2hx42mx8wvyarq24cqdcvzd37wf6nmxmaigb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.19"; sha256 = "1adwrmr618bnc72gab4kg1sqnvvyp3zlzlaafh4n38xyi2hjihs7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.19"; sha256 = "0rmn0i1sy0q91dijw5k20gcbvqg840rqiihv89qqvpdw99al3xgh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.19"; sha256 = "1ck1ws817svrpf5xa100fw74s3mpscds67kjslw57ddi4gh0p07w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.19"; sha256 = "0xvmpr2vg7cknkzb172zqx8sj3a5fy7j0xxdxxc441hc8xyywh5i"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "1l5zs4c975r6s1qp99yjvygil9w2r324r5v7i15x37bzc3xkr61f"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "1zv2vhi7krnibrm0khr0vk99wlxn9dgvhg0lvx9h0didfn94c71v"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "0x2d8hm8lffy3gc0lxd7njcdggclnvd48i1ybwq78ll07930mlky"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "1ra6gvs7xk2iz9in8641ls30pbxlcmk493q3vcbg30acvm335nzh"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.19"; sha256 = "0q8md416zfk3swpv9j4fn00rxpfj6hgkxxsl57qr9pavsximknhp"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.19"; sha256 = "11vyd6rr47dwfyraz86clza3i6nl8kakj6dys1g436d56mc9qxl0"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.19"; sha256 = "1kg0g83sh4kvxda508mav7xkfd56c3nsxj181hsgdz995yrnpmwz"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.19"; sha256 = "1x86splyckv4zxxj39maq7ppjpvfs8zdq98cbrpk0apb2m20clia"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.19"; sha256 = "0q5dp89vh189wa0yzhn9msgxs0d6ch822kz3dx8wpg523xwcf700"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.19"; sha256 = "0jy52i7smi8gsddmbd2isc9l1c4vyir6bb6q4pdwk8nrspl9v153"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.19"; sha256 = "1piir71cvir9xjdmmsais4q00gy64lllbcmzrlmjbip2hvxqbi2b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.19"; sha256 = "01v4w53jaq8fbrlf1dd08b0xmlf34qgchlavf8l7l4qzfzk1zc1i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.19"; sha256 = "1apazbfb96gc3lhj9yq4n1yczsbgjnfrc2a36yqkacfkrzcz5sdb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.19"; sha256 = "03mgjj0sq8h5k7rhi3g4xvc6w129l99fzipqcpri87gq2v2rq9bc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.19"; sha256 = "023bmkhi489932srjpjgni96nifvj04556b1cb69ysqcw2blyjlh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.19"; sha256 = "0gr4y4wmkv8hvrv7j93cdxyaifgm5shslswy237xb3bi2rn91f2j"; }) ]; }; } diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index bee6d7421dab..206a1ed9172a 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -3,184 +3,184 @@ # v7.0 (active) { aspnetcore_7_0 = buildAspNetCore { - version = "7.0.7"; + version = "7.0.8"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c1e2729e-ab96-4929-911d-bf0f24f06f47/1b2f39cbc4eb530e39cfe6f54ce78e45/aspnetcore-runtime-7.0.7-linux-x64.tar.gz"; - sha512 = "e56ee9bc458214bce461e9688e5229ba5b69046ec38a27bfdb2b5413d4b41500cca40152d182793c2768318719d97980b62ae9724de75d6d02874c25e938374d"; + url = "https://download.visualstudio.microsoft.com/download/pr/f452e148-b4ef-4ca7-9d97-59b709c55221/852e848f9fbd345445a0de43efa4e7ec/aspnetcore-runtime-7.0.8-linux-x64.tar.gz"; + sha512 = "b75cb42ecd1936b1b2af5ed59d7f3ef3eb0a602b23f5a272e62c42de9c75db1ae54878b2f9f28d72dac15bdbeaece81cc6344d0df5eae845bc130534ef1bfbb0"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/803c679c-de71-466c-8ada-81139a7c55eb/03af937e87cd7220cf22681420ce0595/aspnetcore-runtime-7.0.7-linux-arm64.tar.gz"; - sha512 = "814db12231db89d9935404ec6693b3fb50ad022c0affbc131d657878e194274f1af5e92dd32c2c4f2a78a7e38d0c18a46ba4ecc67630ca3adf5b7550367c2366"; + url = "https://download.visualstudio.microsoft.com/download/pr/04dc0f8d-880d-4722-bd51-6669e6cd1e72/cd5689508f2da5395bc70473018ff165/aspnetcore-runtime-7.0.8-linux-arm64.tar.gz"; + sha512 = "ce521f56d95c39be6b8428086fb4e0b13ec49b08431bee151a625aeb2366622e6c688abc79b76810bf5c17a8547b894d5ae57539e15ddb3bfbb0e11022c995ea"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e052c143-c16d-45bd-a9ab-af85c66177c8/d8bde85b6f127ce794274c1bc111034b/aspnetcore-runtime-7.0.7-osx-x64.tar.gz"; - sha512 = "142fc2136112ba4397409a9eda67ba708611d5ac3d019bbb86733c89138d285d8bb2d02fd2bd3b2a027b76b6a7fb8369745ca1ee4740f046a9d0867c40271c38"; + url = "https://download.visualstudio.microsoft.com/download/pr/755a7169-d77c-42e1-a1a5-1eea4213675d/1375f947547134e9297aba032c3760b5/aspnetcore-runtime-7.0.8-osx-x64.tar.gz"; + sha512 = "46d4e2f36240efa316c15992646d8b93d6750b987aa6bde88529e50c9cbfa69f250148ed6dfbda93c28664c555bda62fac7182a76e8ddddfa1962716169ac152"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/97bb1f46-3b87-4475-bc06-e5cb7f4e6d0a/3e36e0c804c5805d2fe856505d7b1b3c/aspnetcore-runtime-7.0.7-osx-arm64.tar.gz"; - sha512 = "e6979ab34bea777f1f48bf9208a024b33b1685ec236f13c609975ebc7e1f641806b47daefb9ff1f74f675ee6242b628edd615982bc9c014d18e18cd2662171a8"; + url = "https://download.visualstudio.microsoft.com/download/pr/787adeb9-d6c1-4db3-8c72-63653dd939c4/a7aafd0908cf7866c6908a14a78ac994/aspnetcore-runtime-7.0.8-osx-arm64.tar.gz"; + sha512 = "31b9806f7c3d327008fe505dbd627bcccebcc7db7179b7010ac814844782d054975cb4c1a35f6ae447fbed3227d39def95bc99169032f4fcffd35916896ed4cd"; }; }; }; runtime_7_0 = buildNetRuntime { - version = "7.0.7"; + version = "7.0.8"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/123d8ec6-beb4-4acf-8e9d-b54d2b99bb20/32f203246f4a87d70c339e8e06dc9c36/dotnet-runtime-7.0.7-linux-x64.tar.gz"; - sha512 = "02c4949f2edd4c0e63286443e11f961ee2cbd173eda93b5ba192e7c95dcefe74754222f3986d00f71b213271c184d5c12796a4345d19936a38c45293ac76dd94"; + url = "https://download.visualstudio.microsoft.com/download/pr/c9514df2-f03a-45a3-9a6d-65b2260accd1/0f59516ed5bc603ee95ae91301090ebb/dotnet-runtime-7.0.8-linux-x64.tar.gz"; + sha512 = "50463de25360aba18c29ab8a3d31896793a7bcf899b40249fcac77efab24888e93ac906dac04ea5b72026c89c07dd371247ff89e8613123dead7e889906aa876"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/1b3e2977-140b-48c1-9125-5a542db56d1d/3d3e5d2c24689b63486cf1c61a00b50c/dotnet-runtime-7.0.7-linux-arm64.tar.gz"; - sha512 = "95d2b4cceecd1966bf61fa016b4deb3241c4ffd80cbe6ea1a2ab5158401493e87426b8f41e150e595757fa8e8fb06a8e4631ffcf6bb1a04eddf5ebd9b5e0eb2e"; + url = "https://download.visualstudio.microsoft.com/download/pr/fc0cbb05-48d1-4f9d-aa78-8f2bf6423f1b/f06a3e717b95abf8ca5f40504cd63dee/dotnet-runtime-7.0.8-linux-arm64.tar.gz"; + sha512 = "92835372558bc9913e81617d0c396a60427fa30eb2dc9249bf73772ee8c221cce7358aaa4cfe5a261849f9b1303225f6052d29187cfbb15cbe3caffbad4fe3dd"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/b2d14614-44a5-42f6-92ed-4cb6579c66ee/0472b42d3551d3e673aeb86cba23b95f/dotnet-runtime-7.0.7-osx-x64.tar.gz"; - sha512 = "d1f76a39af4d516bb5670b2e38b0dd4775e7980a5b312c069cfe7016b567521c0a98608d550431337737cf6510f0be1f6ec74f0cdf30c948c0177a7543835d80"; + url = "https://download.visualstudio.microsoft.com/download/pr/5b7cd80a-49dc-4364-a4e8-a760219548aa/6ba0a83c6da3897dab16ba709acfcc9e/dotnet-runtime-7.0.8-osx-x64.tar.gz"; + sha512 = "e2c01f09a7532d72578dbbc27ea0156b5e0ee0c636eb0503ec34bf4445b0263857063dbd7701a29baa5e74129ec9c7593566f66cb33cccd40ae64ec888d7ba3c"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e3e4e56c-8ee6-4aa3-a9a8-6ec7e6b161a3/7a2aa1a2c69ec5f96e7ed5430a1a8933/dotnet-runtime-7.0.7-osx-arm64.tar.gz"; - sha512 = "440338f74bf45f143e160eb2443134d9d8833f9b0a9507443075898f23e8dff94acf17a41c8e2a4c648a977dbf977b4fb568e2d5db8c9999d7d67c7110d7d3d9"; + url = "https://download.visualstudio.microsoft.com/download/pr/11db4f76-fbe9-4692-ba1e-9edd2b5e0eb4/9204a2e30c58c8a01a8a6f7185e6175e/dotnet-runtime-7.0.8-osx-arm64.tar.gz"; + sha512 = "bad440aac7e065c88685de902e5328990d44e60fa8f583d2fcaa38cc9d3cbaf01810cbc40b7cf9275e53f386b59cd88e563f96e907c8b0c0668fa6a905a5eaa4"; }; }; }; sdk_7_0 = buildNetSdk { - version = "7.0.304"; + version = "7.0.305"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/9c86d7b4-acb2-4be4-8a89-d13bc3c3f28f/1d044c7c29df018e8f2837bb343e8a84/dotnet-sdk-7.0.304-linux-x64.tar.gz"; - sha512 = "f4b7d0cde432bd37f445363b3937ad483e5006794886941e43124de051475925b3cd11313b73d2cae481ee9b8f131394df0873451f6088ffdbe73f150b1ed727"; + url = "https://download.visualstudio.microsoft.com/download/pr/87a55ae3-917d-449e-a4e8-776f82976e91/03380e598c326c2f9465d262c6a88c45/dotnet-sdk-7.0.305-linux-x64.tar.gz"; + sha512 = "c63e6baf3760a9949089d78920531a1140f4f31fffe13069b2011c61c3d583d585f5ec8cca973b414fa35d48ccbfea9c1ec1c88222b53afd2af5974be3b5cb1b"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/4d36e684-4405-4e54-a6df-7f342ceda377/956ae226bcf74d038845964e88c6904b/dotnet-sdk-7.0.304-linux-arm64.tar.gz"; - sha512 = "eedfa933039e749df49dc80bc5ccb6d46c2799ffff2f634924ccc699cdbb8e08c12507ccd4f5392fbd05838696e5a642843c2da04ee7bae80e4eab5195138f6d"; + url = "https://download.visualstudio.microsoft.com/download/pr/e2ca71f5-17e9-4dbd-aaf4-1e0fa225a212/61c440dae017c7129de10cfbfe36fd90/dotnet-sdk-7.0.305-linux-arm64.tar.gz"; + sha512 = "451622fe88ed6c6619be6c27f3e9eeee94ae61db3c9a0b8eab7cf1b14a62d41681181748d823a1207ffb6da6e3a098615aa2f59be8e60d403ba4cb98ab267a50"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/18e7fd79-48de-4ad9-a7a5-a659a485e3d7/fc0d190f90917587626fc8086ad6d2f2/dotnet-sdk-7.0.304-osx-x64.tar.gz"; - sha512 = "8ac32c684d9a9691eb2847db50638e7a7179d52882d8a364e8a7b9770fa57a2119141f3871c59556e386709c895ac7b580ae374a3a32fbc652d583d414b3e29f"; + url = "https://download.visualstudio.microsoft.com/download/pr/42115a70-7082-41db-bffa-b54ba38d3a76/5dc32fb8dbd24f358947e96400792bca/dotnet-sdk-7.0.305-osx-x64.tar.gz"; + sha512 = "27762a9104c5f44c189fad2cf81984369503add9c6cbca604a4e539f9957db81d807981ce23c025a74feac1a978b9d679eda66f4078af2de7e0bad5992177700"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c7a10ece-45cd-483f-be8d-15a10b2d0c51/1ded758a3b6140c435e283b0d0ace182/dotnet-sdk-7.0.304-osx-arm64.tar.gz"; - sha512 = "c71bd602e964a9c000c2a7c336039497a41dee8355f37bcb687ab5d27391ce4affe5f1d520ef46f7ac52256d0695c8296f8146686f754af4f198ad54b92031ef"; + url = "https://download.visualstudio.microsoft.com/download/pr/5514f57a-bdd3-4bf8-aeee-9469379dff7b/8b14cea61057408b04bef7cd94123e66/dotnet-sdk-7.0.305-osx-arm64.tar.gz"; + sha512 = "4567aab659a1900d60f2dc07f6c24954b9fc2c49ea54a75c17825d2b9e131860de33bd79195ae529af1df884a25c7e626d7463d13e340ce6e99a74c8ffe60653"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.7"; sha256 = "0f4jf9m8mdm93067w04crx80jy7vvsbw3f7j0lz2dg13bpz30smq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.7"; sha256 = "0amn01562w51zn7f1jyhwqav43ivzhxqgwpmdyzl5gpq7vg4xaz8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.7"; sha256 = "1b2riw4lsg1j7dpnkxlq7djpa1cq72w2s0zf48if0q0g2vk1f981"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.7"; sha256 = "0w0a9c3zikv13z3yb0v681vb478lgg6dbf83gbawabaxaga5i46z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.7"; sha256 = "0y269pjj2lmzg19vlyddqvq7ay0bqbjcq2y3xlk0dskcv289y309"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.7"; sha256 = "09y6gc20vylz1pk5k62bn8lf3amq7hy5pvk55l12h4f4fkzfjs75"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.7"; sha256 = "18489ci2gbv9y55cfxkqjb6bn8pf9w3gk3vb5iz3nqayx4jf2mhz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.7"; sha256 = "15d6lxh1227xw78g55b7rmr6h3qrsb0dxbqfwhq6xi641pnmdzc3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.7"; sha256 = "1dbf2p3vykrwbv3492sf9n4j8k1bwdspl7j7alhvl6ab3qcyw5wa"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.7"; sha256 = "1m16bnbl9c5cr4sfbxin6hqabxf0zm1dhrffhs3mk96nf3bqrm7q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.7"; sha256 = "1chk0nhbrxa408wvk8v6r10aax8mwy821a6cmllpaw97p058b1bj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.7"; sha256 = "16r61daa566hagxf2bnxwgbh8kb5353g744qhpkwn3b1l1vhp427"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.7"; sha256 = "04n2055fdv3fhppjfd1zh50fbdcncw1ldcwgj6y0z9zhkbc5c68c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.7"; sha256 = "1c6wn79hyv3m3fmqj11y61ilqxc39ndd9m1676pi50nydfc301xi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.7"; sha256 = "0zfq188hmgn6l93b0dshh0yb2cnh6pk366psc1iq9yszhl6p4ril"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.7"; sha256 = "1l18jm8qd3yrglmwgjphfk4jz5f0rs0sggb8gp2kvd1jz8d4aq4a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.7"; sha256 = "1g7fbxs7aq68cgd3vhqzxr87wsijvjpcpazf65kskn3vr8gacpiz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.7"; sha256 = "18w443m7kg7inxgnp6j4ym3zb8cpzi6fgf7pknrsx1zmg4qxhkzi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.7"; sha256 = "017rampnrspwrmcxc3sr55rvnzldqjygwc3v3ykbkfdr7lksngn2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.7"; sha256 = "18hxpxsaiw937z9hj0hpvwspqf55gqz2dd1csfc459v65r4fan0x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.7"; sha256 = "1qlrlpxnska62npd8lksl70ya99qfsljp0vjvla9rhnyhxww67zg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.7"; sha256 = "0m7zlq6cbi2w7y7ff3kdl2l0dhcagbnbinrik7j6350lcqpx8m48"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.7"; sha256 = "05hg0ilsh8h2vdknlzkisrb5y5vxaq119p1z2f4smavp3p00fn0c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.7"; sha256 = "1c97hf8s36n8g55rirgpzq74g62y04hvn4ckqkn00kk8i8h6hcnk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.7"; sha256 = "1plxf046sr6c0v873wzfxy86zppmy3j0wfh5hjgrddy92dy2l41c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.7"; sha256 = "056r5q9k9ymdzw8q1dmkljl7sid7wvjyw6lv00bzf0dwfn34889p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.7"; sha256 = "0a1zzwwgfhg5rs16444cbfig0f0ypqn3wh76h6zaaw3810h6p3wj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.7"; sha256 = "0v0ja6j6r529jm4bx1781zm3rnkm45b3hi2l00b9y2zbbw49ln35"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.7"; sha256 = "0c7sg12l9xdv7xq2m9qzgs50yr4gvz10kmmk8h8ndama823s2mlb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.7"; sha256 = "1w773ahjmiv43xjp56nz1nkaiwbl6bj5zgdybihzah5cwf1r4dwj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.7"; sha256 = "0sw4awgkw6s46f3ladqs33p73a82zkrlygd7gnqzd6ynzr3czrlj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.7"; sha256 = "13p19k3k5wds60ci0qbc618k9yw809759diqis7p32adaf64lcs2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.7"; sha256 = "0w0lpabmyh0c2wam8jfvqhkdl798syznrparr9l7sac0gi57zj9j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.7"; sha256 = "057rgppwk92i0pb62myr83h5yrrynjw5q8qqh4pfzhwbwh0szg41"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.7"; sha256 = "0fck0c1nddr152xqmc73byvi0iqa2aw65kjbv8363ny1b6zgmwrv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.7"; sha256 = "1sr8z77zh0lsb1fksp5gmw3w1wyb7liphh87dwghm3ing8facfng"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.7"; sha256 = "06fjfvqxy6akk3p1qh2mdww4sg92z1m8y538mpbwr6pfybph4fhi"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.7"; sha256 = "1pv77y2900l4s5krglilfy345k9cqqgk01z0hyazsdsfblw28m8c"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.7"; sha256 = "1ibxnfxssnwn0mbm3qinf62wb4787sbj2qmls1mdi0rg8b8pj0sh"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.7"; sha256 = "1lrzkv7ypb9w3fmvd41l1r07kpwhyx66iysmwg50n499nwmzl20m"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.7"; sha256 = "1a5yxlmps3m9j752c0ynmljk3rr7xshdiyp6m07kgk3k7xlw6d83"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.7"; sha256 = "1lllvwix6ps9vgism7x7nq9i9rvawvyf5x8xsmm765fiac070f5b"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.7"; sha256 = "1k34ap17kl45wzjcvxnab18dmr54fncgw4n8i1zilp6d91j35lj1"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.7"; sha256 = "12x70za09drfxhqa1b8j5bn8kfkv8y69fd30i4vkmk1c0l73a5bl"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.7"; sha256 = "0mnl7b3qa9qppryky635gx3m88h0bcr5fqklpg1dk0l664d7xx0c"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.7"; sha256 = "1h6g1b11kgkgrm5q85pp5hq224d46lkbjfyv9zjbh65mj5ybaj0x"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.7"; sha256 = "0l3hqdxc729f5wpi1jamv7lngk1rp78q1zqm1f7kvln9rfwj6n54"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.7"; sha256 = "11j6603gjhny29i0wmw9d7mmgdjd82ik0xcnm7frp46wi3nx0h3b"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.7"; sha256 = "0mfd9jsw22699avb5zsnyfgxlafh0f2r16rn6wcsjw6yppz2y3qz"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.7"; sha256 = "1fpids1q90xwl1kdnkd1m4xjc082a3hn675djcir9l69iagh5m43"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.7"; sha256 = "17szhhzwpi9dg5i1xn0p0qr39zl2xc5rmk19l43kblvn7qhjdgcb"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.7"; sha256 = "0p2cabk4qqpm6qjsknidm5kgv4q47rxrnxmxrhjr23jrr5ivl2dl"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.7"; sha256 = "1ka7fcby17za9rrllgyapwbdb8vmfh1n7yf04llj9m2jdrb4a68s"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.7"; sha256 = "0afk2bcvg1w9m4mshxw7kibzyn43595hsni8dqlcwnijgk1bhvx2"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.7"; sha256 = "1l9whyz1gcwx05blm53rhaipv0brmf4rpk022fqm9ig1zk0c6j0d"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.7"; sha256 = "0mrz6ysg08dpyxiaxs521fdzyi3biv7sbq3106vgvvhn8a3004a1"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.7"; sha256 = "0s3jdssvcah1755ifivnipb43a5k33dk8zlfgbsb7wpfgpdcnb25"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.7"; sha256 = "14mgqy07i0basdh186dmw1js92xqgx43gmx6vav0d9s0z90js6w0"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.7"; sha256 = "0npvcwq4wb0pxz1m945a6n2q0f3nd91jyd30b49vipmcjchprzp3"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.7"; sha256 = "02pikwzzmmw4b19fdmcx0s3frjrpk5ngcishjw7sfc69nxzwj8di"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.7"; sha256 = "188wkb0alscymwbkwqz13q4n957k35y6s9h9wasy51yw18868693"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.7"; sha256 = "0jnx7mmwy738qgz644msb3kcpnfsgga50da9qypr876fssn6a2dn"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.7"; sha256 = "180vdwwh5wjqx0znm7y5g8npkvmpc20wjq2iir09mz7dcf3i8z2h"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.7"; sha256 = "1j5qg8nwa4ndha5ih7a9izkcx9zq02zmg2cxy5f6hbnas2gq2is1"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.7"; sha256 = "1imgnxg1l4ssa24yjh90as9nsh0fykybraz08hh15dnf74jnvzcn"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.7"; sha256 = "1gd0yrqmfn37fxdsy659bcpisrsa90m41zqjgsbws0r9pacvz6xs"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.7"; sha256 = "0np2a1rbnznpsd4hi18cvfz9zv5kjszp1zmdjkqmz9651k21z3cv"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.7"; sha256 = "13a44dbsiinlyw82sspq6z3wc7c5phn915jc957s2ajngap42gfr"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.7"; sha256 = "0wa70wrvmi2hs1yv4qrkkyxvvia2dy7zjppni8syrb8chqm6zcx0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.7"; sha256 = "1qyv6phm1pkdzydmmdnlzdi740nkjm4ra7rqd0zpz0ynxi6slxay"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.7"; sha256 = "1l9mcrlfm20hfxv1g4i511xw0laaqmzrkjki0d9nvlrvxhpazjpl"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.7"; sha256 = "0ai4ywzq7fspb11dii90x63cl38fnqjkbdz5llb3wqqfv8i5sdd3"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.7"; sha256 = "03kbgm47xw0np6nnk25ldbqmx5j4qjnagjmmvc32r5j0c589kk4p"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.7"; sha256 = "1jpxc18mrdnfd4j1d6ixa9v1159akz8pj55gzk3qz6wpbwbwspm0"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.7"; sha256 = "1v76cp5hs8mpn7lwzq3p201vk240a811zwndf3yg0921yd5dfvyn"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.7"; sha256 = "1r8krg1v2w56xymlf08i6qfk79nij60zzmm56kcqkznjm6cpqbmv"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.7"; sha256 = "1xcl9b9xkwm45cpmsz4ygpwf318jwc3b9bds48cr21mkals56gvs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.7"; sha256 = "079bk6xbgqz1q483k76jqgaj7fpz3jsnyw0fwg18bgqslm666gl8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.7"; sha256 = "0xbgqgwryqrs3a6asfxwzgwk8m64rww55xizx5fm4sl6mcqz6xjn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.7"; sha256 = "16300jwjfj5m9zgyhx049l404b0fw91pip10w7r7brzskq012lzp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.7"; sha256 = "02mvsjjffwchj7w3bl866phkgs5zkwjfwkxv7rl13jwg461a7d4j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.7"; sha256 = "1qa2bs0dss11ib2kxpdgjga2fc13fsn7mbm88grsmlgpn1xq4hmw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.7"; sha256 = "0b8vz0kaglhp79c2547n8w9lj66f83zybq02vkza2kr0yh5v1qn4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.7"; sha256 = "1rhxjb0kr4fk8qvbwdzdznkq8ryqk3f5nnni5xzlw3dhn18r8bg8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.7"; sha256 = "1cn4f5bh7n7wwgj6vkqhnkihh622iq1vbcjxx8d1gimwmwdr2gln"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.7"; sha256 = "072f0nvh0q2mzz3a8k6kh2w0pq5ppm36b1r8g1lhnpnq0ch42dxi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.7"; sha256 = "17wsi54lvydsr42fs7vjccfy6alc60qb1gpnpwg2yzxgv7l2kblh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.7"; sha256 = "02dr4rnrphyzf5alxyiypfhcf24mhy47yn6asnrxfzjxbgzw9vwh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.7"; sha256 = "1pnvz275ckspanc53k8y4kl7qq0nv478clpcxgjbwgv8ggdzqaf6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.7"; sha256 = "1wywnzybjjghn1sdp010dm5dxc9pbspc0lk2c5dk3ixkf69qcsdg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.7"; sha256 = "15q7i73iwnrw3lmfdiabzsargliy7slrijfncy5dv5j0gacwc3z3"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.7"; sha256 = "12qcq3v5cazahm2vy15yvqwmcwa51l2kv70s4zrpk2cifhqpavsk"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.7"; sha256 = "0i7n6d61kc3r4307fxhgyhx2vk2r3yg50j9z1p6krs0nxa7g67f6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.7"; sha256 = "04w3s9v4wxrysa341n69znmqs7gg7ywzni57ysxkh6i01wi1m83n"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.7"; sha256 = "18qns9568xwpr15864mcz0wvsd2gkfgzys3h47szr15cjnrmd209"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.7"; sha256 = "13zw6kgdni8ixcxd7my91mdgkdci9v743bpl3mhgrf8gs316zwz9"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.7"; sha256 = "1x0bd7b6yjm38k64df1l7jwl6fn1n0wgba8pxrb1dw97ijcq6pds"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.7"; sha256 = "0cri9fbrsdah7xr4x9qy73n3pj0zmrwc8xc8a8zj299xmjx41srp"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.7"; sha256 = "0dp8j9dc46v46zza9i4i7ywn3cz43fxyhzhiwls6nzc9z0y3xnjb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.7"; sha256 = "1difx4s84s5s8yq66qc8j7ldzchlj8han4syalnfw4mx35syh3r9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.7"; sha256 = "0dkzcanshijp0x836rdj1bydpzxnvwk13jjils9kl0503yk91ln5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.7"; sha256 = "1a4m6dkl7plsxv3m0b64nkmdbh6jif0qxi2861qpdh8wd904nl51"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.7"; sha256 = "0yb7rycgcvd4rg3rqb56pqfyqrixyz8a0j0iacsb5773k1l2c0lr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.7"; sha256 = "0myh03v7czlc1sm3b9gqn4m5qm94vc6qar483678mi3d6fmb0c7x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.7"; sha256 = "1fq4zy6af3pidsjqi663kb6354cpayyrd30hd1zhfm14kz00cgg5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.7"; sha256 = "1x15r1d66s0qn9s9lj5dad4g6qfx0pmphix7nbw88pb2fp2az0ia"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.7"; sha256 = "0dd67jl5hd0mq1vl51f4nn4s6pwhssldj7gn4y2adb2vlpwd5zq7"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.7"; sha256 = "12ayxmqacv8n38vvp79g23wd443zs2ws8k64p08pr8aymcpx22k6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.7"; sha256 = "1bm9rzs5lr6a8qxavy7drjv5z1vwxyh1fcv9cag2d7g91q9ljhxn"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.7"; sha256 = "1hb8dd0hwmng2j6bk1s76lkl9ap1rw687cjccv5g79h30fadcf2s"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.7"; sha256 = "0zl5wlkh432gbd87dbxy7hm2xp7snc9z96n63i8h9vz8nvxfgiw9"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.7"; sha256 = "161x2cc39g07lkv3fy84bn5r2mcf3zajidsv4c3f4g68bp30g48v"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.7"; sha256 = "0fd2f787dg7jnvklxylb1ljpbsln55w01r4r77xralpaxh71aiwk"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.7"; sha256 = "1fl7x5kh3rj11yqbpwwc167ymvw0l2cpswh9wmsg2ivng003wk80"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.8"; sha256 = "0c6m32c18j2xznkszg85kdik3pc5r07yfxiki4l5i0a4y54ypbjp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.8"; sha256 = "19r888q35cac4rn6mr4fis0y4k3yvsbm117l7a10qgfdglgirxfq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.8"; sha256 = "1nimaxj9f582y0v5ifxcjyhjrv71yl2hqhszpvhgl4js9bj962gk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.8"; sha256 = "1val93qfr2hdas1fsz9f2kifyn6g60np0c4k2kw8a5wl8fmw0kfd"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.8"; sha256 = "1w4x1spgb4x57qn3d1m9a3gyqnwwfk952kaxg8bqrki20a7qkhl4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.8"; sha256 = "115yh52g223b45mrlfhspm5jlziq4kcaks20dgk596v0k98mzk64"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.8"; sha256 = "0h4yirhfjsim0qpfh6sh46s6abqilcr2gby4c8aq9zicm8mrilpx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.8"; sha256 = "1mgj49vppwmxmsn4pvlfl72y4cljfc6cyl8difbih5ccg6z1a768"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.8"; sha256 = "1vgl2g9ffppgzac05zacrik9n65y2zr0p09b1ddb31nwkvmw6d9j"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.8"; sha256 = "07x477l3l96qp8s5l428a9yl709pp2k0j6ims7ih2wlvcv00yrxf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.8"; sha256 = "02ha9xmgiqqsa20h349gp1gr0i283mpnw9z5639gmg42f5n9bnjh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.8"; sha256 = "0ksdh5vcp7w7cc28cdbw86yxxac2vggl91r84jfc61z0xpry73p7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.8"; sha256 = "0wyq9jhqzy5rzczlbi4fr48z5w3s4v63bjzjq2g7m4j04xp4747a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.8"; sha256 = "1399yd0cjj87i3ihw59dflc3rwlkmlg4562i0fjidj25aidppdm6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.8"; sha256 = "1a6g0rpc78z0fjs4qmsgk5kjxxik9x0ca6czrl26179y8kxqba3z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.8"; sha256 = "1i2mw89q809h4swnhmv33p3wh2sskbkgjkilbvrk01ljbrhi0y30"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.8"; sha256 = "0aw3d5d8hfhk2hsqq776syq6lsqhxcd811zjdyzak7gswbbjgmw5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.8"; sha256 = "0f7mi7109pjlmwhky3y813zs3c9579s2xgyfc500y7vs9d0780bs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.8"; sha256 = "1mvh93rq4syp147dz5175dbrbw58lf42hk9mbjinmr6aa1ahxr28"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.8"; sha256 = "1br7fc155k7blg0xnazgimh9szz49lri4gn8jcwqsjzfclanac6k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.8"; sha256 = "02qac81akznxacy4v89bmkcxjr9vfa98c40cmagynb6vd60rnzca"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.8"; sha256 = "1jlprsgya94lv6agy0s4llcffi3cpv59i2m6aha1m2nh6kd1dawh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.8"; sha256 = "1iygmgc5xrkclkqb0wd7s5ga2as2vy8pnd7j8jdwjnv81m2p778d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.8"; sha256 = "064n292hxr4w3246vfj45v8k8pxghj4cjh02k7rvpjn6g3nnpwhq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.8"; sha256 = "0l209jnikhqc1br5gjwv98pzp7h4amsv7341skzixy7lwamay79f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.8"; sha256 = "1z3n5xw2a8zjvy4w7y6yr1yaig4wdda231yhinkbmhpc80s904sn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.8"; sha256 = "17rh26xs78pmcf9yc3zi3rxx9k3s5fg35xgqq80fvvp88jg9hr5n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.8"; sha256 = "0hp2dsjxg2q3wqnrs8mhfna7pyn9yq55n4rqdydyz2v4d6nsp00l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.8"; sha256 = "0mfgdx7w9l98a1q31mpzcz11p2bxcz5b6ijhrlg3sjkj0wkga7x7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.8"; sha256 = "02xqwf6dry4hrp7agd9av5jmwb7i66bdkzhdq8ngy73zkk5ap1q1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.8"; sha256 = "1whmyzs05751yx5708grmgmiv5i6nbfajhfpryx0h5ipb21csp6k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.8"; sha256 = "1rxy9hah8r2l7bkikj6lp36frfvmvz93v96d12k9s7rgxaqzw3p9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.8"; sha256 = "0rl96iw2lp62sxzc2f0y58gj57rwwzq4l1sb2pn8wsrxhjmj0w26"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0jq12zpbwgnwz9hhr269y74m6c8hli311h9km5jwr75kzwbf9rk8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0xplwfghd8mnpmcmvzdrhx78149r3wvsadp3g3k6fvqd2jh6ncky"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0l5viqkvm2w5p13dcvpnxpb7g5fsn46p8ay59vcpjmr0k9w8bsis"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0hgb6c235fbapz8h5w3x0jjqgg9ahj4xd3829bm8ziyrv3kq2nrg"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "07z788q2hn2iwb3x1lxblj243ncwif1955hzv4qga5h5a5j97yfr"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0g8g5irxlp5wnrrc7gffac33j6azlig8i0fn0088xhm1lliyaj3z"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "1vhgfz5iv0vhn2g970x3zwaa03z7dq63cfv6v6cbrp5l7c640zzd"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "08fs6v4sjws0sq3jpy9p12gxg720fq6lvkggj18b4xqz07fmz055"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0br6psv8srk3vxy3swj84in7b1qd030j8y6i0lhd0pjvxmjhqk1y"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "11gfspry6l8hnn5mll51p57bdncy72sswcf2544ldig43znawzq4"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0y25h674gvf07x1yvvh7x381b7qx5nlgk3xxyj4awqn6hr0m6rny"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "01rzsnaq9jd2wajmyp28bbxhx318hrkixd8h3vvy3ymanhd5sp74"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "1lfww3pgg8flfgpqi7vjl736k68b12v5iakc67a9nm4kml4z2gsj"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "02p3nyyz7mm65vmlafyxrpm1pw4wzryj9z5a4zhvzdlwlddncvya"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "099issp7vpm00ild23571g559mszw11d0za6z5g36n7blywhlj2s"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0zpj8y89qsf2w31api8pj2rjkq5qscvwpr7mwgn2vbh4fl26f63x"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0rwn6lhx5q7ya451dfnlxla9z83lcz87ccxx509qkkdmz7lx3ia2"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0n7xwdvacd4dbss1czpwl2z34jyagpkvf1618g59fif0yg29pwv8"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "18a2iycwmailkcq0ygac1cpysx2kvp2pdp5z02r6s9jx3mgjpb37"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0gky5dr5b8nzh5f60ik3rr6s2wnbwck4rkalyhgbcbyxkkvcffa7"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0czvd8s0rw7iql4ggwair5wgcvar2sa9rp7m8xcg1bz88dlpswlg"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "16rfmdwqkbmgq286viqmffqd0sm59iw68gf62rw61ab9gdahdfg4"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "1nqvcpl5jrqw6gh32palk8dn02asp2q77ss91v1v14pdxsx6sc1c"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0bj4wxhdcdlxs5cvdkn6fzqwrry7a9kx3cz7ad744qjhhm01lspl"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "096svf8b1v5ki24072y9bx0mjnr3zmpbivhnpxqbnji571nw0cax"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "1179n7jg0dz7iik5jdpsfrr2jmzpqd95rw19m1vyqb68qbffy54z"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "00wmjvxdasv24jwhzw6dmyv6rdgd0yz6f1h90yz0yfdxrdbzwipi"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "1y8lb60vgiiw7y10qshhm8y7k21q5jz09f8f1sks4p7v987h5l35"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0nnbvn0rxrcq2lisb0a7mn01lb9xk2ixyj9p1xbfrlzgyarl2xvx"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "1dnn81sa5wrvvdcnnlzg1gf3b5137va8vxfr95lcxd55wh77l71h"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0lgzbv71lbh8bj0v260nk4qzkiyvn1bm2kz8as0nq6vlnzvvmnxc"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "1yxhvx23mn53s37pyz6q370gp056z2hmqd6n0ns8ayxcrr4yx93r"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0cf9mx8yk9v2s5hrv1a603sxq0qvd0mxwwi63l9r1g8x7chc432r"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "09ymhv03h8ws8idmdj1yff0j1r3hxzbdz7n0n9gpqqdyfj2zs762"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "00byqz0f7dz1ncywzbjiqw6vsia7ia05927xm5h6ykv2a9l635j5"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0sy9kn6n7ccx619fyhyafwgh66rmnyv1s2gz5668hywlcwnbbrhx"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "05xim0a1ppzbf7ny6vdfjlrcnh11lqcwydlrdf2l12224kvcmdgm"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0k46q68yp88hj0gkm6q1m4y08vpl49w2pdis160q5jx11fh2bvwf"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0jcx69rq6h6jwlz735qr0pynyadz2nshc6s1xpis6hwc7ysgv0ig"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "1prxn6b80nawq8ixqbmdhj6fzsh4mjhhvrkam6r60an38q8pjmqn"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "1xp91d7pkgcrpwalrfl9z9qa72vxg01kbc1k01d7n88ndpair032"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "1hl7q1mrp85khz192kqs7lgnhqbl6wv34m2pyj97plm3sqvyfchq"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "1sjrs0sc8f9hdqvg94njn3012bcmz87f90ab5dgalhj8m5in394j"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "1k5xw1imhsrvj0b8s0zbg1gzbr0r3ja0cql81pq73nc2yk4x5559"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.8"; sha256 = "0sdm16nvckm4xakarnrfb5l075vzbv8vfxz4lk8vy828iqh9sqmd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.8"; sha256 = "16bs4w9gj09zxjmq94l3526mk277360zj6mwapq5mvpn0q9ll275"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.8"; sha256 = "1d3idyw795rpmaklhdn181v3pq9b3m1994jakgmvh2b9hpb4s6x6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.8"; sha256 = "0qx8czk5x0xxx3f6piz4f6nc43j9hkf0i1yidk5pgshk0l5cjgb3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.8"; sha256 = "0mbj34898p2ci2fcdk90gky9abf1kl8jydqgi6czj87hmk4kfdpf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.8"; sha256 = "00l3nvqxpjhhnmdp5yzk2mcm83ibbhcm1dlfxfzbc635f4zqmqrs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.8"; sha256 = "1xcl7sfx3g1zgvj2kwaffh0gqj3cfh641lma25d8mprqw3kms1l0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.8"; sha256 = "1s9khkkmziz63g48afhqh2dsqx6yvwcca0ai83diz4k8zg0wlwya"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.8"; sha256 = "0jkxmi3lc5qpgk748mfj9vk5x58j8q60zcrv636xpj06qsm70z6x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.8"; sha256 = "1dflhc1dfral612bdqxhm8dznyphvnl56ywjjak6s9nsjc4q8h0s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.8"; sha256 = "1bp114hzsimjhdwyahph8xlp5aji2in6an6da39i6rwg4j52kgbb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.8"; sha256 = "0sxcmaqrdlvfjwcs7gipyf28r4m93q5059nxjp12pblq4cnsyjpx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.8"; sha256 = "173ld6nc66l1lc7g2j9xkvp3nf8d2w15g05rx8waiksl4k2q8rai"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.8"; sha256 = "1rz3m8x5pnn83z503s4smx775bpap1w43c3a7xvqgnhnqi08pqrn"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0x5rh5y073d2fx3cwbmw1i4rzvyxg8dlgzlny4vy87ycf2qjf2yp"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "0cg54bp7zx4kfiglbdz4kn767vlii55gzgg8dx0m0zpgcbwnnnsb"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "17jrrw8nkvayjfp4yl0ay8sxg7p46vl9hyx8xbn036clbm1g3ykw"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "0fn9jb7kr6y7vhcfzmykgf21kpn6xwfxzc487ynx4rmqvhd24ck1"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.8"; sha256 = "0hb9ia3s9llppjnqbzb8cy1zvdbxx1vxcrrj77bmphhmd7rm0582"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.8"; sha256 = "1zynb95vlr46zra82dshnmizgq46hg2n1gh3rfwdkdfzznqghbpz"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.8"; sha256 = "0s4d61ibgs4hvjipp2kqrqafarh561vr5ynyyfrg3vmq2dxl4dgb"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.8"; sha256 = "183yrnyypy3smrvhl1p7srivirbv82f74qizf3sm3259x6cy7h3p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.8"; sha256 = "1m028vv06hx4rnjccm0fya0s888dr2n95qy50alajg2yfsjx5z5d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.8"; sha256 = "0x914n20l9ymszd9zkxfjgkcql8yxpkkywyiqnr47fapnckg9k1s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.8"; sha256 = "065v85x5n2ml7b0zq5aq0n7w941i226alvywxmlr3npskd4dxf1x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.8"; sha256 = "04yaar4msmng1kv5irfhk33093x9wy9j886ba6a2b875fv8bccvx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.8"; sha256 = "1shcpziwrjs8s6w6c8k35ksaynqj50w50mxbaz5x0abx8zm0171w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.8"; sha256 = "1855g78y2xr55l8wg6g3268bs99v4yky3ablyskbzh9fcd69f12n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.8"; sha256 = "1z4z1vwfx8lim0k754wn4l6smx2wbfn3izmla32zbp7azf7wz4mf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.8"; sha256 = "0z636krp140rz3gvd7n2aqvsr9wlg3r05fl1nal81aaplazpjllc"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "108ifhifj7dv0650xciylgnm3y1405mrkfvk21b0bbjva6ng59sx"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "07qljs56khdm4jlh3ack12xx7jp0dxmihdihcnv653bllys1ay9f"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "1lghi90zb4xswp3v03vbb7hbjixr2jq3s1cxhl35qrg5qm1rib5g"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "1yva9fnnrs1cn4n3y0k0ji24nnysg7x0grj54qknf3anv3nsl8z9"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "0ng2ck1na9v25an5b3jwk1ahr5n5habp0sg2fzqdyjms1y1bx7c0"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "03iw2kk1w2bk2jgi76bfw5xq8pjv6fzxac3ll5b3vfxc2b0wn8p6"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.8"; sha256 = "1c9289fprnb4xhf3ayj2rnhmc5z7narrxxfrjfsr8skprkdcidfs"; }) ]; }; } diff --git a/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch b/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch index 9cb3ca2bf9f6..6a57e423bd72 100644 --- a/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch +++ b/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch @@ -1,4 +1,4 @@ -From 67f54fde2b1683aae3800f7a86a4e507c1125be8 Mon Sep 17 00:00:00 2001 +From 4bbbb640934aa653bcfec0335798b77a8935b815 Mon Sep 17 00:00:00 2001 From: Yureka <yuka@yuka.dev> Date: Sat, 7 Aug 2021 09:16:46 +0200 Subject: [PATCH] emulate clang 'sysroot + /include' logic @@ -20,23 +20,23 @@ but it doesn't appear to work 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/emcc.py b/emcc.py -index 999314afc..0e23c066c 100755 +index ba8d1b556..7d89644c5 100755 --- a/emcc.py +++ b/emcc.py -@@ -759,7 +759,12 @@ def emsdk_ldflags(user_args): +@@ -883,7 +883,12 @@ def parse_s_args(args): def emsdk_cflags(user_args): -- cflags = ['--sysroot=' + shared.Cache.get_sysroot(absolute=True)] +- cflags = ['--sysroot=' + cache.get_sysroot(absolute=True)] + cflags = [ -+ '--sysroot=' + shared.Cache.get_sysroot(absolute=True), ++ '--sysroot=' + cache.get_sysroot(absolute=True), + '-resource-dir=@resourceDir@', -+ '-idirafter' + shared.Cache.get_sysroot(absolute=True) + os.path.join('/include'), ++ '-idirafter' + cache.get_sysroot(absolute=True) + os.path.join('/include'), + '-iwithsysroot' + os.path.join('/include','c++','v1') + ] def array_contains_any_of(hay, needles): for n in needles: -- -2.32.0 +2.40.0 diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 02b1f6f03b2a..8afa06eac6fc 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler , jre, binaryen , llvmPackages -, symlinkJoin, makeWrapper, substituteAll, fetchpatch +, symlinkJoin, makeWrapper, substituteAll , buildNpmPackage , emscripten }: stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.24"; + version = "3.1.41"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "emscripten-node-modules-${version}"; inherit pname version src; - npmDepsHash = "sha256-ejuHR2BpAUStWjuvQuGE6ko4byF4GBl6FJBshxlknQk="; + npmDepsHash = "sha256-QlKm6UvPUa7+VJ9ZvXdxYZzK+U96Ju/oAHPhZ/hyv/I="; dontBuild = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "sha256-1jW6ThxK6dThOO90l4Mc5yehVF3tI4HWipBWZAOztrk="; + sha256 = "sha256-yQZrAQfNZZd65a14AFObrLrBzePBDnK0J87oTEB1Dcw="; rev = version; }; @@ -42,17 +42,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./0001-emulate-clang-sysroot-include-logic.patch; - resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/"; - }) - # https://github.com/emscripten-core/emscripten/pull/18219 - (fetchpatch { - url = "https://github.com/emscripten-core/emscripten/commit/afbc14950f021513c59cbeaced8807ef8253530a.patch"; - sha256 = "sha256-+gJNTQJng9rWcGN3GAcMBB0YopKPnRp/r8CN9RSTClU="; - }) - # https://github.com/emscripten-core/emscripten/pull/18220 - (fetchpatch { - url = "https://github.com/emscripten-core/emscripten/commit/852982318f9fb692ba1dd1173f62e1eb21ae61ca.patch"; - sha256 = "sha256-hmIOtpRx3PD3sDAahUcreSydydqcdSqArYvyLGgUgd8="; + resourceDir = "${llvmEnv}/lib/clang/16/"; }) ]; @@ -68,9 +58,6 @@ stdenv.mkDerivation rec { sed -i '/^def/!s/root_is_writable()/True/' tools/config.py sed -i "/^def check_sanity/a\\ return" tools/shared.py - # required for wasm2c - ln -s ${nodeModules} node_modules - echo "EMSCRIPTEN_ROOT = '$out/share/emscripten'" > .emscripten echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten @@ -108,17 +95,17 @@ stdenv.mkDerivation rec { # precompile libc (etc.) in all variants: pushd $TMPDIR - echo 'int __main_argc_argv() { return 42; }' >test.c + echo 'int __main_argc_argv( int a, int b ) { return 42; }' >test.c for LTO in -flto ""; do - # wasm2c doesn't work with PIC - $out/bin/emcc -s WASM2C -s STANDALONE_WASM $LTO test.c - for BIND in "" "--bind"; do - for MT in "" "-s USE_PTHREADS"; do - for RELOCATABLE in "" "-s RELOCATABLE"; do - $out/bin/emcc $RELOCATABLE $BIND $MT $LTO test.c - done - done + # starting with emscripten 3.1.32+, + # if pthreads and relocatable are both used, + # _emscripten_thread_exit_joinable must be exported + # (see https://github.com/emscripten-core/emscripten/pull/18376) + # TODO: get library cache to build with both enabled and function exported + $out/bin/emcc $LTO $BIND test.c + $out/bin/emcc $LTO $BIND -s RELOCATABLE test.c + $out/bin/emcc $LTO $BIND -s USE_PTHREADS test.c done done popd diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index df1cbdf18983..eef6ebc68331 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -55,7 +55,6 @@ let majorVersion = "10"; # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 ../fix-bug-80431.patch ../11/fix-struct-redefinition-on-glibc-2.36.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch @@ -238,6 +237,9 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 416908126975..f981d1ecbe79 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -58,7 +58,6 @@ let majorVersion = "11"; patches = [ # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 ../fix-bug-80431.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch @@ -253,6 +252,9 @@ lib.pipe (stdenv.mkDerivation ({ + lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap"; in lib.optional (target != "") target; + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index f0886f862c97..b816c554fa39 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -68,7 +68,6 @@ let majorVersion = "12"; ../gnat-cflags-11.patch ../gcc-12-gfortran-driving.patch ../ppc-musl.patch - ../install-info-files-serially.patch # backport ICE fix on ccache code ./lambda-ICE-PR109241.patch @@ -300,6 +299,9 @@ lib.pipe (stdenv.mkDerivation ({ lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap"; in lib.optional (target != "") target; + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget diff --git a/pkgs/development/compilers/gcc/13/default.nix b/pkgs/development/compilers/gcc/13/default.nix index 4273195e7182..73b6fb968636 100644 --- a/pkgs/development/compilers/gcc/13/default.nix +++ b/pkgs/development/compilers/gcc/13/default.nix @@ -298,6 +298,9 @@ lib.pipe (stdenv.mkDerivation ({ stripDebugListTarget preFixup; + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 90489fd3fb1c..2f03b838e76e 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -74,7 +74,6 @@ let majorVersion = "4"; ../struct-ucontext-4.8.patch ../sigsegv-not-declared.patch ../res_state-not-declared.patch - ../install-info-files-serially.patch # gcc-11 compatibility (fetchpatch { name = "gcc4-char-reload.patch"; @@ -257,6 +256,9 @@ stdenv.mkDerivation ({ stripDebugListTarget preFixup; + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index ec0f4cde781d..768988e210b7 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -63,7 +63,6 @@ let majorVersion = "4"; [ ../9/fix-struct-redefinition-on-glibc-2.36.patch ../use-source-date-epoch.patch ../parallel-bconfig.patch ./parallel-strsignal.patch ./libsanitizer.patch - ../install-info-files-serially.patch (fetchpatch { name = "avoid-ustat-glibc-2.28.patch"; url = "https://gitweb.gentoo.org/proj/gcc-patches.git/plain/4.9.4/gentoo/100_all_avoid-ustat-glibc-2.28.patch?id=55fcb515620a8f7d3bb77eba938aa0fcf0d67c96"; @@ -273,6 +272,9 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 965a987aab35..c5799060a1e2 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -68,7 +68,6 @@ let majorVersion = "6"; # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 ../fix-bug-80431.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langAda ../gnat-cflags.patch @@ -291,6 +290,9 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 6ec689ab2524..3e8e52940e75 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -61,7 +61,6 @@ let majorVersion = "7"; ../fix-bug-80431.patch ../9/fix-struct-redefinition-on-glibc-2.36.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optionals targetPlatform.isNetBSD [ @@ -244,6 +243,9 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 1baed9137856..25c5475ee802 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -50,7 +50,6 @@ let majorVersion = "8"; # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 ../fix-bug-80431.patch ../9/fix-struct-redefinition-on-glibc-2.36.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch @@ -221,6 +220,9 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index aceb912d7a69..53c98a0b7a88 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -59,7 +59,6 @@ let majorVersion = "9"; ./fix-struct-redefinition-on-glibc-2.36.patch # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 ../fix-bug-80431.patch - ../install-info-files-serially.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch @@ -235,6 +234,9 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + # https://gcc.gnu.org/PR109898 + enableParallelInstalling = false; + inherit (callFile ../common/strip-attributes.nix { }) stripDebugList stripDebugListTarget diff --git a/pkgs/development/compilers/gcc/install-info-files-serially.patch b/pkgs/development/compilers/gcc/install-info-files-serially.patch deleted file mode 100644 index bec7c0a158d0..000000000000 --- a/pkgs/development/compilers/gcc/install-info-files-serially.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur gcc-12.2.0/gcc/Makefile.in gcc-12.2.0-new/gcc/Makefile.in ---- gcc-12.2.0/gcc/Makefile.in 2022-08-19 10:09:52.280658631 +0200 -+++ gcc-12.2.0-new/gcc/Makefile.in 2023-05-04 14:35:44.401420184 +0200 -@@ -3781,6 +3781,11 @@ - fi; \ - fi - -+# We don't care about the order in which the info files are built, but -+# install-info doesn't support multiple parallel invocations writing to -+# the same `dir-file`, so we have to disable parallelism for that reason: -+.NOTPARALLEL: install-info -+ - # Install the info files. - # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir - # to do the install. diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index c3ed81a839af..a53e78103ad5 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -10,15 +10,24 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "12.1.0"; + version = "12.2.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-U45/7G02o82EP4zh7i2Go0VCnsO1B7vxDwIokjyo5Rk="; + hash = "sha256-2i6DZA42b0s1ul6VDhjPi9lpSYvsRD8r9yiRoRfVoW0="; }; + patches = [ + # Fix build on Darwin + # FIXME: remove for next release + (fetchpatch { + url = "https://github.com/KhronosGroup/glslang/commit/6a7ec4be7b8a22ab16cea0f294b5973dbcdd637a.diff"; + hash = "sha256-O1N62X6LZNRNHHz90TLJDbt6pDr28EI6IKMbMXcKBj8="; + }) + ]; + # These get set at all-packages, keep onto them for child drvs passthru = { spirv-tools = spirv-tools; @@ -27,19 +36,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 bison jq ]; - patches = [ - # Related PR: https://github.com/KhronosGroup/glslang/pull/3067 - ./use-CMAKE_INSTALL_FULL_LIBDIR-in-compat-cmake-files.patch - # Upstream tries to detect the Darwin linker by checking for AppleClang, but it’s just Clang in nixpkgs. - # Revert the commit to allow the build to work on Darwin with the nixpkg Darwin Clang toolchain. - (fetchpatch { - name = "Fix-Darwin-linker-error.patch"; - url = "https://github.com/KhronosGroup/glslang/commit/586baa35a47b3aa6ad3fa829a27f0f4206400668.patch"; - hash = "sha256-paAl4E8GzogcxDEzn/XuhNH6XObp+i7WfArqAiuH4Mk="; - revert = true; - }) - ]; - postPatch = '' cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers diff --git a/pkgs/development/compilers/glslang/use-CMAKE_INSTALL_FULL_LIBDIR-in-compat-cmake-files.patch b/pkgs/development/compilers/glslang/use-CMAKE_INSTALL_FULL_LIBDIR-in-compat-cmake-files.patch deleted file mode 100644 index 43ab21963527..000000000000 --- a/pkgs/development/compilers/glslang/use-CMAKE_INSTALL_FULL_LIBDIR-in-compat-cmake-files.patch +++ /dev/null @@ -1,139 +0,0 @@ -commit 0bcfd795469c6067d1e891198d9177afa5cce1c9 -Author: Chuang Zhu <git@chuang.cz> -Date: Sat Nov 19 12:03:20 2022 +0800 - - Use CMAKE_INSTALL_FULL_LIBDIR in compat cmake files - - According to - https://cmake.org/cmake/help/v3.25/module/GNUInstallDirs.html, - CMAKE_INSTALL_LIBDIR can be an absolute path. For instance, Nixpkgs - [defined it to an absolute path in /nix/store](https://github.com/NixOS/nixpkgs/blob/3d17b4c305cefef284109fa9d426b00f3e5072c6/pkgs/development/tools/build-managers/cmake/setup-hook.sh#L101). - The output in this case is: - - # result-glslang/lib/cmake/glslangTargets.cmake:5 - include("${CMAKE_CURRENT_LIST_DIR}/../..//nix/store/3mif2zibig0cilk5dbz334278n0vlq9s-glslang-1.3.231.0/lib/glslang/glslang-targets.cmake") - - Signed-off-by: Chuang Zhu <git@chuang.cz> - -diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt -index 33f16b0d..71a5675d 100644 ---- a/OGLCompilersDLL/CMakeLists.txt -+++ b/OGLCompilersDLL/CMakeLists.txt -@@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) - message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::OGLCompiler) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(OGLCompiler ALIAS glslang::OGLCompiler) -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index 35b74621..b31bdd63 100644 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -125,7 +125,7 @@ if(ENABLE_GLSLANG_INSTALL) - message(WARNING \"Using `SPVRemapperTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::SPVRemapper) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(SPVRemapper ALIAS glslang::SPVRemapper) -@@ -137,7 +137,7 @@ if(ENABLE_GLSLANG_INSTALL) - message(WARNING \"Using `SPIRVTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::SPIRV) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(SPIRV ALIAS glslang::SPIRV) -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index b1ba18f6..8ddef104 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -101,7 +101,7 @@ if(ENABLE_GLSLANG_INSTALL) - message(WARNING \"Using `glslangValidatorTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::glslangValidator) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(glslangValidator ALIAS glslang::glslangValidator) -@@ -116,7 +116,7 @@ if(ENABLE_GLSLANG_INSTALL) - message(WARNING \"Using `spirv-remapTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::spirv-remap) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(spirv-remap ALIAS glslang::spirv-remap) -diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index 7d8790c4..4d8a537b 100644 ---- a/glslang/CMakeLists.txt -+++ b/glslang/CMakeLists.txt -@@ -234,7 +234,7 @@ if(ENABLE_GLSLANG_INSTALL) - message(WARNING \"Using `glslangTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::glslang) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - if(${BUILD_SHARED_LIBS}) -diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt -index 7ed71fbf..acb74275 100644 ---- a/glslang/OSDependent/Unix/CMakeLists.txt -+++ b/glslang/OSDependent/Unix/CMakeLists.txt -@@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) - message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::OSDependent) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(OSDependent ALIAS glslang::OSDependent) -diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt -index 67976da8..882133ab 100644 ---- a/glslang/OSDependent/Windows/CMakeLists.txt -+++ b/glslang/OSDependent/Windows/CMakeLists.txt -@@ -55,7 +55,7 @@ if(ENABLE_GLSLANG_INSTALL) - message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::OSDependent) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(OSDependent ALIAS glslang::OSDependent) -diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt -index 203812d8..408a92db 100644 ---- a/gtests/CMakeLists.txt -+++ b/gtests/CMakeLists.txt -@@ -76,7 +76,7 @@ if(BUILD_TESTING) - message(WARNING \"Using `glslangtestsTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::glslangtests) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(glslangtests ALIAS glslang::glslangtests) -diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt -index 4d5f15fd..16c82a67 100644 ---- a/hlsl/CMakeLists.txt -+++ b/hlsl/CMakeLists.txt -@@ -53,7 +53,7 @@ if(ENABLE_GLSLANG_INSTALL) - message(WARNING \"Using `HLSLTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::HLSL) -- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") -+ include(\"${CMAKE_INSTALL_FULL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(HLSL ALIAS glslang::HLSL) diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index f5328e0b9d98..377f66ca97bc 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -29,8 +29,8 @@ openjdk17.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk-jcef"; - javaVersion = "17.0.6"; - build = "829.9"; + javaVersion = "17.0.7"; + build = "829.16"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime @@ -43,7 +43,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = "sha256-E0pk2dz+iLKuQqMvczWNwy9ifLO8YGKXlKt3MQgiRXo="; + hash = "sha256-b3wW52knkYUeG8h4naTQLGUedhAMiPnUsn3zFAiJCwM="; }; BOOT_JDK = openjdk17-bootstrap.home; diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 0f3334dd4001..56635de5007a 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -20,7 +20,7 @@ ocamlPackages.buildDunePackage rec { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-NGjys54VWzgy1SE93/zt8xooJhnZTst3jsjU36yp7Uk="; + sha256 = "sha256-XHfpYX0lXzT15fuFQcmRBhhaKI9Y4bYOy6kXR320BV0="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index ec494f4afce5..6f8ef0b57512 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -125,6 +125,14 @@ in stdenv.mkDerivation (rec { relative = "llvm"; hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; }) + + # Backport gcc-13 fixes with missing includes. + (fetchpatch { + name = "signals-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; + hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index beab3c885ab1..a5078ef3b76d 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -123,6 +123,20 @@ in stdenv.mkDerivation (rec { relative = "llvm"; hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; }) + + # Backport gcc-13 fixes with missing includes. + (fetchpatch { + name = "signals-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; + hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; + stripLen = 1; + }) + (fetchpatch { + name = "base64-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; + hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index 5edc5c136d57..3c724e07bd16 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -107,6 +107,20 @@ in stdenv.mkDerivation (rec { relative = "llvm"; hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; }) + + # Backport gcc-13 fixes with missing includes. + (fetchpatch { + name = "signals-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; + hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; + stripLen = 1; + }) + (fetchpatch { + name = "base64-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; + hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 0977f2f2caff..59c3edb9e2db 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -98,6 +98,20 @@ in stdenv.mkDerivation (rec { relative = "llvm"; hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; }) + + # Backport gcc-13 fixes with missing includes. + (fetchpatch { + name = "signals-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch"; + hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; + stripLen = 1; + }) + (fetchpatch { + name = "base64-gcc-13.patch"; + url = "https://github.com/llvm/llvm-project/commit/5e9be93566f39ee6cecd579401e453eccfbe81e5.patch"; + hash = "sha256-PAwrVrvffPd7tphpwCkYiz+67szPRzRB2TXBvKfzQ7U="; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 2a85d900c8a8..1e200b17b0b2 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -25,7 +25,7 @@ # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; # } -, officialRelease ? { version = "16.0.1"; sha256 = "sha256-Vr978ZY0i0NkdE/uuwcTccshfAT61KIN6KNq0TdwBNE="; } +, officialRelease ? { version = "16.0.6"; sha256 = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; } # i.e.: # { # version = /* i.e. "15.0.0" */; diff --git a/pkgs/development/compilers/llvm/16/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/16/llvm/gnu-install-dirs.patch index 0ef317af8cc7..1c2d52d59ef2 100644 --- a/pkgs/development/compilers/llvm/16/llvm/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/16/llvm/gnu-install-dirs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45399dc0537e..5d946e9e6583 100644 +index 7e25e0407db2..72f031a82b75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -942,7 +942,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") +@@ -995,7 +995,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime) install(TARGETS tf_xla_runtime EXPORT LLVMExports @@ -12,10 +12,10 @@ index 45399dc0537e..5d946e9e6583 100644 # Once we add more modules, we should handle this more automatically. if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL) diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 057431208322..56f0dcb258da 100644 +index 93e6d67551de..8d367457af5a 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake -@@ -844,8 +844,8 @@ macro(add_llvm_library name) +@@ -874,8 +874,8 @@ macro(add_llvm_library name) get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) install(TARGETS ${name} ${export_to_llvmexports} @@ -26,7 +26,7 @@ index 057431208322..56f0dcb258da 100644 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) if (NOT LLVM_ENABLE_IDE) -@@ -2007,7 +2007,7 @@ function(llvm_install_library_symlink name dest type) +@@ -2043,7 +2043,7 @@ function(llvm_install_library_symlink name dest type) set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) @@ -35,7 +35,7 @@ index 057431208322..56f0dcb258da 100644 if(WIN32 AND "${type}" STREQUAL "SHARED") set(output_dir "${CMAKE_INSTALL_BINDIR}") endif() -@@ -2271,15 +2271,15 @@ function(llvm_setup_rpath name) +@@ -2312,16 +2312,37 @@ function(llvm_setup_rpath name) if (APPLE) set(_install_name_dir INSTALL_NAME_DIR "@rpath") @@ -49,7 +49,30 @@ index 057431208322..56f0dcb258da 100644 - set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) elseif(UNIX) -- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) +- set(_build_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}") ++ # Note that we add `extra_libdir` (aka `LLVM_LIBRARY_DIR` in our case) back ++ # to `_install_rpath` here. ++ # ++ # In nixpkgs we do not build and install LLVM alongside rdeps of LLVM (i.e. ++ # clang); instead LLVM is its own package and thus lands at its own nix ++ # store path. This makes it so that the default relative rpath (`../lib/`) ++ # does not point at the LLVM shared objects. ++ # ++ # More discussion here: ++ # - https://github.com/NixOS/nixpkgs/pull/235624#discussion_r1220150329 ++ # - https://reviews.llvm.org/D146918 (16.0.5+) ++ # ++ # Note that we leave `extra_libdir` in `_build_rpath`: without FHS there is ++ # no potential that this will result in us pulling in the "wrong" LLVM. ++ # Adding this to the build rpath means we aren't forced to use ++ # `installCheckPhase` instead of `checkPhase` (i.e. binaries in the build ++ # dir, pre-install, will have the right rpath for LLVM). ++ # ++ # As noted in the differential above, an alternative solution is to have ++ # all rdeps of nixpkgs' LLVM (that use the AddLLVM.cmake machinery) set ++ # `CMAKE_INSTALL_RPATH`. ++ set(_build_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") set_property(TARGET ${name} APPEND_STRING PROPERTY @@ -71,10 +94,10 @@ index 891c9e6d618c..8d963f3b0069 100644 list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index d4b0ab959148..26ed981fd09f 100644 +index d99af79aa38e..21e794224b99 100644 --- a/cmake/modules/CMakeLists.txt +++ b/cmake/modules/CMakeLists.txt -@@ -128,7 +128,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS +@@ -127,7 +127,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS ) list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) @@ -84,7 +107,7 @@ index d4b0ab959148..26ed981fd09f 100644 "${LLVM_CONFIG_LIBRARY_DIR}" # FIXME: Should there be other entries here? diff --git a/docs/CMake.rst b/docs/CMake.rst -index 879b7b231d4c..9c31d14e8950 100644 +index 7926de258ec8..5ae01adc3905 100644 --- a/docs/CMake.rst +++ b/docs/CMake.rst @@ -250,7 +250,7 @@ description is in `LLVM-related variables`_ below. @@ -120,10 +143,10 @@ index 370005cd8d7d..7e790bc52111 100644 #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@" #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 2c6c55f89d38..f6d2068a0827 100644 +index b1d795a0a349..de6cb1514f05 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp -@@ -369,7 +369,11 @@ int main(int argc, char **argv) { +@@ -366,7 +366,11 @@ int main(int argc, char **argv) { sys::fs::make_absolute(ActivePrefix, Path); ActiveBinDir = std::string(Path.str()); } diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index af7bfead3982..e9b8961d5e59 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -11,8 +11,8 @@ let major = "11"; minor = "0"; - update = "18"; - build = "10"; + update = "19"; + build = "7"; # when building a headless jdk, also bootstrap it with a headless jdk openjdk-bootstrap = openjdk11-bootstrap.override { gtkSupport = !headless; }; @@ -25,7 +25,7 @@ let owner = "openjdk"; repo = "jdk${major}u"; rev = "jdk-${version}"; - sha256 = "sha256-QGOpMIrWwOtIcUY/CLbTRDvcVTG2xioZu46v+n+IIQ4="; + sha256 = "sha256-mp8toB1dWcwOtMqNFd7UwRg8pLJckovqD/LD5p9zUoA="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index 9cb0b811b516..9aa952156d29 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -11,8 +11,8 @@ let version = { feature = "17"; - interim = ".0.6"; - build = "10"; + interim = ".0.7"; + build = "7"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -26,7 +26,7 @@ let owner = "openjdk"; repo = "jdk${version.feature}u"; rev = "jdk-${version.feature}${version.interim}+${version.build}"; - sha256 = "sha256-zPpINi++3Ct0PCwlwlfhceh/ploMkclw+MgeI9dULdc="; + sha256 = "sha256-S6QOB4Tbi+K1yjvvywTfvwFI2eX8AiqIx5c3zfxcskc="; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 05b8249d82e8..4cf4bdfb3e50 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -238,9 +238,10 @@ in stdenv.mkDerivation rec { "x86_64-darwin" "i686-darwin" "aarch64-darwin" "i686-freebsd13" "x86_64-freebsd13" "x86_64-solaris" - "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" "mipsel-linux" - "mips64el-linux" "powerpc64-linux" "powerpc64le-linux" - "riscv64-linux" "s390x-linux" "x86_64-linux" + "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" + "loongarch64-linux" "mipsel-linux" "mips64el-linux" + "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" + "s390x-linux" "x86_64-linux" "aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd" "x86_64-netbsd" "i686-openbsd" "x86_64-openbsd" diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/development/compilers/typescript/default.nix new file mode 100644 index 000000000000..15e786543e23 --- /dev/null +++ b/pkgs/development/compilers/typescript/default.nix @@ -0,0 +1,24 @@ +{ lib, buildNpmPackage, fetchFromGitHub }: + +buildNpmPackage rec { + pname = "typescript"; + version = "5.1.3"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "TypeScript"; + rev = "v${version}"; + hash = "sha256-c+ZI58Zk6TXwJoWUAXeIMToT+e7Ozdn7hxiDpPjeQJg="; + }; + + npmDepsHash = "sha256-RHiUhhkzkr2Ra3wc1d13gE2WIZL49w7IEFEAZuBDTDI="; + + meta = with lib; { + description = "A superset of JavaScript that compiles to clean JavaScript output"; + homepage = "https://github.com/microsoft/TypeScript"; + changelog = "https://github.com/microsoft/TypeScript/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + mainProgram = "tsc"; + }; +} diff --git a/pkgs/development/coq-modules/zorns-lemma/default.nix b/pkgs/development/coq-modules/zorns-lemma/default.nix index 19696bd81d4f..8d57bc885c11 100644 --- a/pkgs/development/coq-modules/zorns-lemma/default.nix +++ b/pkgs/development/coq-modules/zorns-lemma/default.nix @@ -36,4 +36,4 @@ maintainers = with maintainers; [ siraben ]; license = licenses.lgpl21Plus; }; -}).overrideAttrs({version, ...}: if lib.versions.isGe "9.0" version then { repo = "topology"; } else {}) +}).overrideAttrs({version, ...}: lib.optionalAttrs (lib.versions.isGe "9.0" version) { repo = "topology"; }) diff --git a/pkgs/development/embedded/arduino/arduinoOTA/default.nix b/pkgs/development/embedded/arduino/arduinoOTA/default.nix new file mode 100644 index 000000000000..1026b855770f --- /dev/null +++ b/pkgs/development/embedded/arduino/arduinoOTA/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: +buildGoModule rec { + pname = "arduinoOTA"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "arduino"; + repo = pname; + rev = "${version}"; + hash = "sha256-HaNMkeV/PDEotYp8+rUKFaBxGbZO8qA99Yp2sa6glz8="; + }; + + vendorHash = null; + + postPatch = '' + substituteInPlace version/version.go \ + --replace 'versionString = ""' 'versionString = "${version}"' + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://github.com/arduino/arduinoOTA"; + description = "A tool for uploading programs to Arduino boards over a network"; + license = licenses.gpl3; + maintainers = with maintainers; [ poelzi ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6f2df9d5d495..ef1fa745116f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1034,7 +1034,7 @@ self: super: builtins.intersectAttrs super { # the testsuite fails because of not finding tsc without some help aeson-typescript = overrideCabal (drv: { - testToolDepends = drv.testToolDepends or [] ++ [ pkgs.nodePackages.typescript ]; + testToolDepends = drv.testToolDepends or [] ++ [ pkgs.typescript ]; # the testsuite assumes that tsc is in the PATH if it thinks it's in # CI, otherwise trying to install it. # diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index f8d72ab3314c..ce056049dd82 100644 --- a/pkgs/development/interpreters/erlang/26.nix +++ b/pkgs/development/interpreters/erlang/26.nix @@ -1,7 +1,7 @@ { lib, mkDerivation }: mkDerivation { - version = "26.0"; - sha256 = "sha256-7z5LkCLyjqGlo48XlcwAUiu1FkmAAewEGnP30QDDme8="; + version = "26.0.1"; + sha256 = "sha256-uvBJu3hAg2L2yuh/D42tEy2Gr3Adk9/o/ssgy60T4rY="; } diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 4d05a2490e9e..57245bd61e76 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -146,7 +146,7 @@ stdenv.mkDerivation rec { luaOnBuildForHost = override pkgsBuildHost.${luaAttr}; luaOnBuildForTarget = override pkgsBuildTarget.${luaAttr}; luaOnHostForHost = override pkgsHostHost.${luaAttr}; - luaOnTargetForTarget = if lib.hasAttr luaAttr pkgsTargetTarget then (override pkgsTargetTarget.${luaAttr}) else {}; + luaOnTargetForTarget = lib.optionalAttrs (lib.hasAttr luaAttr pkgsTargetTarget) (override pkgsTargetTarget.${luaAttr}); }; meta = { diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index ddb49b40ff64..044a16ec7234 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { luaOnBuildForHost = override pkgsBuildHost.${luaAttr}; luaOnBuildForTarget = override pkgsBuildTarget.${luaAttr}; luaOnHostForHost = override pkgsHostHost.${luaAttr}; - luaOnTargetForTarget = if lib.hasAttr luaAttr pkgsTargetTarget then (override pkgsTargetTarget.${luaAttr}) else {}; + luaOnTargetForTarget = lib.optionalAttrs (lib.hasAttr luaAttr pkgsTargetTarget) (override pkgsTargetTarget.${luaAttr}); }; meta = with lib; { diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix new file mode 100644 index 000000000000..b49c89050f8c --- /dev/null +++ b/pkgs/development/interpreters/php/8.3.nix @@ -0,0 +1,57 @@ +{ callPackage, fetchurl, ... }@_args: + +let + base = (callPackage ./generic.nix (_args // { + version = "8.3.0alpha2"; + hash = null; + })).overrideAttrs (oldAttrs: { + src = fetchurl { + url = "https://downloads.php.net/~eric/php-8.3.0alpha2.tar.xz"; + hash = "sha256-YLCxgiDcsBisOmAodf0h8HyaCIh+4i1Q7QZw/h4KR5I="; + }; + }); +in +base.withExtensions ({ all, ... }: with all; ([ + bcmath + calendar + curl + ctype + dom + exif + fileinfo + filter + ftp + gd + gettext + gmp + iconv + imap + intl + ldap + mbstring + mysqli + mysqlnd + opcache + openssl + pcntl + pdo + pdo_mysql + pdo_odbc + pdo_pgsql + pdo_sqlite + pgsql + posix + readline + session + simplexml + sockets + soap + sodium + sysvsem + sqlite3 + tokenizer + xmlreader + xmlwriter + zip + zlib +])) diff --git a/pkgs/development/interpreters/php/fix-fileinfo-ext-php83.patch b/pkgs/development/interpreters/php/fix-fileinfo-ext-php83.patch new file mode 100644 index 000000000000..fbd6a66dbd14 --- /dev/null +++ b/pkgs/development/interpreters/php/fix-fileinfo-ext-php83.patch @@ -0,0 +1,14 @@ +diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c +index a6f3e64db6..c3047233db 100644 +--- a/ext/fileinfo/fileinfo.c ++++ b/ext/fileinfo/fileinfo.c +@@ -14,6 +14,9 @@ + +----------------------------------------------------------------------+ + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif + #include "php.h" + + #include "libmagic/magic.h" diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index d469032e13b2..ff103373a10f 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -109,7 +109,7 @@ let pythonOnBuildForHost = override pkgsBuildHost.${pythonAttr}; pythonOnBuildForTarget = override pkgsBuildTarget.${pythonAttr}; pythonOnHostForHost = override pkgsHostHost.${pythonAttr}; - pythonOnTargetForTarget = if lib.hasAttr pythonAttr pkgsTargetTarget then (override pkgsTargetTarget.${pythonAttr}) else {}; + pythonOnTargetForTarget = lib.optionalAttrs (lib.hasAttr pythonAttr pkgsTargetTarget) (override pkgsTargetTarget.${pythonAttr}); }; version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 34c49cea9021..4eef42a15149 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.4.13"; + version = "3.4.14"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - sha256 = "sha256-s/7KCbf07zezuASA7E03t83UDY6W/fFw9bljOprXWls="; + hash = "sha256-l5sYQoSKOb5NkO/J05nClKygtuZ9RfgAsmyTzCLQOYM="; }; patches = [ diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 7fe3fb38a1f7..0430a8dae01f 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.26.5"; + version = "2.28.0"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "sha256-rY/qPaG+ZMg8RbHTY6a0uo/WD1veOyPsc4VXCexeq/c="; + sha256 = "sha256-0hWuRUHmnWKJU3EUls17DouNXI2BHVsPmP3H/RQimYo="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index f058be4b645d..bb5a4e0dd53b 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.1"; + version = "0.7.2"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-vxddJkSLsTP3RxTzqIWecAC5NSL7NXdVnf/ANxYZEPk="; + hash = "sha256-UJFD5aTzsT3Zjq4om/7BtWTt3XG7x8p4ZLgoNeMTMOE="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/basu/default.nix b/pkgs/development/libraries/basu/default.nix index c9d005bf9d2a..25e5adf65771 100644 --- a/pkgs/development/libraries/basu/default.nix +++ b/pkgs/development/libraries/basu/default.nix @@ -8,6 +8,7 @@ , meson , ninja , python3 +, getent }: stdenv.mkDerivation (finalAttrs: { @@ -34,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja python3 + getent ]; preConfigure = '' diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 3b7aa4e464b2..228536a9ecfd 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -72,7 +72,10 @@ let then if lib.versionOlder version "1.78" then "mips1" else "mips" else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x" else toString stdenv.hostPlatform.parsed.cpu.family}" - "binary-format=${toString stdenv.hostPlatform.parsed.kernel.execFormat.name}" + # env in host triplet for Mach-O is "macho", but boost binary format for Mach-O is "mach-o" + "binary-format=${if stdenv.hostPlatform.parsed.kernel.execFormat == lib.systems.parse.execFormats.macho + then "mach-o" + else toString stdenv.hostPlatform.parsed.kernel.execFormat.name}" "target-os=${toString stdenv.hostPlatform.parsed.kernel.name}" # adapted from table in boost manual diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix index 4b02b11b3d23..1cc8a843dcd5 100644 --- a/pkgs/development/libraries/draco/default.nix +++ b/pkgs/development/libraries/draco/default.nix @@ -15,14 +15,14 @@ let cmakeBool = b: if b then "ON" else "OFF"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.5.6"; pname = "draco"; src = fetchFromGitHub { owner = "google"; repo = "draco"; - rev = version; + rev = finalAttrs.version; hash = "sha256-2YQMav0JJMbJ2bvnN/Xv90tjE/OWLbrZDO4WlaOvcfI="; fetchSubmodules = true; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jansol ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/libraries/tinygltf/default.nix b/pkgs/development/libraries/draco/tinygltf.nix index 4f965c653850..4f965c653850 100644 --- a/pkgs/development/libraries/tinygltf/default.nix +++ b/pkgs/development/libraries/draco/tinygltf.nix diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index fe71d56357d7..8cf571e2c931 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, libtool, autoconf, automake }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: stdenv.mkDerivation rec { - version = "1.2304.0"; pname = "fastjson"; + version = "1.2304.0"; + src = fetchFromGitHub { - repo = "libfastjson"; owner = "rsyslog"; - rev = "v${version}"; - sha256 = "sha256-WnM6lQjHz0n5BwWWZoDBavURokcaROXJW46RZen9vj4="; + repo = "libfastjson"; + rev = "refs/tags/v${version}"; + hash = "sha256-WnM6lQjHz0n5BwWWZoDBavURokcaROXJW46RZen9vj4="; }; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ libtool ]; - - preConfigure = '' - sh autogen.sh - ''; + nativeBuildInputs = [ + autoreconfHook + ]; meta = with lib; { description = "A fast json library for C"; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 12e59c939afe..7e11c60beb0d 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -542,9 +542,10 @@ stdenv.mkDerivation (finalAttrs: { # outputs where we don't want them. Patch the generated config.h to remove all # such references except for data. postConfigure = let - toStrip = lib.remove "data" finalAttrs.outputs; # We want to keep references to the data dir. + toStrip = map placeholder (lib.remove "data" finalAttrs.outputs) # We want to keep references to the data dir. + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.stdenv.cc; in - "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${placeholder o}") toStrip)} config.h"; + "remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${o}") toStrip)} config.h"; nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ]; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 00b78f57db61..f98c0eb1c348 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -161,14 +161,22 @@ stdenv.mkDerivation ({ ++ lib.optional withGd "--with-gd" ++ lib.optional (!withLibcrypt) "--disable-crypt"; - makeFlags = [ + makeFlags = (args.makeFlags or []) ++ [ "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" ]; + postInstall = (args.postInstall or "") + '' + moveToOutput bin/getent $getent + ''; + installFlags = [ "sysconfdir=$(out)/etc" ]; # out as the first output is an exception exclusive to glibc - outputs = [ "out" "bin" "dev" "static" ]; + + # getent is its own output, not kept in bin, since many things + # depend on getent but not on the locale generation tools in the bin + # output. This saves a couple of megabytes of closure size in many cases. + outputs = [ "out" "bin" "dev" "static" "getent" ]; strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -188,7 +196,7 @@ stdenv.mkDerivation ({ passthru = { inherit version; minorRelease = version; }; } -// (removeAttrs args [ "withLinuxHeaders" "withGd" ]) // +// (removeAttrs args [ "withLinuxHeaders" "withGd" "postInstall" "makeFlags" ]) // { src = fetchurl { diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 1c0c1b09e154..0f6cad157bb7 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -94,7 +94,7 @@ in "user-defined-trusted-dirs=${stdenv.cc.cc.libgcc}/lib" ]; - postInstall = (if stdenv.hostPlatform == stdenv.buildPlatform then '' + postInstall = previousAttrs.postInstall + (if stdenv.hostPlatform == stdenv.buildPlatform then '' echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED make -j''${NIX_BUILD_CORES:-1} localedata/install-locales '' else lib.optionalString stdenv.buildPlatform.isLinux '' diff --git a/pkgs/development/libraries/glibc/info.nix b/pkgs/development/libraries/glibc/info.nix index 04b0dc00a894..d643d8a6ba09 100644 --- a/pkgs/development/libraries/glibc/info.nix +++ b/pkgs/development/libraries/glibc/info.nix @@ -9,7 +9,7 @@ callPackage ./common.nix {} { extraNativeBuildInputs = [ texinfo perl ]; - buildPhase = "make info"; + makeFlags = [ "info" ]; # I don't know why the info is not generated in 'build' # Somehow building the info still does not work, because the final diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index ed6f0a5b32ca..86d6d1438b2d 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -10,8 +10,9 @@ , allLocales ? true, locales ? [ "en_US.UTF-8/UTF-8" ] }: -callPackage ./common.nix { inherit stdenv; } { +(callPackage ./common.nix { inherit stdenv; } { pname = "glibc-locales"; +}).overrideAttrs(finalAttrs: previousAttrs: { builder = ./locales-builder.sh; @@ -25,7 +26,7 @@ callPackage ./common.nix { inherit stdenv; } { else "--big-endian") ]; - buildPhase = '' + preBuild = (previousAttrs.preBuild or "") + '' # Awful hack: `localedef' doesn't allow the path to `locale-archive' # to be overriden, but you *can* specify a prefix, i.e. it will use # <prefix>/<path-to-glibc>/lib/locale/locale-archive. So we use @@ -57,11 +58,15 @@ callPackage ./common.nix { inherit stdenv; } { fi echo SUPPORTED-LOCALES='${toString locales}' > ../glibc-2*/localedata/SUPPORTED - '' + '' - make localedata/install-locales \ - localedir=$out/lib/locale \ ''; + enableParallelBuilding = true; + + makeFlags = (previousAttrs.makeFlags or []) ++ [ + "localedata/install-locales" + "localedir=${builtins.placeholder "out"}/lib/locale" + ]; + installPhase = '' mkdir -p "$out/lib/locale" "$out/share/i18n" @@ -75,4 +80,4 @@ callPackage ./common.nix { inherit stdenv; } { ''; meta.description = "Locale information for the GNU C Library"; -} +}) diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 1bdd6890ab21..e9746271ea27 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; + postPatch = '' + substituteInPlace Make.defaults \ + --replace "-Werror" "" + ''; + passthru.updateScript = gitUpdater { # No nicer place to find latest release. url = "https://git.code.sf.net/p/gnu-efi/code"; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index ccfbd892a97d..3aebf03b8ce0 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -14,6 +14,8 @@ , enableZbar ? false , faacSupport ? false , faac +, opencvSupport ? false +, opencv4 , faad2 , ldacbt , libass @@ -54,7 +56,6 @@ , libusb1 , neon , openal -, opencv4 , openexr_3 , openh264 , libopenmpt @@ -108,13 +109,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.22.3"; + version = "1.22.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-4XmP7i2GEn8GN0gcYH+YMpO/D9garXClx7RyBa82Idg="; + hash = "sha256-6q9TIkVl6qvVBco5xtV2lxm0V5XPUyzhzrYOGy6+maw="; }; patches = [ @@ -171,7 +172,6 @@ stdenv.mkDerivation rec { libusb1 neon openal - opencv4 openexr_3 openh264 rtmpdump @@ -192,6 +192,8 @@ stdenv.mkDerivation rec { libfreeaptx zxing-cpp usrsctp + ] ++ lib.optionals opencvSupport [ + opencv4 ] ++ lib.optionals enableZbar [ zbar ] ++ lib.optionals faacSupport [ @@ -292,6 +294,7 @@ stdenv.mkDerivation rec { "-Dgs=disabled" # depends on `google-cloud-cpp` "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing "-Dopenaptx=enabled" # since gstreamer-1.20.1 `libfreeaptx` is supported for circumventing the dubious license conflict with `libopenaptx` + "-Dopencv=${if opencvSupport then "enabled" else "disabled"}" # Reduces rebuild size when `config.cudaSupport = true` "-Dmicrodns=${if microdnsSupport then "enabled" else "disabled"}" "-Dbluez=${if bluezSupport then "enabled" else "disabled"}" (lib.mesonEnable "doc" enableDocumentation) diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 5c70b225e526..1b8d569f56ac 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.22.3"; + version = "1.22.4"; outputs = [ "out" "dev" ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-HFliiaDUIHOAIz66jDapMsTRrOuhmTKTfZtXwkzvifM="; + hash = "sha256-KSQk6C3qFwUoxCtFb2KolTK8q8BQjxkuNGcvuG9o5bg="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index e6c9d2222d18..1478e96120fc 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.22.3"; + version = "1.22.4"; outputs = [ "bin" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-n/6rlQU/n2mV6zs9oiXojyHBKc1g2gAtP3ldtw1tWXQ="; + hash = "sha256-EcsEmLwWuT2LmdIvdfgpuNCr/YJUhAshIGGNtVMtxlU="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 8837a0a0e93d..b194d6e82753 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.22.3"; + version = "1.22.4"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-RGrJxC1QLL/ZCBc3zBuFOzwfUNt3ynzNAa6hD2h1UME="; + hash = "sha256-TFIFPOjB33L9gXIen1PeOxRu3PLeKPYHvnBbzkz5CdE="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index e5f8ed02061a..cc1244b1ecae 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.22.3"; + version = "1.22.4"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-FaW85iUJseEl6FoJ7EHzIcD1SSZLUETACV/PstXAzqI="; + hash = "sha256-RThGz6RxoMHIAUVRvUhPvPM08ORDBZIxevuyN3Xmm9I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index f125d3ae30f3..aabd0058b260 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -49,13 +49,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.22.3"; + version = "1.22.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-r4EVSzou8/TS/ro5XyVpb+6m/RPsYsktPHqXNHBxAnM="; + hash = "sha256-1xIMEUap1yPVPVv+gHTaJXWoHwWYQ4dSk385u3yDO2o="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index a1271fab91f4..c2fee6d1ea6b 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.22.3"; + version = "1.22.4"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-LsXIBYCLQ3Gn4ysdoCAqHIprNrbOkFCAv1w0CX0SqSM="; + hash = "sha256-mnUbx0Dedo55HDepXwqSTGpB0S/X839UzmpOg0vhItM="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index d41852835e70..6fce751112b1 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , writeText , rustPlatform , meson @@ -112,6 +113,17 @@ let ) (lib.attrNames validPlugins); invalidPlugins = lib.subtractLists (lib.attrNames validPlugins) selectedPlugins; + + # TODO: figure out what must be done about this upstream - related lu-zero/cargo-c#323 lu-zero/cargo-c#138 + cargo-c' = cargo-c.overrideAttrs (oldAttrs: { + patches = (oldAttrs.patches or []) ++ [ + (fetchpatch { + name = "cargo-c-test-rlib-fix.patch"; + url = "https://github.com/lu-zero/cargo-c/commit/596c582deed419b0cf1f80b9be77ff705df20e01.diff"; + hash = "sha256-GETjZwYqX7h51rxWznAg5Ojozdp1SOYnUh+iuRGA4/w="; + }) + ]; + }); in assert lib.assertMsg (invalidPlugins == []) "Invalid gst-plugins-rs plugin${lib.optionalString (lib.length invalidPlugins > 1) "s"}: ${lib.concatStringsSep ", " invalidPlugins}"; @@ -138,7 +150,7 @@ stdenv.mkDerivation rec { ''; }; - postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' + postPatch = '' rm net/raptorq/tests/raptorq.rs ''; @@ -165,7 +177,7 @@ stdenv.mkDerivation rec { pkg-config rustc cargo - cargo-c + cargo-c' nasm ] ++ lib.optionals enableDocumentation [ hotdoc diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 2fe745e0329e..6cafa2b6daeb 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.22.3"; + version = "1.22.4"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-0Co536m9v5mj3S03jheUKzzkLf42+wwn4tCwFyL8Vh0="; + hash = "sha256-RmZhLXqZxg3NbwvbobenTSVioFAbKj4FdvCRa/HYgRs="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index c0926dfc5067..e4fa679d9d24 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.22.3"; + version = "1.22.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-PcmO1cIpM2izxObOVdib6DSgpi6b+I7xeSjPA7fVo2A="; + hash = "sha256-/7Rh/abAbTFsS+VoJjLMiQFFTtcrEJix4CIbxV5nPNc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index c25aa55557aa..a8f4cb166cf3 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.22.3"; + version = "1.22.4"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-onhnBi6LaTBfylt9PxPtfDGLcD59cnVslDlb0wXHsyw="; + hash = "sha256-lnuONT2C0AgaaNxTY5sl2ftMqJv6HgYUA+DNfSNYW6Y="; }; outputs = [ diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 4a77afa176a6..539cfc37051b 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -1,45 +1,63 @@ -{ config, lib, substituteAll, stdenv, fetchurl, pkg-config, gettext, glib, atk, pango, cairo, perl, xorg -, gdk-pixbuf, gobject-introspection -, xineramaSupport ? stdenv.isLinux -, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups -, gdktarget ? if stdenv.isDarwin then "quartz" else "x11" -, AppKit, Cocoa -, fetchpatch, buildPackages +{ config +, lib +, stdenv +, fetchurl +, atk +, buildPackages +, cairo +, cups +, gdk-pixbuf +, gettext +, glib +, gobject-introspection +, libXcomposite +, libXcursor +, libXdamage +, libXi +, libXinerama +, libXrandr +, libXrender +, pango +, perl +, pkg-config +, substituteAll , testers +, AppKit +, Cocoa +, gdktarget ? if stdenv.isDarwin then "quartz" else "x11" +, cupsSupport ? config.gtk2.cups or stdenv.isLinux +, xineramaSupport ? stdenv.isLinux }: let - gtkCleanImmodulesCache = substituteAll { src = ./hooks/clean-immodules-cache.sh; gtk_module_path = "gtk-2.0"; gtk_binary_version = "2.10.0"; }; - in - stdenv.mkDerivation (finalAttrs: { pname = "gtk+"; version = "2.24.33"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/2.24/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - sha256 = "rCrHV/WULTGKMRpUsMgLXvKV8pnCpzxjL2v7H/Scxto="; + url = "mirror://gnome/sources/gtk+/2.24/gtk+-${finalAttrs.version}.tar.xz"; + hash = "sha256-rCrHV/WULTGKMRpUsMgLXvKV8pnCpzxjL2v7H/Scxto="; }; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - enableParallelBuilding = true; - setupHooks = [ ./hooks/drop-icon-theme-cache.sh gtkCleanImmodulesCache ]; - nativeBuildInputs = finalAttrs.setupHooks ++ [ - perl pkg-config gettext gobject-introspection + gettext + gobject-introspection + perl + pkg-config ]; patches = [ @@ -50,19 +68,31 @@ stdenv.mkDerivation (finalAttrs: { ./patches/2.0-darwin-x11.patch ]; - propagatedBuildInputs = with xorg; - [ glib cairo pango gdk-pixbuf atk ] - ++ lib.optionals (stdenv.isLinux || stdenv.isDarwin) [ - libXrandr libXrender libXcomposite libXi libXcursor - ] - ++ lib.optionals stdenv.isDarwin [ libXdamage ] - ++ lib.optional xineramaSupport libXinerama - ++ lib.optionals cupsSupport [ cups ] - ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa ]; + propagatedBuildInputs = [ + atk + cairo + gdk-pixbuf + glib + pango + ] ++ lib.optionals (stdenv.isLinux || stdenv.isDarwin) [ + libXcomposite + libXcursor + libXi + libXrandr + libXrender + ] ++ lib.optional xineramaSupport libXinerama + ++ lib.optional cupsSupport cups + ++ lib.optionals stdenv.isDarwin [ + libXdamage + AppKit + Cocoa + ]; - preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then '' - MACOSX_DEPLOYMENT_TARGET=10.16 - '' else null; + preConfigure = + lib.optionalString (stdenv.isDarwin + && lib.versionAtLeast + stdenv.hostPlatform.darwinMinVersion "11") + "MACOSX_DEPLOYMENT_TARGET=10.16"; configureFlags = [ "--sysconfdir=/etc" @@ -77,6 +107,8 @@ stdenv.mkDerivation (finalAttrs: { "ac_cv_path_GDK_PIXBUF_CSOURCE=${buildPackages.gdk-pixbuf.dev}/bin/gdk-pixbuf-csource" ]; + enableParallelBuilding = true; + installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; @@ -98,11 +130,21 @@ stdenv.mkDerivation (finalAttrs: { tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; - meta = with lib; { + meta = { + homepage = "https://www.gtk.org/"; description = "A multi-platform toolkit for creating graphical user interfaces"; - homepage = "https://www.gtk.org/"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ lovek323 raskin ]; + longDescription = '' + GTK is a highly usable, feature rich toolkit for creating graphical user + interfaces which boasts cross platform compatibility and an easy to use + API. GTK it is written in C, but has bindings to many other popular + programming languages such as C++, Python and C# among others. GTK is + licensed under the GNU LGPL 2.1 allowing development of both free and + proprietary software with GTK without any license fees or royalties. + ''; + changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${finalAttrs.version}/NEWS"; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ lovek323 raskin ]; + platforms = lib.platforms.all; pkgConfigModules = [ "gdk-2.0" "gtk+-2.0" @@ -110,18 +152,5 @@ stdenv.mkDerivation (finalAttrs: { "gdk-x11-2.0" "gtk+-x11-2.0" ]; - platforms = platforms.all; - - longDescription = '' - GTK is a highly usable, feature rich toolkit for creating - graphical user interfaces which boasts cross platform - compatibility and an easy to use API. GTK it is written in C, - but has bindings to many other popular programming languages - such as C++, Python and C# among others. GTK is licensed - under the GNU LGPL 2.1 allowing development of both free and - proprietary software with GTK without any license fees or - royalties. - ''; - changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; }) diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index 1da0345a2a70..6d0978442702 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "22.6.2"; + version = "22.6.3"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-b7a9LD291LT28TujOQ3DE76+wtmBYeAGrXZXTM0quWw="; + hash = "sha256-YxM4vss528sR6uPNoUIBVvJtRF/zIepz31YMRyQu9wU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/hspell/dicts.nix b/pkgs/development/libraries/hspell/dicts.nix index 06f80bf5cf22..e11cbbce3336 100644 --- a/pkgs/development/libraries/hspell/dicts.nix +++ b/pkgs/development/libraries/hspell/dicts.nix @@ -1,4 +1,4 @@ -{ stdenv, hspell }: +{ lib, stdenv, hspell }: let dict = variant: a: stdenv.mkDerivation ({ @@ -8,7 +8,7 @@ let meta = hspell.meta // { broken = true; description = "${variant} Hebrew dictionary"; - } // (if a ? meta then a.meta else {}); + } // (lib.optionalAttrs (a ? meta) a.meta); } // (removeAttrs a ["meta"])); in { diff --git a/pkgs/development/libraries/icu/73.nix b/pkgs/development/libraries/icu/73.nix index 1a5536c0ce84..dfbdf1403adc 100644 --- a/pkgs/development/libraries/icu/73.nix +++ b/pkgs/development/libraries/icu/73.nix @@ -1,4 +1,4 @@ import ./base.nix { - version = "73.1"; - sha256 = "sha256-pFdDHeFktKp+ygDtE00A37+Ip3xphqEK53dPwHa7jEU="; + version = "73.2"; + sha256 = "sha256-gYqAcS7TyqzZtlIwXgGvx/oWfm8ulJltpEuQwqtgTOE="; } diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/development/libraries/imath/default.nix index 675167aaf21b..17d5f57c76c1 100644 --- a/pkgs/development/libraries/imath/default.nix +++ b/pkgs/development/libraries/imath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.1.7"; + version = "3.1.9"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "sha256-8TkrRqQYnp9Ho8jT22EQCEBIjlRWYlOAZSNOnJ5zCM0="; + sha256 = "sha256-NcGiYz7jbxLyVd80lOIyN3zXcC4mHh+dcFEY4Kqw9BY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 9f40598d14c9..7faeb324ad55 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake # for passthru.tests , intel-compute-runtime @@ -9,15 +10,24 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.5"; + version = "22.3.7"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-txh0HGtWc39bWesTfyUjG4n560w8iRLyiHec6JA7FJQ="; + sha256 = "sha256-/iwTPWRVTZk1dhZD2Grcnc76ItgXjf2VrFD+93h8YvM="; }; + patches = [ + # fix build on i686 + # https://github.com/intel/gmmlib/pull/104 + (fetchpatch { + url = "https://github.com/intel/gmmlib/commit/2526286f29d8ad3d3a5833bdc29e23e5f3300b34.patch"; + hash = "sha256-mChK6wprAt+bo39g6LTNy25kJeGoKabpXFq2gSDhaPw="; + }) + ]; + nativeBuildInputs = [ cmake ]; passthru.tests = { diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index d2da17ddc29f..43db1ac56b09 100644 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ip2location-c"; - version = "8.5.1"; + version = "8.6.1"; src = fetchFromGitHub { owner = "chrislim2888"; repo = "IP2Location-C-Library"; rev = version; - sha256 = "sha256-+Az1bAJ3HT9mIjO43FOcEqxX3oA3RcIY7VvxfaHtBX8="; + sha256 = "sha256-3/cLoGV7go4S1ew73IJzJEMTlLnvM3adl+/Sb7mPrZY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index 0f001f84f2c2..993e1c8423d4 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-hCipWbhVsYYqfGXO6CFDPmxiFO7Dc0I/nCnj6lRS2go="; + hash = "sha256-9XfvU01nVcY2NpCqjUyPEJ+F/+A4YjjE0ktMQyEkr3Q="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 3d3fe36b45b5..305d460ffc67 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "0qn412iv3sl843vwx38c5wc9nwf0sx34a4x78qkdn17wjbrfjj79"; - platforms."x86_64-linux".sha256 = "02vipzdcmq5cvpmra44r82z8y9d53yqpnymsc2mfk98fvkvgz2j9"; + platforms."aarch64-linux".sha256 = "12mkg5gncwj7c3l7j6jcsnbwi4fxczvm51x2dgg0my7bl5ja6pd0"; + platforms."x86_64-linux".sha256 = "0nwvqs3l881w6d7gmcpgf6p3sbbjlzmbnz8imzijpnmki71j9s7f"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "112.3.0"; - gitRevision = "b09c4ca"; - chromiumVersion = "112.0.5615.165"; + version = "114.2.11"; + gitRevision = "87c8807"; + chromiumVersion = "114.0.5735.134"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 1db2819a57b5..a0b8cb8efa08 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + ./libclc-gnu-install-dirs.patch + ]; + # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch postPatch = '' substituteInPlace CMakeLists.txt \ @@ -35,9 +39,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja python3 ]; buildInputs = [ llvm_14 ]; strictDeps = true; - cmakeFlags = [ - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; postInstall = '' install -Dt $dev/bin prepare_builtins diff --git a/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch b/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch new file mode 100644 index 000000000000..1e5108a27c38 --- /dev/null +++ b/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch @@ -0,0 +1,10 @@ +--- a/libclc.pc.in ++++ b/libclc.pc.in +@@ -1,5 +1,5 @@ +-includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ +-libexecdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/clc ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++libexecdir=@CMAKE_INSTALL_FULL_DATADIR@/clc + + Name: libclc + Description: Library requirements of the OpenCL C programming language diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index 0a7f9be4f729..32ff8a1e216f 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.33"; + version = "1.1.34"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-tVvW7cbgj2t251SzUchfVEnHgLVgdkTLyGpQfn6VYow="; + sha256 = "sha256-e4J7K1AZyw3AvBNMj69VGKo7gtJ6Nr2ELjqgoqPlObU="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libgdiplus/configure-pkg-config.patch b/pkgs/development/libraries/libgdiplus/configure-pkg-config.patch new file mode 100644 index 000000000000..b636f07e2bd6 --- /dev/null +++ b/pkgs/development/libraries/libgdiplus/configure-pkg-config.patch @@ -0,0 +1,17 @@ +diff --git a/configure.ac b/configure.ac +index e47a3f1..f529e69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,10 +16,8 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + + AC_C_BIGENDIAN + +-AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +-if test "x$PKG_CONFIG" = "xno"; then +- AC_MSG_ERROR([You need to install pkg-config]) +-fi ++PKG_PROG_PKG_CONFIG ++ + GLIB_REQUIRED_VERSION="2.2.3" + PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION) + diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 705205df396c..e71aedd2cbcf 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,18 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib, cairo, Carbon, fontconfig +{ lib, stdenv, fetchzip, pkg-config, glib, cairo, Carbon, fontconfig , libtiff, giflib, libjpeg, libpng , libXrender, libexif, autoreconfHook, fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgdiplus"; - version = "6.0.5"; + version = "6.1"; - src = fetchFromGitHub { - owner = "mono"; - repo = "libgdiplus"; - rev = version; - sha256 = "1387lgph5r17viv3rkf5hbksdn435njzmra7s17q0nzk2mkkm68c"; + # Using source archive to avoid fetching Git submodules. + # Git repo: https://github.com/mono/libgdiplus + src = fetchzip { + url = "https://download.mono-project.com/sources/libgdiplus/libgdiplus-${finalAttrs.version}.tar.gz"; + hash = "sha256-+lP9ETlw3s0RUliQT1uBWZ2j6o3V9EECBQSppOYFq4Q="; }; + patches = [ + # Fix pkg-config lookup when cross-compiling. + ./configure-pkg-config.patch + ]; + NIX_LDFLAGS = "-lgif"; outputs = [ "out" "dev" ]; @@ -45,4 +50,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.mit; }; -} +}) diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix index b62c95fa5c86..9be574e9eaa0 100644 --- a/pkgs/development/libraries/libjxl/default.nix +++ b/pkgs/development/libraries/libjxl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libjxl"; - version = "0.8.1"; + version = "0.8.2"; outputs = [ "out" "dev" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "libjxl"; repo = "libjxl"; rev = "v${version}"; - hash = "sha256-WWuvUTMrlR6ePbEs01ulLnuMiUqGrh4qELWFh0QMaGU="; + hash = "sha256-I3PGgh0XqRkCFz7lUZ3Q4eU0+0GwaQcVb6t4Pru1kKo="; # There are various submodules in `third_party/`. fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index 8841de12f9a4..49e89b97344b 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, fixDarwinDylibNames }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, fixDarwinDylibNames +}: stdenv.mkDerivation rec { pname = "libnatpmp"; @@ -9,6 +14,14 @@ stdenv.mkDerivation rec { hash = "sha256-BoTtLIQGQ351GaG9IOqDeA24cbOjpddSMRuj6Inb/HA="; }; + patches = [ + # install natpmp_declspec.h too, else nothing that uses this library will build + (fetchpatch { + url = "https://github.com/miniupnp/libnatpmp/commit/5f4a7c65837a56e62c133db33c28cd1ea71db662.patch"; + hash = "sha256-tvoGFmo5AzUgb40bIs/EzikE0ex1SFzE5peLXhktnbc="; + }) + ]; + makeFlags = [ "INSTALLPREFIX=$(out)" "CC:=$(CC)" diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 6c6e55a528e4..679de601aa79 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -7,6 +7,8 @@ , ninja , fixedPoint ? false , withCustomModes ? true +, withIntrinsics ? stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isx86 +, withAsm ? false # tests , ffmpeg-headless @@ -46,7 +48,9 @@ stdenv.mkDerivation rec { mesonFlags = [ (lib.mesonBool "fixed-point" fixedPoint) (lib.mesonBool "custom-modes" withCustomModes) - (lib.mesonEnable "asm" false) + (lib.mesonEnable "intrinsics" withIntrinsics) + (lib.mesonEnable "rtcd" (withIntrinsics || withAsm)) + (lib.mesonEnable "asm" withAsm) (lib.mesonEnable "docs" false) ]; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index 5cbc9b8f09b7..86624a1ecc2b 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libqb"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vt9FmIRojX3INOn3CXAjkswVFD8Th4sRIz3RR4GJHFQ="; + sha256 = "sha256-Tfw5nGy3A3zLtVuyHn+8jzXPySRNwBx0opwkE+0k+RA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index bbd892c33ee8..9ae8d87f8872 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -9,22 +9,20 @@ }: stdenv.mkDerivation rec { - version = "3.2.0"; + version = "3.3-20230626"; + commit = "783141fb694f3bd1f8bd8a783670dd25a53b9fc1"; pname = "libsearpc"; src = fetchFromGitHub { owner = "haiwen"; repo = "libsearpc"; - rev = "v${version}"; - sha256 = "18i5zvrp6dv6vygxx5nc93mai2p2x786n5lnf5avrin6xiz2j6hd"; + rev = commit; + sha256 = "sha256-nYYp3EyA8nufhbWaw4Lv/c4utGYaxC+PoFyamUEVJx4="; }; nativeBuildInputs = [ autoreconfHook pkg-config - ]; - - buildInputs = [ python3 ]; diff --git a/pkgs/development/libraries/liburing/0001-Add-custom-error-function-for-tests.patch b/pkgs/development/libraries/liburing/0001-Add-custom-error-function-for-tests.patch deleted file mode 100644 index 191f6ae8cd5a..000000000000 --- a/pkgs/development/libraries/liburing/0001-Add-custom-error-function-for-tests.patch +++ /dev/null @@ -1,66 +0,0 @@ -From d4714fd7aac9c5f499c406703bc437dc6cf72ef3 Mon Sep 17 00:00:00 2001 -From: Steffen <steffen.winter@proton.me> -Date: Mon, 13 Feb 2023 17:32:16 +0100 -Subject: [PATCH 1/3] Add custom error function for tests. - -On musl systems, liburing cannot build examples and tests due to -it's usage of error.h. t_error calls fprintf(stderr, ...) and -exits. - -Closes: #786 - -Signed-off-by: Steffen Winter <steffen.winter@proton.me> ---- - test/helpers.c | 18 ++++++++++++++++++ - test/helpers.h | 2 ++ - 2 files changed, 20 insertions(+) - -diff --git a/test/helpers.c b/test/helpers.c -index 8fb32b8..caa887e 100644 ---- a/test/helpers.c -+++ b/test/helpers.c -@@ -8,6 +8,7 @@ - #include <stdio.h> - #include <fcntl.h> - #include <unistd.h> -+#include <stdarg.h> - #include <sys/types.h> - - #include <arpa/inet.h> -@@ -266,3 +267,20 @@ bool t_probe_defer_taskrun(void) - io_uring_queue_exit(&ring); - return true; - } -+ -+/* -+ * Implementation of error(3), prints an error message and exits. -+ */ -+void t_error(int status, int errnum, const char *format, ...) -+{ -+ va_list args; -+ va_start(args, format); -+ -+ vfprintf(stderr, format, args); -+ if (errnum) -+ fprintf(stderr, ": %s", strerror(errnum)); -+ -+ fprintf(stderr, "\n"); -+ va_end(args); -+ exit(status); -+} -diff --git a/test/helpers.h b/test/helpers.h -index 4375a9e..33b82cf 100644 ---- a/test/helpers.h -+++ b/test/helpers.h -@@ -87,6 +87,8 @@ bool t_probe_defer_taskrun(void); - - #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) - -+void t_error(int status, int errnum, const char *format, ...); -+ - #ifdef __cplusplus - } - #endif --- -2.39.1 - diff --git a/pkgs/development/libraries/liburing/0002-test-Use-t_error-instead-of-glibc-s-error.patch b/pkgs/development/libraries/liburing/0002-test-Use-t_error-instead-of-glibc-s-error.patch deleted file mode 100644 index 676b006482c4..000000000000 --- a/pkgs/development/libraries/liburing/0002-test-Use-t_error-instead-of-glibc-s-error.patch +++ /dev/null @@ -1,109 +0,0 @@ -From e84f40ca872f0bce72b5686c95a11739d9c89494 Mon Sep 17 00:00:00 2001 -From: Steffen <steffen.winter@proton.me> -Date: Mon, 13 Feb 2023 17:56:03 +0100 -Subject: [PATCH 2/3] test: Use t_error instead of glibc's error. - -On musl systems, liburing cannot build examples and tests due to -it's usage of error.h. Replacing calls to error() with t_error(). - -Closes: #786 - -Signed-off-by: Steffen Winter <steffen.winter@proton.me> ---- - test/defer-taskrun.c | 1 - - test/send-zerocopy.c | 1 - - test/single-issuer.c | 15 +++++++-------- - 3 files changed, 7 insertions(+), 10 deletions(-) - -diff --git a/test/defer-taskrun.c b/test/defer-taskrun.c -index 9283f28..87cd256 100644 ---- a/test/defer-taskrun.c -+++ b/test/defer-taskrun.c -@@ -4,7 +4,6 @@ - #include <unistd.h> - #include <stdlib.h> - #include <string.h> --#include <error.h> - #include <sys/eventfd.h> - #include <signal.h> - #include <poll.h> -diff --git a/test/send-zerocopy.c b/test/send-zerocopy.c -index 4db102b..be33094 100644 ---- a/test/send-zerocopy.c -+++ b/test/send-zerocopy.c -@@ -4,7 +4,6 @@ - #include <stdint.h> - #include <assert.h> - #include <errno.h> --#include <error.h> - #include <limits.h> - #include <fcntl.h> - #include <unistd.h> -diff --git a/test/single-issuer.c b/test/single-issuer.c -index 1d13f47..d71cd74 100644 ---- a/test/single-issuer.c -+++ b/test/single-issuer.c -@@ -5,7 +5,6 @@ - #include <stdlib.h> - #include <string.h> - #include <fcntl.h> --#include <error.h> - #include <sys/types.h> - #include <sys/wait.h> - -@@ -56,13 +55,13 @@ static int try_submit(struct io_uring *ring) - return ret; - - if (ret != 1) -- error(1, ret, "submit %i", ret); -+ t_error(1, ret, "submit %i", ret); - ret = io_uring_wait_cqe(ring, &cqe); - if (ret) -- error(1, ret, "wait fail %i", ret); -+ t_error(1, ret, "wait fail %i", ret); - - if (cqe->res || cqe->user_data != 42) -- error(1, ret, "invalid cqe"); -+ t_error(1, ret, "invalid cqe"); - - io_uring_cqe_seen(ring, cqe); - return 0; -@@ -106,7 +105,7 @@ int main(int argc, char *argv[]) - ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER | - IORING_SETUP_R_DISABLED); - if (ret) -- error(1, ret, "ring init (2) %i", ret); -+ t_error(1, ret, "ring init (2) %i", ret); - - if (!fork_t()) { - io_uring_enable_rings(&ring); -@@ -122,7 +121,7 @@ int main(int argc, char *argv[]) - ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER | - IORING_SETUP_R_DISABLED); - if (ret) -- error(1, ret, "ring init (3) %i", ret); -+ t_error(1, ret, "ring init (3) %i", ret); - - io_uring_enable_rings(&ring); - if (!fork_t()) { -@@ -137,7 +136,7 @@ int main(int argc, char *argv[]) - /* test that anyone can submit to a SQPOLL|SINGLE_ISSUER ring */ - ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER|IORING_SETUP_SQPOLL); - if (ret) -- error(1, ret, "ring init (4) %i", ret); -+ t_error(1, ret, "ring init (4) %i", ret); - - ret = try_submit(&ring); - if (ret) { -@@ -157,7 +156,7 @@ int main(int argc, char *argv[]) - /* test that IORING_ENTER_REGISTERED_RING doesn't break anything */ - ret = io_uring_queue_init(8, &ring, IORING_SETUP_SINGLE_ISSUER); - if (ret) -- error(1, ret, "ring init (5) %i", ret); -+ t_error(1, ret, "ring init (5) %i", ret); - - if (!fork_t()) { - ret = try_submit(&ring); --- -2.39.1 - diff --git a/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch b/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch deleted file mode 100644 index ce92f16dcb18..000000000000 --- a/pkgs/development/libraries/liburing/0003-examples-Use-t_error-instead-of-glibc-s-error.patch +++ /dev/null @@ -1,226 +0,0 @@ -From 23704bbd1416ed1a051b32d5d44e46dd654b8ffe Mon Sep 17 00:00:00 2001 -From: Steffen <steffen.winter@proton.me> -Date: Mon, 13 Feb 2023 18:23:44 +0100 -Subject: [PATCH 3/3] examples: Use t_error instead of glibc's error. - -On musl systems, liburing cannot build examples and tests due to -it's usage of error.h. t_error copied from test/helpers.c. -Replacing calls to error() with t_error(). - -Closes: #786 - -Signed-off-by: Steffen Winter <steffen.winter@proton.me> ---- - examples/send-zerocopy.c | 61 +++++++++++++++++++++++++--------------- - 1 file changed, 39 insertions(+), 22 deletions(-) - -diff --git a/examples/send-zerocopy.c b/examples/send-zerocopy.c -index 7f5f2b1..6092af9 100644 ---- a/examples/send-zerocopy.c -+++ b/examples/send-zerocopy.c -@@ -5,11 +5,11 @@ - #include <stdint.h> - #include <assert.h> - #include <errno.h> --#include <error.h> - #include <limits.h> - #include <fcntl.h> - #include <unistd.h> - #include <stdbool.h> -+#include <stdarg.h> - #include <string.h> - - #include <arpa/inet.h> -@@ -57,6 +57,23 @@ static struct sockaddr_storage cfg_dst_addr; - - static char payload[IP_MAXPACKET] __attribute__((aligned(4096))); - -+/* -+ * Implementation of error(3), prints an error message and exits. -+ */ -+static void t_error(int status, int errnum, const char *format, ...) -+{ -+ va_list args; -+ va_start(args, format); -+ -+ vfprintf(stderr, format, args); -+ if (errnum) -+ fprintf(stderr, ": %s", strerror(errnum)); -+ -+ fprintf(stderr, "\n"); -+ va_end(args); -+ exit(status); -+} -+ - static unsigned long gettimeofday_ms(void) - { - struct timeval tv; -@@ -68,7 +85,7 @@ static unsigned long gettimeofday_ms(void) - static void do_setsockopt(int fd, int level, int optname, int val) - { - if (setsockopt(fd, level, optname, &val, sizeof(val))) -- error(1, errno, "setsockopt %d.%d: %d", level, optname, val); -+ t_error(1, errno, "setsockopt %d.%d: %d", level, optname, val); - } - - static void setup_sockaddr(int domain, const char *str_addr, -@@ -84,7 +101,7 @@ static void setup_sockaddr(int domain, const char *str_addr, - addr4->sin_port = htons(cfg_port); - if (str_addr && - inet_pton(AF_INET, str_addr, &(addr4->sin_addr)) != 1) -- error(1, 0, "ipv4 parse error: %s", str_addr); -+ t_error(1, 0, "ipv4 parse error: %s", str_addr); - break; - case PF_INET6: - memset(addr6, 0, sizeof(*addr6)); -@@ -92,10 +109,10 @@ static void setup_sockaddr(int domain, const char *str_addr, - addr6->sin6_port = htons(cfg_port); - if (str_addr && - inet_pton(AF_INET6, str_addr, &(addr6->sin6_addr)) != 1) -- error(1, 0, "ipv6 parse error: %s", str_addr); -+ t_error(1, 0, "ipv6 parse error: %s", str_addr); - break; - default: -- error(1, 0, "illegal domain"); -+ t_error(1, 0, "illegal domain"); - } - } - -@@ -105,12 +122,12 @@ static int do_setup_tx(int domain, int type, int protocol) - - fd = socket(domain, type, protocol); - if (fd == -1) -- error(1, errno, "socket t"); -+ t_error(1, errno, "socket t"); - - do_setsockopt(fd, SOL_SOCKET, SO_SNDBUF, 1 << 21); - - if (connect(fd, (void *) &cfg_dst_addr, cfg_alen)) -- error(1, errno, "connect"); -+ t_error(1, errno, "connect"); - return fd; - } - -@@ -125,7 +142,7 @@ static inline struct io_uring_cqe *wait_cqe_fast(struct io_uring *ring) - - ret = io_uring_wait_cqe(ring, &cqe); - if (ret) -- error(1, ret, "wait cqe"); -+ t_error(1, ret, "wait cqe"); - return cqe; - } - -@@ -143,17 +160,17 @@ static void do_tx(int domain, int type, int protocol) - - ret = io_uring_queue_init(512, &ring, IORING_SETUP_COOP_TASKRUN); - if (ret) -- error(1, ret, "io_uring: queue init"); -+ t_error(1, ret, "io_uring: queue init"); - - if (cfg_fixed_files) { - ret = io_uring_register_files(&ring, &fd, 1); - if (ret < 0) -- error(1, ret, "io_uring: files registration"); -+ t_error(1, ret, "io_uring: files registration"); - } - if (cfg_reg_ringfd) { - ret = io_uring_register_ring_fd(&ring); - if (ret < 0) -- error(1, ret, "io_uring: io_uring_register_ring_fd"); -+ t_error(1, ret, "io_uring: io_uring_register_ring_fd"); - } - - iov.iov_base = payload; -@@ -161,7 +178,7 @@ static void do_tx(int domain, int type, int protocol) - - ret = io_uring_register_buffers(&ring, &iov, 1); - if (ret) -- error(1, ret, "io_uring: buffer registration"); -+ t_error(1, ret, "io_uring: buffer registration"); - - tstop = gettimeofday_ms() + cfg_runtime_ms; - do { -@@ -193,14 +210,14 @@ static void do_tx(int domain, int type, int protocol) - - ret = io_uring_submit(&ring); - if (ret != cfg_nr_reqs) -- error(1, ret, "submit"); -+ t_error(1, ret, "submit"); - - for (i = 0; i < cfg_nr_reqs; i++) { - cqe = wait_cqe_fast(&ring); - - if (cqe->flags & IORING_CQE_F_NOTIF) { - if (cqe->flags & IORING_CQE_F_MORE) -- error(1, -EINVAL, "F_MORE notif"); -+ t_error(1, -EINVAL, "F_MORE notif"); - compl_cqes--; - i--; - io_uring_cqe_seen(&ring, cqe); -@@ -217,7 +234,7 @@ static void do_tx(int domain, int type, int protocol) - fprintf(stderr, "Connection failure"); - goto out_fail; - } else if (cqe->res != -EAGAIN) { -- error(1, cqe->res, "send failed"); -+ t_error(1, cqe->res, "send failed"); - } - io_uring_cqe_seen(&ring, cqe); - } -@@ -226,7 +243,7 @@ static void do_tx(int domain, int type, int protocol) - out_fail: - shutdown(fd, SHUT_RDWR); - if (close(fd)) -- error(1, errno, "close"); -+ t_error(1, errno, "close"); - - fprintf(stderr, "tx=%lu (MB=%lu), tx/s=%lu (MB/s=%lu)\n", - packets, bytes >> 20, -@@ -254,7 +271,7 @@ static void do_test(int domain, int type, int protocol) - - static void usage(const char *filepath) - { -- error(1, 0, "Usage: %s [-n<N>] [-z<val>] [-s<payload size>] " -+ t_error(1, 0, "Usage: %s [-n<N>] [-z<val>] [-s<payload size>] " - "(-4|-6) [-t<time s>] -D<dst_ip> udp", filepath); - } - -@@ -276,13 +293,13 @@ static void parse_opts(int argc, char **argv) - switch (c) { - case '4': - if (cfg_family != PF_UNSPEC) -- error(1, 0, "Pass one of -4 or -6"); -+ t_error(1, 0, "Pass one of -4 or -6"); - cfg_family = PF_INET; - cfg_alen = sizeof(struct sockaddr_in); - break; - case '6': - if (cfg_family != PF_UNSPEC) -- error(1, 0, "Pass one of -4 or -6"); -+ t_error(1, 0, "Pass one of -4 or -6"); - cfg_family = PF_INET6; - cfg_alen = sizeof(struct sockaddr_in6); - break; -@@ -311,9 +328,9 @@ static void parse_opts(int argc, char **argv) - } - - if (cfg_nr_reqs > MAX_SUBMIT_NR) -- error(1, 0, "-n: submit batch nr exceeds max (%d)", MAX_SUBMIT_NR); -+ t_error(1, 0, "-n: submit batch nr exceeds max (%d)", MAX_SUBMIT_NR); - if (cfg_payload_len > max_payload_len) -- error(1, 0, "-s: payload exceeds max (%d)", max_payload_len); -+ t_error(1, 0, "-s: payload exceeds max (%d)", max_payload_len); - - setup_sockaddr(cfg_family, daddr, &cfg_dst_addr); - -@@ -333,7 +350,7 @@ int main(int argc, char **argv) - else if (!strcmp(cfg_test, "udp")) - do_test(cfg_family, SOCK_DGRAM, 0); - else -- error(1, 0, "unknown cfg_test %s", cfg_test); -+ t_error(1, 0, "unknown cfg_test %s", cfg_test); - - return 0; - } --- -2.39.1 - diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index cfcf8ae3dd66..0f1757f4e618 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -1,45 +1,23 @@ -{ lib, stdenv, fetchgit -, fetchpatch -}: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "liburing"; - version = "2.3"; + version = "2.4"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "sha256-vN6lLb5kpgHTKDxwibJPS61sdelILETVtJE2BYgp79k="; + sha256 = "sha256-vbe9uh9AqXyPkzwD6zHoHH3JMeAJEl2FSGzny1T7diM="; }; - patches = [ - # Backported portability fixes from liburing master, needed for pkgsMusl.liburing - ./0001-Add-custom-error-function-for-tests.patch - ./0002-test-Use-t_error-instead-of-glibc-s-error.patch - ./0003-examples-Use-t_error-instead-of-glibc-s-error.patch - - # More portability fixes, in the process of being upstreamed - (fetchpatch { - url = "https://github.com/axboe/liburing/pull/798/commits/0fbcc44fe1fb2dc6807660b2cff1c2995add095b.patch"; - hash = "sha256-xOMsw0VpYGst/+Isd2Tmq8CmBDK+uyLw3KNKPnsCSoA="; - }) - ]; - separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. setOutputFlags = false; - preConfigure = - # We cannot use configureFlags or configureFlagsArray directly, since we - # don't have structuredAttrs yet and using placeholder causes permissions - # denied errors. Using $dev / $man in configureFlags causes bash evaluation - # errors - '' - configureFlagsArray+=( - "--includedir=$dev/include" - "--mandir=$man/share/man" - ) - ''; + configureFlags = [ + "--includedir=${placeholder "dev"}/include" + "--mandir=${placeholder "man"}/share/man" + ]; # Doesn't recognize platform flags configurePlatforms = []; @@ -61,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://git.kernel.dk/cgit/liburing/"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice nickcao ]; }; } diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 094800fcc00e..6667aa4882e0 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "liquid-dsp"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "jgaeddert"; repo = "liquid-dsp"; rev = "v${version}"; - sha256 = "sha256-EvCxBwzpi3riSBhlHr6MmIUYKTCp02y5gz7pDJCEC1Q="; + sha256 = "sha256-3UKAwhYaYZ42+d+wiW/AB6x5TSOel8d++d3HeZqAg/8="; }; configureFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index a2acd331e783..1bc0e1d56698 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -85,8 +85,8 @@ */ let - version = "23.1.2"; - hash = "sha256-YLHzrbFWGDDBWL88aFCJQ2dPudafOEw8colpQ4WrXH4="; + version = "23.1.3"; + hash = "sha256-L21zgbwQ+9LWJjrRAieFuLURBGwakEFi+PfaGO6ortk="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule diff --git a/pkgs/development/libraries/miniaudio/default.nix b/pkgs/development/libraries/miniaudio/default.nix index ba5b60b23c45..f49a17a67f93 100644 --- a/pkgs/development/libraries/miniaudio/default.nix +++ b/pkgs/development/libraries/miniaudio/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { pname = "miniaudio"; - version = "0.11.16"; + version = "0.11.17"; src = fetchFromGitHub { owner = "mackron"; repo = "miniaudio"; rev = version; - hash = "sha256-POe/dYPJ25RKNGIhaLoqxm9JJ08MrTyHVN4NmaGOdwM="; + hash = "sha256-nPQ53+9CDEn91LZgF5RkVur+XckTDcS38FHomPXbtMI="; }; installPhase = '' diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index edd86dd71cdf..cf6c87b269d9 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.23.5"; + version = "1.24.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-gdf3+EsAIf2yfuw75bNAPlwZbi9NFhVB9Q5MmS6KSo8="; + hash = "sha256-IVy2PxFM//AKffYfeLyCNjattnFZmqeg6WNTqXI/yMY="; }; postPatch = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { cyrus_sasl snappy ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security + darwin.apple_sdk_11_0.frameworks.Security ]; cmakeFlags = [ @@ -56,7 +56,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin && stdenv.isx86_64; description = "The official C client library for MongoDB"; homepage = "http://mongoc.org"; license = licenses.asl20; diff --git a/pkgs/development/libraries/msgpack-c/default.nix b/pkgs/development/libraries/msgpack-c/default.nix new file mode 100644 index 000000000000..ded03015f39f --- /dev/null +++ b/pkgs/development/libraries/msgpack-c/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtest +, zlib +}: + +stdenv.mkDerivation rec { + pname = "msgpack-c"; + version = "6.0.0"; + + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "refs/tags/c-${version}"; + hash = "sha256-TfC37QKwqvHxsLPgsEqJYkb7mpRQekbntbBPV4v4FO8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DMSGPACK_BUILD_EXAMPLES=OFF" # examples are not installed even if built + ] ++ lib.optional (!doCheck) "-DMSGPACK_BUILD_TESTS=OFF"; + + checkInputs = [ + gtest + zlib + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + meta = with lib; { + description = "MessagePack implementation for C"; + homepage = "https://github.com/msgpack/msgpack-c"; + changelog = "https://github.com/msgpack/msgpack-c/blob/${src.rev}/CHANGELOG.md"; + license = licenses.boost; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/development/libraries/msgpack-cxx/default.nix b/pkgs/development/libraries/msgpack-cxx/default.nix new file mode 100644 index 000000000000..4ec05b581c4a --- /dev/null +++ b/pkgs/development/libraries/msgpack-cxx/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, zlib +}: + +stdenv.mkDerivation rec { + pname = "msgpack-cxx"; + version = "6.0.0"; + + src = fetchFromGitHub { + owner = "msgpack"; + repo = "msgpack-c"; + rev = "refs/tags/cpp-${version}"; + hash = "sha256-p0eLd0fHhsgnRomubYadumMNiC2itdePJC9B55m49LI="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + boost + ]; + + cmakeFlags = [ + "-DMSGPACK_BUILD_DOCS=OFF" # docs are not installed even if built + ] ++ lib.optional doCheck "-DMSGPACK_BUILD_TESTS=ON"; + + checkInputs = [ + zlib + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + meta = with lib; { + description = "MessagePack implementation for C++"; + homepage = "https://github.com/msgpack/msgpack-c"; + changelog = "https://github.com/msgpack/msgpack-c/blob/${src.rev}/CHANGELOG.md"; + license = licenses.boost; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index 36208fc09a81..1fa8a216e4dd 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -1,20 +1,25 @@ -{lib, stdenv, fetchFromGitHub, cmake}: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, buildExamples ? false +}: -stdenv.mkDerivation rec { - version = "1.4.3"; +stdenv.mkDerivation (finalAttrs: { + version = "1.5.0"; pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; - rev = "v${version}"; - sha256 = "sha256-NcewcNQcI1CjMNibRF9HCoE2Ibs0/Hy4eOkJ20W3wLo="; + rev = "v${finalAttrs.version}"; + hash = "sha256-vPLL6l4sFRi7nvIfdMbBn/gvQ1+1lQHlZbR/2ok0Iw8="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_EXAMPLES=OFF" + "-DBUILD_EXAMPLES=${if buildExamples then "ON" else "OFF"}" ]; doCheck = true; @@ -22,8 +27,22 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/jlblancoc/nanoflann"; - license = lib.licenses.bsd2; description = "Header only C++ library for approximate nearest neighbor search"; + longDescription = '' + nanoflann is a C++11 header-only library for building KD-Trees of datasets + with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and + 3D rotation groups). No support for approximate NN is provided. nanoflann + does not require compiling or installing. You just need to #include + <nanoflann.hpp> in your code. + + This library is a fork of the flann library by Marius Muja and David + G. Lowe, and born as a child project of MRPT. Following the original + license terms, nanoflann is distributed under the BSD license. Please, for + bugs use the issues button or fork and open a pull request. + ''; + changelog = "https://github.com/jlblancoc/nanoflann/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 5c3bc936e8c1..9dacb57e8ea2 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "fastjet"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - hash = "sha256-7gfIdHyOrYbYjeSp5OjR6efXYUlz9WMbqCl/egJHi5E="; + hash = "sha256-BWCMb/IT8G3Z3nI4E9a03M1R5mGsEwmPdL/J7q8ctao="; }; buildInputs = lib.optional withPython python; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 8b5d497c5e9a..de73bcbe2772 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -84,6 +84,12 @@ stdenv.mkDerivation (finalAttrs: { propagatedNativeBuildInputs = [ lndir ]; + # libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked + # against it will crash during build unless they can access `/usr/share/icu/icudtXXl.dat`. + propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' + (allow file-read* (subpath "/usr/share/icu")) + ''; + enableParallelBuilding = true; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtdoc.nix b/pkgs/development/libraries/qt-6/modules/qtdoc.nix index 004a18f53c78..3bbe39e5ee20 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdoc.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdoc.nix @@ -13,7 +13,7 @@ qtModule { --replace '$QT_INSTALL_DOCS' "${qtbase}/share/doc" done ''; - nativeBuildInputs = [ qttools ]; + nativeBuildInputs = [ (qttools.override { withClang = true; }) ]; qtInputs = [ qtdeclarative ]; cmakeFlags = [ "-DCMAKE_MESSAGE_LOG_LEVEL=STATUS" diff --git a/pkgs/development/libraries/qt-6/modules/qttools.nix b/pkgs/development/libraries/qt-6/modules/qttools.nix index 7d13e9a03e5c..adca87550cca 100644 --- a/pkgs/development/libraries/qt-6/modules/qttools.nix +++ b/pkgs/development/libraries/qt-6/modules/qttools.nix @@ -3,13 +3,15 @@ , lib , qtbase , qtdeclarative -, llvmPackages , cups +, llvmPackages +# clang-based c++ parser for qdoc and lupdate +, withClang ? false }: qtModule { pname = "qttools"; - buildInputs = [ + buildInputs = lib.optionals withClang [ llvmPackages.libclang llvmPackages.llvm ]; diff --git a/pkgs/development/libraries/qt-6/qt-env.nix b/pkgs/development/libraries/qt-6/qt-env.nix index 0202783a9d8e..f0bf8721074f 100644 --- a/pkgs/development/libraries/qt-6/qt-env.nix +++ b/pkgs/development/libraries/qt-6/qt-env.nix @@ -8,8 +8,10 @@ buildEnv { extraOutputsToInstall = [ "out" "dev" ]; postBuild = '' - rm "$out/bin/qmake" - cp "${qtbase}/bin/qmake" "$out/bin" + for f in qmake qmake6; do + rm "$out/bin/$f" + cp "${qtbase}/bin/$f" "$out/bin" + done cat >"$out/bin/qt.conf" <<EOF [Paths] Prefix = $out diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index d87d98090966..4be281284abf 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -23,6 +23,9 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + # HACK `propagatedSandboxProfile` does not appear to actually propagate the sandbox profile from `qtbase` + sandboxProfile = toString qtbase.__propagatedSandboxProfile or null; + cmakeFlags = [ "-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}" "-DQT_TRANSLATIONS_DIR=share/qt/translations" diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 51adb59a9176..dc85ac20bf6a 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,23 +2,17 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.243.0"; + version = "1.3.250.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "sdk-${version}"; - hash = "sha256-VOq3r6ZcbDGGxjqC4IoPMGC5n1APUPUAs9xcRzxdyfk="; + hash = "sha256-5mVcbOAuzux/Yuo0NMwZRTsdQr46UxjrtMhT5mPHyCQ="; }; nativeBuildInputs = [ cmake ]; - # https://github.com/KhronosGroup/SPIRV-Headers/issues/282 - postPatch = '' - substituteInPlace SPIRV-Headers.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - meta = with lib; { description = "Machine-readable components of the Khronos SPIR-V Registry"; homepage = "https://github.com/KhronosGroup/SPIRV-Headers"; diff --git a/pkgs/development/libraries/ucc/default.nix b/pkgs/development/libraries/ucc/default.nix index 1e626911f28a..56cebc08dccc 100644 --- a/pkgs/development/libraries/ucc/default.nix +++ b/pkgs/development/libraries/ucc/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ucc"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucc"; rev = "v${version}"; - sha256 = "sha256-5rf08SXy+vCfnz4zLJ0cMnxwso4WpZOt0jRRAUviVFU="; + sha256 = "sha256-7Mo9zU0sogGyDdWIfTgUPoR5Z8D722asC2y7sHnKbzs="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index b2fcf8eb1ebb..684982e5364f 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "62"; + version = "63"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = "R${version}"; - sha256 = "sha256-/40+SXFLX8upGKP3K+wk8RnO1Al4YoF8GFXyoxTkKs0="; + sha256 = "sha256-6ITmzz1xJN/UnzVl0aAO8VNs0Go8zGcswwGpJUwwLB8="; }; patches = [ diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 91bd1a634630..7206fc1bc530 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.249"; + version = "1.3.254"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "v${version}"; - hash = "sha256-PLqF9lO7vWvgRZvXLmOcNhTgkB+3TXUa0eoALwDc5Ws="; + hash = "sha256-4erHZKx4jksAtyG8ZHtlVoEY3EqE4p2pEtcGHqv7G7A="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index d6af2ceabb28..a4cb0ae82330 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.249"; + version = "1.3.254"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "v${version}"; - hash = "sha256-v4GEZEcQP3+oiT66sgysIZ2PdLSidyYjecb3TmcHG2Y="; + hash = "sha256-bxmDhKDM+OOTsSJEoGXlWPZciBcwevv0e4gHweH46JU="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/pkgs/development/libraries/whereami/default.nix b/pkgs/development/libraries/whereami/default.nix new file mode 100644 index 000000000000..8bda2ef46dcf --- /dev/null +++ b/pkgs/development/libraries/whereami/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +}: +let + libExt = stdenv.hostPlatform.extensions.sharedLibrary; +in +stdenv.mkDerivation rec { + pname = "whereami"; + version = "unstable-2022-02-18"; + + src = fetchFromGitHub { + owner = "gpakosz"; + repo = pname; + rev = "ba364cd54fd431c76c045393b6522b4bff547f50"; + sha256 = "XhRqW0wdXzlmyBf1cjqtQvztuyV4buxVl19Q0uyEOhk="; + }; + + makeFlags = [ + "-C_gnu-make" + "build-library" + "binsubdir=platform" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib $out/include + cp bin/platform/library${libExt} $out/lib/libwhereami${libExt} + cp src/whereami.h $out/include/whereami.h + + runHook postInstall + ''; + + meta = with lib; { + description = "Locate the current executable and running module/library"; + homepage = "https://github.com/gpakosz/whereami"; + license = with licenses; [ mit wtfpl ]; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 8e0ebab220af..dbb2fa03d4e5 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -28,15 +28,17 @@ let generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }: - stdenv.mkDerivation rec { + stdenv.mkDerivation (finalAttrs: { pname = "wlroots"; inherit version; + inherit enableXWayland; + src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; - rev = version; + rev = finalAttrs.version; inherit hash; }; @@ -70,11 +72,11 @@ let xorg.xcbutilrenderutil xorg.xcbutilwm ] - ++ lib.optional enableXWayland xwayland + ++ lib.optional finalAttrs.enableXWayland xwayland ++ extraBuildInputs; mesonFlags = - lib.optional (!enableXWayland) "-Dxwayland=disabled" + lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled" ; postFixup = '' @@ -98,13 +100,13 @@ let Pluggable, composable, unopinionated modules for building a Wayland compositor; or about 50,000 lines of code you were going to write anyway. ''; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos synthetica ]; }; - }; + }); in rec { diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index 5b447e8b8891..ce25bd9519a8 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-N0LVgk3VT0Fax1GTB7jzFhwzNEeAuyFHAuxXNCo2o3Y="; + hash = "sha256-0qZUSo3m63kSFYbfn8GUU8JLdgBimlqfEWWrsK/k+Aw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/lisp-modules-new-obsolete/ql.nix b/pkgs/development/lisp-modules-new-obsolete/ql.nix index f65a55dae117..da76d8dd5775 100644 --- a/pkgs/development/lisp-modules-new-obsolete/ql.nix +++ b/pkgs/development/lisp-modules-new-obsolete/ql.nix @@ -221,9 +221,8 @@ let }; qlpkgs = - if builtins.pathExists ./imported.nix - then import ./imported.nix { inherit (pkgs) runCommand fetchzip; pkgs = builtQlpkgs; } - else {}; + lib.optionalAttrs (builtins.pathExists ./imported.nix) + (import ./imported.nix { inherit (pkgs) runCommand fetchzip; pkgs = builtQlpkgs; }); builtQlpkgs = mapAttrs (n: v: build v) qlpkgs; diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index 7e134fbce980..90b749c7bc86 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -230,8 +230,7 @@ let }); qlpkgs = - if builtins.pathExists ./imported.nix - then pkgs.callPackage ./imported.nix { inherit build-asdf-system; } - else {}; + lib.optionalAttrs (builtins.pathExists ./imported.nix) + (pkgs.callPackage ./imported.nix { inherit build-asdf-system; }); in qlpkgs.overrideScope' overrides diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 29d3db2ef469..e999c18b3e7e 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -47,5 +47,6 @@ mapAliases { readability-cli = pkgs.readability-cli; # Added 2023-06-12 thelounge = pkgs.thelounge; # Added 2023-05-22 triton = pkgs.triton; # Added 2023-05-06 + typescript = pkgs.typescript; # Added 2023-06-21 vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27 } diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index b016d08e3cd5..0c94da29c650 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -8,7 +8,6 @@ "@squoosh/cli" = "squoosh-cli"; "@webassemblyjs/cli-1.11.1" = "wasm2wast"; coffee-script = "coffee"; - typescript = "tsc"; vue-cli = "vue"; "@withgraphite/graphite-cli" = "gt"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c2548398f2e0..61448bc9879d 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -364,7 +364,6 @@ , "tsun" , "ts-node" , "ttf2eot" -, "typescript" , "typescript-language-server" , "uglify-js" , "undollar" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 96908fa44102..f34c8ab6bad5 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -142185,24 +142185,6 @@ in bypassCache = true; reconstructLock = true; }; - typescript = nodeEnv.buildNodePackage { - name = "typescript"; - packageName = "typescript"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz"; - sha512 = "XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "TypeScript is a language for application scale JavaScript development"; - homepage = "https://www.typescriptlang.org/"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index de60f890573f..c8013fb412a9 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -521,7 +521,7 @@ final: prev: { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/ts-node" \ - --prefix NODE_PATH : ${final.typescript}/lib/node_modules + --prefix NODE_PATH : ${pkgs.typescript}/lib/node_modules ''; }; @@ -529,14 +529,14 @@ final: prev: { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/tsun" \ - --prefix NODE_PATH : ${final.typescript}/lib/node_modules + --prefix NODE_PATH : ${pkgs.typescript}/lib/node_modules ''; }; typescript-language-server = prev.typescript-language-server.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' - ${pkgs.xorg.lndir}/bin/lndir ${final.typescript} $out + ${pkgs.xorg.lndir}/bin/lndir ${pkgs.typescript} $out ''; }; diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix index 12f9aa4ca02b..d41d0f851fa5 100644 --- a/pkgs/development/ocaml-modules/num/default.nix +++ b/pkgs/development/ocaml-modules/num/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (rec { inherit (ocaml.meta) platforms; inherit (src.meta) homepage; }; -} // (if lib.versions.majorMinor ocaml.version == "4.06" then { +} // (lib.optionalAttrs (lib.versions.majorMinor ocaml.version == "4.06") { env.NIX_CFLAGS_COMPILE = "-fcommon"; - } else {}) + }) ) diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 556d28ba0139..ffb3ef3771bc 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -1,4 +1,4 @@ -{ buildPecl, lib, pcre2, fetchFromGitHub }: +{ buildPecl, lib, pcre2, fetchFromGitHub, php, fetchpatch }: let version = "5.1.22"; @@ -13,6 +13,13 @@ in buildPecl { sha256 = "sha256-L4a+/kWT95a1Km+FzFNiAaBw8enU6k4ZiCFRErjj9o8="; }; + patches = lib.optionals (lib.versionAtLeast php.version "8.3") [ + (fetchpatch { + url = "https://github.com/krakjoe/apcu/commit/c9a29161c68c0faf71046e8f03f6a90900023ded.patch"; + hash = "sha256-B0ZKk9TJy2+sYGs7TEX2KxUiOVawIb+RXNgToU1Fz5I="; + }) + ]; + buildInputs = [ pcre2 ]; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/python-modules/argos-translate-files/default.nix b/pkgs/development/python-modules/argos-translate-files/default.nix new file mode 100644 index 000000000000..1acab31b723c --- /dev/null +++ b/pkgs/development/python-modules/argos-translate-files/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lxml +, translatehtml +}: + +buildPythonPackage rec { + pname = "argos-translate-files"; + version = "1.1.3"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "c6931ea8fbabdc24903ceaabfe848be0fa4a0477d00451a8dfbc1525b623f0ba"; + }; + + propagatedBuildInputs = [ + lxml + translatehtml + ]; + + postPatch = '' + ln -s */requires.txt requirements.txt + ''; + + # required for import check to work (argostranslate) + env.HOME = "/tmp"; + + pythonImportsCheck = [ "argostranslatefiles" ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "Translate files using Argos Translate"; + homepage = "https://www.argosopentech.com"; + license = licenses.mit; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/pkgs/development/python-modules/argostranslate/default.nix b/pkgs/development/python-modules/argostranslate/default.nix new file mode 100644 index 000000000000..8a1cadfb8803 --- /dev/null +++ b/pkgs/development/python-modules/argostranslate/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, ctranslate2 +, ctranslate2-cpp +, sentencepiece +, stanza +}: +let + ctranslate2OneDNN = ctranslate2.override { + ctranslate2-cpp = ctranslate2-cpp.override { + # https://github.com/OpenNMT/CTranslate2/issues/1294 + withOneDNN = true; + withOpenblas = false; + }; + }; +in +buildPythonPackage rec { + pname = "argostranslate"; + version = "1.8.0"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "9b109255d6a2c692c6f3bfbde494d1a27b3d5ed1c1d1d78711cdc1b1e3744c64"; + }; + + propagatedBuildInputs = [ + ctranslate2OneDNN + sentencepiece + stanza + ]; + + postPatch = '' + ln -s */requires.txt requirements.txt + + substituteInPlace requirements.txt \ + --replace "==" ">=" + ''; + + doCheck = false; # needs network access + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # required for import check to work + # PermissionError: [Errno 13] Permission denied: '/homeless-shelter' + env.HOME = "/tmp"; + + pythonImportsCheck = [ + "argostranslate" + "argostranslate.translate" + ]; + + meta = with lib; { + description = "Open-source offline translation library written in Python"; + homepage = "https://www.argosopentech.com"; + license = licenses.mit; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 7b0e1903f8b9..13cbb66055b4 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , defusedxml , fetchFromGitHub +, pytest-aiohttp , pytest-asyncio , pytestCheckHook , python-didl-lite @@ -14,16 +15,16 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.33.2"; + version = "0.34.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-6bTXKlogciD1iTFbo3Pss3fYnXsg4bc2GvryBvC3CDg="; + hash = "sha256-nowtQbgYkXOHQcbjlPDzhJORzSla1gmUoW9qrW0QujE="; }; propagatedBuildInputs = [ @@ -36,6 +37,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-aiohttp pytest-asyncio ]; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 0e95beec83e0..3f52c3acd354 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.13.1"; + version = "2.13.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-67uDwFwLRc8jDeHvLwYFnjYPmvpcPd9g/JL697lP+Ic="; + hash = "sha256-mR5THEu32+xit1SHjZajJGM4qsEaKM48PpkBj7L1gow="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix index f0b82fa67a44..26f636e85bf0 100644 --- a/pkgs/development/python-modules/autograd/default.nix +++ b/pkgs/development/python-modules/autograd/default.nix @@ -1,20 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, future }: +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, future +, pythonOlder +}: buildPythonPackage rec { pname = "autograd"; - version = "1.5"; + version = "1.6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2AvSJRVNHbE8tOrM96GMNYvnIJJkG2hxf5b88dFqzQs="; + hash = "sha256-hzHgigxOOJ2GlaQAcq2kUSZBwRO2ys6PTPvo636a7es="; }; - propagatedBuildInputs = [ numpy future ]; + propagatedBuildInputs = [ + numpy + future + ]; # Currently, the PyPI tarball doesn't contain the tests. When that has been # fixed, enable testing. See: https://github.com/HIPS/autograd/issues/404 doCheck = false; + pythonImportsCheck = [ + "autograd" + ]; + meta = with lib; { homepage = "https://github.com/HIPS/autograd"; description = "Compute derivatives of NumPy code efficiently"; diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 0f01045a6f14..cbddeafd2365 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { disabledTests = [ # Requires network access "test_server_with_path" + # AssertionError: 'reader type: null not compatible with writer type: int' + "test_schema_compatibility_type_mismatch" ]; pythonImportsCheck = [ @@ -38,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python serialization and RPC framework"; homepage = "https://github.com/apache/avro"; + changelog = "https://github.com/apache/avro/releases/tag/release-${version}"; license = licenses.asl20; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 899a1a3fea6f..3d934c49ed79 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.7.5"; + version = "2.7.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TYAfMaiPVEtGxwfb/AldQn+B0Cv/z8FzKjNZcCVQuHs="; + hash = "sha256-OAf5Mjwwi8P5tYy+XQTcKPNKwy2FKZkzTalrQvZLU1Y="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index d1771f97c793..6285f09ec32d 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -7,12 +7,13 @@ , pycryptodomex , pytestCheckHook , pythonOlder +, pytz , sensor-state-data }: buildPythonPackage rec { pname = "bthome-ble"; - version = "2.11.3"; + version = "2.12.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-axumlQnD7MKGdmy1gGQNU4B/3jXffK2jTyO3BtWvp5w="; + hash = "sha256-SonB0pT6sC6kpFmIMzNeASUHyuik4HOOquWx6+K05Y8="; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ buildPythonPackage rec { bluetooth-sensor-state-data sensor-state-data pycryptodomex + pytz ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 0735ac55a15b..e587c281c038 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.13.1"; + version = "5.15.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - hash = "sha256-LcCptMtRxXQPbghMIunrPcSLAXQ/r3xVktueMUQ0+gE="; + hash = "sha256-H+p2fPBXn+VqrW63KkdmPn2xqxC9uAOzQUV1ruKEUSs="; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/cliche/default.nix b/pkgs/development/python-modules/cliche/default.nix new file mode 100644 index 000000000000..0630381ac541 --- /dev/null +++ b/pkgs/development/python-modules/cliche/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, ipdb +, pytestCheckHook +}: + +buildPythonPackage { + pname = "cliche"; + version = "0.10.108"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "kootenpv"; + repo = "cliche"; + rev = "80a9ae2e90f4493880b669d5db51f1d4038589df"; # no tags + sha256 = "sha256-7/icSneLQzwdkRL/mS4RjsgnKa6YIVvGCmdS6pB6r5Y="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "ipdb == 0.13.9" "ipdb" + ''; + + propagatedBuildInputs = [ ipdb ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "cliche" ]; + + meta = with lib; { + description = "Build a simple command-line interface from your functions :computer:"; + homepage = "https://github.com/kootenpv/cliche"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 17f33d8b7fc9..03cdb826786c 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,22 +1,73 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }: +{ lib +, avro +, buildPythonPackage +, fastavro +, fetchFromGitHub +, jsonschema +, protobuf +, pyflakes +, pyrsistent +, pytestCheckHook +, pythonOlder +, rdkafka +, requests +, requests-mock +}: buildPythonPackage rec { - version = "2.0.2"; pname = "confluent-kafka"; + version = "2.1.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - hash = "sha256-OzQupCJu0QXKi8A1sId+TcLxFf/adOOjUPNjaDNWUVs="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "confluentinc"; + repo = "confluent-kafka-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-xnbovQRvbhaYYXnssV0Jy+U9L6BUddIagbup2jdTugY="; + }; + + buildInputs = [ + rdkafka + ]; + + propagatedBuildInputs = [ + requests + ]; + + passthru.optional-dependencies = { + avro = [ + avro + fastavro + ]; + json = [ + jsonschema + pyrsistent + ]; + protobuf = [ + protobuf + ]; }; - buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; + nativeCheckInputs = [ + pyflakes + pytestCheckHook + requests-mock + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "confluent_kafka" + ]; - # No tests in PyPi Tarball - doCheck = false; + disabledTestPaths = [ + "tests/integration/" + ]; meta = with lib; { description = "Confluent's Apache Kafka client for Python"; homepage = "https://github.com/confluentinc/confluent-kafka-python"; + changelog = "https://github.com/confluentinc/confluent-kafka-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ mlieberman85 ]; }; diff --git a/pkgs/development/python-modules/cson/default.nix b/pkgs/development/python-modules/cson/default.nix new file mode 100644 index 000000000000..c05ad78240c0 --- /dev/null +++ b/pkgs/development/python-modules/cson/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, speg +}: + +buildPythonPackage rec { + pname = "cson"; + version = "0.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-7owBZvzR9ReJiHGX4+g1Sse++jlvwpcGvOta8l7cngE="; + }; + + propagatedBuildInputs = [ speg ]; + + pythonImportChecks = [ "cson" ]; + + meta = with lib; { + description = "A python parser for the Coffeescript Object Notation (CSON)"; + homepage = "https://github.com/avakar/pycson"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ xworld21 ]; + }; +} diff --git a/pkgs/development/python-modules/django-timezone-field/default.nix b/pkgs/development/python-modules/django-timezone-field/default.nix index 7870e79140d7..cfca863be096 100644 --- a/pkgs/development/python-modules/django-timezone-field/default.nix +++ b/pkgs/development/python-modules/django-timezone-field/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-timezone-field"; - version = "5.0"; + version = "5.1"; disabled = pythonOlder "3.5"; format = "pyproject"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mfogel"; repo = pname; rev = version; - hash = "sha256-GXkvF/kAOU1JK0GDpUT1irCQlkxIWieYRqPd0fr2HXw="; + hash = "sha256-FAYO8OEE/h4rsbC4Oc57ylWV7TqQ6DOd6/2M+mb/AsM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index bc2d2763e49c..696c85d9fb07 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "drms"; - version = "0.6.3"; + version = "0.6.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-crPVo7ALErZWvNcsaJ/BuBa0VkfCsZ+C929x4kEZHKw="; + hash = "sha256-fH290QRhhglkhkMrpwHUkqVuYvZ6w/MDIYo9V0queVY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 8a3d3c1418f6..ca232d369323 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.0.2"; + version = "2.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QtMt6bNq6nN5crITkRie/nE1TqnXM4Daf1VMPPY2Qcs="; + hash = "sha256-iMFZLsXChfQfkkrbZycYjP53r8zQBHEEncVpOlVkcyc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 9bd758342278..ec35a06c2029 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.34"; + version = "0.5.35"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-gnNncWhrqGTWq8cNVmNMzkgqW0hoglzVGrLjqyUvOIc="; + hash = "sha256-gHHLKviU1ZHrlBp4R3WqAwEGWiM7VuB7lOYiUIJ1J7A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/espeak-phonemizer/default.nix b/pkgs/development/python-modules/espeak-phonemizer/default.nix index 77d1ecc60c75..42eb17326921 100644 --- a/pkgs/development/python-modules/espeak-phonemizer/default.nix +++ b/pkgs/development/python-modules/espeak-phonemizer/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "espeak-phonemizer"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = "espeak-phonemizer"; rev = "refs/tags/v${version}"; - hash = "sha256-F+A2ge9YAib6IjDW3RNi7QqKnh1RGy2mlPFEB+OLCJU="; + hash = "sha256-K0s24mzXUqG0Au40jjGbpKNAznBkMHQzfh2/CDBN0F8="; }; patches = [ diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index 5e7930bbc9cd..e6f40fa90ebd 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -33,6 +33,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = if (pythonAtLeast "3.11") then [ + # regression in 3.11.4 + # https://github.com/agronholm/exceptiongroup/issues/64 + "test_catch_handler_raises" + ] else null; + pythonImportsCheck = [ "exceptiongroup" ]; diff --git a/pkgs/development/python-modules/f5-icontrol-rest/default.nix b/pkgs/development/python-modules/f5-icontrol-rest/default.nix new file mode 100644 index 000000000000..080c3f5f0d73 --- /dev/null +++ b/pkgs/development/python-modules/f5-icontrol-rest/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, six +}: + +buildPythonPackage rec { + pname = "f5-icontrol-rest"; + version = "1.3.15"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "F5Networks"; + repo = "f5-icontrol-rest-python"; + rev = "v${version}"; + sha256 = "sha256-ScudlJTQfa0BsEVI+mIndYWF8OcARdxwFwTAOEJxA8w="; + }; + + propagatedBuildInputs = [ + requests + six + ]; + + # needs to be updated to newer pytest version and requires physical device + doCheck = false; + + pytestFlags = [ + "icontrol/test" + ]; + + pythonImportsCheck = [ "icontrol" ]; + + meta = with lib; { + description = "F5 BIG-IP iControl REST API client"; + homepage = "https://github.com/F5Networks/f5-icontrol-rest-python"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/f5-sdk/default.nix b/pkgs/development/python-modules/f5-sdk/default.nix new file mode 100644 index 000000000000..b73afcec0fab --- /dev/null +++ b/pkgs/development/python-modules/f5-sdk/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, f5-icontrol-rest +, six +}: + +buildPythonPackage rec { + pname = "f5-sdk"; + version = "3.0.21"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-IokMj9mCMsFMVFYO4CpZUB2i32cOamhS5u2mNkNjljo="; + }; + + propagatedBuildInputs = [ + f5-icontrol-rest + six + ]; + + # needs to be updated to newer pytest version and requires physical device + doCheck = false; + + pythonImportsCheck = [ "f5" ]; + + meta = with lib; { + description = "F5 Networks Python SDK"; + homepage = "https://github.com/F5Networks/f5-common-python"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index d158547750f0..4ca32c0d5afa 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/pkgs/development/python-modules/fastapi-mail/default.nix @@ -19,25 +19,23 @@ buildPythonPackage rec { pname = "fastapi-mail"; - version = "1.2.8"; + version = "1.3.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sabuhish"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9u7+TYO0TmzyLcCxZL86ibC3hNH5b722t5fWimRHaW0="; + hash = "sha256-ttVzjmMZe1iWn2J7N5pcol4GFnKv3CB3DOQkZU2HnHg="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "1.2.2"' 'version = "${version}"' \ + --replace 'version = "1.2.5"' 'version = "${version}"' \ --replace 'aiosmtplib = "^2.0"' 'aiosmtplib = "*"' \ --replace 'pydantic = "^1.8"' 'pydantic = "*"' \ - --replace 'starlette = "^0.22.0"' 'starlette = "*"' \ - --replace 'black = "^22.12.0"' "" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index 97f72a8c23a6..0c1aa9fbf2d1 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.11"; + version = "0.5.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iX8Vb6uUn1a7qVxwL6ZFy1YAANaSrucpOOijI1ufZco="; + hash = "sha256-gkHAIrsk6LKNjieTiSU0ZH6WI2+wJB68edNqJ7n86tY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 386dd82e8296..9814e11ff7e5 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.22.3"; + version = "1.22.4"; format = "other"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; - hash = "sha256-cL7T+r5jS8Yi723k5uscM7yc79ZL2rIA9voxa0aMcxw="; + hash = "sha256-4TAtzA8kUbZDgNzA3TuCc1eV6JUdyBLZONi6kfOIFj4="; }; # Python 2.x is not supported. diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 1f2ca0e0f7c2..768f636103ac 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.6.0"; + version = "2023.6.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xpkQSQGwf4RZHKwLdrOLW4yzECKY1vwxHYo+o3eOrhE="; + hash = "sha256-67zl530tvA7h4bpC9qasVsvjzoN9fxtPO9TZmxvABlc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix index 16bbe3092dac..63789c90debd 100644 --- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix +++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "hatch-fancy-pypi-readme"; - version = "22.8.0"; + version = "23.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hatch_fancy_pypi_readme"; inherit version; - hash = "sha256-2pEoLKCWAcGK3tjjeNr4tXjHAhSGbwlxFW7pu5zmwmo="; + hash = "sha256-sd9EBjCUrx6CSM6s1HqSyc8xPWuYI79mr4qSfDlgKH0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 663d4e4c0b3b..d91b01f52cc9 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2023.5.3"; + version = "2023.6.0"; format = "wheel"; src = fetchPypi { @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-g3Hj21UPkHKKRXPewKLivWaUn1kXnVebayJYOmZfLBY="; + hash = "sha256-8LYB3BEDHOj6ItfFRK7ewbhjN604xXKY0YlymNjEO+g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index 23f48886daa3..ea6dc79d51d9 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -8,6 +8,7 @@ , autoPatchelfHook # runtime +, libnl , openssl_1_1 # propagates @@ -27,7 +28,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2023.5.3"; + version = "2023.6.0"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -36,11 +37,11 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-rGBlzYUydgFrt40UQTFlXMUOsEYlgGnvKrfT5WEZrAQ="; + hash = "sha256-fR+ea25SqOMksBJXgSjuVvv2xSBoadZmPWP0IwxpiMA="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-8F5z1PAlfJidNeaiT0PN5odyTs99WN0rirXcUpH1mP0="; + hash = "sha256-bRP82jTVSJS46WuO8MVWFvte+2mCOSsGFDBaXdmdPHI="; }; }.${stdenv.system} or (throw "Unsupported system"); in fetchPypi { @@ -58,6 +59,7 @@ buildPythonPackage rec { ]; buildInputs = [ + libnl openssl_1_1 ]; diff --git a/pkgs/development/python-modules/huawei-lte-api/default.nix b/pkgs/development/python-modules/huawei-lte-api/default.nix index 237878d240e5..749ce13c74db 100644 --- a/pkgs/development/python-modules/huawei-lte-api/default.nix +++ b/pkgs/development/python-modules/huawei-lte-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "huawei-lte-api"; - version = "1.6.11"; + version = "1.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Salamek"; repo = "huawei-lte-api"; rev = "refs/tags/${version}"; - hash = "sha256-pOBYMSORgT8WOnhCdazuKucjPoOywnrWa+qCYR5qSls="; + hash = "sha256-/2puuWdmVvq90/UAEKPMD6wjkdxzzCdukSH4VQia4qA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index b2d5cc0bd86c..74f444485872 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -13,12 +13,13 @@ , pytest-golden , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pyyaml }: buildPythonPackage rec { pname = "ical"; - version = "4.5.3"; + version = "4.5.4"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -27,9 +28,17 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CHo6khJ8Bqej/OdQBtcfa/luO1Gj8cu7h//MwPhWrMU="; + hash = "sha256-UcuJ23yzpRHDUFlwov692UyLXP/9Qb4F+IJIszo12/M="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "tzdata" + ]; + propagatedBuildInputs = [ emoji python-dateutil diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 3b154063404f..e388cccf5932 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -2,7 +2,7 @@ , bash , buildPythonPackage , fetchPypi -, pythonOlder +, stdenv }: buildPythonPackage rec { @@ -26,6 +26,13 @@ buildPythonPackage rec { "invoke" ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + mkdir -p $out/share/{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + $out/bin/inv --print-completion-script=zsh >$out/share/zsh/site-functions/_inv + $out/bin/inv --print-completion-script=bash >$out/share/bash-completion/completions/inv.bash + $out/bin/inv --print-completion-script=fish >$out/share/fish/vendor_completions.d/inv.fish + ''; + meta = with lib; { description = "Pythonic task execution"; homepage = "https://www.pyinvoke.org/"; diff --git a/pkgs/development/python-modules/kasa-crypt/default.nix b/pkgs/development/python-modules/kasa-crypt/default.nix new file mode 100644 index 000000000000..ae208f61c663 --- /dev/null +++ b/pkgs/development/python-modules/kasa-crypt/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, poetry-core +, pytestCheckHook +, setuptools +, pythonOlder +}: + +buildPythonPackage rec { + pname = "kasa-crypt"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "kasa-crypt"; + rev = "refs/tags/v${version}"; + hash = "sha256-w/LA3BqxUcu1+nwq55g+v/QMhz8/uCTz2aRDYIdGPtk="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=kasa_crypt --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + cython + poetry-core + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "kasa_crypt" + ]; + + meta = with lib; { + description = "Fast kasa crypt"; + homepage = "https://github.com/bdraco/kasa-crypt"; + changelog = "https://github.com/bdraco/kasa-crypt/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix index f1107d91506b..ff8b8f587ce4 100644 --- a/pkgs/development/python-modules/knx-frontend/default.nix +++ b/pkgs/development/python-modules/knx-frontend/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "knx-frontend"; - version = "2023.6.9.195839"; + version = "2023.6.23.191712"; format = "pyproject"; # TODO: source build, uses yarn.lock src = fetchPypi { pname = "knx_frontend"; inherit version; - hash = "sha256-lShWlrnELpDamXT2OQvQTKOCOODv+iSxJ9pA5tIgxdM="; + hash = "sha256-MeurZ6731qjeBK6HTwXYLVs6+nXF9Hf1p8/NNwxmae4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix new file mode 100644 index 000000000000..61dab6b8e730 --- /dev/null +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -0,0 +1,93 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, argostranslate +, flask +, flask-swagger +, flask-swagger-ui +, flask-limiter +, flask-babel +, flask-session +, waitress +, expiringdict +, ltpycld2 +, morfessor +, appdirs +, apscheduler +, translatehtml +, argos-translate-files +, requests +, redis +, prometheus-client +, polib +}: + +buildPythonPackage rec { + pname = "libretranslate"; + version = "1.3.11"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "LibreTranslate"; + repo = "LibreTranslate"; + rev = "refs/tags/v${version}"; + hash = "sha256-S2J7kcoZFHOjVm2mb3TblWf9/FzkxZEB3h27BCaPYgY="; + }; + + propagatedBuildInputs = [ + argostranslate + flask + flask-swagger + flask-swagger-ui + flask-limiter + flask-babel + flask-session + waitress + expiringdict + ltpycld2 + morfessor + appdirs + apscheduler + translatehtml + argos-translate-files + requests + redis + prometheus-client + polib + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "==" ">=" + + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + ''; + + postInstall = '' + # expose static files to be able to serve them via web-server + mkdir -p $out/share/libretranslate + ln -s $out/lib/python*/site-packages/libretranslate/static $out/share/libretranslate/static + ''; + + doCheck = false; # needs network access + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # required for import check to work (argostranslate) + env.HOME = "/tmp"; + + pythonImportsCheck = [ "libretranslate" ]; + + meta = with lib; { + description = "Free and Open Source Machine Translation API. Self-hosted, no limits, no ties to proprietary services"; + homepage = "https://libretranslate.com"; + changelog = "https://github.com/LibreTranslate/LibreTranslate/releases/tag/v${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/pkgs/development/python-modules/ltpycld2/default.nix b/pkgs/development/python-modules/ltpycld2/default.nix new file mode 100644 index 000000000000..558dab085dd9 --- /dev/null +++ b/pkgs/development/python-modules/ltpycld2/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "LTpycld2"; + version = "0.42"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "948d0c1ab5518ab4efcbcc3cd73bb29f809f1dfb30f4d2fbd81b175a1ffeb516"; + }; + + doCheck = false; # completely broken tests + + pythonImportsCheck = [ "pycld2" ]; + + meta = with lib; { + description = "Python bindings around Google Chromium's embedded compact language detection library (CLD2)"; + homepage = "https://github.com/LibreTranslate/pycld2"; + license = licenses.asl20; + maintainers = with maintainers; [ misuzu ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/matplotx/default.nix b/pkgs/development/python-modules/matplotx/default.nix new file mode 100644 index 000000000000..7acb17c93667 --- /dev/null +++ b/pkgs/development/python-modules/matplotx/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, setuptools +, matplotlib +, numpy +, networkx +, pypng +, scipy +}: + +buildPythonPackage rec { + pname = "matplotx"; + version = "0.3.10"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "nschloe"; + repo = "matplotx"; + rev = "v${version}"; + hash = "sha256-EWEiEY23uFwd/vgWVLCH/buUmgRqz1rqqlJEdXINYMg="; + }; + + propagatedBuildInputs = [ + setuptools + matplotlib + numpy + ]; + + passthru.optional-dependencies = { + all = [ + networkx + pypng + scipy + ]; + contour = [ networkx ]; + spy = [ + pypng + scipy + ]; + }; + + checkInputs = passthru.optional-dependencies.all; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + "tests/test_spy.py" # Requires meshzoo (non-free) and pytest-codeblocks (not packaged) + ]; + + pythonImportsCheck = [ "matplotx" ]; + + meta = { + homepage = "https://github.com/nschloe/matplotx"; + description = "More styles and useful extensions for Matplotlib"; + changelog = "https://github.com/nschloe/matplotx/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ swflint ]; + }; +} + diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index 58c130c3bd21..ba70066bfff4 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.33.0"; + version = "1.34.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-uzrnKYCythDa+DK1X87zcL9O4cmjRDqxR2hXoN286KQ="; + hash = "sha256-rAFoIKHrhHRqcXmvbzlFKFIaHxVLp6CJUhNASwHhpPk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index 80ebef1c23ed..973d4b40822e 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -10,6 +10,17 @@ , CoreAudio }: +let + # TODO: recheck after 1.59 + miniaudio' = miniaudio.overrideAttrs (oldAttrs: rec { + version = "0.11.16"; # cffi breakage with 0.11.17 + src = fetchFromGitHub { + inherit (oldAttrs.src) owner repo; + rev = "refs/tags/${version}"; + hash = "sha256-POe/dYPJ25RKNGIhaLoqxm9JJ08MrTyHVN4NmaGOdwM="; + }; + }); +in buildPythonPackage rec { pname = "miniaudio"; version = "1.59"; @@ -27,7 +38,7 @@ buildPythonPackage rec { postPatch = '' rm -r miniaudio - ln -s ${miniaudio} miniaudio + ln -s ${miniaudio'} miniaudio substituteInPlace build_ffi_module.py \ --replace "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; substituteInPlace miniaudio.c \ diff --git a/pkgs/development/python-modules/mir_eval/default.nix b/pkgs/development/python-modules/mir_eval/default.nix new file mode 100644 index 000000000000..eaf4a9e4f535 --- /dev/null +++ b/pkgs/development/python-modules/mir_eval/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, future +, six +, numpy +, scipy +, matplotlib +}: + +buildPythonPackage rec { + pname = "mir_eval"; + version = "0.7"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-4f66pXZsZadUXCoXCyQUkPR6mJhzcLHgZ0JCTF3r5l4="; + }; + + propagatedBuildInputs = [ + future + six + numpy + scipy + matplotlib + ]; + + pythonImportsCheck = [ + "mir_eval" + ]; + + meta = with lib; { + description = "Common metrics for common audio/music processing tasks"; + homepage = "https://github.com/craffel/mir_eval"; + license = licenses.mit; + maintainers = with maintainers; [ carlthome ]; + }; +} diff --git a/pkgs/development/python-modules/morfessor/default.nix b/pkgs/development/python-modules/morfessor/default.nix new file mode 100644 index 000000000000..5301438d4ecd --- /dev/null +++ b/pkgs/development/python-modules/morfessor/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "Morfessor"; + version = "2.0.6"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "bb3beac234341724c5f640f65803071f62373a50dba854d5a398567f9aefbab2"; + }; + + checkPhase = "python -m unittest -v morfessor/test/*"; + + pythonImportsCheck = [ "morfessor" ]; + + meta = with lib; { + description = "A tool for unsupervised and semi-supervised morphological segmentation"; + homepage = "https://github.com/aalto-speech/morfessor"; + license = licenses.bsd2; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index ae455229035d..e8a032142254 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -1,31 +1,49 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, enum34, pyyaml, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, pyyaml +, setuptools }: buildPythonPackage rec { - version = "4.28.0"; pname = "mt-940"; + version = "4.30.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ydTOaijDmA2ogIONzRMMoz+5jr99qxWM1zzGGzg7f2Q="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "wolph"; + repo = "mt940"; + rev = "refs/tags/v${version}"; + hash = "sha256-t6FOMu+KcEib+TZAv5uVAzvrUSt/k/RQn28jpdAY5Y0="; }; - propagatedBuildInputs = lib.optional (!isPy3k) enum34; + postPatch = '' + sed -i "/--cov/d" pytest.ini + sed -i "/--no-cov/d" pytest.ini + ''; - nativeCheckInputs = [ pyyaml pytest ]; + nativeBuildInputs = [ + setuptools + ]; - # requires tests files that are not present - doCheck = false; - checkPhase = '' - py.test - ''; + nativeCheckInputs = [ + pyyaml + pytestCheckHook + ]; - pythonImportsCheck = [ "mt940" ]; + pythonImportsCheck = [ + "mt940" + ]; meta = with lib; { - description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation"; + description = "Module to parse MT940 files and returns smart Python collections for statistics and manipulation"; homepage = "https://github.com/WoLpH/mt940"; + changelog = "https://github.com/wolph/mt940/releases/tag/v${version}"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/netapp-lib/default.nix b/pkgs/development/python-modules/netapp-lib/default.nix new file mode 100644 index 000000000000..b84ff5613ecc --- /dev/null +++ b/pkgs/development/python-modules/netapp-lib/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lxml +, six +, xmltodict +}: + +buildPythonPackage rec { + pname = "netapp-lib"; + version = "2021.6.25"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-1g4FCSMyS8T6F/T8BOqak4h1nJis8g9jaOluA4FTNpA="; + }; + + propagatedBuildInputs = [ + lxml + six + xmltodict + ]; + + # no tests in sdist and no other download available + doCheck = false; + + pythonImportsCheck = [ "netapp_lib" ]; + + meta = with lib; { + description = "netapp-lib is required for Ansible deployments to interact with NetApp storage systems"; + homepage = "https://netapp.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/netapp-ontap/default.nix b/pkgs/development/python-modules/netapp-ontap/default.nix new file mode 100644 index 000000000000..cedb2fa064cb --- /dev/null +++ b/pkgs/development/python-modules/netapp-ontap/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cliche +, marshmallow +, pytestCheckHook +, recline +, requests +, requests-toolbelt +, urllib3 +}: + +buildPythonPackage rec { + pname = "netapp-ontap"; + version = "9.12.1.0"; + format = "setuptools"; + + src = fetchPypi { + pname = "netapp_ontap"; + inherit version; + sha256 = "sha256-eqFj2xYl4X1TB4Rxajpor5zgJdoISJk89KpARAHI/W0="; + }; + + propagatedBuildInputs = [ + marshmallow + requests + requests-toolbelt + urllib3 + # required for cli + cliche + recline + ]; + + # no tests in sdist and no other download available + doCheck = false; + + pythonImportsCheck = [ "netapp_ontap" ]; + + meta = with lib; { + description = "A library for working with ONTAP's REST APIs simply in Python"; + homepage = "https://devnet.netapp.com/restapi.php"; + license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 3a0d7a0684a3..28ec3591f51c 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.104.2"; + version = "2.104.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-JOsyu0zIzItK4+Rq8vnqhRO9YucxLLKtMTK+0EJbxSo="; + hash = "sha256-1C5+h1w6ACYmzDjgeS7Xvy/xBQnrpEmLJAhNq9bVs4k="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index 19ba24ef6991..eb1d1f3df3a1 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.1.0"; + version = "2.1.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-asW5L9jS++9ovq7WFh0rU7aB7R2rwi5ce80Hxk9NrI4="; + hash = "sha256-g8VL5nO180XplMgbbeeJIp6lmbWcMKdY/IftlkL6e5U="; }; env.PDM_BUILD_SCM_VERSION = version; diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 37223e779801..fb31ce29b461 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "13.0.0"; + version = "14.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-xe0HK6S612q/DiNLGpBqhfTg1RVvzeeez5Y0ot/+Tqk="; + hash = "sha256-sx/XlL+A2m0WmId8JXxjSmlkxirlYddFbyrsG1uFqk8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 1a2851158c52..ea4943a06506 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -6,6 +6,7 @@ , devtools , email-validator , fetchFromGitHub +, fetchpatch , pytest-mock , pytestCheckHook , python-dotenv @@ -32,7 +33,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.10.8"; + version = "1.10.9"; format = "setuptools"; outputs = [ @@ -47,9 +48,18 @@ buildPythonPackage rec { owner = "pydantic"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4oJoDlP1grLblF0ppqYM1GYEyNMEM9FssFQjacipmms="; + hash = "sha256-POqMxBJUFFS1TnO9h5W7jYwFlukBOng0zbtq4kzmMB4="; }; + patches = [ + # Fixes racy doctests build failures on really fast machines + # FIXME: remove after next release + (fetchpatch { + url = "https://github.com/pydantic/pydantic/pull/6103/commits/f05014a30340e608155683aaca17d275f93a0380.diff"; + hash = "sha256-sr47hpl37SSFFbK+/h3hGlF6Pl6L8XPKDU0lZZV7Vzs="; + }) + ]; + postPatch = '' sed -i '/flake8/ d' Makefile ''; diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix index 9de7758557d0..eb6f34f8e5eb 100644 --- a/pkgs/development/python-modules/pydrive2/default.nix +++ b/pkgs/development/python-modules/pydrive2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydrive2"; - version = "1.15.4"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyDrive2"; inherit version; - hash = "sha256-DAEbdOvCTzxspyggYmt38d/groj1dAxaXPlug915upk="; + hash = "sha256-u9yNLgAuT4fSD5vYSfk/1lieu0Da2X+UtvOCtP/Ws8E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index 10ba5fca4ed9..c7910a4d257e 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.1.2"; + version = "0.2.1.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = "refs/tags/${version}"; - hash = "sha256-4HmxDMyIlihjMQ7SbHUjFZUQR6TphRnBk/GtYnOFIcU="; + hash = "sha256-3NeXAqEoRJMzg/Io9WF93GFJHEjAaHNn4/lBVKc2Q3Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 29d3bab48ab1..85aead0f9b42 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "2.0.7"; + version = "2.0.8"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-koL5SXwcDNyyzDnYwFCQz2ht7bnrvvSo3kmvIqCuDo8="; + hash = "sha256-xc+aEywcAaZ/VL959aTNi0Rm1Cb1aFIDMHij9nzYg8Y="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 0690b1120c52..0bea5f8c51b5 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.22.3"; + version = "1.22.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyMuPDF"; inherit version; - hash = "sha256-Xs2SjpbmMJJXECCXOqFFtXt1cH86Pfl8dC5WMRJhWJE="; + hash = "sha256-XsjVEGdSKXUp0NaNRs/EzpmRSqvZm+hD8VmaGELWP+k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index 94e06834fe25..b036842dc166 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pyro-ppl"; - version = "1.8.4"; + version = "1.8.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - hash = "sha256-dm+tYeUt9IiF3pbUEhPaH46MG3ns8witUxifzRXBy0E="; + hash = "sha256-wqwDWZWHT0rbjQfJKqRZT+eD/94WFKWczl4uDZzxkzQ="; }; propagatedBuildInputs = [ @@ -67,6 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for probabilistic modeling and inference"; homepage = "http://pyro.ai"; + changelog = "https://github.com/pyro-ppl/pyro/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ teh georgewhewell ]; }; diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 1f7722ec4207..422c38aa517e 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "3.4.2"; + version = "3.5.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-C46GrCoilOYVZvuvYIOwyJM16tpJtm8cknqdAzhew7I="; + hash = "sha256-sLVKhQIqJanvupfkJSLObHTiyGE+PP8UdQR2my1azUA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index f430b488c6fe..e9526ebb354a 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "2.1.2"; + version = "2.2.0"; disabled = isPy27; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-B2gDPOQSJGg29xjJbZsWUrSalBnn+S8h+2j8NQ4tfTM="; + hash = "sha256-KolC1lcJWOcVjFEEYK2RNZodVrS/GjBzhlQ6z8kFOmE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/recline/default.nix b/pkgs/development/python-modules/recline/default.nix new file mode 100644 index 000000000000..9bafa54880f5 --- /dev/null +++ b/pkgs/development/python-modules/recline/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pudb +, pytestCheckHook +, setuptools +}: + +buildPythonPackage rec { + pname = "recline"; + version = "2023.5"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "NetApp"; + repo = "recline"; + rev = "v${version}"; + sha256 = "sha256-jsWOPkzhN4D+Q/lK5yWg1kTgFkmOEIQY8O7oAXq5Nak="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pudb + pytestCheckHook + ]; + + pythonImportsCheck = [ "recline" ]; + + meta = with lib; { + description = "This library helps you quickly implement an interactive command-based application"; + homepage = "https://github.com/NetApp/recline"; + license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix index 467d5e1340b4..1c739ebb0780 100644 --- a/pkgs/development/python-modules/redshift-connector/default.nix +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "redshift-connector"; - version = "2.0.910"; + version = "2.0.911"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "aws"; repo = "amazon-redshift-python-driver"; rev = "refs/tags/v${version}"; - hash = "sha256-24yI6pXSHxhT30N3rJXAMtpCOhhGsBuDrwx9jMO1FW0="; + hash = "sha256-D1LpFGYEpGmkYCAJbYJaQStDnol90mH8X4S6iXg6Nfs="; }; # disable test coverage diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix index 9c49071ae313..d678aca57283 100644 --- a/pkgs/development/python-modules/respx/default.nix +++ b/pkgs/development/python-modules/respx/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , httpcore , httpx , flask @@ -21,6 +22,14 @@ buildPythonPackage rec { hash = "sha256-Qs3+NWMKiAFlKTTosdyHOxWRPKFlYQD20+MKiKR371U="; }; + patches = [ + (fetchpatch { + name = "httpx-0.24-test-compatibility.patch"; + url = "https://github.com/lundberg/respx/commit/b014780bde8e82a65fc6bb02d62b89747189565c.patch"; + hash = "sha256-wz9YYUtdptZw67ddnzUCet2iTozKaW0jrTIS62I/HXo="; + }) + ]; + propagatedBuildInputs = [ httpx ]; diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 08df5a3d9fd5..cf8ceb3e96f6 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pytest-mock , pytestCheckHook +, pythonAtLeast , pythonOlder }: @@ -24,6 +25,10 @@ buildPythonPackage rec { pytest-mock ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + "test_compile__compile_restricted_exec__5" + ]; + pythonImportsCheck = [ "RestrictedPython" ]; diff --git a/pkgs/development/python-modules/routeros-api/default.nix b/pkgs/development/python-modules/routeros-api/default.nix new file mode 100644 index 000000000000..622d29584f02 --- /dev/null +++ b/pkgs/development/python-modules/routeros-api/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, six +, mock +, tox +}: + +buildPythonPackage rec { + pname = "routeros-api"; + version = "0.17.0"; + + # N.B. The version published on PyPI is missing tests. + src = fetchFromGitHub { + owner = "socialwifi"; + repo = pname; + rev = version; + sha256 = "wpIfeYZ1w/yoNCHLYFVjn0O4Rb+N5lfvYzhGuN+HDTA="; + }; + + nativeCheckInputs = [ + mock + tox + ]; + + propagatedBuildInputs = [ six ]; + + meta = with lib; { + description = "Python API to RouterBoard devices produced by MikroTik."; + homepage = "https://github.com/socialwifi/RouterOS-api"; + license = licenses.mit; + maintainers = with maintainers; [ quentin ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 4ec3b676698a..b8e19d46f790 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "rq"; - version = "1.15"; + version = "1.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rq"; repo = "rq"; rev = "refs/tags/v${version}"; - hash = "sha256-QTQ90ZJQU6UWPjNCjmR4ez6av+B9M8gDof2Gq+R86aY="; + hash = "sha256-cymNXFI+6YEVw2Pc7u6+vroC0428oW7BTLxyBgPqLng="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index 61f1477c7c51..43836e882303 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , aiohttp , async-timeout +, kasa-crypt , orjson , pythonOlder , requests @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.11.2"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-i6XI6hiQTOGHB4KcDgz/MlYAhdEKaElLfNMq2R0fgu8="; + hash = "sha256-LVpTB7Q78N/cRbneJJ1aT+lFE790ssdMHo8VRirtDHY="; }; postPatch = '' @@ -32,6 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp async-timeout + kasa-crypt orjson requests websocket-client @@ -48,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "API for the Sense Energy Monitor"; homepage = "https://github.com/scottbonline/sense"; + changelog = "https://github.com/scottbonline/sense/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/speg/default.nix b/pkgs/development/python-modules/speg/default.nix new file mode 100644 index 000000000000..83bdc1e5b046 --- /dev/null +++ b/pkgs/development/python-modules/speg/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, speg +}: + +buildPythonPackage rec { + pname = "speg"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-EMvvR+Fo38YvFNtXXPHEKAN6K4gc7mw8/O2gQ5wkPnE="; + extension = "zip"; + }; + + pythonImportChecks = [ "speg" ]; + + # checks fail for seemingly spurious reasons + doCheck = false; + + meta = with lib; { + description = "A PEG-based parser interpreter with memoization (in time)"; + homepage = "https://github.com/avakar/speg"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ xworld21 ]; + }; +} diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index ae9d8bd953e8..ecfa57be2e30 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -4,7 +4,6 @@ , fetchPypi , fetchpatch , python -, pythonAtLeast , scripttest , pytz , pbr @@ -20,21 +19,18 @@ buildPythonPackage rec { pname = "sqlalchemy-migrate"; version = "0.13.0"; - # using deprecated inspect.getargspec function - # https://bugs.launchpad.net/sqlalchemy-migrate/+bug/2003619 - disabled = pythonAtLeast "3.11"; - src = fetchPypi { inherit pname version; sha256 = "1y0lcqii7b4vp7yh9dyxrl4i77hi8jkkw7d06mgdw2h458ljxh0b"; }; - # See: https://review.openstack.org/#/c/608382/ patches = [ + # See: https://review.openstack.org/#/c/608382/ (fetchpatch { url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch"; sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07"; }) + ./python3.11-comp.diff ]; postPatch = '' diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/python3.11-comp.diff b/pkgs/development/python-modules/sqlalchemy-migrate/python3.11-comp.diff new file mode 100644 index 000000000000..c8e201b0ca6d --- /dev/null +++ b/pkgs/development/python-modules/sqlalchemy-migrate/python3.11-comp.diff @@ -0,0 +1,13 @@ +diff --git a/migrate/versioning/shell.py b/migrate/versioning/shell.py +index 5fb86b1..fae0ce4 100644 +--- a/migrate/versioning/shell.py ++++ b/migrate/versioning/shell.py +@@ -108,7 +108,7 @@ def main(argv=None, **kwargs): + parser.error("Invalid command %s" % command) + + parser.set_usage(inspect.getdoc(command_func)) +- f_args, f_varargs, f_kwargs, f_defaults = inspect.getargspec(command_func) ++ f_args, f_varargs, f_kwargs, f_defaults, _, _, _ = inspect.getfullargspec(command_func) + for arg in f_args: + parser.add_option( + "--%s" % arg, diff --git a/pkgs/development/python-modules/stdlib-list/default.nix b/pkgs/development/python-modules/stdlib-list/default.nix index fb46ee24cd50..9cf75ab98ca1 100644 --- a/pkgs/development/python-modules/stdlib-list/default.nix +++ b/pkgs/development/python-modules/stdlib-list/default.nix @@ -1,20 +1,26 @@ { lib , buildPythonPackage -, isPy27 , fetchPypi + +# build-system +, flit-core }: buildPythonPackage rec { pname = "stdlib-list"; - version = "0.8.0"; - format = "setuptools"; - disabled = isPy27; + version = "0.9.0"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "17vdn4q0sdlndc2fr9svapxx6366hnrhkn0fswp1xmr0jxqh7rd1"; + pname = "stdlib_list"; + inherit version; + hash = "sha256-mOtmE1l2yWtO4/TA7wVS67Wpl3zjAoQz23n0c4sCryY="; }; + nativeBuildInputs = [ + flit-core + ]; + pythonImportsCheck = [ "stdlib_list" ]; @@ -23,6 +29,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { + changelog = "https://github.com/pypi/stdlib-list/releases/tag/v${version}"; description = "A list of Python Standard Libraries"; homepage = "https://github.com/jackmaney/python-stdlib-list"; license = licenses.mit; diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix index 0de6a2ff9eed..ad42066758a8 100644 --- a/pkgs/development/python-modules/tensorly/default.nix +++ b/pkgs/development/python-modules/tensorly/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tensorly"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6iZvUgsoYf8fDGEuAODgfr4jCkiJwaJXlQUAsaOF9JU="; + hash = "sha256-hwpdExW/ESOavFkL3old1Efo5WC+PYmcgJp5/oLelaA="; }; propagatedBuildInputs = [ @@ -54,8 +54,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # tries to download data: - "test_kinetic" + # this can fail on hydra and other peoples machines, check with others before re-enabling # AssertionError: Partial_SVD took too long, maybe full_matrices set wrongly "test_svd_time" ]; @@ -65,6 +64,5 @@ buildPythonPackage rec { homepage = "https://tensorly.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; - broken = stdenv.isLinux && stdenv.isAarch64; # test failures: test_TTOI and test_validate_tucker_rank }; } diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index 78bc04fceb4a..ea4f0e265d7f 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -1,13 +1,11 @@ { lib , buildPythonPackage -, fetchpatch , fetchFromGitHub -, pythonAtLeast , coqpit , fsspec , torch-bin -, tensorboardx +, tensorboard , protobuf , psutil @@ -18,7 +16,7 @@ let pname = "trainer"; - version = "0.0.26"; + version = "0.0.27"; in buildPythonPackage { inherit pname version; @@ -28,7 +26,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-poC1aCXBb5mjZvqQjxhiv3+mKK262rxisgkHvAuNCsk="; + hash = "sha256-2uITlcaGcRujhSZPK746d13X8ZrgaGbfMZruLmTpQIs="; }; postPatch = '' @@ -41,7 +39,7 @@ buildPythonPackage { protobuf psutil soundfile - tensorboardx + tensorboard torch-bin ]; diff --git a/pkgs/development/python-modules/translatehtml/default.nix b/pkgs/development/python-modules/translatehtml/default.nix new file mode 100644 index 000000000000..c99b8a44a1db --- /dev/null +++ b/pkgs/development/python-modules/translatehtml/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, argostranslate +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "translatehtml"; + version = "1.5.2"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "6b30ceb8b6f174917e2660caf2d2ccbaa71d8d24c815316edf56b061d678820d"; + }; + + propagatedBuildInputs = [ + argostranslate + beautifulsoup4 + ]; + + postPatch = '' + ln -s */requires.txt requirements.txt + + substituteInPlace requirements.txt \ + --replace "==" ">=" + ''; + + # required for import check to work (argostranslate) + env.HOME = "/tmp"; + + pythonImportsCheck = [ "translatehtml" ]; + + doCheck = false; # no tests + + meta = with lib; { + description = "Translate HTML using Beautiful Soup and Argos Translate."; + homepage = "https://www.argosopentech.com"; + license = licenses.mit; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 9fc1c5eff2a1..1807fdcf2b12 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "ttp"; - version = "0.9.4"; + version = "0.9.5"; format = "pyproject"; src = fetchFromGitHub { owner = "dmulyalin"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iZJ38NQnofW9awisY5cFBIN1rjXinA6CpJYSCCnNaOY="; + hash = "sha256-IWqPFspERBVkjsTYTAkOTOrugq4fD65Q140G3SCEV0w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wxPython/4.2.nix b/pkgs/development/python-modules/wxPython/4.2.nix index 3d4ddb1e7061..0ed40b8a9173 100644 --- a/pkgs/development/python-modules/wxPython/4.2.nix +++ b/pkgs/development/python-modules/wxPython/4.2.nix @@ -41,13 +41,13 @@ buildPythonPackage rec { pname = "wxPython"; - version = "4.2.0"; + version = "4.2.1"; format = "other"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZjzrxFCdfl0RNRiGX+J093+VQ0xdV7w4btWNZc7thsc="; + hash = "sha256-5I3iEaZga/By7D+neHcda3RsALf0uXDrWHKN31bRPVw="; }; patches = [ @@ -127,6 +127,7 @@ buildPythonPackage rec { meta = with lib; { + changelog = "https://github.com/wxWidgets/Phoenix/blob/wxPython-${version}/CHANGES.rst"; description = "Cross platform GUI toolkit for Python, Phoenix version"; homepage = "http://wxpython.org/"; license = licenses.wxWindows; diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 935a82415293..6ab647eaaca8 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.20"; + version = "0.2.22"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-uFIfhu7Sq4yQAzEfegIo0xyok1Bo8M/esg6bZCIWO18="; + hash = "sha256-+a972VZuNgf666VitrPSfRbcZbA49zlTIXbGWioKROc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 8cb0c036e344..4c43febd19dc 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.0.2"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-95i/7dSXOL7OgqrBWy2X8EV4zLFXLzR6NQy3BN9NDhA="; + hash = "sha256-MobeeelKkU5KFIFP/+Ny0ktzTnhKzX+fpzTuODrfjG0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 075f2c58f491..44ca2aa13c66 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.64.0"; + version = "0.68.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-u9MZoJyTmbUBeFbsw2EtwfNDzXKAZOwNc+4TanbQg3A="; + hash = "sha256-xhWl0OUzTz+msZ5UgLrb/wqQTKuuFnpgpk7SPGyyI7Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index 68cb00418ae8..95043c7be482 100644 --- a/pkgs/development/quickemu/default.nix +++ b/pkgs/development/quickemu/default.nix @@ -50,13 +50,13 @@ in stdenv.mkDerivation rec { pname = "quickemu"; - version = "4.7"; + version = "4.8"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = version; - hash = "sha256-6ctO11dKUj+CnHPVdj705uTwx31zKNQp6AUb/0kCgK8="; + hash = "sha256-QchY9inmBqAwNEhUL+uFCRX1laaM57ICbDJEBW7qTic="; }; postPatch = '' diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 774e29e49d06..39f54636c398 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.4.13"; - source.sha256 = "sha256-EWU6pa5QfG29Vb9+m+iSbZmvrJtsDAjToZOK/rPnWos="; + version = "2.4.14"; + source.sha256 = "sha256-lIJKzVEK30D43O5q0YwJ+FcSyJxGij2uWlxH+mlIfHI="; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/tools/abuild/default.nix b/pkgs/development/tools/abuild/default.nix index d7c03dac7870..c08a6f60a5dd 100644 --- a/pkgs/development/tools/abuild/default.nix +++ b/pkgs/development/tools/abuild/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "abuild"; - version = "3.11.7"; + version = "3.11.9"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = pname; rev = version; - sha256 = "sha256-QcfUbjveSGAOMAyIrG0ZNNM4rqT7zWUHIhaMzBenKm0="; + sha256 = "sha256-lp2+38eJLp0SU34pywrrXVON0PW2NvgaIO4n/KChMro="; }; buildInputs = [ diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix index e31ddd0b3768..93636af50226 100644 --- a/pkgs/development/tools/bazel-gazelle/default.nix +++ b/pkgs/development/tools/bazel-gazelle/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-gazelle"; - version = "0.31.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y1otQcGtG7jIJE5G0DET8bFRVL6AEG0r98X5PufT7Lw="; + sha256 = "sha256-avc92qQS2d8MiQVRUYEiMOlsfgQFJ6HZG01rmZeC9Fo="; }; vendorHash = null; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index ce370dd414d8..652e7e32bc50 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -320,10 +320,10 @@ stdenv.mkDerivation rec { sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k"; }; - in (if !stdenv.hostPlatform.isDarwin then { + in (lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { # `extracted` doesn’t work on darwin shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self; }; - } else {}) // { + }) // { bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self; }; java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self; }; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index f0d2147fe7f6..8382f9d4be35 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -285,10 +285,10 @@ stdenv.mkDerivation rec { sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k"; }; - in (if !stdenv.hostPlatform.isDarwin then { + in (lib.optionalSttrs (!stdenv.hostPlatform.isDarwin) { # `extracted` doesn’t work on darwin shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self;}; - } else {}) // { + }) // { bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self;}; cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self;}; java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self;}; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index de69c79b6ea0..1424817edc90 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -295,10 +295,10 @@ stdenv.mkDerivation rec { sha256 = "1mm4awx6sa0myiz9j4hwp71rpr7yh8vihf3zm15n2ii6xb82r31k"; }; - in (if !stdenv.hostPlatform.isDarwin then { + in (lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) { # `extracted` doesn’t work on darwin shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self;}; - } else {}) // { + }) // { bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self;}; cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self;}; java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self;}; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 82eafadd37a3..00715130a000 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -35,16 +35,16 @@ in assert lib.subtractLists [ "ncurses" "qt5" ] uiToolkits == []; # Minimal, bootstrap cmake does not have toolkits assert isBootstrap -> (uiToolkits == []); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cmake" + lib.optionalString isBootstrap "-boot" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.25.3"; + version = "3.26.4"; src = fetchurl { - url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - sha256 = "sha256-zJlXAdWQym3rxCRemYmTkJnKUoJ91GtdNZLwk6/hkBw="; + url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; + hash = "sha256-MTtogMKRvU/jHAqlHW5iZZKCpSHmlfMNXMDSWrvVwgg="; }; patches = [ @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = setupHooks ++ [ + nativeBuildInputs = finalAttrs.setupHooks ++ [ pkg-config ] ++ lib.optionals buildDocs [ texinfo ] @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { configureFlags = [ "CXXFLAGS=-Wno-elaborated-enum-base" - "--docdir=share/doc/${pname}${version}" + "--docdir=share/doc/${finalAttrs.pname}-${finalAttrs.version}" ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails - meta = with lib; { + meta = { homepage = "https://cmake.org/"; description = "Cross-platform, open-source build system generator"; longDescription = '' @@ -164,10 +164,10 @@ stdenv.mkDerivation rec { configuration files, and generate native makefiles and workspaces that can be used in the compiler environment of your choice. ''; - changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/release/${lib.versions.majorMinor version}.html"; - license = licenses.bsd3; - maintainers = with maintainers; [ ttuegel lnl7 AndersonTorres ]; - platforms = platforms.all; + changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor finalAttrs.version}/release/${lib.versions.majorMinor finalAttrs.version}.html"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ttuegel lnl7 AndersonTorres ]; + platforms = lib.platforms.all; broken = (qt5UI && stdenv.isDarwin); }; -} +}) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 3914f6584096..58468ccee5b8 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -18,11 +18,11 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - hash = "sha256-2WFsRM1sU2if+PBfxpWKaT8uF8NHKo2vg87lXav/gp8="; + hash = "sha256-0EtUH5fKQ5+4L6t9DUgJiL5L1OYlY6XKNfrbVAByexw="; }; patches = [ @@ -77,13 +77,6 @@ python3.pkgs.buildPythonApplication rec { "docs/yaml/objects/dep.yaml" ]; }) - - # Fix regression in precomputing CMAKE_SIZEOF_VOID_P - # See https://github.com/mesonbuild/meson/pull/11761 - (fetchpatch { - url = "https://github.com/mesonbuild/meson/commit/7c78c2b5a0314078bdabb998ead56925dc8b0fc0.patch"; - sha256 = "sha256-vSnHhuOIXf/1X+bUkUmGND5b30ES0O8EDArwb4p2/w4="; - }) ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index eacf45074f4f..68b5d8ed373a 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -120,9 +120,6 @@ let substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" ''; - # Silence the depreciation warning from SqlAlchemy - SQLALCHEMY_SILENCE_UBER_WARNING = 1; - # TimeoutErrors on slow machines -> aarch64 doCheck = !stdenv.isAarch64; diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 4a99ce59aa95..709c95fc99b9 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.101.0"; + version = "0.101.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5eeXoy9mRMRexjVh+Cb3t7qL+/GSKHwS0Yjk5TvpCgA="; + sha256 = "sha256-jTQUBcS8JYyXmdYo4sxuGrtuOfkKCZa0OXjGu3wvQBw="; }; vendorHash = "sha256-qYt3NRjlImRE/G2CUYTukOCP37slseYxiJGLFtZCiDk="; diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 6571b7212dab..c9f1dbbd1432 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-9QQ6aDCkTWNq5KOSGF6FH6UQrOYa51ctW3CMcGrCJAQ="; + hash = "sha256-cBaHj50j1jh2ASDbYHVw12GLD4afTVtyLeGrZtcdylY="; }; - vendorHash = "sha256-r1E0JrwLDMlBINxtHKI5XfrG4kYWRcuep8CvtvVCqio="; + vendorHash = "sha256-fX6Lhc/OhPH1g2ANoxZmkADKhoDA3WsSb3cu1tKBjjw="; proxyVendor = true; subPackages = [ diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 7f6dd71c14c7..65cf727997dc 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.0.2"; + version = "16.1.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-BgT+anRMkF00LLi+7Em0pXElwBnPz3QTs0G5+yoEj/k="; + vendorHash = "sha256-tlTmKq1a5hX8G0+7RC1QbWA7YVnoBS5R9QqXljJ4bVg="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-t1DI7AhxnnBoP5h54dUCKtJcIffxmv0c7OczVhEy3rI="; + sha256 = "sha256-1obA2f/YtOBkgYLJqcHQWbaCezEw7lUXs4OxFiONCm8="; }; patches = [ @@ -49,6 +49,12 @@ buildGoModule rec { rm executors/docker/services_test.go ''; + excludedPackages = [ + # CI helper script for pushing images to Docker and ECR registries + # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4139 + "./scripts/sync-docker-images" + ]; + postInstall = '' install packaging/root/usr/share/gitlab-runner/clear-docker-cache $out/bin ''; diff --git a/pkgs/development/tools/database/pgweb/default.nix b/pkgs/development/tools/database/pgweb/default.nix index 7cdf913736a6..f93c2de7b547 100644 --- a/pkgs/development/tools/database/pgweb/default.nix +++ b/pkgs/development/tools/database/pgweb/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgweb"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "sosedoff"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+sU+kNTOv78g4mvynXoIyNtmeIDxzfAs4Kr/Lx9zfiU="; + sha256 = "sha256-NPuL7ffDLpnu0khJBIz+tItYyeHYPeOuTHXr4DjBgM0="; }; postPatch = '' @@ -28,6 +28,6 @@ buildGoModule rec { ''; homepage = "https://sosedoff.github.io/pgweb/"; license = licenses.mit; - maintainers = with maintainers; [ zupo ]; + maintainers = with maintainers; [ zupo luisnquin ]; }; } diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 7abda2291556..4e95b02bfb7b 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.18.8"; + version = "0.18.10"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-yFMPUvRh+sP45qGf65QXmrqy2mBlGZsSizeeV53DvP0="; + hash = "sha256-mJ6q/Ccg7Lm6OXncLnA7QAyiDS/tZJJqobPG+shGPJQ="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/development/tools/fastddsgen/default.nix index 929edbb75452..c09a27f3ed70 100644 --- a/pkgs/development/tools/fastddsgen/default.nix +++ b/pkgs/development/tools/fastddsgen/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle_7, openjdk17, git, perl, cmake }: let pname = "fastddsgen"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-DDS-Gen"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-tnSZ0jyR6iPjyA3vpdZXOza/QI2ro92BOtjKp/NDriM="; + hash = "sha256-3x99FfdxSfqa2+BNZ3lZQzRgjwGhbm5PKezoS6fs5Ts="; }; gradle = gradle_7; diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 37d00c721b9b..d6767677d98e 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.44.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BfzB6Qt0Hg9ryU4zeTi40jByOgqr9mveq5ZGkO8bA9U="; + sha256 = "sha256-nZXNUAS5HZTEMQ/sjetE30s/etpX/Hwp7QqgtOl3Rqs="; }; subPackages = [ "./" ]; diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix index 7646f0d80782..987a1d13dc9b 100644 --- a/pkgs/development/tools/language-servers/gopls/default.nix +++ b/pkgs/development/tools/language-servers/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.12.2"; + version = "0.12.4"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - sha256 = "sha256-mbJ9CzJxhAxYByfNpNux/zOWBGaiH4fvIRIh+BMprMk="; + sha256 = "sha256-OieIbWgc5l7HS6otkRxsKYQmNIjPbADQ+C3A6qJr2h0="; }; modRoot = "gopls"; - vendorSha256 = "sha256-Wx0tXrw3Y3Of3aZNYiD9EVYKFpqA3kqe5tFqppoe0A0="; + vendorSha256 = "sha256-0Svz0VFmNW/f8Po+DpIQi0bJB1ICLcSJM1sG/Nju+ZY="; doCheck = false; diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index c72868de6d4f..d77d8c39878e 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.11.3" +version = "0.12.0" dependencies = [ "config", "diagnostic", @@ -108,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.11.3" +version = "0.12.0" dependencies = [ "fast-hash", "str-util", @@ -121,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e [[package]] name = "cm-syntax" -version = "0.11.3" +version = "0.12.0" dependencies = [ "lex-util", "paths", @@ -150,7 +150,7 @@ dependencies = [ [[package]] name = "config" -version = "0.11.3" +version = "0.12.0" dependencies = [ "fast-hash", "serde", @@ -178,7 +178,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.11.3" +version = "0.12.0" dependencies = [ "fast-hash", "once_cell", @@ -267,6 +267,12 @@ dependencies = [ ] [[package]] +name = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + +[[package]] name = "errno" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -357,6 +363,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] name = "hermit-abi" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -393,17 +405,17 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "autocfg", - "hashbrown", + "equivalent", + "hashbrown 0.14.0", ] [[package]] name = "input" -version = "0.11.3" +version = "0.12.0" dependencies = [ "cm-syntax", "config", @@ -457,13 +469,13 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "la-arena" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dabfe0d01e15fde0eba33b9de62475c59e681a47ce4ffe0534af2577a3f8524" +checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.11.3" +version = "0.12.0" dependencies = [ "analysis", "anyhow", @@ -491,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.11.3" +version = "0.12.0" [[package]] name = "libc" @@ -523,9 +535,9 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lsp-server" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9b4c78d1c3f35c5864c90e9633377b5f374a4a4983ac64c30b8ae898f9305" +checksum = "3711e4d6f491dc9edc0f1df80e204f38206775ac92c1241e89b79229a850bc00" dependencies = [ "crossbeam-channel", "log", @@ -563,7 +575,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.11.3" +version = "0.12.0" dependencies = [ "analysis", "codespan-reporting", @@ -581,7 +593,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.11.3" +version = "0.12.0" dependencies = [ "anyhow", "env_logger", @@ -610,7 +622,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.11.3" +version = "0.12.0" dependencies = [ "fast-hash", "paths", @@ -621,7 +633,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.11.3" +version = "0.12.0" dependencies = [ "config", "diagnostic", @@ -645,7 +657,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.11.3" +version = "0.12.0" dependencies = [ "lex-util", "paths", @@ -717,7 +729,7 @@ dependencies = [ [[package]] name = "panic-hook" -version = "0.11.3" +version = "0.12.0" dependencies = [ "better-panic", ] @@ -768,9 +780,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "363a6f739a0c0addeaf6ed75150b95743aa18643a3c6f40409ed7b6db3a6911f" dependencies = [ "unicode-ident", ] @@ -820,7 +832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64449cfef9483a475ed56ae30e2da5ee96448789fb2aa240a04beb6a055078bf" dependencies = [ "countme", - "hashbrown", + "hashbrown 0.12.3", "memoffset", "rustc-hash", "text-size", @@ -860,29 +872,29 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.97" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" dependencies = [ "itoa", "ryu", @@ -897,21 +909,21 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.20", ] [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] [[package]] name = "slash-var-path" -version = "0.11.3" +version = "0.12.0" dependencies = [ "fast-hash", "str-util", @@ -919,14 +931,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.11.3" +version = "0.12.0" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.11.3" +version = "0.12.0" dependencies = [ "fast-hash", "fmt-util", @@ -937,7 +949,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.11.3" +version = "0.12.0" dependencies = [ "config", "pretty_assertions", @@ -953,7 +965,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.11.3" +version = "0.12.0" dependencies = [ "config", "elapsed", @@ -967,7 +979,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.11.3" +version = "0.12.0" dependencies = [ "fast-hash", "once_cell", @@ -976,7 +988,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.11.3" +version = "0.12.0" dependencies = [ "la-arena", "sml-lab", @@ -987,7 +999,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.11.3" +version = "0.12.0" dependencies = [ "config", "cov-mark", @@ -1002,14 +1014,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.11.3" +version = "0.12.0" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.11.3" +version = "0.12.0" dependencies = [ "cov-mark", "diagnostic", @@ -1020,11 +1032,11 @@ dependencies = [ [[package]] name = "sml-libs" version = "0.1.0" -source = "git+https://github.com/azdavis/sml-libs.git#531ade607bcb8692897a8afec3d89789fea4e5dc" +source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e58af01200af5b0" [[package]] name = "sml-naive-fmt" -version = "0.11.3" +version = "0.12.0" dependencies = [ "fast-hash", "sml-comment", @@ -1033,11 +1045,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.11.3" +version = "0.12.0" [[package]] name = "sml-parse" -version = "0.11.3" +version = "0.12.0" dependencies = [ "diagnostic", "event-parse", @@ -1049,14 +1061,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.11.3" +version = "0.12.0" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.11.3" +version = "0.12.0" dependencies = [ "num-bigint", "num-traits", @@ -1065,7 +1077,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.11.3" +version = "0.12.0" dependencies = [ "chain-map", "config", @@ -1088,7 +1100,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.11.3" +version = "0.12.0" dependencies = [ "chain-map", "code-h2-md-map", @@ -1107,7 +1119,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.11.3" +version = "0.12.0" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1115,7 +1127,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.11.3" +version = "0.12.0" dependencies = [ "char-name", "code-h2-md-map", @@ -1128,7 +1140,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.11.3" +version = "0.12.0" dependencies = [ "fast-hash", "sml-hir", @@ -1164,9 +1176,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "fcb8d4cebc40aa517dfb69618fa647a346562e67228e2236ae0042ee6ac14775" dependencies = [ "proc-macro2", "quote", @@ -1196,7 +1208,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.3" +version = "0.12.0" dependencies = [ "analysis", "cm-syntax", @@ -1264,9 +1276,9 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e [[package]] name = "toml" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" dependencies = [ "serde", "serde_spanned", @@ -1276,18 +1288,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" dependencies = [ "indexmap", "serde", @@ -1540,7 +1552,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.11.3" +version = "0.12.0" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 5e7fac455f5c..11aad10e0f91 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-e+v/f7zyRwHL2cuNvuOxPg32ilxwUNoQj+ANJBheXII="; + hash = "sha256-WoawuH0fuhVrTEtcdfkKpJUQBcbMnbybDST4DDkJEqM="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "char-name-0.1.0" = "sha256-hElcqzsfU6c6HzOqnUpbz+jbNGk6qBS+uk4fo1PC86Y="; - "sml-libs-0.1.0" = "sha256-5Ql/OUC3lakCkUROXI5eau7ur0Rgf9qIWV9NgFfPB40="; + "sml-libs-0.1.0" = "sha256-q3n4UfDcpDaN8v9UewAz2G26NeDDsZFuczS7N6nkl5Q="; }; }; diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index d8006f0c7630..7ecd97835b1a 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , bison , boost182 @@ -27,6 +28,16 @@ stdenv.mkDerivation rec { hash = "sha256-zeBVh9gPMR+1ETx0ujl+TUSoeHHR4fkQfxyOpCDKP9M="; }; + patches = [ + # Fix build on Darwin. Remove with next release. + # https://github.com/nix-community/nixd/pull/172 + (fetchpatch { + url = "https://github.com/nix-community/nixd/commit/3dbe1eb6bde1949b510e19a2d1863a2f4d2329a6.patch"; + hash = "sha256-130L+85bZIBmNfHqH3PdmQCBuxLnCs3IyAAoW15RQSk="; + includes = [ "lib/lspserver/src/Logger.cpp" "lib/nixd/src/ServerController.cpp" ]; + }) + ]; + mesonBuildType = "release"; nativeBuildInputs = [ @@ -83,6 +94,5 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ inclyc Ruixi-rebirth ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/development/tools/lightningcss/default.nix index 7993cb3adea1..63cc8d77bff3 100644 --- a/pkgs/development/tools/lightningcss/default.nix +++ b/pkgs/development/tools/lightningcss/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.21.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; rev = "refs/tags/v${version}"; - sha256 = "ECBW0fXX7RrsnBrClwbFIa1i9GfqaYJXIP0zm68Ds84="; + sha256 = "knYiK3+4mZNExVLFOj+cLbR8gdsm8CAHQY6xpdsqiew="; }; - cargoHash = "sha256-Y7aLtsnInNnh5p5keBHrfFlIi7F1tRasDmX4BFLLicU="; + cargoHash = "sha256-aUtx5wqH6E1AkXoXiiu9ODMziX6k/HG0H0wQSQttOig="; buildFeatures = [ "cli" diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index ce7b5f26e735..e417bc217f8d 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizinc"; - version = "2.7.5"; + version = "2.7.6"; src = fetchFromGitHub { owner = "MiniZinc"; repo = "libminizinc"; rev = finalAttrs.version; - sha256 = "sha256-RstT9jOfyTrl/pdsQT/U9+wHJoJyBqvlZn21dRaawG8="; + sha256 = "sha256-1+bFF79lYt5RAx5gfNg7J3iB7ExxNgFUmBIcg6/hfQs="; }; nativeBuildInputs = [ bison cmake flex jq ]; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 5a47aefbd452..6dec4e64543b 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.26896"; + version = "0.1.27054"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nSqQr5fLkmN8ePc4JigHOMi7cXmmbpj4m864Ed/jYUw="; + sha256 = "sha256-t273BD2plrsBKQqYg1EHdPIXR3qs9coHhTc/k5297cw="; }; vendorHash = "sha256-IUDiKAwhJdDkp7qXPMcP6+QjEZvevBH0IFKFPAsHKio="; diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index 654a6b4a502d..242df1d44c7d 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -4,10 +4,8 @@ , perlPackages , buildEnv , makeWrapper -, libtool , unzip , pkg-config -, sqlite , libpqxx , top-git , mercurial @@ -22,7 +20,6 @@ , prometheus-cpp , nukeReferences , git -, boehmgc , nlohmann_json , docbook_xsl , openssh @@ -126,13 +123,13 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - version = "2023-03-27"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "082495e34e094cae1eb49dbfc5648938e23c6355"; - sha256 = "sha256-Nj9U0V7Zv7XoRDdO7ECphTk6jHfOgeZe6G0x4FQLpJ0="; + rev = "526e8bd7441d1beb271ff89bbca3604077ecffdb"; + sha256 = "sha256-VRNI3H/WUTi7VTNLwO/I0gMnJ6ZMYRbBfgdsAj+TmP4="; }; buildInputs = [ diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 01d62cac0e9e..131546996162 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.13.9"; + version = "2.13.10"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-jZTclbYIz3AhawEgOj+CQrl6Iy2y4jQhovQ3CNoI8zc="; + sha256 = "sha256-5dEJXsEyJWXzjxSTRvcZZ0lsKB6sxR7Fx3mUuFDn0zU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 2d01944dce41..e09ecac29b3a 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -2,7 +2,7 @@ , withGocode ? true, gocode , withGodef ? true, godef , withGotools? true, gotools -, withTypescript ? true, nodePackages +, withTypescript ? true, typescript , abseil-cpp, boost, llvmPackages , fixDarwinDylibNames, Cocoa }: @@ -77,7 +77,7 @@ stdenv.mkDerivation { ln -sf ${gotools}/bin/gopls $TARGET '' + lib.optionalString withTypescript '' TARGET=$out/lib/ycmd/third_party/tsserver - ln -sf ${nodePackages.typescript} $TARGET + ln -sf ${typescript} $TARGET ''; # fixup the argv[0] and replace __file__ with the corresponding path so diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index 7bc1f80c699f..16c65b3ae243 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -10,14 +10,14 @@ let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ]; in buildDunePackage rec { pname = "dune-release"; - version = "1.6.2"; + version = "2.0.0"; duneVersion = "3"; minimalOCamlVersion = "4.06"; src = fetchurl { url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "sha256-oJ5SL7qNM5izoEpr+nTjbT+YmmNIoy7QgSNse3wNIA4="; + hash = "sha256-u8TgaoeDaDLenu3s1Km/Kh85WHMtvUy7C7Q+OY588Ss="; }; nativeBuildInputs = [ makeWrapper ] ++ runtimeInputs; @@ -34,6 +34,10 @@ in buildDunePackage rec { ''; preCheck = '' + export HOME=$TMPDIR + git config --global user.email "nix-builder@nixos.org" + git config --global user.name "Nix Builder" + # it fails when it tries to reference "./make_check_deterministic.exe" rm -r tests/bin/check ''; @@ -47,6 +51,7 @@ in buildDunePackage rec { meta = with lib; { description = "Release dune packages in opam"; homepage = "https://github.com/ocamllabs/dune-release"; + changelog = "https://github.com/tarides/dune-release/blob/${version}/CHANGES.md"; license = licenses.isc; maintainers = with maintainers; [ sternenseemann ]; }; diff --git a/pkgs/development/tools/qc/default.nix b/pkgs/development/tools/qc/default.nix index 14cdaf3ee355..9be03518e5b6 100644 --- a/pkgs/development/tools/qc/default.nix +++ b/pkgs/development/tools/qc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "qc"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "qownnotes"; repo = "qc"; rev = "v${version}"; - hash = "sha256-6dH7pmsd7kUgwHplvCfNqoq/ucDY/UZnyVxC3VvV+fQ="; + hash = "sha256-lNS2wrjG70gi6mpIYMvuusuAJL3LkAVh8za+KnBTioc="; }; vendorHash = "sha256-7t5rQliLm6pMUHhtev/kNrQ7AOvmA/rR93SwNQhov6o="; @@ -26,8 +26,11 @@ buildGoModule rec { ]; postInstall = '' + export HOME=$(mktemp -d) installShellCompletion --cmd qc \ - --zsh ./misc/completions/zsh/_qc + --bash <($out/bin/qc completion bash) \ + --fish <($out/bin/qc completion fish) \ + --zsh <($out/bin/qc completion zsh) ''; meta = with lib; { diff --git a/pkgs/development/tools/qtcreator/qt6.nix b/pkgs/development/tools/qtcreator/qt6.nix index 1d61966386f4..25d056917e43 100644 --- a/pkgs/development/tools/qtcreator/qt6.nix +++ b/pkgs/development/tools/qtcreator/qt6.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - qttools + (qttools.override { withClang = true; }) wrapQtAppsHook python3 ninja diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index 7e1d1a1336c1..95c220e2d4d9 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -7,15 +7,15 @@ let rustfmt-nightly = rustfmt.override { asNightly = true; }; in rustPlatform.buildRustPackage rec { pname = "rust-bindgen-unwrapped"; - version = "0.65.1"; + version = "0.66.0"; src = fetchCrate { pname = "bindgen-cli"; inherit version; - sha256 = "9JJXQQSbCxTh3fIbVSrc6WAYGivwomkoB8ZIquUNr9o="; + sha256 = "sha256-Or5gaYXqfRcxAzBf4nOjmM9CQMvfwb8KbpD8hDJJQ4o="; }; - cargoSha256 = "Kz6Y+4F9Yu5oKYI9LgZKLh0AkQTwerPS4A758TZrkoc="; + cargoHash = "sha256-rsowGeBSuqHyz90qozeCi5dXsH4EHKhIUQbDaNJKabI="; buildInputs = [ clang.cc.lib ]; diff --git a/pkgs/development/tools/rust/cargo-c/default.nix b/pkgs/development/tools/rust/cargo-c/default.nix index 54474d2d6fd8..a3fb8ea57c67 100644 --- a/pkgs/development/tools/rust/cargo-c/default.nix +++ b/pkgs/development/tools/rust/cargo-c/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.9.13"; + version = "0.9.20"; src = fetchCrate { inherit pname; # this version may need to be updated along with package version - version = "${version}+cargo-0.65"; - sha256 = "sha256-f/p+ZIvDe9JQ8GM82SEud7sRTlimNs/ADPevfdkhsfg="; + version = "${version}+cargo-0.71"; + hash = "sha256-T0/gqzeJxDSZDoi8tl4vgYEAFbJDlCoxuqoi6rnf5U4="; }; - cargoSha256 = "sha256-JrlEWgKbTqQG/JYFqBR53eB58fa29c/+vIdSNGoS5Y0="; + cargoHash = "sha256-tArfCEGFRgJPERZW1HzfdDedc+FD8bpc+LX4wNwdv6Q="; nativeBuildInputs = [ pkg-config (lib.getDev curl) ]; buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/tools/rust/cargo-guppy/default.nix b/pkgs/development/tools/rust/cargo-guppy/default.nix index a79f03c2859f..f1e066f1b9c0 100644 --- a/pkgs/development/tools/rust/cargo-guppy/default.nix +++ b/pkgs/development/tools/rust/cargo-guppy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-guppy"; - version = "unstable-2023-06-19"; + version = "unstable-2023-06-26"; src = fetchFromGitHub { owner = "guppy-rs"; repo = "guppy"; - rev = "23b1c804cb4a6d9d38d093ca3400e90805d4c36c"; - sha256 = "sha256-cKnu28L8tjndjtHuClLIpiwTzf6YoN37vw1sE7xrNzQ="; + rev = "c05b95997a127cebef76d3b238e0341086e59e32"; + sha256 = "sha256-CQ0bpc5pmPMQMQ+8mcrUwo19zqyfkk5pE/lWRr9azXs="; }; - cargoSha256 = "sha256-fCIBv8FOUBPzf7I7CdVBDvbHVyuNQRURxNQ7B7cgoKE="; + cargoSha256 = "sha256-OHtg3za8EyQVYQ6XQzLK7UgvGSl8ObfeKURFL6vBDnE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-hakari/default.nix b/pkgs/development/tools/rust/cargo-hakari/default.nix index f5c9a96b496b..06c1fd6016f4 100644 --- a/pkgs/development/tools/rust/cargo-hakari/default.nix +++ b/pkgs/development/tools/rust/cargo-hakari/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hakari"; - version = "0.9.25"; + version = "0.9.26"; src = fetchFromGitHub { owner = "guppy-rs"; repo = "guppy"; rev = "cargo-hakari-${version}"; - sha256 = "sha256-cKnu28L8tjndjtHuClLIpiwTzf6YoN37vw1sE7xrNzQ="; + sha256 = "sha256-CQ0bpc5pmPMQMQ+8mcrUwo19zqyfkk5pE/lWRr9azXs="; }; - cargoHash = "sha256-PoTwS9oS8Nmkdp3ZvdZRdk028SIx6D7kfsiRksyTpKo="; + cargoHash = "sha256-F6+GRn3l849vRVKE1KhLMnxwR5NWu1b78xTxrHi817A="; cargoBuildFlags = [ "-p" "cargo-hakari" ]; cargoTestFlags = [ "-p" "cargo-hakari" ]; diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 69ca714bd685..a7725ad4eefc 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.53"; + version = "0.9.54"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-oDkPURyVLOXSnRReCEkXubj0nNeMvHNH/WqG+Wp54ek="; + hash = "sha256-HkDGW91XDoYMfknPg6td51KTYniCfGtGQd3dkzumRpo="; }; - cargoHash = "sha256-iXZy4pPYnf3A3mPg5Os00I//QJha68agvwhLU5vf320="; + cargoHash = "sha256-McL5G/PtdOou17hWLiNTSJEjTh4YpT1GUPjTMAVNxQA="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/rust/cargo-release/Cargo.lock b/pkgs/development/tools/rust/cargo-release/Cargo.lock index c1ac6ee34661..dc07a0b57bd6 100644 --- a/pkgs/development/tools/rust/cargo-release/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-release/Cargo.lock @@ -18,60 +18,79 @@ dependencies = [ ] [[package]] +name = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", +] + +[[package]] name = "anstream" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ "anstyle", "anstyle-parse", + "anstyle-query", "anstyle-wincon", - "concolor-override", - "concolor-query 0.3.3", + "colorchoice", "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "0.3.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] name = "anstyle-parse" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" dependencies = [ "utf8parse", ] [[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] name = "anstyle-wincon" -version = "0.2.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "assert_fs" -version = "1.0.7" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf09bb72e00da477c2596865e8873227e2196d263cca35414048875dbbeea1be" +checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" dependencies = [ + "anstyle", "doc-comment", "globwalk", - "predicates 2.1.1", + "predicates", "predicates-core", "predicates-tree", "tempfile", @@ -96,15 +115,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base16ct" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64ct" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bitflags" @@ -114,18 +133,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] name = "bstr" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" dependencies = [ "memchr", "once_cell", @@ -135,21 +154,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "bytes" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "camino" -version = "1.1.1" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" dependencies = [ "serde", ] @@ -165,7 +178,7 @@ dependencies = [ [[package]] name = "cargo-release" -version = "0.24.10" +version = "0.24.11" dependencies = [ "anyhow", "assert_fs", @@ -190,7 +203,7 @@ dependencies = [ "log", "maplit", "once_cell", - "predicates 3.0.2", + "predicates", "quick-error", "regex", "semver", @@ -199,19 +212,19 @@ dependencies = [ "termcolor", "time", "toml", - "toml_edit 0.19.8", + "toml_edit", "trycmd", ] [[package]] name = "cargo-test-macro" version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#3c5af6bed9a1a243a693e8e22ee2486bd5b82a6c" +source = "git+https://github.com/rust-lang/cargo#809b720f05494388cbd54e3a9e7dedd8b3fc13e3" [[package]] name = "cargo-test-support" version = "0.1.0" -source = "git+https://github.com/rust-lang/cargo#3c5af6bed9a1a243a693e8e22ee2486bd5b82a6c" +source = "git+https://github.com/rust-lang/cargo#809b720f05494388cbd54e3a9e7dedd8b3fc13e3" dependencies = [ "anyhow", "cargo-test-macro", @@ -230,37 +243,37 @@ dependencies = [ "tar", "termcolor", "time", - "toml_edit 0.15.0", + "toml", "url", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "cargo-util" -version = "0.2.3" -source = "git+https://github.com/rust-lang/cargo#3c5af6bed9a1a243a693e8e22ee2486bd5b82a6c" +version = "0.2.4" +source = "git+https://github.com/rust-lang/cargo#809b720f05494388cbd54e3a9e7dedd8b3fc13e3" dependencies = [ "anyhow", "core-foundation", - "crypto-hash", "filetime", - "hex 0.4.3", + "hex", "jobserver", "libc", "log", "miow", "same-file", + "sha2", "shell-escape", "tempfile", "walkdir", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "cargo_metadata" -version = "0.15.1" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406c859255d568f4f742b3146d51851f3bfd49f734a2c289d9107c4395ee0062" +checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", @@ -287,9 +300,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.2.1" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" dependencies = [ "clap_builder", "clap_derive", @@ -309,9 +322,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.1" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" dependencies = [ "anstream", "anstyle", @@ -323,49 +336,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.12", + "syn", ] [[package]] name = "clap_lex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" - -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "commoncrypto" -version = "0.2.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007" -dependencies = [ - "commoncrypto-sys", -] +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] -name = "commoncrypto-sys" -version = "0.2.0" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2" -dependencies = [ - "libc", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "concolor-control" @@ -375,35 +366,20 @@ checksum = "7104119c2f80d887239879d0c50e033cd40eac9a3f3561e0684ba7d5d654f4da" dependencies = [ "atty", "bitflags", - "concolor-query 0.0.4", + "concolor-query", ] [[package]] -name = "concolor-override" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] name = "concolor-query" version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad159cc964ac8f9d407cbc0aa44b02436c054b541f2b4b5f06972e1efdc54bc7" [[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys 0.45.0", -] - -[[package]] name = "const-oid" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" +checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" [[package]] name = "content_inspector" @@ -426,27 +402,27 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] [[package]] name = "crates-index" -version = "0.19.6" +version = "0.19.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4141149a7de0e3619fd1e77b7d1a750f03d109cb8a543ef67d0b6748ff1da666" +checksum = "65aa5fcd68f892b56202f15a18a53308b2d489b728958dbce48d2d1f3bbaa685" dependencies = [ "git2", - "hex 0.4.3", + "hex", "home", "memchr", "num_cpus", @@ -462,8 +438,8 @@ dependencies = [ [[package]] name = "crates-io" -version = "0.35.1" -source = "git+https://github.com/rust-lang/cargo#3c5af6bed9a1a243a693e8e22ee2486bd5b82a6c" +version = "0.36.1" +source = "git+https://github.com/rust-lang/cargo#809b720f05494388cbd54e3a9e7dedd8b3fc13e3" dependencies = [ "anyhow", "curl", @@ -484,9 +460,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -494,9 +470,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -505,9 +481,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if", @@ -518,18 +494,18 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", ] [[package]] name = "crypto-bigint" -version = "0.4.9" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ "generic-array", "rand_core", @@ -548,18 +524,6 @@ dependencies = [ ] [[package]] -name = "crypto-hash" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a77162240fd97248d19a564a565eb563a3f592b386e4136fb300909e67dddca" -dependencies = [ - "commoncrypto", - "hex 0.3.2", - "openssl", - "winapi", -] - -[[package]] name = "ct-codecs" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -582,9 +546,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.59+curl-7.86.0" +version = "0.4.63+curl-8.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cfce34829f448b08f55b7db6d0009e23e2e86a34e8c2b366269bf5799b4a407" +checksum = "aeb0fef7046022a1e2ad67a004978f0e3cacb9e3123dc62ce768f92197b771dc" dependencies = [ "cc", "libc", @@ -597,9 +561,9 @@ dependencies = [ [[package]] name = "der" -version = "0.6.1" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +checksum = "56acb310e15652100da43d130af8d97b509e95af61aab1c5a7939ef24337ee17" dependencies = [ "const-oid", "pem-rfc7468", @@ -614,11 +578,12 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", "subtle", ] @@ -652,20 +617,22 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "dunce" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "ecdsa" -version = "0.14.8" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" dependencies = [ "der", + "digest", "elliptic-curve", "rfc6979", "signature", + "spki", ] [[package]] @@ -685,13 +652,12 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" -version = "0.12.3" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" dependencies = [ "base16ct", "crypto-bigint", - "der", "digest", "ff", "generic-array", @@ -720,13 +686,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -750,9 +716,9 @@ dependencies = [ [[package]] name = "ff" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core", "subtle", @@ -760,27 +726,27 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.1.17" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "filetime" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" +checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.45.0", + "redox_syscall 0.2.16", + "windows-sys 0.48.0", ] [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "libz-sys", @@ -803,21 +769,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] name = "form_urlencoded" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -828,19 +779,20 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "js-sys", @@ -862,9 +814,9 @@ dependencies = [ [[package]] name = "git2" -version = "0.16.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" +checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ "bitflags", "libc", @@ -887,7 +839,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "bstr", "fnv", "log", @@ -907,9 +859,9 @@ dependencies = [ [[package]] name = "group" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand_core", @@ -954,12 +906,6 @@ checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] name = "hex" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" - -[[package]] -name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" @@ -987,11 +933,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1022,11 +968,10 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.18" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" dependencies = [ - "crossbeam-utils", "globset", "lazy_static", "log", @@ -1040,9 +985,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -1059,24 +1004,25 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.5" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ + "hermit-abi 0.3.1", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "is-terminal" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", "rustix", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -1090,38 +1036,29 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] [[package]] -name = "kstring" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747" -dependencies = [ - "static_assertions", -] - -[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1129,15 +1066,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libgit2-sys" -version = "0.14.2+1.5.1" +version = "0.15.2+1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" dependencies = [ "cc", "libc", @@ -1149,9 +1086,9 @@ dependencies = [ [[package]] name = "libssh2-sys" -version = "0.2.23" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" +checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" dependencies = [ "cc", "libc", @@ -1163,9 +1100,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "libc", @@ -1175,18 +1112,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "log" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" [[package]] name = "maplit" @@ -1202,18 +1136,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -1253,45 +1187,10 @@ dependencies = [ ] [[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "openssl" -version = "0.10.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" [[package]] name = "openssl-probe" @@ -1301,20 +1200,19 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.25.2+1.1.1t" +version = "111.26.0+1.1.1u" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320708a054ad9b3bf314688b5db87cf4d6683d64cfc835e2337924ae62bf4431" +checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" dependencies = [ - "autocfg", "cc", "libc", "openssl-src", @@ -1324,9 +1222,9 @@ dependencies = [ [[package]] name = "orion" -version = "0.17.3" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2baf7fd2e326e3895c681176788dd227fcd8369350e53c570592d8563fecbb6" +checksum = "cbe74a766292f94f7e69db5a7bf010eadd944f24186c463fe578a7e637582066" dependencies = [ "fiat-crypto", "subtle", @@ -1335,30 +1233,31 @@ dependencies = [ [[package]] name = "os_pipe" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53dbb20faf34b16087a931834cba2d7a73cc74af2b7ef345a4c8324e2409a12" +checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" dependencies = [ "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "p384" -version = "0.11.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" dependencies = [ "ecdsa", "elliptic-curve", + "primeorder", "sha2", ] [[package]] name = "pasetors" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed20c4c21d893414f42e0cbfebe8a8036b5ae9b0264611fb6504e395eda6ceec" +checksum = "824bf633b85dc1dece2eb07161627ba5d90a951597cd5dbf8d85f4d82b7aea69" dependencies = [ "ct-codecs", "ed25519-compact", @@ -1377,9 +1276,9 @@ dependencies = [ [[package]] name = "pem-rfc7468" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" dependencies = [ "base64ct", ] @@ -1392,9 +1291,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pkcs8" -version = "0.9.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ "der", "spki", @@ -1402,26 +1301,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "predicates" -version = "2.1.1" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c" -dependencies = [ - "difflib", - "itertools", - "predicates-core", -] - -[[package]] -name = "predicates" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c575290b64d24745b6c57a12a31465f0a66f3a4799686a6921526a33b0797965" +checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" dependencies = [ "anstyle", "difflib", @@ -1434,25 +1322,34 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.3" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" dependencies = [ "predicates-core", "termtree", ] [[package]] +name = "primeorder" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" +dependencies = [ + "elliptic-curve", +] + +[[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" dependencies = [ "unicode-ident", ] @@ -1465,9 +1362,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -1483,9 +1380,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -1493,9 +1390,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.2" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -1513,23 +1410,32 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + +[[package]] name = "redox_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.7.1" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.1", "memchr", "regex-syntax", ] @@ -1542,28 +1448,18 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" [[package]] name = "rfc6979" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "crypto-bigint", "hmac", - "zeroize", + "subtle", ] [[package]] @@ -1574,23 +1470,23 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.36.8" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "same-file" @@ -1603,12 +1499,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] @@ -1619,9 +1514,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "sec1" -version = "0.3.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e" dependencies = [ "base16ct", "der", @@ -1633,38 +1528,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.152" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -1673,9 +1568,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" dependencies = [ "serde", ] @@ -1705,9 +1600,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signature" -version = "1.6.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ "digest", "rand_core", @@ -1721,18 +1616,18 @@ checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" [[package]] name = "smol_str" -version = "0.1.24" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" dependencies = [ "serde", ] [[package]] name = "snapbox" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9615402f9cff539301119bdf2c2f328739cf2b45c2116666618fb6ac399f75bb" +checksum = "f6bccd62078347f89a914e3004d94582e13824d4e3d8a816317862884c423835" dependencies = [ "anstream", "anstyle", @@ -1752,18 +1647,18 @@ dependencies = [ [[package]] name = "snapbox-macros" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8e40c667388ed1cb5060f545d0013bf0a23efdfa6c5c3e9ef592de391cd860f" +checksum = "eaaf09df9f0eeae82be96290918520214530e738a7fe5a351b0f24cf77c0ca31" dependencies = [ "anstream", ] [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -1771,21 +1666,15 @@ dependencies = [ [[package]] name = "spki" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", "der", ] [[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1793,26 +1682,15 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "1.0.109" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.12" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", @@ -1831,16 +1709,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if", "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.45.0", ] [[package]] @@ -1854,58 +1731,57 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ "rustix", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "termtree" -version = "0.2.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] [[package]] name = "time" -version = "0.3.16" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fab5c8b9980850e06d92ddbe3ab839c062c801f3927c0fb8abd6fc8e918fbca" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ "itoa", - "libc", - "num_threads", "serde", "time-core", "time-macros", @@ -1913,15 +1789,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bb801831d812c562ae7d2bfb531f26e66e4e1f6b17307ba4149c5064710e5b" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -1943,66 +1819,43 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" dependencies = [ "serde", "serde_spanned", - "toml_datetime 0.6.1", - "toml_edit 0.19.8", -] - -[[package]] -name = "toml_datetime" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808b51e57d0ef8f71115d8f3a01e7d3750d01c79cac4b3eda910f4389fdf92fd" -dependencies = [ - "serde", + "toml_datetime", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.15.0" +version = "0.19.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1541ba70885967e662f69d31ab3aeca7b1aaecfcd58679590b893e9239c3646" -dependencies = [ - "combine", - "indexmap", - "itertools", - "kstring", - "serde", - "toml_datetime 0.5.0", -] - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" dependencies = [ "indexmap", "serde", "serde_spanned", - "toml_datetime 0.6.1", + "toml_datetime", "winnow", ] [[package]] name = "trycmd" -version = "0.14.15" +version = "0.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32564b3f936a9ebedf5cc07dcf1e7e661204766d35f92c03bf347b099d84e783" +checksum = "2925e71868a12b173c1eb166018c2d2f9dfaedfcaec747bdb6ea2246785d258e" dependencies = [ "glob", "humantime", @@ -2011,7 +1864,7 @@ dependencies = [ "serde", "shlex", "snapbox", - "toml_edit 0.19.8", + "toml_edit", ] [[package]] @@ -2031,15 +1884,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.10" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "unicode-normalization" @@ -2090,12 +1943,11 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -2107,9 +1959,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2117,24 +1969,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2142,22 +1994,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "winapi" @@ -2192,139 +2044,162 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "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]] name = "windows-sys" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.1", + "windows-targets 0.42.2", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.0", ] [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.1", + "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]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.1" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" dependencies = [ "memchr", ] [[package]] name = "zeroize" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index 6422384e1667..59652d402205 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_5 +, libgit2 , openssl , stdenv , curl @@ -12,19 +12,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.24.10"; + version = "0.24.11"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "refs/tags/v${version}"; - hash = "sha256-3kOis5C0XOdp0CCCSZ8PoGtePqW7ozwzSTA9TGe7kAg="; + hash = "sha256-VF0jVk94DncSNB1EnYHGUolVYvykEwluHJiHQShcqQo="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "cargo-test-macro-0.1.0" = "sha256-nlFhe1q0D60dljAi6pFNaz+ssju2Ymtx/PNUl5kJmWo="; + "cargo-test-macro-0.1.0" = "sha256-jXWdCc3wxcF02uL2OyMepJ+DmINAHRYtAUH6L16bCjI="; }; }; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2_1_5 + libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ curl diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index 5691823ae25a..563a744d5dbf 100644 --- a/pkgs/development/tools/rust/duckscript/default.nix +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "duckscript_cli"; - version = "0.8.19"; + version = "0.8.20"; src = fetchCrate { inherit pname version; - sha256 = "sha256-lIev80us8+XlS6opyTViWEcueisEJfSaXfbxLLvdVCo="; + sha256 = "sha256-o9GKcRBtQn0m8pQHlokACGVBArd4khtoJ6e4Q2hcT14="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoHash = "sha256-YtPCfoHxKiVXEpWwQRf2zHGZ8nIKN0hx5p50j0dS/Xw="; + cargoHash = "sha256-dG7bBg/pRcSWWV0NK8gWbXAmsNipHQKUwmTHHFdUsrc="; meta = with lib; { description = "Simple, extendable and embeddable scripting language."; diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 27691c748a9a..eb2bf54f299b 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-iVN6LpikU+TP4P9ZJUVQR/ZNkRHjYLgdDA0aQeWMZfA="; + hash = "sha256-UH+qOKKQdWXQZZMtrihbWmKaUoSy1NciGh9UTtS/W5E="; }; - cargoHash = "sha256-iX4cbZ0PV0/o42f1QKNlAkwHEif2fu+RvhdzH7tWOZE="; + cargoHash = "sha256-EGgVPRaofia+AwXSr6X4Aa8jbk5qDkXg1XvMoEp0qMQ="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/development/tools/sem/default.nix b/pkgs/development/tools/sem/default.nix index 177490762722..b9e9040bc471 100644 --- a/pkgs/development/tools/sem/default.nix +++ b/pkgs/development/tools/sem/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sem"; - version = "0.28.1"; + version = "0.28.2"; src = fetchFromGitHub { owner = "semaphoreci"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-pyin05mPIAq5dJebLehsCYDaIf5eGCcGzF5uz8egJV8="; + sha256 = "sha256-L+OdUqhNbCI1UsFvihiKQnmPIzS0mxAKLPVv4u2VP6Y="; }; - vendorSha256 = "sha256-kuLN3r6CGL/fGQ5ggSLZWNC4AVvvGn6znTFGqkS4AXg="; + vendorHash = "sha256-GAYCdq4eHTyxQ5JaNYLd3mQ2LvgLHdmYdz4RN+Hpe70="; subPackages = [ "." ]; ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 7ebe7dba8512..f800dedf615f 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, zip, unzip, firefox, bash }: +{ lib +, bash +, fetchFromGitHub +, firefox +, strip-nondeterminism +, stdenv +, unzip +, zip +}: stdenv.mkDerivation rec { pname = "slimerjs"; @@ -12,7 +20,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ zip ]; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ + strip-nondeterminism + unzip + ]; preConfigure = '' test -d src && cd src @@ -20,6 +31,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' + strip-nondeterminism --type zip omni.ja mkdir -p "$out"/{bin,share/doc/slimerjs,lib/slimerjs} cp LICENSE README* "$out/share/doc/slimerjs" cp -r * "$out/lib/slimerjs" diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index c9061da1c180..63ff07b4ce54 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "2023.2"; + version = "2023.3.rc1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "v${version}"; - hash = "sha256-l44Ru0WjROQEDNU/2YQJGti1uDZP9osRdfsXus5EGX0="; + hash = "sha256-HV7jNvgTRRGnhurtT5pf5f5gzUOmr3iWNcDc8TE4ICQ="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index e12122ddb0c3..ec2b31656556 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.64.8"; + version = "1.73.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-ueOOEiJ6NWwBaSarXWiAZLnNZg/1RM9Tej602selbC8="; + sha256 = "sha256-Gl5jIMh0zH7BWFKny4cT3QpwM0/W9Bd9ycRYbNPxXAQ="; }; - vendorSha256 = "sha256-dNK8ZqV6Cr88BsGWQEU8uAzi+eOQh0IhKpKmjUbrViA="; + vendorSha256 = "sha256-6wJxAD3s5UcAqPJy6CzHe1aP097+aXHjBNG4BJ0zhmQ="; ldflags = [ "-s" diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 5e196e4c307a..f99257fee592 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.15.5"; + version = "1.15.7"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-5QrUB7p78HmwTUagYKNbFxndUKdeGd51gpqIO1O/8H4="; + hash = "sha256-x4ydM6xDls/7otR8toDEZVk/dKBGHB1+3K1RdRGg9eI="; }; - cargoHash = "sha256-ZNWG3eKnT2LFywIQO1iLIhaUKrINdwbCsSbC55wFrF4="; + cargoHash = "sha256-tc0Bf5n4pKwAExps84kSgI0rP2BwvuMRdFEqU0qlDdg="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index 4326556f13cb..af1dd355b5f2 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uftrace"; - version = "0.13.1"; + version = "0.14"; src = fetchFromGitHub { owner = "namhyung"; repo = "uftrace"; rev = "v${version}"; - sha256 = "sha256-hpEExyvazCH+lNTK0Ej0zbnWyX0gVLPjM9XfOuAueis="; + sha256 = "sha256-f0R3EbLd0sJ1kcsRquFZRrl8jXi0msIz2SZ0oJzoWUE="; }; postUnpack = '' diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 6341c229999a..423646b3bc15 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.4.2"; + version = "3.5.0"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/unityhub-amd64-${version}.deb"; - sha256 = "sha256-I1qtrD94IpMut0a6JUHErHaksoZ+z8/dDG8U68Y5zJE="; + sha256 = "sha256-d5TUUhGqchkrCRqJWHEewurjsHxbfZ+5hv9w9Yv2EQ4="; }; nativeBuildInputs = [ @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { icu libpulseaudio - # Editor dependencies + # Unity Editor dependencies libglvnd # provides ligbl xorg.libX11 xorg.libXcursor @@ -90,6 +90,12 @@ stdenv.mkDerivation rec { zlib clang git # for git-based packages in unity package manager + + # Unity Editor 2019 specific dependencies + xorg.libXi + xorg.libXrender + gnome2.GConf + libcap ] ++ extraLibs pkgs; }; diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index 28b51f87e577..af6f8e5fcbcc 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.33.2"; + version = "0.34.3"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-jXPyOnGCyXe06pazppo6czJ4CpaeEscRbanchDnz2tw="; + sha256 = "sha256-oeKzbe272Mg0pp+MW6/oBw64/OAzTSmo1qSNAoRqmOE="; }; vendorHash = null; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 5a408913da4f..2d500eb9eba4 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -40,7 +40,7 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.249"; + version = "1.3.254"; # If we were to use "dev" here instead of headers, the setupHook would be # placed in that output instead of "out". @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "v${version}"; - hash = "sha256-+Vjy3hzzpC+bFNSEHLsfUaaHMSrMv2G+B8lGjui0fJs="; + hash = "sha256-hh/lCXSKq8xmygVsFFOGu79DvBvBPcc1l1e5wQskK7M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index 060b75ed2914..770a1232196a 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -1,36 +1,24 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , rustPlatform -, pkg-config -, libressl -, curl -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "wasm-pack"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-pack"; - rev = "v${version}"; - sha256 = "sha256-oIMS0kln+HCW9kFfLU+Vi0/4EYKYzzlA1BQHZNQkJMI="; + rev = "refs/tags/v${version}"; + hash = "sha256-Sfcf/Dko2lAfkfYdeanLAqhbUgeKtGBxx4timZi2kCk="; }; - cargoHash = "sha256-l6zn714DMQ+frU9Mppz4LuGY6Zf9qmxZ9MuwIvYvQMU="; + cargoHash = "sha256-bl1KDFNvpNtkbKqiBRbmQLo1/oqLl7u7gNHLhhm8ETI="; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - # LibreSSL works around segfault issues caused by OpenSSL being unable to - # gracefully exit while doing work. - # See: https://github.com/rustwasm/wasm-pack/issues/650 - libressl - ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - - # Needed to get openssl-sys to use pkg-config. - OPENSSL_NO_VENDOR = 1; + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; # Most tests rely on external resources and build artifacts. # Disabling check here to work with build sandboxing. diff --git a/pkgs/games/aaaaxy/default.nix b/pkgs/games/aaaaxy/default.nix index 06805a25bf4f..6539cb2db37a 100644 --- a/pkgs/games/aaaaxy/default.nix +++ b/pkgs/games/aaaaxy/default.nix @@ -19,17 +19,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.4.8"; + version = "1.4.18"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-WiU4pTIsgwkotKLvqTL/P1CZdW20y6VQbBjoPyMCd4E="; + hash = "sha256-g2xUBh0zRB+9awYEr15ay0k+EyAiWmGG5UfZatE24/8="; fetchSubmodules = true; }; - vendorHash = "sha256-On2J/9qnUGTysCWKRoU79mE1bFz275RWjJSfHqjsAoI="; + vendorHash = "sha256-9SeNXOl1wEcG/CtNuuYQ8Y5XEw2GYAIQ2lXk5lgXsN8="; buildInputs = [ alsa-lib diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix index 9541b97476c1..6e644245c4fb 100644 --- a/pkgs/games/mari0/default.nix +++ b/pkgs/games/mari0/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, zip, love, makeWrapper, makeDesktopItem -, copyDesktopItems }: +{ lib +, copyDesktopItems +, fetchFromGitHub +, love +, makeDesktopItem +, makeWrapper +, stdenv +, strip-nondeterminism +, zip +}: stdenv.mkDerivation rec { pname = "mari0"; @@ -12,7 +20,12 @@ stdenv.mkDerivation rec { sha256 = "1zqaq4w599scsjvy1rsb21fd2r8j3srx9vym4ir9bh666dp36gxa"; }; - nativeBuildInputs = [ makeWrapper copyDesktopItems zip ]; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + strip-nondeterminism + zip + ]; desktopItems = [ (makeDesktopItem { @@ -28,6 +41,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall zip -9 -r mari0.love ./* + strip-nondeterminism --type zip mari0.love install -Dm444 -t $out/share/games/lovegames/ mari0.love makeWrapper ${love}/bin/love $out/bin/mari0 \ --add-flags $out/share/games/lovegames/mari0.love diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index 5fc11d212514..6ca70596458d 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, love, zip, fetchpatch, makeWrapper -, makeDesktopItem, copyDesktopItems }: +{ lib +, copyDesktopItems +, fetchFromGitHub +, fetchpatch +, fetchurl +, love +, makeDesktopItem +, makeWrapper +, stdenv +, strip-nondeterminism +, zip +}: stdenv.mkDerivation rec { pname = "orthorobot"; @@ -29,7 +39,12 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ makeWrapper zip copyDesktopItems ]; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + strip-nondeterminism + zip + ]; patches = [ # support for love11 @@ -42,6 +57,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall zip -9 -r orthorobot.love ./* + strip-nondeterminism --type zip orthorobot.love install -Dm444 -t $out/share/games/lovegames/ orthorobot.love makeWrapper ${love}/bin/love $out/bin/orthorobot \ --add-flags $out/share/games/lovegames/orthorobot.love diff --git a/pkgs/games/space-station-14-launcher/deps.nix b/pkgs/games/space-station-14-launcher/deps.nix index 46e477829165..ef3faa91eeea 100644 --- a/pkgs/games/space-station-14-launcher/deps.nix +++ b/pkgs/games/space-station-14-launcher/deps.nix @@ -25,8 +25,8 @@ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18.2"; sha256 = "02xd4phd6wfixhdq48ma92c166absqw41vdq5kvjch8p0vc9cdl2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.18"; sha256 = "16rydr6kc2hhnn9ws1kf4rqm0a001i56f3ayv5l4bn3z95rvdm0l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.18"; sha256 = "002jll4a28j1rxn1sbhnfp0rlkx70hh0i91y2yzxj10hbnpvylbq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.19"; sha256 = "1r41m93kacyyhgjxmhx84n9wv9c2ckwa8295qa4kj8rn73gg4x28"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.19"; sha256 = "1izm1kx4rwi6cp6r6qzjn9h1lmqdcx87yj4gnf291gnabgwpdg9i"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; }) @@ -35,9 +35,9 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "7.0.4"; sha256 = "0lsbzwqiwqv2qq6858aphq7rsp6fs3i0di132w7c0r2r081szql9"; }) (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.4"; sha256 = "0mhfj8bj8dlc01y20ihq6j9r59f67cry6yd6qi6rg9zh93m43jpv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.18"; sha256 = "1mhs8f7k7rc562yrr9h320jfbjlys3715d60x1h6822ywrc4qfv4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.18"; sha256 = "1riq1f8ah0lmaxxnqhw9hdlwlxg8q4dqzkqvkain0sxjxzky7akz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.18"; sha256 = "0p77flwzh7002yl88270b05l549mk708h4bqpaa28j556l9jri2b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.19"; sha256 = "0xf920dcy92gyf1a4ply370m1k82ja9srql5sq7wm2prl1y77wxp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.19"; sha256 = "0r0q5jd7a0dbc2w767clz460pn6lhvrmimsrn3jqw9irgm7g2xns"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.19"; sha256 = "0slhgkjlwcmz4xjl0x6rwhhcdc6f7hz0vb4lg5ak85inl5m98xa9"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) diff --git a/pkgs/games/wireworld/default.nix b/pkgs/games/wireworld/default.nix index 5528b52a280a..828d313d2a87 100644 --- a/pkgs/games/wireworld/default.nix +++ b/pkgs/games/wireworld/default.nix @@ -6,6 +6,7 @@ , makeWrapper , makeDesktopItem , copyDesktopItems +, strip-nondeterminism }: stdenv.mkDerivation rec { @@ -19,7 +20,12 @@ stdenv.mkDerivation rec { hash = "sha256-8BshnGLuA8lmG9g7FU349DWKP/fZvlvjrQBau/LSJ4E="; }; - nativeBuildInputs = [ makeWrapper copyDesktopItems zip ]; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + strip-nondeterminism + zip + ]; desktopItems = [ (makeDesktopItem { @@ -35,6 +41,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall zip -9 -r Wireworld.love ./* + strip-nondeterminism --type zip Wireworld.love install -Dm444 -t $out/share/games/lovegames/ Wireworld.love makeWrapper ${love}/bin/love $out/bin/Wireworld \ --add-flags $out/share/games/lovegames/Wireworld.love diff --git a/pkgs/games/xivlauncher/default.nix b/pkgs/games/xivlauncher/default.nix index 3bb6ba67d03c..f98771ec0fbf 100644 --- a/pkgs/games/xivlauncher/default.nix +++ b/pkgs/games/xivlauncher/default.nix @@ -1,9 +1,9 @@ -{ lib, buildDotnetModule, fetchFromGitHub, dotnetCorePackages, SDL2, libsecret, glib, gnutls, aria2, steam-run, gst_all_1 +{ lib, buildDotnetModule, fetchFromGitHub, dotnetCorePackages, SDL2, libsecret, glib, gnutls, aria2, steam, gst_all_1 , copyDesktopItems, makeDesktopItem, makeWrapper , useSteamRun ? true }: let - rev = "1.0.3"; + rev = "1.0.4"; in buildDotnetModule rec { pname = "XIVLauncher"; @@ -13,7 +13,7 @@ in owner = "goatcorp"; repo = "XIVLauncher.Core"; inherit rev; - hash = "sha256-aQVfW6Ef8X6L6hBEOCY/Py5tEyorXqtOO3v70mD7efA="; + hash = "sha256-HbOo1aCBYnLXI2QZEBSRQNchHD2/fo50M2ZnIXkRn6Y="; fetchSubmodules = true; }; @@ -39,10 +39,14 @@ in cp src/XIVLauncher.Core/Resources/logo.png $out/share/pixmaps/xivlauncher.png ''; - postFixup = lib.optionalString useSteamRun '' + postFixup = lib.optionalString useSteamRun (let + steam-run = (steam.override { + extraPkgs = pkgs: [ pkgs.libunwind ]; + }).run; + in '' substituteInPlace $out/bin/XIVLauncher.Core \ --replace 'exec' 'exec ${steam-run}/bin/steam-run' - '' + '' + '') + '' wrapProgram $out/bin/XIVLauncher.Core --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" # the reference to aria2 gets mangled as UTF-16LE and isn't detectable by nix: https://github.com/NixOS/nixpkgs/issues/220065 mkdir -p $out/nix-support diff --git a/pkgs/games/xivlauncher/deps.nix b/pkgs/games/xivlauncher/deps.nix index 240b0e19a9d2..b92db7c2dec5 100644 --- a/pkgs/games/xivlauncher/deps.nix +++ b/pkgs/games/xivlauncher/deps.nix @@ -23,18 +23,16 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.0.1"; sha256 = "0axjv1nhk1z9d4c51d9yxdp09l8yqqnqaifhqcwnxnv0r4y5cka9"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.0.1"; sha256 = "1h6jfifg7pw2vacpdds4v4jqnaydg9b108irf315wzx6rh8yv9cb"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "6.0.0"; sha256 = "06zy947m5lrbwb684g42ijb07r5jsqycvfnphc6cqfdrfnzqv6k9"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "7.0.0"; sha256 = "1rl5zi8s213g70nvqfacf50ff8vqvaj8i7jxv0gjw2hkz73dg4h1"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "6.0.0-preview.5.21301.5"; sha256 = "02712s86n2i8s5j6vxdayqwcc7r538yw3frhf1gfrc6ah6hvqnzc"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) (fetchNuGet { pname = "Mono.Cecil"; version = "0.9.6.1"; sha256 = "1fr7969h5q611l5227xw6nvv5rzap76vbpk0wg9hxbcxk3hn7szf"; }) - (fetchNuGet { pname = "Mono.Nat"; version = "3.0.1"; sha256 = "1xy3c9wsiz8k3rx8v60y6gnps337rsb5jpyj0r6g384prg6z4vh0"; }) - (fetchNuGet { pname = "MonoTorrent"; version = "2.0.0"; sha256 = "016cbjsy1gp60g6w0mdya11ky3lfr3scg20k1p7lglbnzv7ixycq"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) - (fetchNuGet { pname = "ReusableTasks"; version = "2.0.0"; sha256 = "0qag69n8kx164minz3h50g6f7cdq15r89vikcd1llbkdwq4qldaa"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 44e46355d0bf..7c809f0c964c 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "cups"; - version = "2.4.3"; + version = "2.4.5"; src = fetchurl { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "sha256-nd65jyDpyfSvEhwrEFPnQgt5vWdw8a3tKGYwPSdSb28="; + sha256 = "sha256-mkBN5V90UlsKaFHfDP3r+hIVrsDnwve+a5sJtpFvsAA="; }; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index eadd3d892393..d6fb53dd86d9 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchurl , fetchFromGitHub , makeWrapper @@ -17,10 +16,10 @@ }: let - version = "2.0"; + version = "2.1"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "sha256-niQWFfV4zWkLtDMRAA3r3s9qnFCnCCsAGVLxj28h3cI="; + sha256 = "sha256-W4vxlAJkuTDHGhxhTFfaIkf1Ky1CQLyoZcxtNm3/Zog="; }; in stdenv.mkDerivation rec { @@ -31,24 +30,14 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PWH+XLKraFfjXovnZpREXBaQVyOyP8yIMYDMiF6ddXg="; + sha256 = "sha256-M5zOKwqQ0y70gsI+c0Or7hUzz4fH/8DqcOeKq4Vryc4="; }; - # Remove in the next patch release - patches = [ - (fetchpatch { - name = "fix-macos-build-error.patch"; - url = "https://github.com/Genymobile/scrcpy/commit/6b769675fa68e60c9765022e43c4d7b1e329353a.patch"; - hash = "sha256-lQx01HI0nTWdZFusLIswZT2iOgkP84btqF6F58tGNko="; - }) - ]; - - # postPatch: - # screen.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. + # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. # This can happen when running on non-NixOS because then scrcpy seems to have a hard time using the host OpenGL-supporting hardware. # It would be better to fix the OpenGL problem, but that seems much more intrusive. postPatch = '' - substituteInPlace app/src/screen.c \ + substituteInPlace app/src/display.c \ --replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE" ''; diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 6db3ab932db9..a5bb8835008e 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -9,20 +9,22 @@ , python3 , sqlite , vala +, libwebsockets }: stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "8.0.3"; + version = "9.0.2"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; - rev = "0fdc14d5175979919b7c741f6bb97bfaaacbbfbe"; - sha256 = "1cr1hvpp96s5arnzh1r5sazapcghhvbazbf7zym37yp3fy3lpya1"; + rev = "v${version}"; + sha256 = "sha256-aJJVrKulZVa1LNOUBIwuPrWqlsjz7kyP/LXWwxO8++A="; }; nativeBuildInputs = [ + libwebsockets autoreconfHook vala pkg-config diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index ad52653968d7..fe0d0ca63ea9 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -62,6 +62,7 @@ let if stdenv.isAarch64 then stdenv else (overrideCC stdenv (mkCc stdenv.cc)).override { + extraBuildInputs = [ pkgs.darwin.apple_sdk_11_0.frameworks.CoreFoundation ]; targetPlatform = stdenv.targetPlatform // { darwinMinVersion = "10.12"; darwinSdkVersion = "11.0"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix deleted file mode 100644 index c9202b536583..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ appleDerivation', stdenvNoCC, ed, unifdef }: - -appleDerivation' stdenvNoCC { - nativeBuildInputs = [ ed unifdef ]; - - installPhase = '' - export SRCROOT=$PWD - export DSTROOT=$out - export PUBLIC_HEADERS_FOLDER_PATH=include - export PRIVATE_HEADERS_FOLDER_PATH=include - bash xcodescripts/headers.sh - ''; -} diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index 915d3a61f816..6ff3cec2f1eb 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation', stdenvNoCC, ed, unifdef, Libc_old, Libc_10-9 }: +{ appleDerivation', stdenvNoCC, ed, unifdef, Libc_10-9 }: appleDerivation' stdenvNoCC { nativeBuildInputs = [ ed unifdef ]; @@ -7,7 +7,6 @@ appleDerivation' stdenvNoCC { ./0001-Define-TARGET_OS_EMBEDDED-in-std-lib-io-if-not-defin.patch ]; - # TODO: asl.h actually comes from syslog project now installPhase = '' export SRCROOT=$PWD export DSTROOT=$out @@ -18,20 +17,6 @@ appleDerivation' stdenvNoCC { cp ${./CrashReporterClient.h} $out/include/CrashReporterClient.h cp ${Libc_10-9}/include/NSSystemDirectories.h $out/include - - # Ugh Apple stopped releasing this stuff so we need an older one... - cp ${Libc_old}/include/spawn.h $out/include - cp ${Libc_old}/include/setjmp.h $out/include - cp ${Libc_old}/include/ucontext.h $out/include - cp ${Libc_old}/include/pthread*.h $out/include - cp ${Libc_old}/include/sched.h $out/include - cp -R ${Libc_old}/include/malloc $out/include - - mkdir -p $out/include/libkern - cp ${Libc_old}/include/asl.h $out/include - cp ${Libc_old}/include/libproc.h $out/include - cp ${Libc_old}/include/libkern/OSAtomic.h $out/include/libkern - cp ${Libc_old}/include/libkern/OSCacheControl.h $out/include/libkern ''; appleHeaders = builtins.readFile ./headers.txt; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/headers.txt b/pkgs/os-specific/darwin/apple-source-releases/Libc/headers.txt index ea62e31dc781..c7cad6343d8a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/headers.txt +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/headers.txt @@ -21,7 +21,6 @@ arpa/inet.h arpa/nameser_compat.h arpa/telnet.h arpa/tftp.h -asl.h assert.h bitstring.h cpio.h @@ -49,12 +48,8 @@ langinfo.h libc.h libc_private.h libgen.h -libkern/OSAtomic.h -libkern/OSCacheControl.h -libproc.h limits.h locale.h -malloc/malloc.h memory.h monetary.h monitor.h @@ -72,24 +67,17 @@ protocols/routed.h protocols/rwhod.h protocols/talkd.h protocols/timed.h -pthread.h -pthread_impl.h -pthread_spis.h -pthread_workqueue.h ranlib.h readpassphrase.h regex.h runetype.h -sched.h search.h secure/_common.h secure/_stdio.h secure/_string.h semaphore.h -setjmp.h sgtty.h signal.h -spawn.h stab.h standards.h stddef.h @@ -112,7 +100,6 @@ time.h timeconv.h ttyent.h tzfile.h -ucontext.h ulimit.h unistd.h util.h diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index aa93a32c5621..c9cc99a6550e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, buildPackages, fetchzip +{ lib, stdenv, buildPackages, fetchzip, fetchFromGitHub , appleDerivation', xnu, Libc, Libm, libdispatch, Libinfo , dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto -, copyfile, removefile, libresolvHeaders, libresolv, Libnotify, libplatform, libpthread +, copyfile, removefile, libresolvHeaders, libresolv, Libnotify, libmalloc, libplatform, libpthread , mDNSResponder, launchd, libutilHeaders, hfsHeaders, darwin-stubs , headersOnly ? false , withLibresolv ? !headersOnly @@ -30,6 +30,15 @@ let fi ''; }; + + # Libsystem needs `asl.h` from syslog. This is the version corresponding to the 10.12 SDK + # source release, but it hasn’t changed in newer versions. + syslog.src = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "syslog"; + rev = "syslog-349.50.5"; + hash = "sha256-tXLW/TNsluhO1X9Rv3FANyzyOe5TE/hZz0gVo7JGvHA="; + }; in appleDerivation' stdenv { dontBuild = true; @@ -57,12 +66,19 @@ appleDerivation' stdenv { ${libclosure} ${CarbonHeaders} ${libdispatch} ${ncurses.dev} \ ${CommonCrypto} ${copyfile} ${removefile} ${libresolvHeaders} \ ${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} \ - ${libutilHeaders} ${libpthread} ${hfsHeaders}; do + ${libutilHeaders} ${libmalloc} ${libpthread} ${hfsHeaders}; do (cd $dep/include && find . -name '*.h' | copyHierarchy $out/include) done (cd ${buildPackages.darwin.cctools.dev}/include/mach-o && find . -name '*.h' | copyHierarchy $out/include/mach-o) + for header in pthread.h pthread_impl.h pthread_spis.h sched.h; do + ln -s "$out/include/pthread/$header" "$out/include/$header" + done + + # Copy `asl.h` from the syslog sources since it is no longer provided as part of Libc. + cp ${syslog.src}/libsystem_asl.tproj/include/asl.h $out/include + mkdir -p $out/include/os cp ${darling.src}/src/libc/os/activity.h $out/include/os diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt index cdca44c7292c..b6e608f81ebf 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt @@ -1381,7 +1381,6 @@ protocols/routed.h protocols/rwhod.h protocols/talkd.h protocols/timed.h -pthread.h pthread/introspection.h pthread/pthread.h pthread/pthread_impl.h @@ -1389,9 +1388,6 @@ pthread/pthread_spis.h pthread/qos.h pthread/sched.h pthread/spawn.h -pthread_impl.h -pthread_spis.h -pthread_workqueue.h pwd.h ranlib.h readpassphrase.h @@ -1414,7 +1410,6 @@ rpc/xdr.h rpcsvc/yp_prot.h rpcsvc/ypclnt.h runetype.h -sched.h search.h secure/_common.h secure/_stdio.h diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 40f3fd2478a5..ab13e91e3735 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -19,6 +19,7 @@ let Libinfo = "503.50.4"; Libsystem = "1238.60.2"; removefile = "45"; + libmalloc = "116.50.8"; libresolv = "64"; libplatform = "126.50.8"; mDNSResponder = "765.50.9"; @@ -265,7 +266,6 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { rev = "Libc-997.90.3"; hash = "sha256-B18RNO+Rai5XE52TKdJV7eknosTZ+bRERkiU12d/kPU="; }; - Libc_old = applePackage "Libc/825_40_1.nix" "osx-10.8.5" "sha256-JvPSY7FzraGpqF/jYLfhU2o/2195NuKrXsryYfVtx3s=" {}; }; libclosure = applePackage "libclosure" "osx-10.11.6" "sha256-L5rQ+UBpf3B+W1U+gZKk7fXulslHsc8lxnCsplV+nr0=" {}; libdispatch = applePackage "libdispatch" "osx-10.10.5" "sha256-jfAEk0OLrJa9AIZVikIoHomd+l+4rCfc320Xh50qK5M=" {}; @@ -273,6 +273,9 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { Libinfo = applePackage "Libinfo" "osx-10.11.6" "sha256-6F7wiwerv4nz/xXHtp1qCHSaFzZgzcRN+jbmXA5oWOQ=" {}; Libm = applePackage "Libm" "osx-10.7.4" "sha256-KjMETfT4qJm0m0Ux/F6Rq8bI4Q4UVnFx6IKbKxXd+Es=" {}; Libnotify = applePackage "Libnotify" "osx-10.12.6" "sha256-6wvMBxAUfiYcQtmlfYCj1d3kFmFM/jdboTd7hRvi3e4=" {}; + libmalloc = if stdenv.isx86_64 then + applePackage "libmalloc" "osx-10.12.6" "sha256-brfG4GEF2yZipKdhlPq6DhT2z5hKYSb2MAmffaikdO4=" {} + else macosPackages_11_0_1.libmalloc; libplatform = applePackage "libplatform" "osx-10.12.6" "sha256-6McMTjw55xtnCsFI3AB1osRagnuB5pSTqeMKD3gpGtM=" {}; libpthread = applePackage "libpthread" "osx-10.12.6" "sha256-QvJ9PERmrCWBiDmOWrLvQUKZ4JxHuh8gS5nlZKDLqE8=" {}; libresolv = applePackage "libresolv" "osx-10.12.6" "sha256-FtvwjJKSFX6j9APYPC8WLXVOjbHLZa1Gcoc8yxLy8qE=" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libmalloc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libmalloc/default.nix new file mode 100644 index 000000000000..8b362a2edd54 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/libmalloc/default.nix @@ -0,0 +1,10 @@ +{ appleDerivation', stdenvNoCC }: + +# Unfortunately, buiding libmalloc is not feasible due to its use of non-public headers, but its +# headers are needed by Libsystem. +appleDerivation' stdenvNoCC { + installPhase = '' + mkdir -p $out/include + cp -R include/malloc $out/include/ + ''; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix index 1637ed783895..0a70e648695d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix @@ -28,6 +28,7 @@ hfs = applePackage' "hfs" "556.41.1" "macos-11.0.1" "0a0s6b12b0q07wslfifna0bj51d libclosure = applePackage' "libclosure" "78" "macos-11.0.1" "0vf9n0k3m8dbprv1bf45zqg0g43bidy2i5z1v9a826bsf8lv7am7" {}; libdispatch = applePackage' "libdispatch" "1271.40.12" "macos-11.0.1" "1ck5srcjapg18vqb8wl08gacs7ndc6xr067qjn3ngx39q1jdcywz" {}; libiconv = applePackage' "libiconv" "59" "macos-11.0.1" "0lwa4brdwm4lvrdnxylzsn1yph4m7csgri2zkc4xb4xiisz32pwp" {}; +libmalloc = applePackage' "libmalloc" "317.40.8" "macos-11.0.1" "sha256-Tdhb0mq3w4Hwvp3xHB79Vr22hCOQK6h28HCsd7jvITI=" {}; libplatform = applePackage' "libplatform" "254.40.4" "macos-11.0.1" "1qf3ri0yd8b1xjln1j1gyx7ks6k3a2jhd63blyvfby75y9s7flky" {}; libpthread = applePackage' "libpthread" "454.40.3" "macos-11.0.1" "0zljbw8mpb80n1if65hhi9lkgwbgjr8vc9wvf7q1nl3mzyl35f8p" {}; libresolv = applePackage' "libresolv" "68" "macos-11.0.1" "045ahh8nvaam9whryc2f5g5xagwp7d187r80kcff82snp5p66aq1" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index 62003a6e4a6c..b05d973bb3d3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -116,6 +116,9 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ( cp EXTERNAL_HEADERS/Availability*.h $out/System/Library/Frameworks/Kernel.framework/Versions/A/Headers/ cp -r EXTERNAL_HEADERS/corecrypto $out/include + # These headers are needed by Libsystem. + cp libsyscall/wrappers/{spawn/spawn.h,libproc/libproc.h} $out/include + # Build the mach headers we crave export SRCROOT=$PWD/libsyscall export DERIVED_SOURCES_DIR=$out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-arm64.txt b/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-arm64.txt index fe17d8784e41..23ae12a9b057 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-arm64.txt +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-arm64.txt @@ -637,6 +637,7 @@ libkern/os/reason_private.h libkern/os/refcnt.h libkern/os/refcnt_internal.h libkern/os/trace.h +libproc.h mach/arm/_structs.h mach/arm/asm.h mach/arm/boolean.h @@ -1270,6 +1271,7 @@ servers/ls_defs.h servers/netname.h servers/netname_defs.h servers/nm_defs.h +spawn.h sys/_endian.h sys/_posix_availability.h sys/_select.h diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-x86_64.txt b/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-x86_64.txt index 93c0dbb18bf7..8d7d9be7f218 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-x86_64.txt +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/headers-x86_64.txt @@ -554,6 +554,7 @@ libkern/os/object.h libkern/os/object_private.h libkern/os/overflow.h libkern/os/trace.h +libproc.h mach/audit_triggers.defs mach/boolean.h mach/bootstrap.h @@ -1116,6 +1117,7 @@ servers/ls_defs.h servers/netname.h servers/netname_defs.h servers/nm_defs.h +spawn.h sys/_endian.h sys/_posix_availability.h sys/_select.h diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 33cdc0fb8450..f579c00eb5c9 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -22,7 +22,7 @@ }: let - apparmor-version = "3.1.4"; + apparmor-version = "3.1.5"; apparmor-meta = component: with lib; { homepage = "https://apparmor.net/"; @@ -36,7 +36,7 @@ let owner = "apparmor"; repo = "apparmor"; rev = "v${apparmor-version}"; - hash = "sha256-YWPdIUd+2x74tqiW+YX8NKh3jxSKhD+5zdiDMjhPzpE="; + hash = "sha256-nqIRs2REbSQNKglEEjAO/YSZc6r2ks128sUNq61gRWE="; }; aa-teardown = writeShellScript "aa-teardown" '' diff --git a/pkgs/os-specific/linux/below/default.nix b/pkgs/os-specific/linux/below/default.nix index 53791e1a59ad..2bdca0805a22 100644 --- a/pkgs/os-specific/linux/below/default.nix +++ b/pkgs/os-specific/linux/below/default.nix @@ -22,6 +22,12 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-EoRCmEe9SAySZCm+QhaR4ngik4Arnm4SZjgDM5fSRmk="; + prePatch = ''sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service''; + postInstall = '' + install -d $out/lib/systemd/system + install -t $out/lib/systemd/system etc/below.service + ''; + # bpf code compilation hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 0e7988f4d99a..153719c8b841 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, lvm2, json_c, asciidoctor , openssl, libuuid, pkg-config, popt, nixosTests +, libargon2, withInternalArgon2 ? false # The release tarballs contain precomputed manpage files, so we don't need # to run asciidoctor on the man sources. By avoiding asciidoctor, we make @@ -37,11 +38,12 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s"; configureFlags = [ - "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" "--disable-ssh-token" ] ++ lib.optionals (!rebuildMan) [ "--disable-asciidoc" + ] ++ lib.optionals (!withInternalArgon2) [ + "--enable-libargon2" ] ++ lib.optionals stdenv.hostPlatform.isStatic [ "--disable-external-tokens" # We have to override this even though we're removing token @@ -51,7 +53,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config ] ++ lib.optionals rebuildMan [ asciidoctor ]; - buildInputs = [ lvm2 json_c openssl libuuid popt ]; + buildInputs = [ lvm2 json_c openssl libuuid popt ] ++ lib.optional (!withInternalArgon2) libargon2; # The test [7] header backup in compat-test fails with a mysterious # "out of memory" error, even though tons of memory is available. @@ -76,7 +78,7 @@ stdenv.mkDerivation rec { description = "LUKS for dm-crypt"; changelog = "https://gitlab.com/cryptsetup/cryptsetup/-/raw/v${version}/docs/v${version}-ReleaseNotes"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ raitobezarius ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 59f9d368f2fd..08b0cd5e5c18 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.370"; + version = "0.371"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "sha256-fqhYPKqtuI+7h/SgdWI4i7jBTgluy/hI8Q6pq4LKtY4="; + sha256 = "sha256-bK61nvuzm8LTotVSBtGyBMELZPqoENkPM4NKtgEx9qw="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 370e88096320..dccecb62175e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -721,6 +721,7 @@ let ZRAM = module; ZRAM_WRITEBACK = option yes; ZSWAP = option yes; + ZPOOL = yes; ZBUD = option yes; ZSMALLOC = module; }; diff --git a/pkgs/os-specific/linux/kernel/linux-6.4.nix b/pkgs/os-specific/linux/kernel/linux-6.4.nix new file mode 100644 index 000000000000..b90750b3b8fb --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-6.4.nix @@ -0,0 +1,18 @@ +{ lib, fetchurl, buildLinux, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "6.4"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = versions.pad 3 version; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; + sha256 = "sha256-j6BYjwws7KRMrHeg45ukjJ8AprncaXYcAqXT76yNp/M="; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 8eaab5a6f8b1..d5be2d43d2c0 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,14 +3,14 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "6.1.31"; - hash = "sha256-quYsp6h7IV6gUT0e55FeBlS8rH9OGrqdbM1XSIYNRV4="; + version = "6.1.35"; + hash = "sha256-CfrM2CNaGUTfkVteudL8xnAuCdZJxD5pUEC1YW9LiuU="; variant = "lts"; }; mainVariant = { - version = "6.3.5"; - hash = "sha256-2+8WDj1VdmIdC0DjmKyY/fMi5zoiXDAWy7EAmkImvXk="; + version = "6.3.9"; + hash = "sha256-t1fKPZ+giANPmhM4zGoGtYWJF6rDnbpJaoHILl3nyRI="; variant = "main"; }; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix new file mode 100644 index 000000000000..8722ff818297 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/binutils/default.nix @@ -0,0 +1,118 @@ +{ lib +, buildPlatform +, hostPlatform +, fetchurl +, bash +, gnumake +, gnupatch +, gnugrep +, gnutar +, gawk +, bzip2 +, sed +, mesBootstrap ? false, tinycc ? null +, gcc ? null, glibc ? null, binutils ? null, linux-headers +}: +assert mesBootstrap -> tinycc != null; +assert !mesBootstrap -> gcc != null && glibc != null && binutils != null; +let + pname = "binutils" + lib.optionalString mesBootstrap "-mes"; + version = "2.20.1"; + rev = "a"; + + src = fetchurl { + url = "mirror://gnu/binutils/binutils-${version}${rev}.tar.bz2"; + sha256 = "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi"; + }; + + patches = [ + # Enables building binutils using TCC and Mes C Library + (fetchurl { + url = "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/binutils-boot-2.20.1a.patch?id=50249cab3a98839ade2433456fe618acc6f804a5"; + sha256 = "086sf6an2k56axvs4jlky5n3hs2l3rq8zq5d37h0b69cdyh7igpn"; + }) + + # Make binutils output deterministic by default. + ./deterministic.patch + ]; + + configureFlags = [ + "--disable-nls" + "--disable-shared" + "--disable-werror" + "--prefix=${placeholder "out"}" + + "--build=${buildPlatform.config}" + "--host=${hostPlatform.config}" + + # Turn on --enable-new-dtags by default to make the linker set + # RUNPATH instead of RPATH on binaries. This is important because + # RUNPATH can be overridden using LD_LIBRARY_PATH at runtime. + "--enable-new-dtags" + + # By default binutils searches $libdir for libraries. This brings in + # libbfd and libopcodes into a default visibility. Drop default lib + # path to force users to declare their use of these libraries. + "--with-lib-path=:" + ]; +in +bash.runCommand "${pname}-${version}" { + inherit pname version; + + nativeBuildInputs = [ + (if mesBootstrap then tinycc.compiler else gcc) + gnumake + gnupatch + gnugrep + gnutar + gawk + bzip2 + sed + ] ++ lib.optional (!mesBootstrap) binutils; + + passthru.tests.get-version = result: + bash.runCommand "${pname}-get-version-${version}" {} '' + ${result}/bin/ld --version + mkdir $out + ''; + + meta = with lib; { + description = "Tools for manipulating binaries (linker, assembler, etc.)"; + homepage = "https://www.gnu.org/software/binutils"; + license = licenses.gpl3Plus; + maintainers = teams.minimal-bootstrap.members; + platforms = platforms.unix; + }; +} '' + # Unpack + cp ${src} binutils.tar.bz2 + bunzip2 binutils.tar.bz2 + tar xf binutils.tar + rm binutils.tar + cd binutils-${version} + + # Patch + ${lib.concatMapStringsSep "\n" (f: "patch -Np1 -i ${f}") patches} + # Clear the default library search path. + echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt + + # Configure + ${if mesBootstrap then '' + export CC="tcc -B ${tinycc.libs}/lib -D __GLIBC_MINOR__=6 -D MES_BOOTSTRAP=1" + export AR="tcc -ar" + '' else '' + export CC="gcc -B ${glibc}/lib -I${glibc}/include -I${linux-headers}/include" + export CPP="gcc -E -I${glibc}/include -I${linux-headers}/include" + export AR="ar" + export LIBRARY_PATH="${glibc}/lib" + export LIBS="-lc -lnss_files -lnss_dns -lresolv" + ''} + export SED=sed + bash ./configure ${lib.concatStringsSep " " configureFlags} + + # Build + make + + # Install + make install +'' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/binutils/deterministic.patch b/pkgs/os-specific/linux/minimal-bootstrap/binutils/deterministic.patch new file mode 100644 index 000000000000..736e0aca6ce1 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/binutils/deterministic.patch @@ -0,0 +1,12 @@ +diff -ur orig/binutils-2.23.1/ld/ldlang.c binutils-2.23.1/ld/ldlang.c +--- orig/ld/ldlang.c ++++ new/ld/ldlang.c +@@ -3095,6 +3095,8 @@ + ldfile_output_machine)) + einfo (_("%P%F:%s: can not set architecture: %E\n"), name); + ++ link_info.output_bfd->flags |= BFD_DETERMINISTIC_OUTPUT; ++ + link_info.hash = bfd_link_hash_table_create (link_info.output_bfd); + if (link_info.hash == NULL) + einfo (_("%P%F: can not create hash table: %E\n")); diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix index 9011c45a8fe3..45175b987cad 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -15,6 +15,20 @@ lib.makeScope bash_2_05 = callPackage ./bash/2.nix { tinycc = tinycc-mes; }; + binutils = callPackage ./binutils { + bash = bash_2_05; + gcc = gcc2; + binutils = binutils-mes; + glibc = glibc22; + sed = heirloom.sed; + }; + binutils-mes = callPackage ./binutils { + bash = bash_2_05; + tinycc = tinycc-mes; + sed = heirloom.sed; + mesBootstrap = true; + }; + bzip2 = callPackage ./bzip2 { bash = bash_2_05; tinycc = tinycc-mes; @@ -27,6 +41,23 @@ lib.makeScope tinycc = tinycc-mes; }; + gcc2 = callPackage ./gcc/2.nix { + bash = bash_2_05; + gcc = gcc2-mes; + binutils = binutils-mes; + glibc = glibc22; + }; + gcc2-mes = callPackage ./gcc/2.nix { + bash = bash_2_05; + tinycc = tinycc-mes; + binutils = binutils-mes; + mesBootstrap = true; + }; + + inherit (callPackage ./glibc { + bash = bash_2_05; + }) glibc22; + gnugrep = callPackage ./gnugrep { bash = bash_2_05; tinycc = tinycc-mes; @@ -58,6 +89,8 @@ lib.makeScope heirloom-devtools = callPackage ./heirloom-devtools { tinycc = tinycc-mes; }; + linux-headers = callPackage ./linux-headers { bash = bash_2_05; }; + ln-boot = callPackage ./ln-boot { }; mes = lib.recurseIntoAttrs (callPackage ./mes { }); @@ -80,8 +113,12 @@ lib.makeScope test = kaem.runCommand "minimal-bootstrap-test" {} '' echo ${bash_2_05.tests.get-version} + echo ${binutils.tests.get-version} + echo ${binutils-mes.tests.get-version} echo ${bzip2.tests.get-version} echo ${gawk.tests.get-version} + echo ${gcc2.tests.get-version} + echo ${gcc2-mes.tests.get-version} echo ${gnugrep.tests.get-version} echo ${gnused.tests.get-version} echo ${gnutar.tests.get-version} diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/2.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/2.nix new file mode 100644 index 000000000000..0a79c97e75af --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/gcc/2.nix @@ -0,0 +1,140 @@ +{ lib +, buildPlatform +, hostPlatform +, fetchurl +, bash +, gnumake +, gnupatch +, gnugrep +, gnutar +, gzip +, heirloom +, binutils +, mesBootstrap ? false, tinycc ? null, mes-libc +, gcc ? null, glibc ? null, linux-headers +}: +assert mesBootstrap -> tinycc != null; +assert !mesBootstrap -> gcc != null && glibc != null; +let + # Gcc-2.95.3 is the most recent GCC that is supported by what the Mes C + # Library v0.16 offers. Gcc-3.x (and 4.x) place higher demands on a C + # library, such as dir.h/struct DIR/readdir, locales, signals... Also, + # with gcc-2.95.3, binutils (2.14.0, 2.20.1a) and glibc-2.2.5 we found a + # GNU toolchain triplet "that works". + # - from guix/gnu/packages/commencement.scm + pname = "gcc" + lib.optionalString mesBootstrap "-mes"; + version = "2.95.3"; + + src = fetchurl { + url = "mirror://gnu/gcc/gcc-${version}/gcc-core-${version}.tar.gz"; + sha256 = "1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"; + }; + + patches = [ + # This patch enables building gcc-2.95.3 using TCC and Mes C Library. + # * Disable building DOC + # * Avoid running `fixproto'. + # * Force running `fixinc'. + # * Replace Makefile trickery of creating an libgcc1.a archive, then + # extracting the .o files later to create a new libgcc2.a archive. + # Instead, keep temporary .o files. + (fetchurl { + url = "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/gcc-boot-2.95.3.patch?id=50249cab3a98839ade2433456fe618acc6f804a5"; + sha256 = "03l3jaxch6d76mx4zkn6ky64paj58jk0biddck01qd4bnw9z8hiw"; + }) + ]; + + makeFlags = [ + "LANGUAGES=c" + ] ++ lib.optionals mesBootstrap [ + "LIBGCC2_INCLUDES=\"-I ${mes-libc}/include\"" + "BOOT_LDFLAGS=\" -B ${tinycc.libs}/lib\"" + ] ++ lib.optionals (!mesBootstrap) [ + "LIBGCC2_INCLUDES=\"-I ${glibc}/include -I ${linux-headers}/include\"" + ]; +in +bash.runCommand "${pname}-${version}" { + inherit pname version; + + nativeBuildInputs = [ + (if mesBootstrap then tinycc.compiler else gcc) + gnumake + gnupatch + gnugrep + gnutar + gzip + heirloom.sed + binutils + ]; + + passthru.tests.get-version = result: + bash.runCommand "${pname}-get-version-${version}" {} '' + ${result}/bin/gcc --version + mkdir $out + ''; + + meta = with lib; { + description = "GNU Compiler Collection, version ${version}"; + homepage = "https://gcc.gnu.org"; + license = licenses.gpl3Plus; + maintainers = teams.minimal-bootstrap.members; + platforms = platforms.unix; + }; +} '' + # Unpack + tar xzf ${src} + cd gcc-${version} + + # Patch + ${lib.concatMapStringsSep "\n" (f: "patch -Np1 -i ${f}") patches} + # /build/glibc-2.2.5/intl/loadmsgcat.c:334: multiple definition of `_nl_load_domain' + # ../intl/libintl.a(loadmsgcat.o):/build/gcc-2.95.3/texinfo/intl/loadmsgcat.c:66: first defined here + rm -R texinfo + mkdir -p texinfo + echo 'all:'>texinfo/Makefile.in + echo 'install:'>>texinfo/Makefile.in + + # Configure + ${if mesBootstrap then '' + export CC="tcc -B ${tinycc.libs}/lib -D __GLIBC_MINOR__=6" + export CPP="tcc -E" + export ac_cv_func_setlocale=no + '' else '' + export CC="gcc -I${glibc}/include -I${linux-headers}/include -I${gcc}/lib/gcc-lib/${hostPlatform.config}/${version}/include" + export CPP="gcc -E -I${glibc}/include -I${linux-headers}/include -I${gcc}/lib/gcc-lib/${hostPlatform.config}/${version}/include" + export LIBRARY_PATH="${glibc}/lib" + export LIBS="-lc -lnss_files -lnss_dns -lresolv" + ''} + export OLDCC="$CC" + export CC_FOR_BUILD="$CC" + export AR=ar + export RANLIB=ranlib + export ac_cv_c_float_format='IEEE (little-endian)' + bash ./configure \ + --build=${buildPlatform.config} \ + --host=${hostPlatform.config} \ + --enable-static \ + --disable-shared \ + --disable-werror \ + --prefix=$out + # no info at this stage + touch gcc/cpp.info gcc/gcc.info + + # Build + make ${lib.concatStringsSep " " makeFlags} + + # Install + make install + mkdir tmp + cd tmp + ar x ../gcc/libgcc2.a + ${lib.optionalString mesBootstrap "ar x ${tinycc.libs}/lib/libtcc1.a"} + ar r $out/lib/gcc-lib/${hostPlatform.config}/${version}/libgcc.a *.o + cd .. + ${lib.optionalString mesBootstrap '' + cp gcc/libgcc2.a $out/lib/libgcc2.a + ar x ${tinycc.libs}/lib/libtcc1.a + ar x ${tinycc.libs}/lib/libc.a + ar r $out/lib/gcc-lib/${hostPlatform.config}/${version}/libc.a libc.o libtcc1.o + ''} +'' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/glibc/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/glibc/default.nix new file mode 100644 index 000000000000..5c4ff386add5 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/glibc/default.nix @@ -0,0 +1,121 @@ +{ lib +, buildPlatform +, hostPlatform +, fetchurl +, bash +, gcc2-mes +, gnumake +, gnupatch +, gnused +, gnugrep +, gnutar +, gzip +, gawk +, heirloom +, binutils-mes +, linux-headers +}: +let + pname = "glibc"; + + buildGlibc = { version, src, patches, configureFlags, gcc, binutils, CC, CPP }: + bash.runCommand "${pname}-${version}" { + inherit pname version; + + nativeBuildInputs = [ + gcc + gnumake + gnupatch + gnused + gnugrep + gnutar + gzip + gawk + binutils + ]; + + meta = with lib; { + description = "The GNU C Library"; + homepage = "https://www.gnu.org/software/libc"; + license = licenses.lgpl2Plus; + maintainers = teams.minimal-bootstrap.members; + platforms = platforms.linux; + }; + } '' + # Unpack + tar xzf ${src} + cd glibc-${version} + + # Patch + ${lib.concatMapStringsSep "\n" (f: "patch -Np1 -i ${f}") patches} + + # Configure + export CC="${CC}" + export CPP="${CPP}" + bash ./configure --prefix=$out ${lib.concatStringsSep " " ( + [ + "--build=${buildPlatform.config}" + "--host=${hostPlatform.config}" + "--with-headers=${linux-headers}/include" + "--enable-static" + "--disable-shared" + ] ++ configureFlags)} + + # Build + make + + # Install + # GNU sed w/ mes-libc crashes on certain stdio actions + export PATH="${heirloom.sed}/bin:$PATH" + make install + ''; +in +{ + glibc22 = buildGlibc rec { + # GNU C Library 2.2.5 is the most recent glibc that we managed to build + # using gcc-2.95.3. Newer versions (2.3.x, 2.6, 2.1x) seem to need a newer + # gcc. + # - from guix/gnu/packages/commencement.scm + version = "2.2.5"; + src = fetchurl { + url = "mirror://gnu/glibc/glibc-${version}.tar.gz"; + sha256 = "1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q"; + }; + + patches = [ + # This patch enables building glibc-2.2.5 using TCC and GNU Make 4.x and Mes C Library. + # * Makefile: Do not assemble from stdin, use file indirection. + # * Makefile: Add new target: install-lib-all. + # * Makefile: Avoid building stub DOC. + # * [_LIBC_REENTRANT]: Add missing guarding. + # * [MES_BOOTSTRAP]: Disable some GCC extensions. + # * [MES_BOOTSTRAP]: Add missing GCC div/mod defines. + (fetchurl { + url = "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/glibc-boot-${version}.patch?id=50249cab3a98839ade2433456fe618acc6f804a5"; + sha256 = "1nyz2dr9g7scqwwygd6jvbl7xxpwh11ryvgdz8aikkkna02q1pm8"; + }) + # We want to allow builds in chroots that lack /bin/sh. Thus, system(3) + # and popen(3) need to be tweaked to use the right shell. For the bootstrap + # glibc, we just use whatever `sh' can be found in $PATH. The final glibc + # instead uses the hard-coded absolute file name of `bash'. + (fetchurl { + url = "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/glibc-bootstrap-system-${version}.patch?id=50249cab3a98839ade2433456fe618acc6f804a5"; + sha256 = "1l67w9rysrlsg2i0r210qxxn37h2969ba9lx7pp3ywlnikvi98m8"; + }) + ]; + + configureFlags = [ + "--disable-sanity-checks" + "--enable-static-nss" + "--without-__thread" + "--without-cvs" + "--without-gd" + "--without-tls" + ]; + + gcc = gcc2-mes; + binutils = binutils-mes; + CC = "gcc -D MES_BOOTSTRAP=1 -D BOOTSTRAP_GLIBC=1 -L $(pwd)"; + CPP = "gcc -E -D MES_BOOTSTRAP=1 -D BOOTSTRAP_GLIBC=1"; + }; +} diff --git a/pkgs/os-specific/linux/minimal-bootstrap/linux-headers/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/linux-headers/default.nix new file mode 100644 index 000000000000..6addd11554d0 --- /dev/null +++ b/pkgs/os-specific/linux/minimal-bootstrap/linux-headers/default.nix @@ -0,0 +1,49 @@ +{ lib +, fetchurl +, bash +, gnutar +, xz +}: +let + # WARNING: You probably don't want to use this package outside minimal-bootstrap + # + # We need some set of Linux kernel headers to build our bootstrap packages + # (gcc/binutils/glibc etc.) against. As long as it compiles it is "good enough". + # Therefore the requirement for correctness, completeness, platform-specific + # features, and being up-to-date, are very loose. + # + # Rebuilding the Linux headers from source correctly is something we can defer + # till we have access to gcc/binutils/perl. For now we can use Guix's assembled + # kernel header distribution and assume it's good enough. + pname = "linux-headers"; + version = "4.14.67"; + + src = fetchurl { + url = "mirror://gnu/gnu/guix/bootstrap/i686-linux/20190815/linux-libre-headers-stripped-4.14.67-i686-linux.tar.xz"; + sha256 = "0sm2z9x4wk45bh6qfs94p0w1d6hsy6dqx9sw38qsqbvxwa1qzk8s"; + }; +in +bash.runCommand "${pname}-${version}" { + inherit pname version; + + nativeBuildInputs = [ + gnutar + xz + ]; + + meta = with lib; { + description = "Header files and scripts for Linux kernel"; + license = licenses.gpl2; + maintainers = teams.minimal-bootstrap.members; + platforms = platforms.linux; + }; +} '' + # Unpack + cp ${src} linux-headers.tar.xz + unxz linux-headers.tar.xz + tar xf linux-headers.tar + + # Install + mkdir $out + cp -r include $out +'' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix index f06db98a8efe..65b052c44569 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix @@ -1,13 +1,14 @@ +{ +}: + rec { name = "stage0-posix-${version}-${rev}-source"; # Pinned from https://github.com/oriansj/stage0-posix/commit/3189b5f325b7ef8b88e3edec7c1cde4fce73c76c version = "unstable-2023-05-02"; rev = "3189b5f325b7ef8b88e3edec7c1cde4fce73c76c"; + outputHashAlgo = "sha256"; # This 256 byte seed is the only pre-compiled binary in the bootstrap chain. - # While it is included in the stage0-posix source bundle and is synced with - # stage0-posix updates, we have split it out into its own derivation to highlight - # its unique status as a trusted binary seed. hex0-seed = import <nix/fetchurl.nix> { name = "hex0-seed-${version}"; url = "https://github.com/oriansj/bootstrap-seeds/raw/b1263ff14a17835f4d12539226208c426ced4fba/POSIX/x86/hex0-seed"; @@ -15,20 +16,91 @@ rec { executable = true; }; - # Packaged resources required for the first bootstrapping stage. - # Contains source code and 256-byte hex0 binary seed. - # - # We don't have access to utilities such as fetchgit and fetchzip since this - # is this is part of the bootstrap process and would introduce a circular - # dependency. The only tool we have to fetch source trees is `import <nix/fetchurl.nix>` - # with the unpack option, taking a NAR file as input. This requires source - # tarballs to be repackaged. - # - # To build see `make-bootstrap-sources.nix` - src = import <nix/fetchurl.nix> { - inherit name; - url = "https://github.com/emilytrau/bootstrap-tools-nar-mirror/releases/download/2023-05-02/${name}.nar.xz"; - hash = "sha256-ZRG0k49MxL1UTZhuMTvPoEprdSpJRNVy8QhLE6k+etg="; - unpack = true; + /* + Since `make-minimal-bootstrap-sources` requires nixpkgs and nix it + will create a circular dependency if it is used in place of the + binary bootstrap-files. To break the circular dependency, + `minimal-bootstrap-sources` extends `make-minimal-bootstrap-sources` + by adding Fixed Output Derivation (FOD) attributes. These cause + the builder to be skipped if the expected output is found (by + its hash) in the store or on a substituter. + + # How do I update the hash? + + Run the following command: + ``` + nix hash file $(nix build --print-out-paths -f '<nixpkgs>' make-minimal-bootstrap-sources) + ``` + + # Why do we need this `.nar` archive? + + This archive exists only because of a quirk/limitation of Nix: in + restricted mode the builtin fetchers can download only single + files; they have no way to unpack multi-file archives except for + NAR archives: + + https://github.com/NixOS/nixpkgs/pull/232576#issuecomment-1592415619 + + # Why don't we have to upload this to tarballs.nixos.org like the binary bootstrap-files did? + + Unlike this archive, the binary bootstrap-files contained binaries, + which meant that we had to: + + 1. Make sure they came from a trusted builder (Hydra) + 2. Keep careful track of exactly what toolchain (i.e. nixpkgs + commit) that builder used to create them. + 3. Keep copies of the built binaries, in case the toolchains that + produced them failed to be perfectly deterministic. + + The curated archives at tarballs.nixos.org exist in order to + satisfy these requirements. + + The second point created a significant burden: since the nixpkgs + toolchain used to build a given copy of the binary bootstrap-files + itself used a *previous* copy of the bootstrap-files, this meant + we had to track the provenance of all bootstrap-files tarballs + ever used, for all eternity. There was no explanation of where + the "original" bootstrap-files came from: turtles all the way + down. In spite of all this effort we still can't be sure of our + ability to reproduce the binary bootstrap-files, since the + compilers that built them don't always produce exactly bit-for-bit + deterministic results. + + Since this archive contains no binaries and uses a format (NAR) + specifically designed for bit-exact reproducibility, none of the + requirements above apply to `minimal-bootstrap-sources`. + */ + minimal-bootstrap-sources = derivation { + name = "${name}.nar.xz"; + system = builtins.currentSystem; + outputHashMode = "flat"; + inherit outputHashAlgo; + outputHash = "sha256-ig988BiRTz92hhZZgKQW1tVPoV4aQ2D69Cq3wHvVgHg="; + + # This builder always fails, but fortunately Nix will print the + # "builder", which is really the error message that we want the + # user to see. + builder = '' + # + # + # Neither your store nor your substituters seems to have: + # + # ${name}.nar.xz + # + # Please obtain or create this file, give it exactly the name + # shown above, and then run the following command: + # + # nix-store --add-fixed ${outputHashAlgo} ${name}.nar.xz + # + # You can create this file from an already-bootstrapped nixpkgs + # using the following command: + # + # nix-build '<nixpkgs>' -A make-minimal-bootstrap-sources + # + # Or, if you prefer, you can create this file using only `git`, + # `nix`, and `xz`. For the commands needed in order to do this, + # see `make-bootstrap-sources.nix`. + # + ''; }; } diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix index 2b41261add3a..c15223a43d48 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/default.nix @@ -3,7 +3,10 @@ }: lib.makeScope newScope (self: with self; { - inherit (import ./bootstrap-sources.nix) version hex0-seed src; + inherit (self.callPackage ./bootstrap-sources.nix {}) + version hex0-seed minimal-bootstrap-sources; + + src = minimal-bootstrap-sources; m2libc = src + "/M2libc"; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix index 43859b966add..b85b2f2cac14 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix @@ -9,7 +9,7 @@ derivationWithMeta { pname = "hex0"; builder = hex0-seed; args = [ - "${src}/bootstrap-seeds/POSIX/x86/hex0_x86.hex0" + "${src}/x86/hex0_x86.hex0" (placeholder "out") ]; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/minimal.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/minimal.nix index e85efbbb0243..24fc77f8d345 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/minimal.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/kaem/minimal.nix @@ -9,7 +9,7 @@ derivationWithMeta { pname = "kaem-minimal"; builder = hex0; args = [ - "${src}/bootstrap-seeds/POSIX/x86/kaem-minimal.hex0" + "${src}/x86/kaem-minimal.hex0" (placeholder "out") ]; diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix index fec03f370bc3..8951cc9ddbc4 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix @@ -1,5 +1,4 @@ -# Packaged resources required for the first bootstrapping stage. -# Contains source code and 256-byte hex0 binary seed. +# Packaged source files for the first bootstrapping stage. # # We don't have access to utilities such as fetchgit and fetchzip since this # is this is part of the bootstrap process and would introduce a circular @@ -9,23 +8,29 @@ # # To build: # -# nix-build pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix -# => ./result/stage0-posix-$version-$rev-source.nar.xz +# nix-build '<nixpkgs>' -o sources.nar.xz -A make-minimal-bootstrap-sources # -{ pkgs ? import ../../../../.. {} }: +{ lib +, fetchFromGitHub +, runCommand +, nix +, xz +}: let - inherit (pkgs) callPackage runCommand fetchFromGitHub nix xz; - - inherit (import ./bootstrap-sources.nix) name rev; + inherit (import ./bootstrap-sources.nix { }) name rev; src = fetchFromGitHub { owner = "oriansj"; repo = "stage0-posix"; inherit rev; - sha256 = "sha256-ZRG0k49MxL1UTZhuMTvPoEprdSpJRNVy8QhLE6k+etg="; + sha256 = "sha256-FpMp7z+B3cR3LkQ+PooH/b1/NlxH8NHVJNWifaPWt4U="; fetchSubmodules = true; postFetch = '' + # Seed binaries will be fetched separately + echo "Removing seed binaries" + rm -rf $out/bootstrap-seeds/* + # Remove vendored/duplicate M2libc's echo "Removing duplicate M2libc" rm -rf \ @@ -35,12 +40,20 @@ let $out/mescc-tools-extra/M2libc ''; }; + in -runCommand name { +runCommand "${name}.nar.xz" { nativeBuildInputs = [ nix xz ]; passthru = { inherit src; }; + + meta = with lib; { + description = "Packaged sources for the first bootstrapping stage"; + homepage = "https://github.com/oriansj/stage0-posix"; + license = licenses.gpl3Plus; + maintainers = teams.minimal-bootstrap.members; + platforms = platforms.all; + }; } '' - mkdir $out - nix-store --dump ${src} | xz -c > "$out/${name}.nar.xz" + nix-store --dump ${src} | xz -c > $out '' diff --git a/pkgs/os-specific/linux/minimal-bootstrap/utils.nix b/pkgs/os-specific/linux/minimal-bootstrap/utils.nix index bba6edae973a..cc8c04619169 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/utils.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/utils.nix @@ -29,11 +29,9 @@ rec { , text , executable ? false # run chmod +x ? , destination ? "" # relative path appended to $out eg "/bin/foo" - , allowSubstitutes ? false - , preferLocalBuild ? true }: derivationWithMeta { - inherit name text allowSubstitutes preferLocalBuild; + inherit name text; passAsFile = [ "text" ]; builder = "${kaem}/bin/kaem"; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 6a02bd43aa89..96a3ace57d2d 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "sssd"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "SSSD"; repo = pname; rev = version; - sha256 = "sha256-H9Snh2RzbnjGPqvC9fJHeZvAkGX/O/vmVsl143yb194="; + sha256 = "sha256-OafSo28MN92py33foE8oMkPUmV9WUUOkKWJgm0i7MJU="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index fd5ca2df5a94..ab64c9f9c483 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -190,6 +190,13 @@ stdenv.mkDerivation (finalAttrs: { ./0017-core-don-t-taint-on-unmerged-usr.patch ./0018-tpm2_context_init-fix-driver-name-checking.patch ./0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch + + # https://github.com/systemd/systemd/pull/28000 + (fetchpatch { + name = "fix-service-exit"; + url = "https://github.com/systemd/systemd/commit/5f7f82ba625ee48d662c1f0286f44b8b0918d05d.patch"; + sha256 = "sha256-pFRXpZjeVl5ZG/mOjHEuMg9zXq4Orwvdp+/LYTbR09I="; + }) ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/os-specific/linux/vdo/default.nix index 669f67e09f34..11597c9ed653 100644 --- a/pkgs/os-specific/linux/vdo/default.nix +++ b/pkgs/os-specific/linux/vdo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "vdo"; - version = "8.2.0.2"; # bump this version with kvdo + version = "8.2.2.2"; # bump this version with kvdo src = fetchFromGitHub { owner = "dm-vdo"; repo = pname; rev = version; - hash = "sha256-IP/nL4jQ+rIWuUxXUiBtlIKTMZCNelvxgTfTcaB1it0="; + hash = "sha256-+2w9jzJemI2xr+i/Jd5TIBZ/o8Zv+Ett0fbJbkOD7KI="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/apache-airflow/python-package.nix b/pkgs/servers/apache-airflow/python-package.nix index 7be16894e0b9..49b29495197a 100644 --- a/pkgs/servers/apache-airflow/python-package.nix +++ b/pkgs/servers/apache-airflow/python-package.nix @@ -82,7 +82,7 @@ , enabledProviders ? [] }: let - version = "2.6.0"; + version = "2.6.2"; airflow-src = fetchFromGitHub rec { owner = "apache"; @@ -91,7 +91,7 @@ let # Download using the git protocol rather than using tarballs, because the # GitHub archive tarballs don't appear to include tests forceFetchGit = true; - hash = "sha256-CsLOj68+tSOI7drZq6QH+C2EB/9trg5cFAYAQp/06m8="; + hash = "sha256-ejZw71lMhfnqy4Ziha8/ufmX+SkOfopkeCskf02ZQgA="; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index ffa10568ffff..4a07e129cfd3 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,6 +1,7 @@ { lib , llvmPackages , fetchFromGitHub +, fetchpatch , cmake , ninja , python3 @@ -27,7 +28,7 @@ let else llvmPackages.stdenv).mkDerivation; in mkDerivation rec { pname = "clickhouse"; - version = "23.3.3.52"; + version = "23.3.5.9"; src = fetchFromGitHub rec { owner = "ClickHouse"; @@ -35,9 +36,7 @@ in mkDerivation rec { rev = "v${version}-lts"; fetchSubmodules = true; name = "clickhouse-${rev}.tar.gz"; - hash = if stdenv.isDarwin - then "sha256-VaUGbUyDilYPK4iBv/nICOsfeolNQeBSEtC71gBTkpE=" - else "sha256-NH+OW6zr8XBmJr68fX1WIy8Wt7cLWFMskIv7Be0TLEU="; + hash = "sha256-soF0L69oi95r0zgzPL0DfDhhXfRKekN5u/4+/mt8QwM="; postFetch = '' # delete files that make the source too big rm -rf $out/contrib/llvm-project/llvm/test @@ -53,7 +52,7 @@ in mkDerivation rec { tar -I 'gzip -n' \ --sort=name \ --mtime=1970-01-01 \ - --owner=root --group=root \ + --owner=0 --group=0 \ --numeric-owner --mode=go=rX,u+rw,a-s \ --transform='s@^@source/@S' \ -cf temp -C "$out" . @@ -157,9 +156,11 @@ in mkDerivation rec { "-DENABLE_TESTS=OFF" "-DCOMPILER_CACHE=disabled" "-DENABLE_EMBEDDED_COMPILER=ON" - "-DWERROR=OFF" ]; + # https://github.com/ClickHouse/ClickHouse/issues/49988 + hardeningDisable = [ "fortify" ]; + postInstall = '' rm -rf $out/share/clickhouse-test diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 939ef23275d7..6d13c600a702 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.14"; + version = "9.18.16"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-muEu32rDxDCzPs0afAwMYIddJVGF64eFD6ml55SmSgk="; + sha256 = "sha256-yII0/gfudcPIqeWRUv7mS3FGQ96OIs+Y2j200LV+B3U="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index f5a3dec64e5e..ba394429926a 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.7"; + version = "3.2.8"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "d3b7872ac8aa80f7f54ddb1bb3b1e2f90ec55f7270a2c4a9338eab42b7d2767b"; + sha256 = "ef419a428f327def77780bc90eda763b51e6121fe548543da84b9eb96a261a6e"; }; outputs = [ "bin" "out" "dev" ]; @@ -29,12 +29,6 @@ stdenv.mkDerivation rec { ./runtime-deps.patch ]; - # Upstream mistake in 3.2.7: too strict constraint. - postPatch = '' - substituteInPlace configure.ac \ - --replace 'libngtcp2 = 0.13.0' 'libngtcp2 = 0.13.1' - ''; - nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gnutls liburcu libidn2 libunistring diff --git a/pkgs/servers/endlessh-go/default.nix b/pkgs/servers/endlessh-go/default.nix index 6e60940b1579..013c61213bed 100644 --- a/pkgs/servers/endlessh-go/default.nix +++ b/pkgs/servers/endlessh-go/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "endlessh-go"; - version = "20230211"; + version = "20230613"; src = fetchFromGitHub { owner = "shizunge"; repo = "endlessh-go"; rev = version; - sha256 = "sha256-hG+WIp7JzlHVHjVUouPoocRLpwxWl6hpNorMvc4MsWM="; + sha256 = "sha256-XJcl8w36ZfcYp+0JlSvDW0BoW5MNC8pmTLZgkYLobBU="; }; - vendorHash = "sha256-zhkQ3v8oN0hu3siu7yVxsFVTnNvJV59tHGpfXZzE+O4="; + vendorHash = "sha256-UsbuB4GsL9pteebAF2ybAt7GgEpY0z4O9zjSYEIamdQ="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7547228bef26..635763c8768f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.6.2"; + version = "2023.6.3"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3262dd2af806..4687181bef8e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -231,15 +231,6 @@ let doCheck = false; }); - sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "2.0.12"; - src = fetchPypi { - pname = "SQLAlchemy"; - inherit version; - hash = "sha256-vd/FvR3uXbD93J2rJvgAwoPzJD5ygbvxByAP7TASX5w="; - }; - }); - # Pinned due to API changes in 0.3.0 tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { version = "0.2.0"; @@ -296,7 +287,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.6.2"; + hassVersion = "2023.6.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -312,7 +303,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-WPjqKCktCEk7yPrz8/GDphoFtD4Q3j0cIxUxOEwc/i0="; + hash = "sha256-hlU2LNG/9Uy7XfST/ZwVOQCar0IFvFUgpMSoSCviTrc="; }; # Secondary source is git for tests @@ -320,7 +311,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-qAwNuCoQN2r++QvKCTdNs7AePszSxwrFaY5FHXf3Vy8="; + hash = "sha256-V/ndNu8zvtI8Z0LzrlWaV+EbeL8oBBz/D46ec+fhPPY="; }; nativeBuildInputs = with python.pkgs; [ @@ -357,7 +348,7 @@ in python.pkgs.buildPythonApplication rec { "PyJWT" "pyOpenSSL" "requests" - "typing-extensions" + "typing_extensions" "voluptuous-serialize" "yarl" ]; diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 5a19437fb23e..85f7cce8d3ac 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.6.2"; + version = "2023.6.3"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-DApFCEpm+Q0UqXZkHsowPs7jFoua4UahfEoejKXEnms="; + hash = "sha256-Ia+y9I92XqPcoRFXfEmoAmzU2LUH5oP+A5Uu/8DdUAc="; }; nativeBuildInputs = [ @@ -30,7 +30,6 @@ buildPythonPackage rec { substituteInPlace pyproject.toml --replace \ 'homeassistant = "${version}"' \ 'homeassistant = "~${lib.versions.majorMinor home-assistant.version}"' - cat pyproject.toml ''; pythonImportsCheck = [ diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 91a902a8a2d7..5b058ffb92b9 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -47,6 +47,9 @@ let }; extraPytestFlagsArray = { + conversation = [ + "--deselect tests/components/conversation/test_init.py::test_get_agent_list" + ]; dnsip = [ # Tries to resolve DNS entries "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" @@ -63,10 +66,19 @@ let # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" ]; + sonos = [ + # KeyError: 'sonos_media_player' + "--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_warnings" + "--deselect tests/components/sonos/test_init.py::test_async_poll_manual_hosts_3" + ]; unifiprotect = [ # "TypeError: object Mock can't be used in 'await' expression "--deselect tests/components/unifiprotect/test_repairs.py::test_ea_warning_fix" ]; + zha = [ + "--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_manual_backup_non_ezsp" + "--deselect tests/components/zha/test_config_flow.py::test_formation_strategy_restore_automatic_backup_non_ezsp" + ]; }; in lib.listToAttrs (map (component: lib.nameValuePair component ( home-assistant.overridePythonAttrs (old: { diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 6ab952af2638..5b1edb5a2d86 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -10,14 +10,14 @@ with lib; stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.4.1"; pname = "tengine"; src = fetchFromGitHub { owner = "alibaba"; repo = pname; rev = version; - hash = "sha256-h/eSa2wCPvnX29wdtDHNQh8r1No1/YGinZNYU2MnsTM="; + hash = "sha256-h9PFzJc/29WFe4mW+xpJAL1Z2XqBxMEtQeN5DMgOVBA="; }; buildInputs = diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 9f568dec5d71..5b07f7c1d0c6 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.275"; + version = "0.21.327"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-MQrIzt/V6MWhRvdpBFR1sg8CeJNE3r05+DdxVYssRjFSqDOLTAOoL8Dd0S2upuzFTBcxB2dIYDYfdKrtUT8suA=="; + hash = "sha512-CVdtnUOlbVyQXJmnV0wuRHyD4nT3g0IpT9sDD/9CR/NDlDwsg/+/9qV77GpqJiI8n0NmGaGg7dmLmlK9XGufuw=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index dbcdad040709..fed8b1e9da84 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-06-21"; + version = "unstable-2023-06-23"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "d32a83345518f4bb632bef9ca2de669b35f0e555"; - sha256 = "sha256-XpAUv4NVERVGxV4lk6u15lIIce8ZrYf9uN3fdL5xolI="; + rev = "b9247810b90938339e87056a5d0f8a7f207d4ea4"; + sha256 = "sha256-FJoSQSmlrceG9NVoEx1PvcS3IX/8Eu+Q2tzgx8DJjjc="; }; sourceRoot = "source/klippy"; diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index ef87288df29b..95b613f0b478 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -1,42 +1,71 @@ -{ lib, fetchurl, perlPackages, makeWrapper, gnupg, re2c, gcc, gnumake }: +{ lib, fetchurl, perlPackages, makeBinaryWrapper, gnupg, re2c, gcc, gnumake, libxcrypt, openssl, coreutils, poppler_utils, tesseract, iana-etc }: perlPackages.buildPerlPackage rec { pname = "SpamAssassin"; - version = "3.4.6"; + version = "4.0.0"; src = fetchurl { url = "mirror://apache/spamassassin/source/Mail-${pname}-${version}.tar.bz2"; - sha256 = "044ng2aazqy8g0m17q0a4939ck1ca4x230q2q7q7jndvwkrpaj5w"; + hash = "sha256-5aoXBQowvHK6qGr9xgSMrepNHsLsxh14dxegWbgxnog="; }; - # ExtUtil::MakeMaker is bundled with Perl, but the bundled version - # causes build errors for aarch64-darwin, so we override it with the - # latest version. We can drop the dependency to go back to the - # bundled version when the version that comes with Perl is ≥7.57_02. - # - # Check the version bundled with Perl like this: - # perl -e 'use ExtUtils::MakeMaker qw($VERSION); print "$VERSION\n"' - nativeBuildInputs = [ makeWrapper perlPackages.ExtUtilsMakeMaker ]; + patches = [ + ./satest-no-clean-path.patch + ./sa_compile-use-perl5lib.patch + ]; + + nativeBuildInputs = [ makeBinaryWrapper ]; buildInputs = (with perlPackages; [ HTMLParser NetCIDRLite NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP LWPProtocolHttps IOSocketSSL DBI EncodeDetect IPCountry NetIdent Razor2ClientAgent MailSPF NetDNSResolverProgrammable Socket6 - ]); + ArchiveZip EmailAddressXS NetLibIDN2 MaxMindDBReader GeoIP MailDMARC + MaxMindDBReaderXS + ]) ++ [ + openssl + ]; - # Enabling 'taint' mode is desirable, but that flag disables support - # for the PERL5LIB environment variable. Needs further investigation. - makeFlags = [ "PERL_BIN=${perlPackages.perl}/bin/perl" "PERL_TAINT=no" ]; + makeFlags = [ "PERL_BIN=${perlPackages.perl}/bin/perl" "ENABLE_SSL=yes" ]; makeMakerFlags = [ "SYSCONFDIR=/etc LOCALSTATEDIR=/var/lib/spamassassin" ]; - doCheck = false; + checkInputs = (with perlPackages; [ + TextDiff # t/strip2.t + ]) ++ [ + coreutils # date, t/basic_meta.t + poppler_utils # pdftotext, t/extracttext.t + tesseract # tesseract, t/extracttext.t + iana-etc # t/dnsbl_subtests.t (/etc/protocols used by Net::DNS::Nameserver) + re2c gcc gnumake + ]; + preCheck = '' + substituteInPlace t/spamc_x_e.t \ + --replace "/bin/echo" "${coreutils}/bin/echo" + export C_INCLUDE_PATH='${lib.makeSearchPathOutput "include" "include" [ libxcrypt ]}' + export HARNESS_OPTIONS="j''${NIX_BUILD_CORES}" + + export HOME=$NIX_BUILD_TOP/home + mkdir -p $HOME + mkdir t/log # pre-create to avoid race conditions + ''; postInstall = '' mkdir -p $out/share/spamassassin mv "rules/"* $out/share/spamassassin/ for n in "$out/bin/"*; do - wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : ${lib.makeBinPath [ gnupg re2c gcc gnumake ]} + # Skip if this isn't a perl script + if ! head -n1 "$n" | grep -q bin/perl; then + continue + fi + echo "Wrapping $n for taint mode" + orig="$out/bin/.$(basename "$n")-wrapped" + mv "$n" "$orig" + # We don't inherit argv0 so that $^X works properly in e.g. sa-compile + makeWrapper "${perlPackages.perl}/bin/perl" "$n" \ + --add-flags "-T $perlFlags $orig" \ + --prefix PATH : ${lib.makeBinPath [ gnupg re2c gcc gnumake ]} \ + --prefix C_INCLUDE_PATH : ${lib.makeSearchPathOutput "include" "include" [ libxcrypt ]} done ''; diff --git a/pkgs/servers/mail/spamassassin/sa_compile-use-perl5lib.patch b/pkgs/servers/mail/spamassassin/sa_compile-use-perl5lib.patch new file mode 100644 index 000000000000..ba68142a92d9 --- /dev/null +++ b/pkgs/servers/mail/spamassassin/sa_compile-use-perl5lib.patch @@ -0,0 +1,23 @@ +diff -ru orig/t/sa_compile.t new/t/sa_compile.t +--- orig/t/sa_compile.t 2022-12-14 06:03:26.000000000 +0000 ++++ new/t/sa_compile.t 2023-06-25 12:30:39.735577152 +0000 +@@ -40,7 +40,7 @@ + + # we now have an "installed" version we can run sa-compile with. Ensure + # sarun() will use it appropriately +-$scr = "$instdir/$temp_binpath/spamassassin"; ++$scr = "$perl_cmd -T $instdir/$temp_binpath/spamassassin"; + $scr_localrules_args = $scr_cf_args = ""; # use the default rules dir, from our "install" + + &set_rules(' +@@ -86,8 +86,8 @@ + # ------------------------------------------------------------------- + + rmtree( glob "~/.spamassassin/sa-compile.cache". { safe => 1 }); # reset test +-system_or_die "TMP=$instdir TMPDIR=$instdir $instdir/$temp_binpath/sa-compile --quiet -p $cwd/$workdir/user.cf --keep-tmps -D 2>$instdir/sa-compile.debug"; # --debug +-$scr = "$instdir/$temp_binpath/spamassassin"; ++system_or_die "TMP=$instdir TMPDIR=$instdir $perl_cmd -T $instdir/$temp_binpath/sa-compile --quiet -p $cwd/$workdir/user.cf --keep-tmps -D 2>$instdir/sa-compile.debug"; # --debug ++$scr = "$perl_cmd -T $instdir/$temp_binpath/spamassassin"; + $scr_localrules_args = $scr_cf_args = ""; # use the default rules dir, from our "install" + + %patterns = ( diff --git a/pkgs/servers/mail/spamassassin/satest-no-clean-path.patch b/pkgs/servers/mail/spamassassin/satest-no-clean-path.patch new file mode 100644 index 000000000000..11f5c31d31e7 --- /dev/null +++ b/pkgs/servers/mail/spamassassin/satest-no-clean-path.patch @@ -0,0 +1,18 @@ +diff -ru orig/t/SATest.pm new/t/SATest.pm +--- orig/t/SATest.pm 2023-06-25 11:26:27.663204415 +0000 ++++ new/t/SATest.pm 2023-06-25 11:34:08.902174669 +0000 +@@ -65,9 +65,12 @@ + + # Clean PATH so taint doesn't complain + if (!$RUNNING_ON_WINDOWS) { +- $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin'; ++ # untaint PATH ++ $ENV{'PATH'} =~ /^(.+)$/; ++ $ENV{'PATH'} = $1; ++ # $ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin'; + # Remove tainted envs, at least ENV used in FreeBSD +- delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; ++ # delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; + } else { + # Windows might need non-system directories in PATH to run a Perl installation + # The best we can do is clean out obviously bad stuff such as relative paths or \..\ diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index 901b880572e4..2ca8c8181022 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mediamtx"; - version = "0.23.5"; + version = "0.23.6"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-LGD6VL5guUqBFjN36KOTVyWRupCuoch3yhW8SabkihY="; + hash = "sha256-7Afer0lzI264qK9iWfGMxgUuKBmDDdR+fTapt3SIGYY="; }; - vendorHash = "sha256-5G557by0nqE3a9R1/TZZ2I+4KX5J6dqzwc1pP95mGAg="; + vendorHash = "sha256-wgTMobmIu6nJdyFOoFVhyKvWQEuZTDSEzJGQLUYS6o4="; # Tests need docker doCheck = false; diff --git a/pkgs/servers/monitoring/cockpit/default.nix b/pkgs/servers/monitoring/cockpit/default.nix index 3fe0c17ded93..f73f391f71b9 100644 --- a/pkgs/servers/monitoring/cockpit/default.nix +++ b/pkgs/servers/monitoring/cockpit/default.nix @@ -149,6 +149,7 @@ stdenv.mkDerivation rec { "--enable-prefix-only=yes" "--disable-pcp" # TODO: figure out how to package its dependency "--with-default-session-path=/run/wrappers/bin:/run/current-system/sw/bin" + "--with-admin-group=root" # TODO: really? Maybe "wheel"? ]; enableParallelBuilding = true; diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index 861ffbaa9796..74bd2f139508 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.4.5"; + version = "0.4.7"; src = fetchFromGitHub { owner = "justwatchcom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A3hMSnfxiEgFYueARuldEHT/5ROCIwWjqQj2FdkVYqo="; + sha256 = "sha256-aSygfs5jVc1CTb+uj16U//99ypP4kixz7gqDvxIxxfM="; }; - vendorSha256 = null; + vendorHash = null; ldflags = let t = "github.com/prometheus/common/version"; in [ diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 693662be34ff..e20b36a5a192 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.18"; + version = "2.9.19"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-Eda6i4kJbvX1Wzkwd9YSd3fes3kdkekKKhIt7xH8Yi8="; + hash = "sha256-CiDvDnnUR/jaEWU+bceH6uIr9QBtsAz+6vnQjT3sNQQ="; }; vendorHash = "sha256-m/15F0BHCAEcNlRf71jJP5bjrrqRgX/CQm8SddpTkYw="; diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index 314e9b4cce6f..bb86f5f48c4a 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -4,16 +4,16 @@ with lib; buildGoModule rec { pname = "nats-streaming-server"; - version = "0.25.4"; + version = "0.25.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-/uPkcJOUDPVcdNBo6PxbJEvrrbElQ8lzMERZv6lOZwQ="; + sha256 = "sha256-rx6H3YXyg53th81w1SsKg5h9wj2vswnArDO0TNUlvpE="; }; - vendorHash = "sha256-Ah7F4+l1Bmr5j15x7fsEOzFIvxDR4OuJFTY95ZYyOYc="; + vendorHash = "sha256-erTxz3YpE64muc9OgP38BrPNH5o3tStSYsCbBd++kFU="; # tests fail and ask to `go install` doCheck = false; diff --git a/pkgs/servers/nosql/immudb/default.nix b/pkgs/servers/nosql/immudb/default.nix index e227f5f5a5dc..716f9f0a9f74 100644 --- a/pkgs/servers/nosql/immudb/default.nix +++ b/pkgs/servers/nosql/immudb/default.nix @@ -14,13 +14,13 @@ let in buildGoModule rec { pname = "immudb"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "codenotary"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G6Oy+veZGQYtRyeOSpFmQ3Ehro3Ra69iCQVl9YnerAk="; + sha256 = "sha256-xvbks6dUiS14cntydAjSNTujxsSwYzmf+B4Zh4V/NwI="; }; preBuild = '' @@ -29,7 +29,7 @@ buildGoModule rec { go generate -tags webconsole ./webconsole ''; - vendorSha256 = "sha256-k2OwwGjuyfM3QIRz+/DgGD0xUYor4TDmfBmcQOkcA3A="; + vendorHash = "sha256-7mMutYx2/jmTx+7h9S412fYCFXiJnTGz0qwDSO7BIzM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index a250f3c560f6..a76dac6681c4 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "questdb"; - version = "7.1.3"; + version = "7.2"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${version}/questdb-${version}-no-jre-bin.tar.gz"; - sha256 = "lB3h8HRQaQwdTtxxjHNfYrDXY3UULSSrM74OCGgLoMc="; + sha256 = "sha256-37pmNeN02sHt2Cpyjk3FpBFscBw2Zqm4nNmOlyiX6H0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index c65fd71a0cf3..8ce4b7676e44 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -58,13 +58,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "openvscode-server"; - version = "1.79.1"; + version = "1.79.2"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${finalAttrs.version}"; - hash = "sha256-yMJo66RYcbVyIFKNNxDe0U9CPvaez/kTu9sPGcaESPw="; + hash = "sha256-u5LuDcKTN4CEpRnFCeEbni6hiDDwTV9LUEmXaQYJvJw="; }; yarnCache = stdenv.mkDerivation { diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index 2ac8db3ec738..1ba25683c923 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-XKgjLlm53jfZz94lq6DtVVIwMkTjArzMWQ2+ePH+pzU="; - arm64-linux_hash = "sha256-xbw/ObIe/wPEnBekikkN7bykb+pQZ9wIMEqjOzvf4NQ="; - x64-osx_hash = "sha256-/U+YV5Y3MY5ibo6eBzYgFq2bWz3JP9XBZd8jFSMlkBM="; + x64-linux_hash = "sha256-TKK0009ZEFWpzR9jYRanG3sMVp8hQcTd9G/FvUu00tQ="; + arm64-linux_hash = "sha256-u1vjSYu751VoOYsCPyPzcNnmG0rrKk7VgbXMG8X96jU="; + x64-osx_hash = "sha256-IHJ6hZP4DVTotoGxfLLbOveA8TD+6DHXkC+8QqmgTeg="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.1.8.1889"; + version = "0.1.9.1905"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/scaphandre/default.nix b/pkgs/servers/scaphandre/default.nix new file mode 100644 index 000000000000..cc01b684e9e1 --- /dev/null +++ b/pkgs/servers/scaphandre/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, powercap +, runCommand +, dieHook +, nixosTests +}: + +rustPlatform.buildRustPackage rec { + pname = "scaphandre"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "hubblo-org"; + repo = pname; + rev = "v${version}"; + hash = "sha256-cXwgPYTgom4KrL/PH53Fk6ChtALuMYyJ/oTrUKHCrzE="; + }; + + cargoSha256 = "sha256-Vdkq9ShbHWepvIgHPjhKY+LmhjS+Pl84QelgEpen7Qs="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + checkPhase = '' + runHook preCheck + + # Work around to pass test due to non existing path + # https://github.com/hubblo-org/scaphandre/blob/v0.5.0/src/sensors/powercap_rapl.rs#L29 + export SCAPHANDRE_POWERCAP_PATH="$(mktemp -d)/scaphandre" + + mkdir -p "$SCAPHANDRE_POWERCAP_PATH" + + runHook postCheck + ''; + + passthru.tests = { + stdout = self: runCommand "${pname}-test" { + buildInputs = [ + self + dieHook + ]; + } '' + ${self}/bin/scaphandre stdout -t 4 > $out || die "Scaphandre failed to measure consumption" + [ -s $out ] + ''; + vm = nixosTests.scaphandre; + }; + + meta = with lib; { + description = "Electrical power consumption metrology agent"; + homepage = "https://github.com/hubblo-org/scaphandre"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ gaelreyrol ]; + }; +} diff --git a/pkgs/servers/search/zincsearch/default.nix b/pkgs/servers/search/zincsearch/default.nix index d38f729c2be4..20f48867bdc2 100644 --- a/pkgs/servers/search/zincsearch/default.nix +++ b/pkgs/servers/search/zincsearch/default.nix @@ -5,12 +5,12 @@ }: let - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "zinclabs"; repo = "zincsearch"; rev = "v${version}"; - hash = "sha256-M2QNrQFMZJuJ2BlGmHT1eGGWccXqjLSjuEppP8uTWJw="; + hash = "sha256-6ZwEH9Xm+iIZ0SDa8qb82lIN3KU6DMe2wt0q9doKgkE="; }; webui = buildNpmPackage { diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 5576eb75ef35..4a98e2a436e1 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -1,98 +1,35 @@ -{ lib +{ faad2 , fetchFromGitHub -, makeWrapper -, perlPackages , flac -, faad2 -, sox , lame +, lib +, makeWrapper , monkeysAudio +, perl534Packages +, sox +, stdenv , wavpack +, zlib }: -perlPackages.buildPerlPackage rec { +perl534Packages.buildPerlPackage rec { pname = "slimserver"; - version = "7.9.2"; + version = "8.3.1"; src = fetchFromGitHub { owner = "Logitech"; repo = "slimserver"; rev = version; - hash = "sha256-P4CSu/ff6i48uWV5gXsJgayZ1S1s0RAqa5O5y3Y0g9Y="; + hash = "sha256-yMFOwh/oPiJnUsKWBGvd/GZLjkWocMAUK0r+Hx/SUPo="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - perlPackages.perl - perlPackages.AnyEvent - perlPackages.ArchiveZip - perlPackages.AudioScan - perlPackages.CarpClan - perlPackages.CGI - perlPackages.ClassXSAccessor - perlPackages.DataDump - perlPackages.DataURIEncode - perlPackages.DBDSQLite - perlPackages.DBI - perlPackages.DBIxClass - perlPackages.DigestSHA1 - perlPackages.EV - perlPackages.ExporterLite - perlPackages.FileBOM - perlPackages.FileCopyRecursive - perlPackages.FileNext - perlPackages.FileReadBackwards - perlPackages.FileSlurp - perlPackages.FileWhich - perlPackages.HTMLParser - perlPackages.HTTPCookies - perlPackages.HTTPDaemon - perlPackages.HTTPMessage - perlPackages.ImageScale - perlPackages.IOSocketSSL - perlPackages.IOString - perlPackages.JSONXSVersionOneAndTwo - perlPackages.LogLog4perl - perlPackages.LWP - perlPackages.NetHTTP - perlPackages.NetHTTPSNB - perlPackages.ProcBackground - perlPackages.SubName - perlPackages.TemplateToolkit - perlPackages.TextUnidecode - perlPackages.TieCacheLRU - perlPackages.TieCacheLRUExpires - perlPackages.TieRegexpHash - perlPackages.TimeDate - perlPackages.URI - perlPackages.URIFind - perlPackages.UUIDTiny - perlPackages.XMLParser - perlPackages.XMLSimple - perlPackages.YAMLLibYAML - ]; + buildInputs = [ perl534Packages.CryptOpenSSLRSA perl534Packages.IOSocketSSL ]; prePatch = '' - mkdir CPAN_used - # slimserver doesn't work with current DBIx/SQL versions, use bundled copies - mv CPAN/DBIx CPAN/SQL CPAN_used - rm -rf CPAN rm -rf Bin touch Makefile.PL - - # relax audio scan version constraints - substituteInPlace lib/Audio/Scan.pm --replace "0.93" "1.01" - substituteInPlace modules.conf --replace "Audio::Scan 0.93 0.95" "Audio::Scan 0.93" - ''; - - preConfigurePhase = ""; - - buildPhase = '' - mv lib tmp - mkdir -p ${perlPackages.perl.libPrefix} - mv CPAN_used/* ${perlPackages.perl.libPrefix} - cp -rf tmp/* ${perlPackages.perl.libPrefix} ''; doCheck = false; @@ -100,6 +37,7 @@ perlPackages.buildPerlPackage rec { installPhase = '' cp -r . $out wrapProgram $out/slimserver.pl \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib stdenv.cc.cc.lib ]}" \ --prefix PATH : "${lib.makeBinPath [ lame flac faad2 sox monkeysAudio wavpack ]}" ''; @@ -109,9 +47,9 @@ perlPackages.buildPerlPackage rec { homepage = "https://github.com/Logitech/slimserver"; description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; # the firmware is not under a free license! - # https://github.com/Logitech/slimserver/blob/public/7.9/License.txt + # https://github.com/Logitech/slimserver/blob/public/8.3/License.txt license = licenses.unfree; - maintainers = [ ]; + maintainers = with maintainers; [ adamcstephens jecaro ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index f190cda238ad..82ff542c9228 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.31"; + version = "2.35"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-zkeoj+l82aP3/rXn7JuNS4OvAGnHaVRz+xXxPEPMEs8="; + hash = "sha256-V9Q9rjinFDFCi2snQ27R0Y9KFrYD/HLElnT8KV/3bP4="; }; buildInputs = [ curl openssl ]; diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 0c311668c8b5..f5fa6a97b986 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.22.0"; + version = "1.22.2"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-Q8NqWV9s4DrN3lEGkAYYm59HCIo6dIpQQHbzepKao+o="; + hash = "sha256-KfS0GH6gebpQDdbO49mu148GUnv6B08OHOTbkR3h7xE="; }; - vendorHash = "sha256-61TnfP62a5bUtBLxDe1FpF28hcPGzyuO5D/JNTqAfx8="; + vendorHash = "sha256-7um5V8AcHXn6UgOluUokuTRJED57tAC4ushVCR37ORA="; subPackages = [ "cmd/spicedb" ]; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 1e7f6bc44e3a..b5d07489b31d 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.3.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-fgppjXg7PcUmh57HrOvxnHy3Si23JeP2QedqWcxBiTY="; + sha256 = "sha256-CSuHaQEnaBLGIMjJ6/8JzOEwQUrm9vI/a2cumyjTT8k="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-GbMjIoTZMJUJVU4McSayX8aWu7iFI6NBPcbQ5oj8xn0="; + vendorHash = "sha256-jP6jm4yNx6wzbUsGDBaRSGcD62wpyvct/q4q4ryqvpY="; proxyVendor = true; doCheck = false; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 835701456dce..b847de1f3ae6 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -1,18 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, postgresql, msgpack, groonga }: +{ lib, stdenv, fetchurl, pkg-config, postgresql, msgpack-c, groonga }: stdenv.mkDerivation rec { pname = "pgroonga"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-iF/zh4zDDpAw5fxW1WG8i2bfPt4VYsnYArwOoE/lwgM="; + hash = "sha256-2/dInLG8isiSJHJgNyxgbUwMd/mtcUJxcTvSnVpBZ9M="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ postgresql msgpack groonga ]; + buildInputs = [ postgresql msgpack-c groonga ]; - makeFlags = [ "HAVE_MSGPACK=1" ]; + makeFlags = [ + "HAVE_MSGPACK=1" + "MSGPACK_PACKAGE_NAME=msgpack-c" + ]; installPhase = '' install -D pgroonga.so -t $out/lib/ diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index f32f6a9814ce..6847c5064dc5 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "proxysql"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "sysown"; repo = pname; rev = version; - hash = "sha256-KPTvFbEreWQBAs5ofcdVzlVqL0t5pM/mMLv4+E4lJ5M="; + hash = "sha256-D/AUjndpu4QJmlgLBXRqMj9gsHYitEYhHVMQzoab1ik="; }; patches = [ @@ -171,5 +171,6 @@ stdenv.mkDerivation rec { description = "High-performance MySQL proxy"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ ajs124 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/sql/proxysql/makefiles.patch b/pkgs/servers/sql/proxysql/makefiles.patch index ed16c9d64703..bfe897254557 100644 --- a/pkgs/servers/sql/proxysql/makefiles.patch +++ b/pkgs/servers/sql/proxysql/makefiles.patch @@ -1,8 +1,8 @@ diff --git a/Makefile b/Makefile -index df7ed196..3a3b393d 100644 +index c053ab64..03f38a21 100644 --- a/Makefile +++ b/Makefile -@@ -57,11 +57,7 @@ endif +@@ -59,11 +59,7 @@ endif export MAKEOPT=-j ${NPROCS} @@ -15,7 +15,7 @@ index df7ed196..3a3b393d 100644 USERCHECK := $(shell getent passwd proxysql) GROUPCHECK := $(shell getent group proxysql) -@@ -784,16 +780,10 @@ cleanbuild: +@@ -868,16 +864,10 @@ cleanbuild: .PHONY: install install: src/proxysql @@ -36,10 +36,10 @@ index df7ed196..3a3b393d 100644 install -m 0755 etc/init.d/proxysql /etc/init.d ifeq ($(DISTRO),"CentOS Linux") diff --git a/deps/Makefile b/deps/Makefile -index 47c0f3c3..80d33d11 100644 +index dbe495c0..9c50bab8 100644 --- a/deps/Makefile +++ b/deps/Makefile -@@ -66,10 +66,7 @@ endif +@@ -69,10 +69,7 @@ default: $(tmpdefault) libinjection/libinjection/src/libinjection.a: @@ -50,8 +50,8 @@ index 47c0f3c3..80d33d11 100644 cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch endif ifeq ($(UNAME_S),Darwin) -@@ -83,8 +80,6 @@ libinjection: libinjection/libinjection/src/libinjection.a - +@@ -91,8 +88,6 @@ $(error Incompatible OpenSSL version: struct bio_st mismatch!) + endif libssl/openssl/libssl.a: - cd libssl && rm -rf openssl-openssl-*/ openssl-3*/ || true @@ -59,7 +59,7 @@ index 47c0f3c3..80d33d11 100644 # cd libssl/openssl && patch crypto/ec/curve448/curve448.c < ../curve448.c-multiplication-overflow.patch # cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch cd libssl/openssl && ./config no-ssl3 no-tests -@@ -103,8 +98,6 @@ ifeq ($(MIN_VERSION),$(lastword $(SORTED_VERSIONS))) +@@ -112,8 +107,6 @@ ifeq ($(MIN_VERSION),$(lastword $(SORTED_VERSIONS))) endif libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a @@ -68,7 +68,7 @@ index 47c0f3c3..80d33d11 100644 #ifeq ($(REQUIRE_PATCH), true) cd libhttpserver/libhttpserver && patch -p1 < ../noexcept.patch cd libhttpserver/libhttpserver && patch -p1 < ../re2_regex.patch -@@ -122,8 +115,6 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a +@@ -131,8 +124,6 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a libev/libev/.libs/libev.a: @@ -77,16 +77,16 @@ index 47c0f3c3..80d33d11 100644 cd libev/libev && patch ev.c < ../ev.c-multiplication-overflow.patch cd libev/libev && ./configure cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE} -@@ -132,8 +123,6 @@ ev: libev/libev/.libs/libev.a - +@@ -148,8 +139,6 @@ coredumper/coredumper/src/libcoredumper.a: + coredumper: coredumper/coredumper/src/libcoredumper.a curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a - cd curl && rm -rf curl-*/ || true - cd curl && tar -zxf curl-*.tar.gz # cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE} - # cd curl/curl && patch configure < ../configure.patch cd curl/curl && autoreconf -fi -@@ -143,16 +132,6 @@ curl: curl/curl/lib/.libs/libcurl.a + ifeq ($(UNAME_S),Darwin) +@@ -161,16 +150,6 @@ curl: curl/curl/lib/.libs/libcurl.a libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a: @@ -100,10 +100,10 @@ index 47c0f3c3..80d33d11 100644 - cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.75.tar.gz -# cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/connection.c < ../connection.c-snprintf-overflow.patch -endif - ifeq ($(UNAME_S),Darwin) - cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/mhd_sockets.c < ../mhd_sockets.c-issue-5977.patch - endif -@@ -171,8 +150,6 @@ cityhash: cityhash/cityhash/src/.libs/libcityhash.a + cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE} + + microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a +@@ -186,8 +165,6 @@ cityhash: cityhash/cityhash/src/.libs/libcityhash.a lz4/lz4/lib/liblz4.a: @@ -112,7 +112,7 @@ index 47c0f3c3..80d33d11 100644 cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE} lz4: lz4/lz4/lib/liblz4.a -@@ -197,8 +174,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s +@@ -213,8 +190,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s libdaemon/libdaemon/libdaemon/.libs/libdaemon.a: @@ -121,7 +121,7 @@ index 47c0f3c3..80d33d11 100644 cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE} -@@ -282,8 +257,6 @@ sqlite3: sqlite3/sqlite3/sqlite3.o +@@ -302,8 +277,6 @@ sqlite3: sqlite3/sqlite3/sqlite3.o libconfig/libconfig/lib/.libs/libconfig++.a: @@ -130,7 +130,7 @@ index 47c0f3c3..80d33d11 100644 cd libconfig/libconfig && ./configure --disable-examples cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE} -@@ -291,9 +264,6 @@ libconfig: libconfig/libconfig/lib/.libs/libconfig++.a +@@ -311,9 +284,6 @@ libconfig: libconfig/libconfig/lib/.libs/libconfig++.a prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a: @@ -140,7 +140,7 @@ index 47c0f3c3..80d33d11 100644 cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch -@@ -304,10 +274,6 @@ prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a +@@ -324,10 +294,6 @@ prometheus-cpp: prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a re2/re2/obj/libre2.a: @@ -151,7 +151,7 @@ index 47c0f3c3..80d33d11 100644 cd re2/re2 && patch re2/onepass.cc < ../onepass.cc-multiplication-overflow.patch ifeq ($(UNAME_S),Darwin) cd re2/re2 && sed -i '' -e 's/-O3 -g/-O3 -g -std=c++11 -fPIC -DMEMORY_SANITIZER -DRE2_ON_VALGRIND /' Makefile -@@ -322,8 +288,6 @@ re2: re2/re2/obj/libre2.a +@@ -342,8 +308,6 @@ re2: re2/re2/obj/libre2.a pcre/pcre/.libs/libpcre.a: diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 5a0ec5876140..176be440bb82 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.10.1"; + version = "2.10.3"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-KvbWto3erR7ylYk59sKKZwZ961aLFi8KyZhLQJitmng="; + sha256 = "sha256-0Mg+jBuj12GlNdKoyUcB1YDv2oGl9OARKdTzQ+WIWfw="; stripRoot = false; }; - vendorHash = "sha256-Wa3Pm+5Knhua18IHME8S4PIdgt94QdhU1jY5pudlwp0="; + vendorHash = "sha256-sCylkXFg3cGm2ksN9TYV6hxdDqwlxfhZLQtjbZq7LBQ="; subPackages = [ "cmd/traefik" ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index d6c98e86d410..bf7cb3aceb49 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -892,11 +892,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libX11 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libpthreadstubs, libxcb, xtrans }: stdenv.mkDerivation { pname = "libX11"; - version = "1.8.4"; + version = "1.8.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.8.4.tar.xz"; - sha256 = "067mgmsqck78b7pf5h25irz3zvcnzqbgbz7s7k70967smsjqg8n9"; + url = "mirror://xorg/individual/lib/libX11-1.8.6.tar.xz"; + sha256 = "1jawl8zp1h7hdmxx1sc6kmxkki187d9yixr2l03ai6wqqry5nlsr"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 84237b44c0de..941504a62b14 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -174,7 +174,7 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.8.4.tar.xz +mirror://xorg/individual/lib/libX11-1.8.6.tar.xz mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2 mirror://xorg/individual/lib/libxcb-1.14.tar.xz diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix index ad0e0f996a50..e79373da156e 100644 --- a/pkgs/shells/nushell/plugins/default.nix +++ b/pkgs/shells/nushell/plugins/default.nix @@ -1,5 +1,6 @@ { lib, newScope, IOKit, CoreFoundation }: lib.makeScope newScope (self: with self; { + gstat = callPackage ./gstat.nix { }; query = callPackage ./query.nix { inherit IOKit CoreFoundation; }; }) diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix new file mode 100644 index 000000000000..abddd8525459 --- /dev/null +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -0,0 +1,28 @@ +{ stdenv +, lib +, rustPlatform +, openssl +, nushell +, pkg-config +}: + +let + pname = "nushell_plugin_gstat"; +in +rustPlatform.buildRustPackage { + inherit pname; + version = nushell.version; + src = nushell.src; + cargoHash = "sha256-+RFCkM++6DgrwFjTr3JlCgh9FqDBUOQsOucbZAi+V/k="; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + cargoBuildFlags = [ "--package nu_plugin_gstat" ]; + doCheck = false; # some tests fail + meta = with lib; { + description = "A git status plugin for Nushell"; + homepage = "https://github.com/nushell/nushell/tree/main/crates/nu_plugin_gstat"; + license = licenses.mpl20; + maintainers = with maintainers; [ mrkkrp ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 76cda675fb8b..d8dce917120f 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.13.4"; + version = "0.14.0"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = "refs/tags/${version}"; - sha256 = "sha256-/u8jA7sLy3N8483uIzqBeSxEAGhX7+XS4D14n+15JHU="; + sha256 = "sha256-ZrPKKa/vl06QAjGr16ZzKF/DAByFHr6ze2WVOCa+wf8="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 56a475d2513e..7eb37db64d48 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2023-06-19"; + version = "2023-06-26"; pname = "oh-my-zsh"; - rev = "c0e811c90df387eca4223c7d4dbb3f2d32a684c7"; + rev = "d5f1f50ad2d62363785464d5b6eef1a009243d7a"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "sha256-Kv6sA4ICKcLi4jU16fBwnCHbHbOyYUvjVA4Gl0WQAeI="; + sha256 = "sha256-QN4UTsug7pA0VjA18n/Yek77lwooVaYHZDSCr579iAk="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 261774755bfd..9bec2b61a6ad 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "refs/tags/v${version}"; - hash = "sha256-IiMYGefF+p4bUueO/9/mJ4mHMyJYiq+67GgNdGJ6Eew="; + hash = "sha256-+hzjSbbrXr0w1rGHm6m2oZ6pfmD6UUDBfPd7uMg5l5c="; }; strictDeps = true; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 0c5645e5a487..f5fbbcc22805 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -95,18 +95,20 @@ rec { makeStaticDarwin = stdenv: stdenv.override (old: { # extraBuildInputs are dropped in cross.nix, but darwin still needs them extraBuildInputs = [ pkgs.buildPackages.darwin.CF ]; - mkDerivationFromStdenv = extendMkDerivationArgs old (args: { - NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + mkDerivationFromStdenv = withOldMkDerivation old (stdenv: mkDerivationSuper: args: + (mkDerivationSuper args).overrideAttrs (finalAttrs: { + NIX_CFLAGS_LINK = toString (finalAttrs.NIX_CFLAGS_LINK or "") + lib.optionalString (stdenv.cc.isGNU or false) " -static-libgcc"; - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ - (pkgs.buildPackages.makeSetupHook { - name = "darwin-portable-libSystem-hook"; - substitutions = { - libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; - }; - } ./darwin/portable-libsystem.sh) - ]; - }); + nativeBuildInputs = (finalAttrs.nativeBuildInputs or []) + ++ lib.optional stdenv.hasCC [ + (pkgs.buildPackages.makeSetupHook { + name = "darwin-portable-libSystem-hook"; + substitutions = { + libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; + }; + } ./darwin/portable-libsystem.sh) + ]; + })); }); # Puts all the other ones together diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 9cfe21e3640d..0e483321b935 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -310,8 +310,7 @@ in }; # `gettext` comes with obsolete config.sub/config.guess that don't recognize LoongArch64. - extraNativeBuildInputs = - lib.optional (localSystem.isLoongArch64) prevStage.updateAutotoolsGnuConfigScriptsHook; + extraNativeBuildInputs = [ prevStage.updateAutotoolsGnuConfigScriptsHook ]; }) # First rebuild of gcc; this is linked against all sorts of junk @@ -391,8 +390,7 @@ in }; # `gettext` comes with obsolete config.sub/config.guess that don't recognize LoongArch64. - extraNativeBuildInputs = - lib.optional (localSystem.isLoongArch64) prevStage.updateAutotoolsGnuConfigScriptsHook; + extraNativeBuildInputs = [ prevStage.updateAutotoolsGnuConfigScriptsHook ]; }) # 2nd stdenv that contains our own rebuilt binutils and is used for @@ -477,8 +475,7 @@ in # `gettext` comes with obsolete config.sub/config.guess that don't recognize LoongArch64. # `libtool` comes with obsolete config.sub/config.guess that don't recognize Risc-V. - extraNativeBuildInputs = - lib.optional (localSystem.isLoongArch64 || localSystem.isRiscV) prevStage.updateAutotoolsGnuConfigScriptsHook; + extraNativeBuildInputs = [ prevStage.updateAutotoolsGnuConfigScriptsHook ]; }) @@ -516,10 +513,11 @@ in passthru = a.passthru // { inherit (self) gmp mpfr libmpc isl; }; }); }; - extraNativeBuildInputs = [ prevStage.patchelf ] ++ + extraNativeBuildInputs = [ + prevStage.patchelf # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. - lib.optional (!localSystem.isx86 || localSystem.libc == "musl") - prevStage.updateAutotoolsGnuConfigScriptsHook; + prevStage.updateAutotoolsGnuConfigScriptsHook + ]; }) @@ -572,10 +570,11 @@ in shell = self.bash + "/bin/bash"; }; }; - extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++ + extraNativeBuildInputs = [ + prevStage.patchelf prevStage.xz # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. - lib.optional (!localSystem.isx86 || localSystem.libc == "musl") - prevStage.updateAutotoolsGnuConfigScriptsHook; + prevStage.updateAutotoolsGnuConfigScriptsHook + ]; }) # Construct the final stdenv. It uses the Glibc and GCC, and adds @@ -610,10 +609,11 @@ in initialPath = ((import ../generic/common-path.nix) {pkgs = prevStage;}); - extraNativeBuildInputs = [ prevStage.patchelf ] ++ + extraNativeBuildInputs = [ + prevStage.patchelf # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. - lib.optional (!localSystem.isx86 || localSystem.libc == "musl") - prevStage.updateAutotoolsGnuConfigScriptsHook; + prevStage.updateAutotoolsGnuConfigScriptsHook + ]; cc = prevStage.gcc; @@ -645,8 +645,7 @@ in ++ [ linuxHeaders # propagated from .dev binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params gcc.cc.libgcc glibc.passthru.libgcc ] - ++ lib.optionals (!localSystem.isx86 || localSystem.libc == "musl") - [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ] + ++ [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ] ++ (with gcc-unwrapped.passthru; [ gmp libmpc mpfr isl ]) diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index c889c722dd6b..f6d2e179b22e 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -69,11 +69,11 @@ let ''; in buildPythonApplication rec { pname = "xpra"; - version = "4.4.5"; + version = "4.4.6"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - hash = "sha256-o2vDPzZWgpEFe0yzNjwtuLPHO0GfWbSscKjvIfTi6Ro="; + hash = "sha256-BWf3nypfSrYCzpJ0OfBkecoHGbG1lEgu5jLZhfkIejQ="; }; patches = [ diff --git a/pkgs/tools/admin/awsume/default.nix b/pkgs/tools/admin/awsume/default.nix new file mode 100644 index 000000000000..b0d817445b3d --- /dev/null +++ b/pkgs/tools/admin/awsume/default.nix @@ -0,0 +1,59 @@ +{ lib +, python3 +, installShellFiles +, buildPythonApplication +, fetchFromGitHub +, boto3 +, colorama +, psutil +, pluggy +, pyyaml +}: + +buildPythonApplication rec { + pname = "awsume"; + version = "4.5.3"; + + src = fetchFromGitHub { + owner = "trek10inc"; + repo = "awsume"; + rev = version; + sha256 = "sha256-An7omHk2Yxjc6db6Y8QSrtgUvSF5rlVhgxMTpNOePHo="; + }; + + AWSUME_SKIP_ALIAS_SETUP = 1; + + nativeBuildInputs = [ installShellFiles ]; + + propagatedBuildInputs = [ + colorama + boto3 + psutil + pluggy + pyyaml + ]; + + postPatch = '' + patchShebangs shell_scripts + substituteInPlace shell_scripts/{awsume,awsume.fish} --replace "awsumepy" "$out/bin/awsumepy" + ''; + + postInstall = '' + installShellCompletion --cmd awsume \ + --bash <(PYTHONPATH=./awsume/configure ${python3}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['bash'])") \ + --zsh <(PYTHONPATH=./awsume/configure ${python3}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['zsh'])") \ + --fish <(PYTHONPATH=./awsume/configure ${python3}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['fish'])") \ + + rm -f $out/bin/awsume.bat + ''; + + + doCheck = false; + + meta = with lib; { + description = "A utility for easily assuming AWS IAM roles from the command line"; + homepage = "https://github.com/trek10inc/awsume"; + license = [ licenses.mit ]; + maintainers = [ maintainers.nilp0inter ]; + }; +} diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index c85116abaf78..f87723cc3100 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.16"; + version = "2.9.17"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-NfGS5kUfmv1djYMqB1HrNFgM2cBfW4EZHrkxhwmBWKQ="; + sha256 = "sha256-sxIyiUw5bI2M5mndjt6l5i5WJej24mMdmXrV5MbwTY8="; }; # these tests require network access that we're not going to give them diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 00fc7ff64f65..4ef0fb7a5837 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lego"; - version = "4.12.1"; + version = "4.12.3"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NmJQkNdqki1La6yt7cFY0sAEz9Ksrx3hWmWOTUMST+g="; + sha256 = "sha256-H6JGeLE/fzbfo8/mn5hTKcr7XfvmjOojeXLxUKGzt4w="; }; vendorHash = "sha256-Pwtvv/qVX91yWx49IYdveVCySoVxekvHomfAzOdFj7w="; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 13a6ad432b12..7f724d8b4c7e 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { pname = "pulumi"; - version = "3.71.0"; + version = "3.72.2"; # Used in pulumi-language packages, which inherit this prop sdkVendorHash = "sha256-S8eb2V7ZHhQ0xas+88lwxjL50+22dbyJ0aM60dAtb5k="; @@ -23,12 +23,12 @@ buildGoModule rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-7R44W/AFHddgTGm2FYi0sH4IsFlJkBGeQ7Vu60UjW5U="; + hash = "sha256-g/8l/ebtb1Gs6TKtg0joe55TyWj1/SAiA4Ds1NHKLFI="; # Some tests rely on checkout directory name name = "pulumi"; }; - vendorHash = "sha256-wDg9XObNGIVuMWNG95vq0tjd2cRHauB+QkJ2CjM5E3w="; + vendorHash = "sha256-eOxlTsvC/B+YTFlmT7MtiBBSJIntI4vogdiZ1gOkehw="; sourceRoot = "${src.name}/pkg"; diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index 5ebfcbec8286..f6d83690824f 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -6,6 +6,7 @@ , wget , Accelerate , CoreGraphics +, CoreML , CoreVideo }: @@ -28,7 +29,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ SDL2 ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; + buildInputs = [ SDL2 ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreML CoreVideo ]; + + env = lib.optionalAttrs stdenv.isDarwin { + WHISPER_COREML = "1"; + WHISPER_COREML_ALLOW_FALLBACK = "1"; + }; makeFlags = [ "main" "stream" ]; diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 84b2bee78a20..1262ce367f24 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,39 +1,54 @@ -{ fetchurl, lib, stdenv, libcdio, zlib, bzip2, readline, acl, attr, libiconv }: - -stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchurl +, acl +, attr +, bzip2 +, libcdio +, libiconv +, readline +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { pname = "xorriso"; - version = "1.5.6"; + version = "1.5.6.pl02"; src = fetchurl { - url = "mirror://gnu/xorriso/xorriso-${version}.tar.gz"; - sha256 = "sha256-1La2a9BMScazWO5mR12AbW9tdIboARBqR9Mx3x8vj+s="; + url = "mirror://gnu/xorriso/xorriso-${finalAttrs.version}.tar.gz"; + hash = "sha256-eG+fXfmGXMWwwf7O49LA9eBMq4yahZvRycfM1JZP2uE="; }; doCheck = true; - buildInputs = [ libcdio zlib bzip2 readline libiconv ] - ++ lib.optionals stdenv.isLinux [ acl attr ]; + buildInputs = [ + bzip2 + libcdio + libiconv + readline + zlib + ] + ++ lib.optionals stdenv.isLinux [ + acl + attr + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-include unistd.h"; - meta = with lib; { - description = "ISO 9660 Rock Ridge file system manipulator"; - - longDescription = - '' GNU xorriso copies file objects from POSIX compliant filesystems - into Rock Ridge enhanced ISO 9660 filesystems and allows - session-wise manipulation of such filesystems. It can load the - management information of existing ISO images and it writes the - session results to optical media or to filesystem objects. Vice - versa xorriso is able to copy file objects out of ISO 9660 - filesystems. - ''; - - license = licenses.gpl3Plus; - + meta = { homepage = "https://www.gnu.org/software/xorriso/"; - - maintainers = [ maintainers.vrthra ]; - platforms = platforms.unix; + description = "ISO 9660 Rock Ridge file system manipulator"; + longDescription = '' + GNU xorriso copies file objects from POSIX compliant filesystems into Rock + Ridge enhanced ISO 9660 filesystems and allows session-wise manipulation + of such filesystems. It can load the management information of existing + ISO images and it writes the session results to optical media or to + filesystem objects. + Vice versa xorriso is able to copy file objects out of ISO 9660 + filesystems. + ''; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 71ce5b080b0b..fd4643025605 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -29,6 +29,13 @@ stdenv.mkDerivation rec { excludes = [ "lib/ext2fs/hashmap.h" ]; extraPrefix = ""; }) + # Avoid trouble with older systems like NixOS 23.05. + # TODO: most likely drop this at some point, e.g. when 23.05 loses support. + (fetchurl { + name = "mke2fs-avoid-incompatible-features.patch"; + url = "https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/plain/debian/patches/disable-metadata_csum_seed-and-orphan_file-by-default?h=debian/master&id=3fb3d18baba90e5d48d94f4c0b79b2d271b0c913"; + hash = "sha256-YD11K4s2bqv0rvzrxtaiodzLp3ztULlOlPUf1XcpxRY="; + }) ]; configureFlags = diff --git a/pkgs/tools/games/trigger-control/default.nix b/pkgs/tools/games/trigger-control/default.nix new file mode 100644 index 000000000000..67ce995e04e4 --- /dev/null +++ b/pkgs/tools/games/trigger-control/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, makeWrapper +, pkg-config +, SDL2 +, dbus +, libdecor +, libnotify +, dejavu_fonts +, gnome +}: + +let + inherit (gnome) zenity; +in + +stdenv.mkDerivation rec { + pname = "trigger-control"; + version = "unstable-2023-06-18"; + + src = fetchFromGitHub { + owner = "Etaash-mathamsetty"; + repo = "trigger-control"; + rev = "d457ebd9e0844cfc456bfa4fa4bb694bb8ad982a"; + hash = "sha256-QWhUQ8xqS8oRVF0KUpEthlrOoXmhcfEkIHauDI1/5a8="; + }; + + nativeBuildInputs = [ + cmake + makeWrapper + pkg-config + ]; + + buildInputs = [ + SDL2 + dbus + libnotify + ] ++ lib.optionals stdenv.isLinux [ + libdecor + ]; + + # The app crashes without a changed fontdir and upstream recommends dejavu as font + postPatch = '' + substituteInPlace trigger-control.cpp --replace "/usr/share/fonts/" "${dejavu_fonts}/share/fonts/" + ''; + + installPhase = '' + runHook preInstall + + install -D trigger-control $out/bin/trigger-control + + runHook postInstall + ''; + + postInstall = lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/trigger-control \ + --prefix PATH : ${lib.makeBinPath [ zenity ]} + ''; + + meta = with lib; { + description = "Control the dualsense's triggers on Linux (and Windows) with a gui and C++ api"; + homepage = "https://github.com/Etaash-mathamsetty/trigger-control"; + license = licenses.mit; + maintainers = with maintainers; [ azuwis ]; + }; +} diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 9950d3c56f99..795378d370c2 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch -, autoreconfHook, bison, glm, flex +, autoreconfHook, bison, glm, flex, wrapQtAppsHook, cmake , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv -, python3Packages +, python3, qtbase, qtsvg, boost , zlib, perl, curl , texLive, texinfo , darwin @@ -25,17 +25,17 @@ stdenv.mkDerivation rec { flex bison texinfo + wrapQtAppsHook + cmake ]; buildInputs = [ ghostscriptX imagemagick fftw boehmgc ncurses readline gsl libsigsegv - zlib perl curl + zlib perl curl qtbase qtsvg boost texLive - ] ++ (with python3Packages; [ - python - pyqt5 - ]); + (python3.withPackages (ps: with ps; [ cson numpy pyqt5 ])) + ]; propagatedBuildInputs = [ glm @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { OpenGL GLUT Cocoa ]); + dontWrapQtApps = true; + preConfigure = '' HOME=$TMP ''; @@ -57,6 +59,9 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-I${boehmgc.dev}/include/gc"; postInstall = '' + rm "$out"/bin/xasy + makeQtWrapper "$out"/share/asymptote/GUI/xasy.py "$out"/bin/xasy --prefix PATH : "$out"/bin + mv $out/share/info/asymptote/*.info $out/share/info/ sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info rmdir $out/share/info/asymptote @@ -66,6 +71,8 @@ stdenv.mkDerivation rec { install -Dt $out/share/emacs/site-lisp/${pname} $out/share/asymptote/*.el ''; + dontUseCmakeConfigure = true; + enableParallelBuilding = true; # Missing install depends: # ...-coreutils-9.1/bin/install: cannot stat 'asy-keywords.el': No such file or directory diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index c4dcd2684912..265c6365d6fb 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.243.0"; + version = "1.3.250.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "sdk-${finalAttrs.version}"; - hash = "sha256-snxbTI4q0YQq8T5NQD3kcsN59iJnhlLiu1Fvr+fCDeQ="; + hash = "sha256-H4UkR/EiBWpdhdPHNBrdRkl4eN8kD9gEOzpnwfFSdpI="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/tools/graphics/ueberzugpp/default.nix index 919540b949e1..3fa206d8866e 100644 --- a/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/pkgs/tools/graphics/ueberzugpp/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "ueberzugpp"; - version = "2.8.7"; + version = "2.8.8"; src = fetchFromGitHub { owner = "jstkdng"; repo = "ueberzugpp"; rev = "v${version}"; - hash = "sha256-grkLsbatgezM8wFbwAatLQw35wucU0Kc6hacRefFvHw="; + hash = "sha256-HvcH8ysH43i87so758m6QD+AuNfTiOdo5knI+3PBO8U="; }; # error: no member named 'ranges' in namespace 'std' diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 81e2f329d1b5..68ef3eddee5d 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.248"; + version = "1.3.254"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "v${version}"; - hash = "sha256-CuwYpB8HX8pnR+ElkQfckpKDLKyZIzqm4F9kluM1cKo="; + hash = "sha256-YWJk0sAvhmfVbJ6Nv24kzFL4SltQnggNjZ+NjaUO1Io="; }; nativeBuildInputs = [ cmake jq ]; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/add-missing-macro-definition.patch b/pkgs/tools/graphics/vulkan-tools-lunarg/add-missing-macro-definition.patch new file mode 100644 index 000000000000..4d5717363303 --- /dev/null +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/add-missing-macro-definition.patch @@ -0,0 +1,26 @@ +diff --git a/layersvt/api_dump.h b/layersvt/api_dump.h +index 6e13b6de3..33bee96e7 100644 +--- a/layersvt/api_dump.h ++++ b/layersvt/api_dump.h +@@ -60,6 +60,8 @@ + #include <unordered_set> + #include <utility> + ++#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) ++ + #ifdef ANDROID + + #include <android/log.h> +diff --git a/layersvt/screenshot.cpp b/layersvt/screenshot.cpp +index b9743371c..6ee65c576 100755 +--- a/layersvt/screenshot.cpp ++++ b/layersvt/screenshot.cpp +@@ -44,6 +44,8 @@ using namespace std; + + #include "screenshot_parsing.h" + ++#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) ++ + #ifdef ANDROID + + #include <android/log.h> diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 88058d2caa3b..8dec2e5130e7 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.249"; + version = "1.3.250"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "v${version}"; - hash = "sha256-yQE6tjUxIZEMspxDaO9AoSjoEHQl2eDAc0E/aVQZnxQ="; + hash = "sha256-oI2ITvciuE/f8ojFpIwcH+HnYCasz43nKkER3wJxX+c="; fetchSubmodules = true; }; @@ -81,7 +81,17 @@ stdenv.mkDerivation rec { done ''; - patches = [ ./gtest.patch ]; + patches = [ + # Redefine an internal macro removed in vulkan-validation-layers + # FIXME: remove when fixed upstream + ./add-missing-macro-definition.patch + + # Skip QNX-specific extension causing build failures + # FIXME: remove when fixed upstream + ./skip-qnx-extension.patch + + ./gtest.patch + ]; # Same as vulkan-validation-layers dontPatchELF = true; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/skip-qnx-extension.patch b/pkgs/tools/graphics/vulkan-tools-lunarg/skip-qnx-extension.patch new file mode 100644 index 000000000000..777b32f43af4 --- /dev/null +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/skip-qnx-extension.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 209f3ec39..c711af38b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -190,7 +190,7 @@ endif() + # Define macro used for building vk.xml generated files + function(run_vulkantools_vk_xml_generate dependency output) + add_custom_command(OUTPUT ${output} +- COMMAND ${PYTHON_CMD} -B ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py -registry ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml -scripts ${VULKAN_HEADERS_REGISTRY_DIRECTORY} ${output} ++ COMMAND ${PYTHON_CMD} -B ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py -registry ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml -scripts ${VULKAN_HEADERS_REGISTRY_DIRECTORY} ${output} -removeExtensions VK_QNX_external_memory_screen_buffer + DEPENDS ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/generator.py ${VULKANTOOLS_SCRIPTS_DIR}/${dependency} ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/reg.py + ) + endfunction() diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index d3ffe35ff964..3f36e8abf7f9 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , pkg-config +, python3 , glslang , libffi , libX11 @@ -21,18 +22,19 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.249"; + version = "1.3.254"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "v${version}"; - hash = "sha256-+d0Yp+e/wzlRmUIs4SffiphkqmM/7avJrt3JNOgO19I="; + hash = "sha256-MyYngyoIGpGu1jFN1GDm9BcFye1JRz1cN6SaZue1ZGQ="; }; nativeBuildInputs = [ cmake pkg-config + python3 ]; buildInputs = [ diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index a57b815af485..465b42a84072 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.34.1"; + version = "2.34.2"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-VRzONsVBPtIpFJUTEnKp53uOyOkWXG2eRXuXVv1hfXM="; + hash = "sha256-rq+TN9j/PX2h3lzK+WhcB3KBgvcTyXyU9VApelqfIJE="; }; - vendorHash = "sha256-hIR2vI+wvT5pN87sDMCHinTqj3lBvJUPddgQ3+j3Ja0="; + vendorHash = "sha256-UyWrvReFUCQ091Mbk1iJE55rJkkmTyMX4yvb9ppszt8="; doCheck = false; diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/tools/misc/cod/default.nix index 0a6a3178ece7..e80abc03a794 100644 --- a/pkgs/tools/misc/cod/default.nix +++ b/pkgs/tools/misc/cod/default.nix @@ -33,6 +33,6 @@ buildGoModule rec { homepage = "https://github.com/dim-an/cod/"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; - broken = true; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/misc/depotdownloader/default.nix b/pkgs/tools/misc/depotdownloader/default.nix index ecbe3cc67d2a..9e0263013e68 100644 --- a/pkgs/tools/misc/depotdownloader/default.nix +++ b/pkgs/tools/misc/depotdownloader/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "depotdownloader"; - version = "2.4.7"; + version = "2.5.0"; src = fetchFromGitHub { owner = "SteamRE"; repo = "DepotDownloader"; rev = "DepotDownloader_${version}"; - sha256 = "F67bRIIN9aRbcPVFge3o0I9RF5JqHNDlTPhOpwqdADY="; + sha256 = "Kgi0u+H5BIAhrjk9e+8H1h0p5Edm3+2twYBPY3JQGps="; }; projectFile = "DepotDownloader.sln"; diff --git a/pkgs/tools/misc/depotdownloader/deps.nix b/pkgs/tools/misc/depotdownloader/deps.nix index 320c1e35844e..58e2f63ba01d 100644 --- a/pkgs/tools/misc/depotdownloader/deps.nix +++ b/pkgs/tools/misc/depotdownloader/deps.nix @@ -4,9 +4,12 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "protobuf-net"; version = "3.1.17"; sha256 = "1pyx9gnzd91m6viph8gyf57l10jspfphczm5m11wriy3ydrzh6yc"; }) - (fetchNuGet { pname = "protobuf-net.Core"; version = "3.1.17"; sha256 = "0gk3zi1iaxssgjw4kdkpj98sy6hyx8m18fijxy413p19zknvnb0n"; }) - (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; }) + (fetchNuGet { pname = "protobuf-net"; version = "3.2.16"; sha256 = "0pwlqlq2p8my2sr8b0cvdav5cm8wpwf3s4gy7s1ba701ac2zyb9y"; }) + (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.16"; sha256 = "00znhikq7valr3jaxg66cwli9hf75wkmmpf6rf8p790hf8lxq0c5"; }) + (fetchNuGet { pname = "QRCoder"; version = "1.4.3"; sha256 = "1hmlqbdyq5n9bsmns5h0dwcxpd2jvqr9a2y6dyc9kbjmc8j1dpla"; }) + (fetchNuGet { pname = "SteamKit2"; version = "2.5.0-beta.1"; sha256 = "0691285g4z12hv5kpv72l36h45086n14rw56x3dnixcvrjzg2q01"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) ] diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index d57a52f6828f..e8dda315d9d9 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.6.1"; + version = "2023.6.2"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-26oVqSNXuCyovybe0vi10rD89eSQHFYn+WHpGLMn2QA="; + hash = "sha256-ne9Su7Tp0p1fWQ6ivvWPkdEskTZpqIjQvh26D3Ta4Sc="; }; postPatch = '' diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/tools/misc/fclones/gui.nix index 5f0959f55b42..2652b674e39b 100644 --- a/pkgs/tools/misc/fclones/gui.nix +++ b/pkgs/tools/misc/fclones/gui.nix @@ -1,6 +1,6 @@ { lib , rustPlatform -, fetchCrate +, fetchFromGitHub , pkg-config , wrapGAppsHook4 , gdk-pixbuf @@ -12,14 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones-gui"; - version = "0.1.2"; + version = "0.1.4"; - src = fetchCrate { - inherit pname version; - hash = "sha256-ge2l414kYHK3y4V837GTQ5sSxVRlU8ZYyGdBj4+vUL8="; + src = fetchFromGitHub { + owner = "pkolaczk"; + repo = "fclones-gui"; + rev = "v${version}"; + hash = "sha256-zJ5TqFmvUL1nKR8E+jGR4K6OGHJ4ckRky+bdKW0T30s="; }; - cargoHash = "sha256-rDAUA75KCWlhf13bCucV5w9WAJ+Uw+s8sUCCeWBYJeA="; + cargoHash = "sha256-QT4ZxjarPkEqJLKPsGAaMIaSUmKWZ1xtxWMe2uXaUek="; nativeBuildInputs = [ pkg-config @@ -36,7 +38,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Interactive duplicate file remover"; - homepage = "https://github.com/pkolaczk/fclones/tree/main/fclones-gui"; + homepage = "https://github.com/pkolaczk/fclones-gui"; + changelog = "https://github.com/pkolaczk/fclones-gui/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/tools/misc/fre/default.nix b/pkgs/tools/misc/fre/default.nix new file mode 100644 index 000000000000..92393eb4fc27 --- /dev/null +++ b/pkgs/tools/misc/fre/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "fre"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "camdencheek"; + repo = "fre"; + rev = version; + hash = "sha256-nG2+LsmmzAsan3ZjFXGPMz/6hTdj9jiDfgeAwNpu7Eg="; + }; + + cargoHash = "sha256-y0sWe7q5MKebwKObXRgRs348hmjZaklnhYdfUnHoYX0="; + + meta = with lib; { + description = "A CLI tool for tracking your most-used directories and files"; + homepage = "https://github.com/camdencheek/fre"; + changelog = "https://github.com/camdencheek/fre/blob/${version}/CHANGELOG.md"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ gaykitty ]; + }; +} diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 66c20078afb0..1dc0eda83f67 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -26,7 +26,7 @@ assert !cppSupport || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.14.0"; + version = "1.14.1-2"; pname = "hdf5" + lib.optionalString cppSupport "-cpp" + lib.optionalString fortranSupport "-fortran" @@ -34,8 +34,11 @@ stdenv.mkDerivation rec { + lib.optionalString threadsafe "-threadsafe"; src = fetchurl { - url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/hdf5-${version}/src/hdf5-${version}.tar.bz2"; - sha256 = "sha256-5OeUM0UO2uKGWkxjKBiLtFORsp10+MU47mmfCxFsK6A="; + url = let + majorMinor = lib.versions.majorMinor version; + majorMinorPatch = with lib.versions; "${major version}.${minor version}.${patch version}"; + in "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${majorMinor}/hdf5-${majorMinorPatch}/src/hdf5-${version}.tar.bz2"; + sha256 = "sha256-BsoUHRo8MStdfMSCahJzcpOuExAxdIhhaJ9qLsghnb0="; }; passthru = { diff --git a/pkgs/tools/misc/kicli/default.nix b/pkgs/tools/misc/kicli/default.nix new file mode 100644 index 000000000000..76516f4e4ac3 --- /dev/null +++ b/pkgs/tools/misc/kicli/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: +buildGoModule rec { + pname = "kicli"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "anned20"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Mt1lHOC8gBcLQ6kArUvlPrH+Y/63mIQTCsUY2UTJE2c="; + }; + + vendorHash = "sha256-+8L/9NJ3dzP4k+LXkPD208uFGeARv7aT39bhH+R08e0="; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://github.com/anned20/kicli"; + description = "CLI interface to the Kimai time tracking project"; + license = licenses.mit; + maintainers = with maintainers; [ poelzi ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/kitty-img/default.nix b/pkgs/tools/misc/kitty-img/default.nix new file mode 100644 index 000000000000..75a2b81d7d75 --- /dev/null +++ b/pkgs/tools/misc/kitty-img/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromSourcehut }: + +rustPlatform.buildRustPackage rec { + pname = "kitty-img"; + version = "1.0.0"; + + src = fetchFromSourcehut { + owner = "~zethra"; + repo = "kitty-img"; + rev = version; + hash = "sha256-5thx4ADmJE29bxN+ZO3hF0jhgXK+boqt8oj4Sygl5SU="; + }; + + cargoHash = "sha256-Ai1Esw83V3jbPDDQyNh8bTNLQBYBonIDkWP3AFgN78U="; + + meta = with lib; { + description = "Print images inline in kitty"; + homepage = "https://git.sr.ht/~zethra/kitty-img"; + changelog = "https://git.sr.ht/~zethra/kitty-img/refs/${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ gaykitty ]; + }; +} diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index 1eaf8150ac1e..9d2b08a9696f 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.18.0"; + version = "2.18.1"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = version; - hash = "sha256-XjsKdfz4uQ1W8ul/2dbKiz7oVksUv5UNBF0U0MNsUPs="; + hash = "sha256-xa7LdIeeSzCoSUVe9CzC3hKDiKlQdr011+iF/WOVGx0="; }; - cargoHash = "sha256-G7cJoUxkOn6pQtRwzI8/KFvvbkN8JLgZcdUUZffIydo="; + cargoHash = "sha256-zaRoL5fV0Vyca0Ay1WIl/1jAlPSeuoBevgrEFER6XJU="; cargoPatches = [ # enable pkg-config feature of zstd diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/tools/misc/otel-cli/default.nix index b9efcd250286..992dd9c71d16 100644 --- a/pkgs/tools/misc/otel-cli/default.nix +++ b/pkgs/tools/misc/otel-cli/default.nix @@ -1,23 +1,23 @@ -{ lib, bash, buildGoModule, fetchFromGitHub, getent, nix-update-script, stdenv }: +{ lib, bash, buildGoModule, fetchFromGitHub, getent, coreutils, nix-update-script, stdenv }: buildGoModule rec { pname = "otel-cli"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "equinix-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-hez/jHet7W4FnOjgLb0jE1FhoNimiLGaOuTI44UWbSA="; + hash = "sha256-edxDPxUamZiBezMj2SII/zq8atnyZVWtboUJsShDAyw="; }; - vendorHash = "sha256-gVRgqBgiFnPU6MRZi/Igs7nDPMwJYsdln7vPAcxTvPU="; + vendorHash = "sha256-MlLFTi+O925NA73zDRrk0AgJzwtdNBhCxDjmniNPwio="; preCheck = '' ln -s $GOPATH/bin/otel-cli . '' + lib.optionalString (!stdenv.isDarwin) '' substituteInPlace main_test.go \ - --replace 'const minimumPath = `/bin:/usr/bin`' 'const minimumPath = `${lib.makeBinPath [ getent ]}`' + --replace 'const minimumPath = `/bin:/usr/bin`' 'const minimumPath = `${lib.makeBinPath [ getent coreutils ]}`' ''; passthru.updateScript = nix-update-script {}; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 23c414145fb1..2a8866795cfc 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20230522"; + version = "20230622"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-GvRrdgUCOxQ2C7lohF3mQT2yS/D5UfXgII0jgDy2QgI="; + sha256 = "sha256-3jokrXAhmKZCEVzrmygGJf1Jxt2IQrCGhf8FfGuEI44="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/tools/misc/pridefetch/default.nix b/pkgs/tools/misc/pridefetch/default.nix index 80fd1b0e9bc2..22e5c7a0afb2 100644 --- a/pkgs/tools/misc/pridefetch/default.nix +++ b/pkgs/tools/misc/pridefetch/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, python3, zip }: let +{ lib +, fetchFromGitHub +, python3 +, stdenv +, strip-nondeterminism +, zip +}: + +let version = "1.1.0"; sha256 = "sha256-563xOz63vto19yuaHtReV1dSw6BgNf+CLtS3lrPnaoc="; @@ -9,25 +17,33 @@ rev = "v" + version; inherit sha256; }; -in stdenv.mkDerivation { +in + +stdenv.mkDerivation { inherit pname version src; + nativeBuildInputs = [ + strip-nondeterminism zip ]; + buildInputs = [ (python3.withPackages (pythonPackages: with pythonPackages; [ distro ])) ]; + buildPhase = '' runHook preBuild pushd src zip -r ../pridefetch.zip ./* + strip-nondeterminism ../pridefetch.zip popd echo '#!/usr/bin/env python' | cat - pridefetch.zip > pridefetch rm pridefetch.zip runHook postBuild ''; + installPhase = '' runHook preInstall mkdir -p $out/bin @@ -35,6 +51,7 @@ in stdenv.mkDerivation { chmod +x $out/bin/pridefetch runHook postInstall ''; + meta = with lib; { description = "Print out system statistics with pride flags"; longDescription = '' diff --git a/pkgs/tools/misc/rpcsvc-proto/default.nix b/pkgs/tools/misc/rpcsvc-proto/default.nix index 3e8f62ff8954..b84bbb7d9d51 100644 --- a/pkgs/tools/misc/rpcsvc-proto/default.nix +++ b/pkgs/tools/misc/rpcsvc-proto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rpcsvc-proto"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "thkukuk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DXRLEpOanWcxCSTC8OxEw5SWKpgFz7oTPukzfnPrAOk="; + sha256 = "sha256-DEXzSSmjMeMsr1PoU/ljaY+6b4COUU2Z8MJkGImsgzk="; }; patches = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; - outputs = [ "out" "man" ]; + outputs = [ "out" "man" "dev" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 8ed7f61f4306..aec20c138408 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2023.4"; + version = "2023.5"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-xk06T4A451o5C5rquCvQEpGKCw8AcBVf49Lg8VD0GdE="; + hash = "sha256-vXl7NrTNc0p6wMEmsd7aHs5CjFXkWj8PwR7avZIqnCA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/spacer/default.nix b/pkgs/tools/misc/spacer/default.nix index e7e4d7cbf741..f6c6db98998e 100644 --- a/pkgs/tools/misc/spacer/default.nix +++ b/pkgs/tools/misc/spacer/default.nix @@ -5,21 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "spacer"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "samwho"; repo = "spacer"; rev = "v${version}"; - hash = "sha256-eFXxcOhUqyo3eUws3RCO0w+0XGlxZAonKFTphnrhHs8="; + hash = "sha256-F2PrBlS9uL6BQtjNNabCpl3ofavsUGlBy/Hotm42Oec="; }; - cargoHash = "sha256-z7igJc8HHqpiY2an4hFWoZElwgF5NUA+TFPqxuowC/w="; - - # Cargo.lock is outdated - preConfigure = '' - cargo metadata --offline - ''; + cargoHash = "sha256-aeXvqgSKRvm9W6sc5XCkwhMYUncj8pEPyQpYQr+fj7Y="; meta = with lib; { description = "CLI tool to insert spacers when command output stops"; diff --git a/pkgs/tools/misc/tagref/default.nix b/pkgs/tools/misc/tagref/default.nix index 383add676c26..67745de84f2a 100644 --- a/pkgs/tools/misc/tagref/default.nix +++ b/pkgs/tools/misc/tagref/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "tagref"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "stepchowfun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BZ0by5H6yZuvksMneor02rx0kXlvO9tdpWivRDB9qDs="; + sha256 = "sha256-wjCehdCZR/97nD4HsTZCiVZZb2GQaOTfyU72Ez5kjW8="; }; - cargoHash = "sha256-w+YU0+/vba/fRYbLAmOloOuHMWbFiEyt3b0mfIvFE0Q="; + cargoHash = "sha256-Wis6C4Wlz7NScFeKXWODA8BKmRtL7adaYxPVR13wNsg="; meta = with lib; { description = "Tagref helps you refer to other locations in your codebase."; diff --git a/pkgs/tools/misc/tgpt/default.nix b/pkgs/tools/misc/tgpt/default.nix new file mode 100644 index 000000000000..19af12dfd1ee --- /dev/null +++ b/pkgs/tools/misc/tgpt/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "tgpt"; + version = "1.6.11"; + + src = fetchFromGitHub { + owner = "aandrew-me"; + repo = "tgpt"; + rev = "refs/tags/v${version}"; + hash = "sha256-WcHPryzdFFS8eXaLPtwRd3xZwZ/x+MfwsA8wO2tRSYI="; + }; + + vendorHash = "sha256-2I5JJWxM6aZx0eZu7taUTL11Y/5HIrXYC5aezrTbbsM="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "ChatGPT in terminal without needing API keys"; + homepage = "https://github.com/aandrew-me/tgpt"; + changelog = "https://github.com/aandrew-me/tgpt/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index b7cf5626e919..2b153d230f28 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -1,10 +1,6 @@ { lib, python3Packages, fetchPypi, installShellFiles }: -let - pypkgs = python3Packages; - -in -pypkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "tmuxp"; version = "1.28.1"; @@ -19,11 +15,12 @@ pypkgs.buildPythonApplication rec { format = "pyproject"; nativeBuildInputs = [ - pypkgs.poetry-core + python3Packages.poetry-core + python3Packages.shtab installShellFiles ]; - propagatedBuildInputs = with pypkgs; [ + propagatedBuildInputs = with python3Packages; [ click colorama kaptan @@ -32,9 +29,8 @@ pypkgs.buildPythonApplication rec { postInstall = '' installShellCompletion --cmd tmuxp \ - --bash <(_TMUXP_COMPLETE=bash_source $out/bin/tmuxp) \ - --fish <(_TMUXP_COMPLETE=fish_source $out/bin/tmuxp) \ - --zsh <(_TMUXP_COMPLETE=zsh_source $out/bin/tmuxp) + --bash <(shtab --shell=bash -u tmuxp.cli.create_parser) \ + --zsh <(shtab --shell=zsh -u tmuxp.cli.create_parser) ''; meta = with lib; { diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 9dd4f07faa23..9e4df46f6663 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.9m"; + version = "0.9.9n"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-l9EMoUUM4pH+YwzdrTXhBawiW1l2OzX9ou18U5kM36c="; + sha256 = "sha256-THsIA8+yfMXM+WLVL8TCnD1CEZy1iB4hA7SzhdVT4hA="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 87162c4e0d4d..40cfa4077227 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , fetchpatch , pkg-config , udev @@ -14,9 +14,11 @@ stdenv.mkDerivation rec { pname = "dhcpcd"; version = "9.4.1"; - src = fetchurl { - url = "mirror://roy/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-gZNXY07+0epc9E7AGyTT0/iFL+yLQkmSXcxWZ8VON2w="; + src = fetchFromGitHub { + owner = "NetworkConfiguration"; + repo = "dhcpcd"; + rev = "v${version}"; + sha256 = "sha256-qyxON+TsAKMwAI19b5P+dT/sgxpW6m1giGcf/boFpHc="; }; patches = [ diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index c145f191eb30..e1234a374558 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.47.0"; + version = "2.48.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-sgaNrRRAINMI0utLQ6o6zcI5ImaDrYho9WeFiJg7WuE="; + sha256 = "sha256-MqkpzNUd2FZgt9TZPtEp+jIq7r3sr+EeTpHlqNCgatU="; }; buildInputs = [ boost zlib openssl ] diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index 0c705725d678..373bfd370994 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -12,21 +12,28 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.5.5"; + version = "1.6.0"; src = fetchFromGitHub { owner = "tonarino"; repo = "innernet"; - rev = "v${version}"; - sha256 = "sha256-jUL7/jHjfgpLg6728JQETbBcC2Q3G8d31oiwhkS+FD0="; + rev = "refs/tags/v${version}"; + hash = "sha256-eAiYXE8kSfuhBgrIo6rbtE2YH9JcLJwA/vXA5IWNYG8="; }; - cargoSha256 = "sha256-qQ6yRI0rNxV/TRZHCR69h6kx6L2Wp75ziw+B2P8LZmE="; + + cargoHash = "sha256-F+VvVF+5I53IF4Vur0SkUQXoqo8EE3XWirm88gu/GI4="; nativeBuildInputs = [ rustPlatform.bindgenHook installShellFiles ]; - buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; + + buildInputs = [ + sqlite + ] ++ lib.optionals stdenv.isDarwin [ + Security + libiconv + ]; postInstall = '' installManPage doc/innernet-server.8.gz @@ -46,6 +53,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A private network system that uses WireGuard under the hood"; homepage = "https://github.com/tonarino/innernet"; + changelog = "https://github.com/tonarino/innernet/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ tomberek _0x4A6F ]; }; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index f8c4175e8a3c..37645f5f055a 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2023-05-30T22-41-38Z"; + version = "2023-06-23T18-12-07Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-PTkT4i7NNLeSGUyrG/bIkPTnIBIA1hTSBUUpJWkdNS0="; + sha256 = "sha256-nftbBSVY0rXTT9z/mVmCOZfRLI1x2pWT3A4isABdf3A="; }; - vendorHash = "sha256-kjFAUBgMsydP4K32Yiu6BSA8heFhWEBf21iZs+1llCA="; + vendorHash = "sha256-rkIvfOIyr4ENuh+aM0FSyy4iTlngQRpErRT/FMUn+oQ="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/tools/networking/oapi-codegen/default.nix index af5509033cb5..c5b74f14985e 100644 --- a/pkgs/tools/networking/oapi-codegen/default.nix +++ b/pkgs/tools/networking/oapi-codegen/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "oapi-codegen"; - version = "1.12.4"; + version = "1.13.0"; src = fetchFromGitHub { owner = "deepmap"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VbaGFTDfe/bm4EP3chiG4FPEna+uC4HnfGG4C7YUWHc="; + hash = "sha256-xanS2oPh+f+cmiTrfbMvFKcFVQ5DsWDe3KOZzhOl370="; }; - vendorHash = "sha256-o9pEeM8WgGVopnfBccWZHwFR420mQAA4K/HV2RcU2wU="; + vendorHash = "sha256-8qjS0BdBwnRjs3GrWHZOnxIJCiiGzgX2mqlmWLWzDuA="; # Tests use network doCheck = false; diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index f486c903c5d6..eb97e24b1f7c 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, makeWrapper, coreutils }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils }: stdenv.mkDerivation rec { pname = "openresolv"; version = "3.12.0"; - src = fetchurl { - url = "mirror://roy/openresolv/${pname}-${version}.tar.xz"; - sha256 = "sha256-QrMFCOhXoihTXGMeqsk2hi2G7KaMFLXAvzh7oXa5G5c="; + src = fetchFromGitHub { + owner = "NetworkConfiguration"; + repo = "openresolv"; + rev = "v${version}"; + sha256 = "sha256-lEyqOf2NGWnH44pDVNVSWZeuhXx7z0ru4KuXu2RuyIg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix index 7e0399a89721..ff682cfac52e 100644 --- a/pkgs/tools/networking/pritunl-client/default.nix +++ b/pkgs/tools/networking/pritunl-client/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "pritunl-client"; @@ -14,8 +14,16 @@ buildGoModule rec { modRoot = "cli"; vendorHash = "sha256-miwGLWpoaavg/xcw/0pNBYCdovBnvjP5kdaaGPcRuWk="; + nativeBuildInputs = [ + installShellFiles + ]; + postInstall = '' mv $out/bin/cli $out/bin/pritunl-client + installShellCompletion --cmd pritunl-client \ + --bash <($out/bin/pritunl-client completion bash) \ + --fish <($out/bin/pritunl-client completion fish) \ + --zsh <($out/bin/pritunl-client completion zsh) ''; meta = with lib; { diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index d4f9faa9e67f..3853271ac00b 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.30.1"; + version = "2.31.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sQpFIZphZqjifqVH3okR+2Ww6IRnqImDySLNk7qYgtg="; + hash = "sha256-49MhTCc+LCfw1tOvLFaagMnQITeCeG+xfH5FmF4/u/c="; }; - vendorHash = "sha256-FW39fqvoMkXrpV0C3WAAOjaEUPF0LrBS99dIC/rFtSI="; + vendorHash = "sha256-eHNdtK3OZRi+oujuC4yToPdNL5GyRqNu09nRRP5cYK4="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; @@ -37,6 +37,7 @@ buildGoModule rec { meta = with lib; { description = "A simple deb and rpm packager written in Go"; homepage = "https://github.com/goreleaser/nfpm"; + changelog = "https://github.com/goreleaser/nfpm/releases/tag/v${version}"; maintainers = with maintainers; [ marsam techknowlogick caarlos0 ]; license = with licenses; [ mit ]; }; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e70f195d2679..faa1520c9957 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -111,6 +111,13 @@ let hash = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0="; }; + patch-fix-aarch64-darwin-static = fetchpatch { + # https://github.com/NixOS/nix/pull/8068 + name = "fix-aarch64-darwin-static.patch"; + url = "https://github.com/NixOS/nix/commit/220aa8e0ac9d17de2c9f356a68be43b673d851a1.patch"; + hash = "sha256-YrmFkVpwPreiig1/BsP+DInpTdQrPmS7bEY0WUGpw+c="; + }; + in lib.makeExtensible (self: { nix_2_3 = (common rec { version = "2.3.16"; @@ -170,6 +177,9 @@ in lib.makeExtensible (self: { nix_2_13 = common { version = "2.13.3"; hash = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc="; + patches = [ + patch-fix-aarch64-darwin-static + ]; }; nix_2_14 = common { diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 9440f9fef552..db618f4ec4c3 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -26,13 +26,13 @@ let buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; electron = electron_24; - version = "2023.5.0"; + version = "2023.5.1"; src = applyPatches { src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - sha256 = "sha256-ELKpGSY4ZbgSk4vJnTiB+IOa8RQU8Ahy3A1mYsKtthU="; + sha256 = "sha256-dD9C6+GRjCMcfBse2Qq0ot8bVGyhjnd8VvpdNlrjRs4="; }; patches = [ ]; @@ -42,7 +42,7 @@ let pname = "bitwarden-desktop-native"; inherit src version; sourceRoot = "source-patched/apps/desktop/desktop_native"; - cargoSha256 = "sha256-SeK8Nbgenof9vXI2v7tJ5oHiX60kBoR+UNOSJTRHdzk="; + cargoSha256 = "sha256-8U4E5q2OSZGXy2ZRn0y4Skm5Y+FiOJVU1mtzObO9UqY="; nativeBuildInputs = [ pkg-config @@ -95,7 +95,7 @@ buildNpmPackage' { npmBuildFlags = [ "--workspace apps/desktop" ]; - npmDepsHash = "sha256-G8DEYPjEP3L4s0pr5n2ZTj8kkT0E7Po1BKhZ2hUdJuY="; + npmDepsHash = "sha256-USXWA/7wuu3i9/+/pMXREgcB+4yOpQGG5RGuUyJvuQw="; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/tools/security/cloudfox/default.nix b/pkgs/tools/security/cloudfox/default.nix index b34d152f5c8d..f82705cdd3e1 100644 --- a/pkgs/tools/security/cloudfox/default.nix +++ b/pkgs/tools/security/cloudfox/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cloudfox"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "BishopFox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-46w0/Da5sJkw2jLEGiFICEaX9bvCs0sbad1RyDCxINw="; + hash = "sha256-EqL5/PVQm/lfviojKoYKDnzilx7KQZ7T3EEx/or6y7E="; }; vendorHash = "sha256-lgccNq1cSg8rrHW0aMLcC5HrZXf8TvdFSmk6pbGXNqQ="; diff --git a/pkgs/tools/security/das/default.nix b/pkgs/tools/security/das/default.nix new file mode 100644 index 000000000000..f8ccf8cb4ac7 --- /dev/null +++ b/pkgs/tools/security/das/default.nix @@ -0,0 +1,50 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "das"; + version = "0.3.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "snovvcrash"; + repo = "DivideAndScan"; + rev = "refs/tags/v${version}"; + hash = "sha256-UFuIy19OUiS8VmmfGm0F4hI4s4BU5b4ZVh40bFGiLfk="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'networkx = "^2.8.4"' 'networkx = "*"' + ''; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + dash + defusedxml + dnspython + netaddr + networkx + pandas + plotly + python-nmap + scipy + tinydb + ]; + + pythonImportsCheck = [ + "das" + ]; + + meta = with lib; { + description = "Divide full port scan results and use it for targeted Nmap runs"; + homepage = "https://github.com/snovvcrash/DivideAndScan"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index a4b6f6c164f3..102313ddbdfc 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "eid-mw"; # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS. - version = "5.1.10"; + version = "5.1.11"; src = fetchFromGitHub { owner = "Fedict"; repo = "eid-mw"; rev = "v${version}"; - hash = "sha256-2Xru/s7KawZlIxON5nO679P+L3okofE054WDfRsE3ZI="; + hash = "sha256-70UjfkH+rx1Q+2XEuAByoDsP5ZelyuGXaHdkjTe/sCY="; }; nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config makeWrapper ]; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 212277577069..63fe55331111 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-06-23"; + version = "2023-06-24"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bTTf4p8FVYnXZxTS8FOtCasMXZVlQl+PQb0RS10WvN0="; + hash = "sha256-uQQ/TPE+64VeUSbnzNlRBdG1Nv4QcsQvfLyoRH68OhA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 6c2ffe123548..78f4af894a30 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.tests.connman = lib.nixosTests.gnupg; + passthru.tests = lib.nixosTests.gnupg; meta = with lib; { homepage = "https://gnupg.org"; diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix index c8e313cd9cf5..de8fd8ce1508 100644 --- a/pkgs/tools/security/gnupg/24.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -6,6 +6,7 @@ , withPcsc ? !enableMinimal, pcsclite , guiSupport ? stdenv.isDarwin, pinentry , withTpm2Tss ? !stdenv.isDarwin && !enableMinimal, tpm2-tss +, nixosTests }: assert guiSupport -> enableMinimal == false; @@ -85,7 +86,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.tests.connman = lib.nixosTests.gnupg; + passthru.tests = nixosTests.gnupg; meta = with lib; { homepage = "https://gnupg.org"; diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/tools/security/jwx/default.nix index a290bd9e17eb..da39777074c6 100644 --- a/pkgs/tools/security/jwx/default.nix +++ b/pkgs/tools/security/jwx/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "jwx"; - version = "2.0.9"; + version = "2.0.11"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = pname; rev = "v${version}"; - hash = "sha256-0Ha16moHpPt7IwSmSLSf3ExKlp2TDkssPppNIPHrsJw="; + hash = "sha256-8ZzDVCJERf9T9Tlth+9imVJPZIAwffR03S/8UflKjZc="; }; vendorHash = "sha256-RyAQh1uXw3bEZ6vuh8+mEf8T4l3ZIFAaFJ6dGMoANys="; diff --git a/pkgs/tools/security/notation/default.nix b/pkgs/tools/security/notation/default.nix new file mode 100644 index 000000000000..4c579f3f016d --- /dev/null +++ b/pkgs/tools/security/notation/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "notation"; + version = "1.0.0-rc.7"; + + src = fetchFromGitHub { + owner = "notaryproject"; + repo = pname; + rev = "v${version}"; + hash = "sha256-EM2QunSL88Am3zgKwgI94jET3xaVfvsa4MCtMZ3ejjU="; + }; + + vendorHash = "sha256-88PCnIm7nQB8jLzrfVOyDLXWX7RZeT31n1cwvb4Qza0="; + + # This is a Go sub-module and cannot be built directly (e2e tests). + excludedPackages = [ "./test" ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "CLI tool to sign and verify OCI artifacts and container images"; + homepage = "https://notaryproject.dev/"; + license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; + }; +} diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 778f5e6ca008..2f6323bb3f79 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.9.6"; + version = "2.9.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-hltXm+NXExmO9IuwdfuET9+PaRby9pLAE/4ac7xQqvE="; + hash = "sha256-w9XiXZzkDM1ZETzs/c3uMEoaRXUXKzpzn3k3RbgTXbE="; }; - vendorHash = "sha256-geQBa0caKjDQD3AlVNhU8cmM9mFSR+Ix0HjxKKadSqE="; + vendorHash = "sha256-T09uSUBRZGsI732723UTd2jOT9/pYjUp+nshWthGA1k="; modRoot = "./v2"; subPackages = [ @@ -36,6 +36,6 @@ buildGoModule rec { homepage = "https://github.com/projectdiscovery/nuclei"; changelog = "https://github.com/projectdiscovery/nuclei/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab Misaka13514 ]; }; } diff --git a/pkgs/tools/security/proxmark3/darwin-always-gui.patch b/pkgs/tools/security/proxmark3/darwin-always-gui.patch new file mode 100644 index 000000000000..99c4495e9661 --- /dev/null +++ b/pkgs/tools/security/proxmark3/darwin-always-gui.patch @@ -0,0 +1,13 @@ +diff --git a/client/src/proxmark3.c b/client/src/proxmark3.c +index 6c77bfad3..0d41a2d6b 100644 +--- a/client/src/proxmark3.c ++++ b/client/src/proxmark3.c +@@ -1098,7 +1098,7 @@ int main(int argc, char *argv[]) { + + #ifdef HAVE_GUI + +-# if defined(_WIN32) ++# if defined(_WIN32) || (defined(__MACH__) && defined(__APPLE__)) + InitGraphics(argc, argv, script_cmds_file, script_cmd, stayInCommandLoop); + MainGraphics(); + # else diff --git a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix index 6b021e970277..59b2ee8f253a 100644 --- a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix +++ b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -1,11 +1,28 @@ -{ lib, mkDerivation, fetchFromGitHub, pkg-config, gcc-arm-embedded, bluez5 +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, gcc-arm-embedded , readline - -, hardwarePlatform ? "PM3RDV4" - -, hardwarePlatformExtras ? "" }: - -mkDerivation rec { +, bzip2 +, openssl +, jansson +, whereami +, lua +, Foundation +, AppKit +, withGui ? true, wrapQtAppsHook, qtbase +, withPython ? true, python3 +, withBlueshark ? false, bluez5 +, withGeneric ? false +, withSmall ? false +, withoutFunctions ? [] +, hardwarePlatform ? if withGeneric then "PM3GENERIC" else "PM3RDV4" +, hardwarePlatformExtras ? lib.optionalString withBlueshark "BTADDON" +, standalone ? "LF_SAMYRUN" +}: +assert withBlueshark -> stdenv.hostPlatform.isLinux; +stdenv.mkDerivation rec { pname = "proxmark3-rrg"; version = "4.16191"; @@ -16,23 +33,54 @@ mkDerivation rec { sha256 = "sha256-l0aDp0s9ekUUHqkzGfVoSIf/4/GN2uiVGL/+QtKRCOs="; }; - nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; - buildInputs = [ bluez5 readline ]; + patches = [ + # Don't check for DISPLAY env variable on Darwin. pm3 uses this to test if + # XQuartz is installed, however it is not actually required for GUI features + ./darwin-always-gui.patch + ]; + + postPatch = '' + # Remove hardcoded paths on Darwin + substituteInPlace Makefile.defs \ + --replace "/usr/bin/ar" "ar" \ + --replace "/usr/bin/ranlib" "ranlib" + # Replace hardcoded path to libwhereami + substituteInPlace client/Makefile \ + --replace "/usr/include/whereami.h" "${whereami}/include/whereami.h" + ''; + + nativeBuildInputs = [ + pkg-config + gcc-arm-embedded + ] ++ lib.optional withGui wrapQtAppsHook; + buildInputs = [ + readline + bzip2 + openssl + jansson + whereami + lua + ] ++ lib.optional withGui qtbase + ++ lib.optional withPython python3 + ++ lib.optional withBlueshark bluez5 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation AppKit ]; makeFlags = [ + "PREFIX=${placeholder "out"}" + "UDEV_PREFIX=${placeholder "out"}/etc/udev/rules.d" "PLATFORM=${hardwarePlatform}" "PLATFORM_EXTRAS=${hardwarePlatformExtras}" - ]; - - installPhase = '' - install -Dt $out/bin client/proxmark3 - install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf - ''; + "STANDALONE=${standalone}" + "USE_BREW=0" + ] ++ lib.optional withSmall "PLATFORM_SIZE=256" + ++ map (x: "SKIP_${x}=1") withoutFunctions; + enableParallelBuilding = true; meta = with lib; { description = "Client for proxmark3, powerful general purpose RFID tool"; homepage = "https://rfidresearchgroup.com/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nyanotech ]; + maintainers = with maintainers; [ nyanotech emilytrau ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index cddb284e80c3..c461c83e12b2 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.36.8"; + version = "2.36.9"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-eBgyjiospcBzUCMSMRgL3V5YyybD6aqt7gQZ7VfrmZY="; + sha256 = "sha256-eV922fUtNAHGFxuDwTKoakSzf1lMzVg+vOeaBbOP4V0="; }; - vendorHash = "sha256-wepAJ92IZbUZHO0HiX+JOtQ/WKydCImzHytXRUhjhAU="; + vendorHash = "sha256-20IggKOPS+Pu4tQIdYU5SXQhu2FrW0MdCdB9dvmqs7E="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/tools/security/semgrep/common.nix b/pkgs/tools/security/semgrep/common.nix index 48381e9eb0e6..0ad680b0ddee 100644 --- a/pkgs/tools/security/semgrep/common.nix +++ b/pkgs/tools/security/semgrep/common.nix @@ -1,54 +1,39 @@ -{ lib, fetchFromGitHub, fetchzip, stdenv }: +{ lib }: rec { - version = "1.15.0"; + version = "1.27.0"; - src = fetchFromGitHub { - owner = "returntocorp"; - repo = "semgrep"; - rev = "v${version}"; - sha256 = "sha256-x+AOt6nn2hN4MODFZCvlq0kZ3VLoS7rVcFGGCEssIu0="; - }; + srcHash = "sha256-F6n3LQY4a5sO6c8SMQF9YjjgOS+v2SH+UQPwhg2EX7Q="; # submodule dependencies # these are fetched so we: # 1. don't fetch the many submodules we don't need # 2. avoid fetchSubmodules since it's prone to impurities submodules = { - "cli/src/semgrep/lang" = fetchFromGitHub { - owner = "returntocorp"; - repo = "semgrep-langs"; - rev = "08656cdefc9e6818c64e168cf51ee1e76ea8829e"; - sha256 = "sha256-vYf33JhfvEDmt/VW0hBOmqailIERS0GdUgrPuCxWt9I="; - }; - "cli/src/semgrep/semgrep_interfaces" = fetchFromGitHub { + "cli/src/semgrep/semgrep_interfaces" = { owner = "returntocorp"; repo = "semgrep-interfaces"; - rev = "ba9241ca8f13dea72a4ca5c5eae99f45c071c8b4"; - sha256 = "sha256-2rcMmN42445AivcyYLPeE+HBYOyxJijQME1UUr9HISA="; + rev = "213f67abea73546ca6111e1bbf0ef96aa917c940"; + hash = "sha256-HeNHJkTje9j16+dwsfyMhoqQn/J18q/7XvQPRwgTw/Y="; }; }; # fetch pre-built semgrep-core since the ocaml build is complex and relies on # the opam package manager at some point - core = rec { - data = { - x86_64-linux = { - suffix = "-ubuntu-16.04.tgz"; - sha256 = "sha256-vLtV1WAnOD6HhgrWYIP0NfXHKfvXORksdNp5UTG1QWc="; - }; - x86_64-darwin = { - suffix = "-osx.zip"; - sha256 = "sha256-6+ENjOOIJ5TSjpnJ5pDudblrWj/FLUe66UGr6V9c0HQ="; - }; + # pulling it out of the python wheel as r2c no longer release a built binary + # on github releases + core = { + x86_64-linux = { + platform = "any"; + hash = "sha256-cRj81dXpAE6S0EXajsRikOIAPzlUf42FhiDCWjv+wZQ="; + }; + x86_64-darwin = { + platform = "macosx_10_14_x86_64"; + hash = "sha256-jqfGVZGF/DFgXkr7kQg6QyqEELSr8AKE3Ga8kTftnIY="; }; - src = let - inherit (stdenv.hostPlatform) system; - selectSystemData = data: data.${system} or (throw "Unsupported system: ${system}"); - inherit (selectSystemData data) suffix sha256; - in fetchzip { - url = "https://github.com/returntocorp/semgrep/releases/download/v${version}/semgrep-v${version}${suffix}"; - inherit sha256; + aarch64-darwin = { + platform = "macosx_11_0_arm64"; + hash = "sha256-e/uCSRMdbVD0lvc0hukbiUzheqRNIIh1LgMq6Ae7JYI="; }; }; @@ -66,7 +51,5 @@ rec { ''; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jk ambroisie ]; - # limited by semgrep-core - platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/tools/security/semgrep/default.nix b/pkgs/tools/security/semgrep/default.nix index 0e9c3ddc391c..23749643a443 100644 --- a/pkgs/tools/security/semgrep/default.nix +++ b/pkgs/tools/security/semgrep/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, callPackage , semgrep-core , buildPythonApplication , pythonPackages @@ -11,12 +10,20 @@ }: let - common = callPackage ./common.nix { }; + common = import ./common.nix { inherit lib; }; in buildPythonApplication rec { pname = "semgrep"; - inherit (common) src version; + inherit (common) version; + src = fetchFromGitHub { + owner = "returntocorp"; + repo = "semgrep"; + rev = "v${version}"; + hash = common.srcHash; + }; + # prepare a subset of the submodules as we only need a handful + # and there are many many submodules total postPatch = (lib.concatStringsSep "\n" (lib.mapAttrsToList ( path: submodule: '' @@ -27,7 +34,7 @@ buildPythonApplication rec { ln -s ${submodule}/ ${path} '' ) - common.submodules)) + '' + passthru.submodulesSubset)) + '' cd cli ''; @@ -97,10 +104,12 @@ buildPythonApplication rec { passthru = { inherit common; + submodulesSubset = lib.mapAttrs (k: args: fetchFromGitHub args) common.submodules; updateScript = ./update.sh; }; meta = common.meta // { description = common.meta.description + " - cli"; + inherit (semgrep-core.meta) platforms; }; } diff --git a/pkgs/tools/security/semgrep/semgrep-core.nix b/pkgs/tools/security/semgrep/semgrep-core.nix index e5ce941298a4..c4846c6d91d5 100644 --- a/pkgs/tools/security/semgrep/semgrep-core.nix +++ b/pkgs/tools/security/semgrep/semgrep-core.nix @@ -1,21 +1,52 @@ -{ lib, stdenvNoCC, callPackage }: +{ lib, stdenvNoCC, fetchPypi, unzip }: let - common = callPackage ./common.nix { }; + common = import ./common.nix { inherit lib; }; in stdenvNoCC.mkDerivation rec { pname = "semgrep-core"; inherit (common) version; - inherit (common.core) src; + # fetch pre-built semgrep-core since the ocaml build is complex and relies on + # the opam package manager at some point + # pulling it out of the python wheel as r2c no longer release a built binary + # on github releases + src = + let + inherit (stdenvNoCC.hostPlatform) system; + data = common.core.${system} or (throw "Unsupported system: ${system}"); + in + fetchPypi rec { + pname = "semgrep"; + inherit version; + format = "wheel"; + dist = python; + python = "cp37.cp38.cp39.py37.py38.py39"; + inherit (data) platform hash; + }; + + nativeBuildInputs = [ unzip ]; + + # _tryUnzip from unzip's setup-hook doesn't recognise .whl + # "do not know how to unpack source archive" + # perform unpack by hand + unpackPhase = '' + runHook preUnpack + LANG=en_US.UTF-8 unzip -qq "$src" + runHook postUnpack + ''; + + dontConfigure = true; + dontBuild = true; installPhase = '' runHook preInstall - install -Dm 755 -t $out/bin semgrep-core + install -Dm 755 -t $out/bin semgrep-${version}.data/purelib/semgrep/bin/semgrep-core runHook postInstall ''; meta = common.meta // { description = common.meta.description + " - core binary"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.attrNames common.core; }; } diff --git a/pkgs/tools/security/semgrep/update.sh b/pkgs/tools/security/semgrep/update.sh index 25b18edd6e2f..090d607a6928 100755 --- a/pkgs/tools/security/semgrep/update.sh +++ b/pkgs/tools/security/semgrep/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused jq +#!nix-shell -i bash -p curl gnused jq nix-prefetch set -euxo pipefail @@ -33,7 +33,7 @@ NEW_VERSION=$( ) # trim v prefix NEW_VERSION="${NEW_VERSION:1}" -OLD_VERSION="$(instantiateClean semgrep.common.version)" +OLD_VERSION="$(instantiateClean semgrep.passthru.common.version)" if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then echo "Already up to date" @@ -50,43 +50,54 @@ fetchgithub() { set -eo pipefail } -fetchzip() { - set +eo pipefail - nix-build -E "with import $NIXPKGS_ROOT {}; fetchzip {url = \"$1\"; sha256 = lib.fakeSha256; }" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g' - set -eo pipefail +fetch_arch() { + VERSION=$1 + PLATFORM=$2 + nix-prefetch "{ fetchPypi }: +fetchPypi rec { + pname = \"semgrep\"; + version = \"$VERSION\"; + format = \"wheel\"; + dist = python; + python = \"cp37.cp38.cp39.py37.py38.py39\"; + platform = \"$PLATFORM\"; +} +" } replace "$OLD_VERSION" "$NEW_VERSION" "$COMMON_FILE" echo "Updating src" -OLD_HASH="$(instantiateClean semgrep.common.src.outputHash)" +OLD_HASH="$(instantiateClean semgrep.passthru.common.srcHash)" echo "Old hash $OLD_HASH" TMP_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" replace "$OLD_HASH" "$TMP_HASH" "$COMMON_FILE" -NEW_HASH="$(fetchgithub semgrep.common.src)" +NEW_HASH="$(fetchgithub semgrep.src)" echo "New hash $NEW_HASH" replace "$TMP_HASH" "$NEW_HASH" "$COMMON_FILE" echo "Updated src" -# loop through platforms for core -nix-instantiate -E "with import $NIXPKGS_ROOT {}; builtins.attrNames semgrep.common.core.data" --eval --strict --json \ -| jq '.[]' -r \ -| while read -r PLATFORM; do - echo "Updating core for $PLATFORM" - SUFFIX=$(instantiateClean semgrep.common.core.data."$PLATFORM".suffix) - OLD_HASH=$(instantiateClean semgrep.common.core.data."$PLATFORM".sha256) - echo "Old hash $OLD_HASH" - NEW_URL="https://github.com/returntocorp/semgrep/releases/download/v$NEW_VERSION/semgrep-v$NEW_VERSION$SUFFIX" - NEW_HASH="$(fetchzip "$NEW_URL")" - echo "New hash $NEW_HASH" +update_core_platform() { + SYSTEM=$1 + echo "Updating core src $SYSTEM" + + PLATFORM="$(instantiateClean "semgrep.passthru.common.core.$SYSTEM.platform")" + OLD_HASH="$(instantiateClean "semgrep.passthru.common.core.$SYSTEM.hash")" + echo "Old core hash $OLD_HASH" + NEW_HASH="$(fetch_arch "$NEW_VERSION" "$PLATFORM")" + echo "New core hash $NEW_HASH" replace "$OLD_HASH" "$NEW_HASH" "$COMMON_FILE" - echo "Updated core for $PLATFORM" -done + echo "Updated core src $SYSTEM" +} + +update_core_platform "x86_64-linux" +update_core_platform "x86_64-darwin" +update_core_platform "aarch64-darwin" OLD_PWD=$PWD TMPDIR="$(mktemp -d)" @@ -109,7 +120,7 @@ nix-instantiate -E "with import $NIXPKGS_ROOT {}; builtins.attrNames semgrep.pas echo "Updating $SUBMODULE" OLD_REV=$(instantiateClean semgrep.passthru.common.submodules."$SUBMODULE".rev) echo "Old commit $OLD_REV" - OLD_HASH=$(instantiateClean semgrep.passthru.common.submodules."$SUBMODULE".outputHash) + OLD_HASH=$(instantiateClean semgrep.passthru.common.submodules."$SUBMODULE".hash) echo "Old hash $OLD_HASH" NEW_REV=$(get_submodule_commit "$SUBMODULE") @@ -120,13 +131,12 @@ nix-instantiate -E "with import $NIXPKGS_ROOT {}; builtins.attrNames semgrep.pas continue fi - NEW_URL=$(instantiateClean semgrep.passthru.common.submodules."$SUBMODULE".url | sed "s@$OLD_REV@$NEW_REV@g") - NEW_HASH=$(nix --experimental-features nix-command hash to-sri "sha256:$(nix-prefetch-url "$NEW_URL")") + NEW_URL=$(instantiateClean semgrep.passthru.submodulesSubset."$SUBMODULE".url | sed "s@$OLD_REV@$NEW_REV@g") TMP_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" replace "$OLD_REV" "$NEW_REV" "$COMMON_FILE" replace "$OLD_HASH" "$TMP_HASH" "$COMMON_FILE" - NEW_HASH="$(fetchgithub semgrep.passthru.common.submodules."$SUBMODULE")" + NEW_HASH="$(fetchgithub semgrep.passthru.submodulesSubset."$SUBMODULE")" echo "New hash $NEW_HASH" replace "$TMP_HASH" "$NEW_HASH" "$COMMON_FILE" diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix index 2d0b7330e3ee..93cbedf367f4 100644 --- a/pkgs/tools/security/ssh-to-age/default.nix +++ b/pkgs/tools/security/ssh-to-age/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-age"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-age"; rev = version; - sha256 = "sha256-1YCo1Jm52S7hdJQFt/+OkdpWdvWP8eBsThZk5Gi4JiE="; + sha256 = "sha256-guBwwIXKAr9rtkiitFPs+usdzCQacnXcn5bTtQY77AY="; }; - vendorHash = "sha256-L6mjCKMabnLRmiT8jcNCPEsTceYxRBHxhE0CpOvu3Sk="; + vendorHash = "sha256-NEHZ2ZakkO6Yw2pZdKIfCp9NzjgIRIVxARpcQOBGse4="; checkPhase = '' runHook preCheck diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 8d50e8c029bc..87d4e02cb293 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.13.3"; + version = "1.14.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-/AqUsjZArL4KjAzSkb1sM/xhKCIlg+2uvkV0TVwI1Q4="; + sha256 = "sha256-kx60OMIw7F9osF1u6GGp/xfUXo9XUhHmsrh3gCud0iI="; }; - vendorHash = "sha256-Wt5VahshNI/etzQQdcKgD/TBuD4NMi5eVPMHiJYfScY="; + vendorHash = "sha256-gQ+n/UtZn07lyi48sRCulZ7R4gtwKVu1tklFwRAUIZo="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index a5484339b46d..e3c9d77735cd 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.13.2"; + version = "1.13.3"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-RVqhObAw1M4zNK5cXzbD+cbITtsUPBXoc7O7zqVRJhI="; - aarch64-linux = "sha256-WLw6GKNZc5a7HGTAI4kzsel8N9EwoTWda7Z05pXNeDA="; - i686-linux = "sha256-v1f5yDrarKmWFtL9fIr03H5tH/bDi83XVYsTnLgLq5Q="; - x86_64-darwin = "sha256-f1f6KFgr/A62PxEZEzzkNkQF4YI/xISYKVczcXn3r0k="; - aarch64-darwin = "sha256-TQ9Wi6rBXWCYBkkvCyoMMbRiUOEBykvbwp6hdqUUO4I="; + x86_64-linux = "sha256-heC2VX656nAlYoTwfa4Tv+tlkclfKxNTTpWa+Y6XWLA="; + aarch64-linux = "sha256-Alx8Lacb0IO8kSjYwkeytGxQkCM57zTSk+JXATxZ1eU="; + i686-linux = "sha256-eJW6boE0KG4oF/Sf1UxWVXkwLOx5R6ohrpog3YXKfvY="; + x86_64-darwin = "sha256-lWLEr0arVR7fpgxGEZqkoj/w4YHzNQo+jILZRQ53Eok="; + aarch64-darwin = "sha256-hGlmOKLpb9P/pO8ilxG2dLYDULXarp55/e8HoSbHz98="; }; in fetchzip { diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index e907ee972181..2d44f726de84 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.94"; + version = "1.0.100"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MeglBAWmEqRtWKzvNMixXUPOkGGTFCCyO9A+RE/joTw="; + sha256 = "sha256-RyfUJJ4XgC8mNss4mPMxogQ4nL1uvPwDisVPtgF6+OU="; }; - cargoHash = "sha256-NkGWjvIN6Be12tuDEd7PhdFQgVUwzz2CEg6XASn9DKY="; + cargoHash = "sha256-Dp8UUMWAOYdNAljktrMHpPxTIPDCY/VPWA33kzZNCuc="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 8549548312b8..b8a2e59931a8 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - hash = "sha256-QHr4FvoXIqsAE7wE/eFKH18ivagVpZkQbGO7qR0dev8="; + hash = "sha256-hKgk2wIfFvYOKYo90rzGlntvRRWId4UUgSevY1KLhik="; }; - cargoHash = "sha256-KsM28vcu/C8orB+TSDGu4nGSpxX1mnEP2Yg7Fu4uh5Q="; + cargoHash = "sha256-2iMjxjObh3V+HM79y8hQF+i7eQ+sjNl3kDopCbCsSZg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/system/jsvc/default.nix b/pkgs/tools/system/jsvc/default.nix index 85ae689f3224..4dcc773ebf43 100644 --- a/pkgs/tools/system/jsvc/default.nix +++ b/pkgs/tools/system/jsvc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jsvc"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz"; - sha256 = "sha256-J5Gzd6R8CMqhsgRPrrHhD//LdpcVEQKnBB7i/pLL8ns="; + sha256 = "sha256-30hJ0F5YFmEOZ4IYg/T8HhFySgu4t4uEsh7dUDns674="; }; buildInputs = [ commonsDaemon ]; diff --git a/pkgs/tools/text/scraper/default.nix b/pkgs/tools/text/scraper/default.nix index fd8324217f05..d325646a35d2 100644 --- a/pkgs/tools/text/scraper/default.nix +++ b/pkgs/tools/text/scraper/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "scraper"; - version = "0.16.0"; + version = "0.17.1"; src = fetchCrate { inherit pname version; - hash = "sha256-3FxEfrScOetB1raiT9xjq9G2xLrLZqVlkqbVAFCIhZ0="; + hash = "sha256-SVrQi9VxTzUHkdFdieOAIBhKvyrZqi3xKGooHkCEmhQ="; }; - cargoHash = "sha256-Pf8+vvOvOHpuJ2v7iwdVzHwneqvhk2E4nbGO4TL/FAM="; + cargoHash = "sha256-/Lut38gFO4XtrBHXr4sfcII+bWgcCDrHf5/PKPrDiDs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/text/textpieces/default.nix b/pkgs/tools/text/textpieces/default.nix index 7b20083a80bf..d9bd7a07b828 100644 --- a/pkgs/tools/text/textpieces/default.nix +++ b/pkgs/tools/text/textpieces/default.nix @@ -10,6 +10,7 @@ , gtk4 , libgee , libadwaita +, libportal-gtk4 , json-glib , blueprint-compiler , gtksourceview5 @@ -20,17 +21,17 @@ }: let - pythonEnv = python3.withPackages ( ps: with ps; [ pyyaml ] ); + pythonEnv = python3.withPackages (ps: with ps; [ pyyaml ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "textpieces"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "liferooter"; - repo = pname; - rev = "v${version}"; - hash = "sha256-LQq6pjue72a4kIHhWtoxJi/eKxPa4du5sBQY97SG1gY="; + repo = "textpieces"; + rev = "v${finalAttrs.version}"; + hash = "sha256-3ZUHzt3oXYgsnJVDf83JUDhcF+0DLgFfOMtpKI/FTcE="; }; nativeBuildInputs = [ @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { glib gtk4 libadwaita + libportal-gtk4 libgee json-glib gtksourceview5 @@ -72,5 +74,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ zendo ]; + broken = true; # https://github.com/liferooter/textpieces/issues/130 }; -} +}) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 6be356f1a00b..def8b112011c 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -49,6 +49,12 @@ let license = [ "lppl13c" ]; }; + # TODO: remove this when updating to texlive-2023, npp-for-context is no longer in texlive + npp-for-context = orig.npp-for-context // { + # tlpdb lists license as "noinfo", but it's gpl3: https://github.com/luigiScarso/context-npp + license = [ "gpl3Only" ]; + }; + # remove dependency-heavy packages from the basic collections collection-basic = orig.collection-basic // { deps = lib.filter (n: n != "metafont" && n != "xdvi") orig.collection-basic.deps; diff --git a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed index 82fe0025b5ea..022ec5c8589b 100644 --- a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed +++ b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed @@ -58,6 +58,7 @@ $a} s/"lppl1\.3a"/"lppl13a"/g s/"lppl1\.3c"/"lppl13c"/g s/"other-free"/"free"/g + s/"opl"/"opubl"/g s/"pd"/"publicDomain"/g s/^catalogue-license (.*)/ license = [ \1 ];/p diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb.nix index 912446bda2c6..eb36837b8186 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb.nix @@ -25886,7 +25886,7 @@ lshort-german = { stripPrefix = 0; sha512.run = "c937bb8da86a3ef6d428d134903bf8af74a286d644bedfe4766841b2b5234b34e2caed70460ecaf7a1b1dc57f1faf1396435cca7f714f84d75f15acea12e79f8"; sha512.doc = "69cebdd6a1444670a154d5cdd199022f6f1d6612b24b05fc8dc1e9f54a89fb65cda1f545341cd37616dbf6dd94077ccb924bf4b49f1473e45eb0bcd33f5f33a6"; - license = [ "opl" ]; + license = [ "opubl" ]; version = "3.0c"; }; lshort-italian = { diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index b5b66ec34751..b7ca158d2e70 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -55,6 +55,12 @@ in rustPlatform.buildRustPackage rec { Security ]; + # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library + # and linking it with cctools ld64. + postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace build.rs --replace 'cmd.arg("-x")' 'cmd.arg("-S")' + ''; + checkType = "debug"; postBuild = '' diff --git a/pkgs/tools/video/yaydl/default.nix b/pkgs/tools/video/yaydl/default.nix new file mode 100644 index 000000000000..a5eb46b04190 --- /dev/null +++ b/pkgs/tools/video/yaydl/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, makeWrapper +, openssl +, ffmpeg +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "yaydl"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "dertuxmalwieder"; + repo = pname; + rev = "release-${version}"; + sha256 = "sha256-JwyWWqbUNZyH6gymeScb9tMZoPvn/Igz9iW2pp0XvEI="; + }; + + cargoSha256 = "sha256-jmqO0UvU6s+E5r6VFFjOvSe8oiLiTG5rPNHzoHVftWo="; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ openssl ] + ++ lib.optional stdenv.isDarwin Security; + + postInstall = '' + wrapProgram $out/bin/yaydl \ + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} + ''; + + meta = with lib; { + homepage = "https://code.rosaelefanten.org/yaydl"; + description = "Yet another youtube down loader"; + license = licenses.cddl; + maintainers = with maintainers; [ earthengine ]; + }; +} diff --git a/pkgs/tools/virtualization/uefi-run/default.nix b/pkgs/tools/virtualization/uefi-run/default.nix index 9de84ae8fc23..aacb6f7d583b 100644 --- a/pkgs/tools/virtualization/uefi-run/default.nix +++ b/pkgs/tools/virtualization/uefi-run/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "uefi-run"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Richard-W"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OL21C3J4M7q1nNB6lL9xaU6ryZN45UDUqiKsbqQhYH8="; + hash = "sha256-tR547osqw18dCMHJLqJ8AQBelbv8yCl7rAqslu+vnDQ="; }; - cargoSha256 = "sha256-ieX8jQKv9Fht1p7JtTieZ5M+rXdn6/Oo/LgJ8NEBIuQ="; + cargoHash = "sha256-s1Kbc3JHoYy0UJwNfSunIdQ3xHjlQaut/Cb0JSYyB9g="; meta = with lib; { description = "Directly run UEFI applications in qemu"; diff --git a/pkgs/tools/wayland/wl-screenrec/default.nix b/pkgs/tools/wayland/wl-screenrec/default.nix new file mode 100644 index 000000000000..8f09b806f6af --- /dev/null +++ b/pkgs/tools/wayland/wl-screenrec/default.nix @@ -0,0 +1,39 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, wayland +, ffmpeg +}: + +rustPlatform.buildRustPackage rec { + pname = "wl-screenrec"; + version = "unstable-2023-05-31"; + + src = fetchFromGitHub { + owner = "russelltg"; + repo = pname; + rev = "fc918f7898900c1882c6f64c96ed2de8cb9a6300"; + hash = "sha256-P/JELiw0qGcwLFgNPccN/uetNy8CNCJdlCLhgq0h4sc="; + }; + + cargoHash = "sha256-r9zmAiLiAntHcb5W/WKmKbVP9c9+15ElIWtHkks0wig="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + wayland + ffmpeg + ]; + + meta = with lib; { + description = "High performance wlroots screen recording, featuring hardware encoding"; + homepage = "https://github.com/russelltg/wl-screenrec"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ colemickens ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4553ba96dee1..efae4ef55088 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -944,6 +944,7 @@ mapAliases ({ linuxPackages_6_1 = linuxKernel.packages.linux_6_1; linuxPackages_6_2 = linuxKernel.packages.linux_6_2; linuxPackages_6_3 = linuxKernel.packages.linux_6_3; + linuxPackages_6_4 = linuxKernel.packages.linux_6_4; linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; @@ -967,6 +968,7 @@ mapAliases ({ linux_6_1 = linuxKernel.kernels.linux_6_1; linux_6_2 = linuxKernel.kernels.linux_6_2; linux_6_3 = linuxKernel.kernels.linux_6_3; + linux_6_4 = linuxKernel.kernels.linux_6_4; linuxPackages_mptcp = throw "'linuxPackages_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 linux_mptcp_95 = throw "'linux_mptcp_95' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04 @@ -1677,6 +1679,7 @@ mapAliases ({ timescale-prometheus = promscale; # Added 2020-09-29 timedoctor = throw "'timedoctor' has been removed from nixpkgs"; # Added 2022-10-09 timetable = throw "timetable has been removed, as the upstream project has been abandoned"; # Added 2021-09-05 + tinygltf = throw "TinyglTF has been embedded in draco due to lack of other users and compatibility breaks."; # Added 2023-06-25 tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17 tkcvs = tkrev; # Added 2022-03-07 togglesg-download = throw "togglesg-download was removed 2021-04-30 as it's unmaintained"; # Added 2021-04-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc6ed7ab4a63..b85950f1e450 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -316,6 +316,8 @@ with pkgs; atomic-operator = callPackage ../tools/security/atomic-operator { }; + atomic-swap = callPackage ../applications/blockchains/atomic-swap { }; + avro-tools = callPackage ../development/tools/avro-tools { }; bacnet-stack = callPackage ../tools/networking/bacnet-stack { }; @@ -911,6 +913,8 @@ with pkgs; graphw00f = callPackage ../tools/security/graphw00f { }; + graphite-cursors = callPackage ../data/icons/graphite-cursors { }; + opendrop = python3Packages.callPackage ../tools/networking/opendrop { }; owl = callPackage ../tools/networking/owl { }; @@ -1677,6 +1681,8 @@ with pkgs; kaufkauflist = callPackage ../applications/misc/kaufkauflist { }; + kicli = callPackage ../tools/misc/kicli { }; + ksmbd-tools = callPackage ../os-specific/linux/ksmbd-tools { }; ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; @@ -1811,6 +1817,8 @@ with pkgs; topicctl = callPackage ../tools/misc/topicctl { }; + trigger-control = callPackage ../tools/games/trigger-control { }; + ttchat = callPackage ../tools/misc/ttchat { }; ukmm = callPackage ../tools/games/ukmm { }; @@ -2103,6 +2111,8 @@ with pkgs; util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux; }; + git-relevant-history = callPackage ../applications/version-management/git-relevant-history { }; + git-remote-codecommit = python3Packages.callPackage ../applications/version-management/git-remote-codecommit { }; gitRepo = git-repo; @@ -2581,6 +2591,8 @@ with pkgs; retroarch-assets = callPackage ../applications/emulators/retroarch/retroarch-assets.nix { }; + libretranslate = with python3.pkgs; toPythonApplication libretranslate; + libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { retroarch = retroarchBare; @@ -2967,6 +2979,8 @@ with pkgs; arduino-mk = callPackage ../development/embedded/arduino/arduino-mk { }; + arduinoOTA = callPackage ../development/embedded/arduino/arduinoOTA { }; + apio = python3Packages.callPackage ../development/embedded/fpga/apio { }; apitrace = libsForQt5.callPackage ../applications/graphics/apitrace { }; @@ -3016,7 +3030,7 @@ with pkgs; astc-encoder = callPackage ../tools/graphics/astc-encoder { }; - asymptote = callPackage ../tools/graphics/asymptote { + asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo media9 ocgx2 collection-latexextra; }; }; @@ -3062,6 +3076,8 @@ with pkgs; awslogs = callPackage ../tools/admin/awslogs { }; + awsume = python3Packages.callPackage ../tools/admin/awsume { }; + aws-assume-role = callPackage ../tools/admin/aws-assume-role { }; aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { }; @@ -4486,6 +4502,8 @@ with pkgs; wl-mirror = callPackage ../tools/wayland/wl-mirror { }; + wl-screenrec = callPackage ../tools/wayland/wl-screenrec { }; + wlogout = callPackage ../tools/wayland/wlogout { }; wlopm = callPackage ../tools/wayland/wlopm { }; @@ -4621,6 +4639,8 @@ with pkgs; dapr-cli = callPackage ../development/tools/dapr/cli { }; + das = callPackage ../tools/security/das { }; + dasel = callPackage ../applications/misc/dasel { }; dasher = callPackage ../applications/accessibility/dasher { }; @@ -5007,6 +5027,8 @@ with pkgs; frawk = callPackage ../tools/text/frawk { }; + fre = callPackage ../tools/misc/fre { }; + frei = callPackage ../tools/misc/frei { }; frogmouth = callPackage ../tools/text/frogmouth { }; @@ -5019,6 +5041,8 @@ with pkgs; fsql = callPackage ../tools/misc/fsql { }; + kitty-img = callPackage ../tools/misc/kitty-img { }; + ### TOOLS/TYPESETTING/TEX advi = callPackage ../tools/typesetting/tex/advi { }; @@ -6636,6 +6660,8 @@ with pkgs; bombardier = callPackage ../tools/networking/bombardier { }; + caeml = callPackage ../applications/networking/mailreaders/caeml { }; + calyx-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn { provider = "calyx"; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -7415,7 +7441,7 @@ with pkgs; easeprobe = callPackage ../tools/misc/easeprobe { }; emscripten = callPackage ../development/compilers/emscripten { - llvmPackages = llvmPackages_14; + llvmPackages = llvmPackages_16; }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); @@ -10754,6 +10780,8 @@ with pkgs; notary = callPackage ../tools/security/notary { }; + notation = callPackage ../tools/security/notation { }; + notify-osd = callPackage ../applications/misc/notify-osd { }; notes-up = callPackage ../applications/office/notes-up { }; @@ -11640,7 +11668,9 @@ with pkgs; inherit (callPackages ../tools/security/proxmark3 { gcc-arm-embedded = gcc-arm-embedded-8; }) proxmark3 proxmark3-unstable; - proxmark3-rrg = libsForQt5.callPackage ../tools/security/proxmark3/proxmark3-rrg.nix { }; + proxmark3-rrg = libsForQt5.callPackage ../tools/security/proxmark3/proxmark3-rrg.nix { + inherit (darwin.apple_sdk.frameworks) Foundation AppKit; + }; proxychains = callPackage ../tools/networking/proxychains { }; @@ -13203,8 +13233,6 @@ with pkgs; tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; - tinygltf = callPackage ../development/libraries/tinygltf { }; - tinyobjloader = callPackage ../development/libraries/tinyobjloader { }; tinyprog = callPackage ../development/embedded/fpga/tinyprog { }; @@ -14424,6 +14452,10 @@ with pkgs; yj = callPackage ../development/tools/yj { }; + yaydl = callPackage ../tools/video/yaydl { + inherit (darwin.apple_sdk.frameworks) Security; + }; + zarchive = callPackage ../tools/archivers/zarchive { }; zprint = callPackage ../development/tools/zprint { }; @@ -16909,7 +16941,7 @@ with pkgs; tbox = callPackage ../development/libraries/tbox { }; - inherit (nodePackages) typescript; + typescript = callPackage ../development/compilers/typescript { }; bupc = callPackage ../development/compilers/bupc { }; @@ -17322,6 +17354,16 @@ with pkgs; phpExtensions = php.extensions; phpPackages = php.packages; + # Import PHP83 interpreter, extensions and packages + php83 = callPackage ../development/interpreters/php/8.3.nix { + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + pcre2 = pcre2.override { + withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630 + }; + }; + php83Extensions = recurseIntoAttrs php83.extensions; + php83Packages = recurseIntoAttrs php83.packages; + # Import PHP82 interpreter, extensions and packages php82 = callPackage ../development/interpreters/php/8.2.nix { stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; @@ -19160,8 +19202,8 @@ with pkgs; openai-whisper = with python3.pkgs; toPythonApplication openai-whisper; - openai-whisper-cpp = callPackage ../tools/audio/openai-whisper-cpp { - inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; + openai-whisper-cpp = darwin.apple_sdk_11_0.callPackage ../tools/audio/openai-whisper-cpp { + inherit (darwin.apple_sdk_11_0.frameworks) Accelerate CoreGraphics CoreML CoreVideo; }; opengrok = callPackage ../development/tools/misc/opengrok { }; @@ -20408,7 +20450,9 @@ with pkgs; dotconf = callPackage ../development/libraries/dotconf { }; - draco = callPackage ../development/libraries/draco { }; + draco = callPackage ../development/libraries/draco { + tinygltf = callPackage ../development/libraries/draco/tinygltf.nix { }; + }; # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { @@ -21386,7 +21430,7 @@ with pkgs; hwloc = callPackage ../development/libraries/hwloc { }; - hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_13; }; + hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_16; }; hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; @@ -23333,6 +23377,10 @@ with pkgs; msgpack = callPackage ../development/libraries/msgpack { }; + msgpack-c = callPackage ../development/libraries/msgpack-c { }; + + msgpack-cxx = callPackage ../development/libraries/msgpack-cxx { }; + msoffcrypto-tool = with python3.pkgs; toPythonApplication msoffcrypto-tool; msilbc = callPackage ../development/libraries/msilbc { }; @@ -24850,6 +24898,8 @@ with pkgs; # bump when majoring of packages have updated webrtc-audio-processing = webrtc-audio-processing_0_3; + whereami = callPackage ../development/libraries/whereami { }; + wildmidi = callPackage ../development/libraries/wildmidi { }; wiredtiger = callPackage ../development/libraries/wiredtiger { }; @@ -26529,6 +26579,8 @@ with pkgs; scalr-cli = callPackage ../tools/admin/scalr-cli { }; + scaphandre = callPackage ../servers/scaphandre { }; + shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; }; shairport-sync = callPackage ../servers/shairport-sync { }; @@ -27293,6 +27345,8 @@ with pkgs; smemstat = callPackage ../os-specific/linux/smemstat { }; + tgpt = callPackage ../tools/misc/tgpt { }; + tgt = callPackage ../tools/networking/tgt { }; lkl = callPackage ../applications/virtualization/lkl { }; @@ -27511,6 +27565,8 @@ with pkgs; }; checkMeta = callPackage ../stdenv/generic/check-meta.nix { }; }); + minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix { }; + make-minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix { }; mingetty = callPackage ../os-specific/linux/mingetty { }; @@ -29432,8 +29488,9 @@ with pkgs; qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; - saga = libsForQt5.callPackage ../applications/gis/saga { + saga = callPackage ../applications/gis/saga { inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (libsForQt5) dxflib; }; spatialite_gui = callPackage ../applications/gis/spatialite-gui { @@ -31025,6 +31082,8 @@ with pkgs; firefox-beta = wrapFirefox firefox-beta-unwrapped { }; firefox-devedition = wrapFirefox firefox-devedition-unwrapped { }; + firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { }; + firefox-esr = firefox-esr-102; firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; @@ -31751,7 +31810,9 @@ with pkgs; wlroots_0_16 wlroots; - sway-unwrapped = callPackage ../applications/window-managers/sway { }; + sway-unwrapped = callPackage ../applications/window-managers/sway { + wlroots = wlroots_0_16; + }; sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; @@ -31985,9 +32046,7 @@ with pkgs; img2pdf = with python3Packages; toPythonApplication img2pdf; - imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { - typescript = nodePackages.typescript; - }; + imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { }; imgcat = callPackage ../applications/graphics/imgcat { }; @@ -33099,6 +33158,8 @@ with pkgs; else libsForQt5.callPackage ../applications/audio/musescore { }; + music-player = callPackage ../applications/audio/music-player { }; + mmh = callPackage ../applications/networking/mailreaders/mmh { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; @@ -35523,7 +35584,7 @@ with pkgs; weechat-unwrapped = callPackage ../applications/networking/irc/weechat { inherit (darwin) libobjc; inherit (darwin) libresolv; - guile = guile_2_0; + guile = guile_3_0; }; weechat = wrapWeechat weechat-unwrapped { }; @@ -39522,7 +39583,7 @@ with pkgs; openzwave = callPackage ../development/libraries/openzwave { }; - mongoc = callPackage ../development/libraries/mongoc { }; + mongoc = darwin.apple_sdk_11_0.callPackage ../development/libraries/mongoc { }; mongoose = callPackage ../development/libraries/science/math/mongoose { }; @@ -40313,10 +40374,7 @@ with pkgs; yabasic = callPackage ../development/interpreters/yabasic { }; - wasm-pack = callPackage ../development/tools/wasm-pack { - inherit (darwin.apple_sdk.frameworks) Security; - libressl = libressl_3_6; - }; + wasm-pack = callPackage ../development/tools/wasm-pack { }; wasynth = callPackage ../development/tools/wasynth { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index fc6f2288349a..fea9eea010be 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -183,6 +183,13 @@ in { ]; }; + linux_6_4 = callPackage ../os-specific/linux/kernel/linux-6.4.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -576,6 +583,7 @@ in { linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_3 = recurseIntoAttrs (packagesFor kernels.linux_6_3); + linux_6_4 = recurseIntoAttrs (packagesFor kernels.linux_6_4); } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 @@ -635,7 +643,7 @@ in { packageAliases = { linux_default = packages.linux_6_1; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_3; + linux_latest = packages.linux_6_4; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_4; linux_rt_latest = packages.linux_rt_6_1; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b2714c0826a7..ffa2532f99b9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14256,6 +14256,28 @@ with self; { }; }; + MailDMARC = buildPerlPackage { + pname = "Mail-DMARC"; + version = "1.20230215"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DMARC-1.20230215.tar.gz"; + hash = "sha256-V9z1R1nLkkSOVukUE0D2E0QnTFjZ3WWqkKqczw5+uQM="; + }; + buildInputs = [ ExtUtilsMakeMaker FileShareDirInstall ]; + doCheck = false; # uses actual DNS at runtime + checkInputs = [ XMLSAX XMLValidatorSchema TestException TestFileShareDir TestMore TestOutput ]; + propagatedBuildInputs = [ + ConfigTiny DBDSQLite DBIxSimple EmailMIME EmailSender Encode FileShareDir GetoptLong + IOCompress IO IOSocketSSL NetDNS NetIDNEncode NetIP NetSSLeay RegexpCommon Socket6 + SysSyslog URI XMLLibXML + ]; + meta = { + description = "Perl implementation of DMARC"; + homepage = "https://github.com/msimerson/mail-dmarc"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MailMaildir = buildPerlPackage { version = "1.0.0"; pname = "Mail-Maildir"; @@ -18001,6 +18023,21 @@ with self; { }; }; + NetLibIDN2 = buildPerlModule { + pname = "Net-LibIDN2"; + version = "1.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TH/THOR/Net-LibIDN2-1.02.tar.gz"; + hash = "sha256-0fMK/GrPplQbAMCafkx059jkuknjJ3wLvEGuNcE5DQc="; + }; + propagatedBuildInputs = [ pkgs.libidn2 ]; + meta = { + description = "Perl bindings for GNU Libidn2"; + homepage = "https://github.com/gnuthor/Net--LibIDN2"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + NetNetmask = buildPerlPackage { pname = "Net-Netmask"; version = "2.0001"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 6d03fddc015c..2be6447f83be 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,7 +1,6 @@ { stdenv , lib , pkgs -, fetchgit , phpPackage , autoconf , pkg-config @@ -10,22 +9,16 @@ , curl , cyrus_sasl , enchant2 -, fetchpatch , freetds -, freetype , gd , gettext , gmp , html-tidy , icu64 -, libXpm , libffi , libiconv -, libjpeg , libkrb5 -, libpng , libsodium -, libwebp , libxml2 , libxslt , libzip @@ -46,6 +39,7 @@ , uwimap , valgrind , zlib +, fetchpatch }: lib.makeScope pkgs.newScope (self: with self; { @@ -84,15 +78,15 @@ lib.makeScope pkgs.newScope (self: with self; { # will mark the extension as a zend extension or not. mkExtension = lib.makeOverridable ({ name - , configureFlags ? [ "--enable-${extName}" ] - , internalDeps ? [ ] - , postPhpize ? "" - , buildInputs ? [ ] - , zendExtension ? false - , doCheck ? true - , extName ? name - , ... - }@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // { + , configureFlags ? [ "--enable-${extName}" ] + , internalDeps ? [ ] + , postPhpize ? "" + , buildInputs ? [ ] + , zendExtension ? false + , doCheck ? true + , extName ? name + , ... + }@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // { pname = "php-${name}"; extensionName = extName; @@ -216,8 +210,6 @@ lib.makeScope pkgs.newScope (self: with self; { ast = callPackage ../development/php-packages/ast { }; - blackfire = pkgs.callPackage ../development/tools/misc/blackfire/php-probe.nix { inherit php; }; - couchbase = callPackage ../development/php-packages/couchbase { }; datadog_trace = callPackage ../development/php-packages/datadog_trace { }; @@ -282,7 +274,7 @@ lib.makeScope pkgs.newScope (self: with self; { redis = callPackage ../development/php-packages/redis { }; - relay = callPackage ../development/php-packages/relay { inherit php; }; + relay = callPackage ../development/php-packages/relay { inherit php; }; smbclient = callPackage ../development/php-packages/smbclient { }; @@ -332,7 +324,16 @@ lib.makeScope pkgs.newScope (self: with self; { } { name = "exif"; doCheck = false; } { name = "ffi"; buildInputs = [ libffi ]; } - { name = "fileinfo"; buildInputs = [ pcre2 ]; } + { + name = "fileinfo"; + buildInputs = [ pcre2 ]; + patches = lib.optionals (lib.versionAtLeast php.version "8.3") [ + # Fix the extension unable to be loaded due to missing `get_module` function. + # `ZEND_GET_MODULE` macro that creates it is conditional on `COMPILE_DL_FILEINFO` being defined. + # https://github.com/php/php-src/issues/11408#issuecomment-1602106200 + ../development/interpreters/php/fix-fileinfo-ext-php83.patch + ]; + } { name = "filter"; buildInputs = [ pcre2 ]; } { name = "ftp"; buildInputs = [ openssl ]; } { @@ -519,7 +520,18 @@ lib.makeScope pkgs.newScope (self: with self; { ''; doCheck = false; } - { name = "session"; doCheck = false; } + { name = "session"; + doCheck = false; + patches = lib.optionals (lib.versionAtLeast php.version "8.3") [ + # Fix GH-11529: Crash after dealing with an Apache request + # To be removed in next alpha + # See https://github.com/php/php-src/issues/11529 + (fetchpatch { + url = "https://github.com/php/php-src/commit/8d4370954ec610164a4503431bb0c52da6954aa7.patch"; + hash = "sha256-w1uF9lRdfhz9I0gux0J4cvMzNS93uSHL1fYG23VLDPc="; + }) + ]; + } { name = "shmop"; } { name = "simplexml"; @@ -625,5 +637,7 @@ lib.makeScope pkgs.newScope (self: with self; { # Produce the final attribute set of all extensions defined. in builtins.listToAttrs namedExtensions - ); + ) // lib.optionalAttrs (!(lib.versionAtLeast php.version "8.3")) { + blackfire = callPackage ../development/tools/misc/blackfire/php-probe.nix { inherit php; }; + }; }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6ae01f8bea8..3e2540841e3d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -612,6 +612,12 @@ self: super: with self; { argon2-cffi-bindings = callPackage ../development/python-modules/argon2-cffi-bindings { }; + argostranslate = callPackage ../development/python-modules/argostranslate { + ctranslate2-cpp = pkgs.ctranslate2; + }; + + argos-translate-files = callPackage ../development/python-modules/argos-translate-files { }; + argparse-addons = callPackage ../development/python-modules/argparse-addons { }; argparse-dataclass = callPackage ../development/python-modules/argparse-dataclass { }; @@ -1883,6 +1889,8 @@ self: super: with self; { class-doc = callPackage ../development/python-modules/class-doc { }; + cliche = callPackage ../development/python-modules/cliche { }; + click = callPackage ../development/python-modules/click { }; clickclick = callPackage ../development/python-modules/clickclick { }; @@ -2203,6 +2211,8 @@ self: super: with self; { crytic-compile = callPackage ../development/python-modules/crytic-compile { }; + cson = callPackage ../development/python-modules/cson { }; + csrmesh = callPackage ../development/python-modules/csrmesh { }; csscompressor = callPackage ../development/python-modules/csscompressor { }; @@ -3437,6 +3447,10 @@ self: super: with self; { ezyrb = callPackage ../development/python-modules/ezyrb { }; + f5-icontrol-rest = callPackage ../development/python-modules/f5-icontrol-rest { }; + + f5-sdk = callPackage ../development/python-modules/f5-sdk { }; + f90nml = callPackage ../development/python-modules/f90nml { }; fabric = callPackage ../development/python-modules/fabric { }; @@ -5429,6 +5443,8 @@ self: super: with self; { karton-yaramatcher = callPackage ../development/python-modules/karton-yaramatcher { }; + kasa-crypt = callPackage ../development/python-modules/kasa-crypt { }; + kazoo = callPackage ../development/python-modules/kazoo { }; kbcstorage = callPackage ../development/python-modules/kbcstorage { }; @@ -5728,6 +5744,8 @@ self: super: with self; { (p: p.py) ]; + libretranslate = callPackage ../development/python-modules/libretranslate { }; + librosa = callPackage ../development/python-modules/librosa { }; librouteros = callPackage ../development/python-modules/librouteros { }; @@ -5947,6 +5965,8 @@ self: super: with self; { lsprotocol = callPackage ../development/python-modules/lsprotocol { }; + ltpycld2 = callPackage ../development/python-modules/ltpycld2 { }; + luddite = callPackage ../development/python-modules/luddite { }; ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; @@ -6111,6 +6131,8 @@ self: super: with self; { matplotlib-inline = callPackage ../development/python-modules/matplotlib-inline { }; + matplotx = callPackage ../development/python-modules/matplotx { }; + matrix-api-async = callPackage ../development/python-modules/matrix-api-async { }; matrix-client = callPackage ../development/python-modules/matrix-client { }; @@ -6298,6 +6320,8 @@ self: super: with self; { mip = callPackage ../development/python-modules/mip { }; + mir_eval = callPackage ../development/python-modules/mir_eval { }; + misaka = callPackage ../development/python-modules/misaka { }; misoc = callPackage ../development/python-modules/misoc { }; @@ -6434,6 +6458,8 @@ self: super: with self; { moretools = callPackage ../development/python-modules/moretools { }; + morfessor = callPackage ../development/python-modules/morfessor { }; + morphys = callPackage ../development/python-modules/morphys { }; mortgage = callPackage ../development/python-modules/mortgage { }; @@ -6708,6 +6734,10 @@ self: super: with self; { netaddr = callPackage ../development/python-modules/netaddr { }; + netapp-lib = callPackage ../development/python-modules/netapp-lib { }; + + netapp-ontap = callPackage ../development/python-modules/netapp-ontap { }; + netcdf4 = callPackage ../development/python-modules/netcdf4 { }; netdata = callPackage ../development/python-modules/netdata { }; @@ -10523,6 +10553,8 @@ self: super: with self; { recipe-scrapers = callPackage ../development/python-modules/recipe-scrapers { }; + recline = callPackage ../development/python-modules/recline { }; + recoll = toPythonModule (pkgs.recoll.override { python3Packages = self; }); @@ -10797,6 +10829,8 @@ self: super: with self; { rouge-score = callPackage ../development/python-modules/rouge-score { }; + routeros-api = callPackage ../development/python-modules/routeros-api { }; + routes = callPackage ../development/python-modules/routes { }; rova = callPackage ../development/python-modules/rova { }; @@ -11508,6 +11542,8 @@ self: super: with self; { speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; + speg = callPackage ../development/python-modules/speg { }; + spglib = callPackage ../development/python-modules/spglib { }; sphfile = callPackage ../development/python-modules/sphfile { }; @@ -12438,6 +12474,8 @@ self: super: with self; { transitions = callPackage ../development/python-modules/transitions { }; + translatehtml = callPackage ../development/python-modules/translatehtml { }; + translatepy = callPackage ../development/python-modules/translatepy { }; translationstring = callPackage ../development/python-modules/translationstring { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 86535cad8f9d..3886ae04e492 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -259,10 +259,12 @@ let overlays = [ (self': super': { pkgsStatic = super'; })] ++ overlays; - } // lib.optionalAttrs stdenv.hostPlatform.isLinux { crossSystem = { isStatic = true; - parsed = makeMuslParsedPlatform stdenv.hostPlatform.parsed; + parsed = + if stdenv.isLinux + then makeMuslParsedPlatform stdenv.hostPlatform.parsed + else stdenv.hostPlatform.parsed; } // lib.optionalAttrs (stdenv.hostPlatform.system == "powerpc64-linux") { gcc.abi = "elfv2"; }; diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index aa282adf6a3a..40faa7642129 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -72,7 +72,7 @@ let darwin = pkgs.darwin.system_cmds; }; getent = { - linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc + linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc.getent else pkgs.netbsd.getent; darwin = pkgs.netbsd.getent; }; |