Merge master into staging-next
This commit is contained in:
commit
e1399a2156
|
@ -11985,6 +11985,12 @@
|
||||||
githubId = 852967;
|
githubId = 852967;
|
||||||
name = "Russell O'Connor";
|
name = "Russell O'Connor";
|
||||||
};
|
};
|
||||||
|
rodrgz = {
|
||||||
|
email = "rodrgz@proton.me";
|
||||||
|
github = "rodrgz";
|
||||||
|
githubId = 53882428;
|
||||||
|
name = "Erik Rodriguez";
|
||||||
|
};
|
||||||
roelvandijk = {
|
roelvandijk = {
|
||||||
email = "roel@lambdacube.nl";
|
email = "roel@lambdacube.nl";
|
||||||
github = "roelvandijk";
|
github = "roelvandijk";
|
||||||
|
|
|
@ -20,7 +20,13 @@
|
||||||
pkgs.mkpasswd # for generating password files
|
pkgs.mkpasswd # for generating password files
|
||||||
|
|
||||||
# Some text editors.
|
# Some text editors.
|
||||||
pkgs.vim
|
(pkgs.vim.customize {
|
||||||
|
name = "vim";
|
||||||
|
vimrcConfig.packages.default = {
|
||||||
|
start = [ pkgs.vimPlugins.vim-nix ];
|
||||||
|
};
|
||||||
|
vimrcConfig.customRC = "syntax on";
|
||||||
|
})
|
||||||
|
|
||||||
# Some networking tools.
|
# Some networking tools.
|
||||||
pkgs.fuse
|
pkgs.fuse
|
||||||
|
|
|
@ -4,6 +4,9 @@ let
|
||||||
in
|
in
|
||||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||||
name = "alps";
|
name = "alps";
|
||||||
|
meta = with pkgs.lib.maintainers; {
|
||||||
|
maintainers = [ hmenke ];
|
||||||
|
};
|
||||||
|
|
||||||
nodes = {
|
nodes = {
|
||||||
server = {
|
server = {
|
||||||
|
|
|
@ -1468,8 +1468,8 @@ let
|
||||||
mktplcRef = {
|
mktplcRef = {
|
||||||
name = "latex-workshop";
|
name = "latex-workshop";
|
||||||
publisher = "James-Yu";
|
publisher = "James-Yu";
|
||||||
version = "9.0.0";
|
version = "9.1.0";
|
||||||
sha256 = "sha256-aXDYRLbDZGul2mG+jZs6o5Z5QVhEiOCaLhHpj/zVt6E=";
|
sha256 = "sha256-a/v8/5ztB9DXqYpGWMYSRIwZIj1D+iebG35fO0yDjQQ=";
|
||||||
};
|
};
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
|
changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog";
|
||||||
|
|
|
@ -1,4 +1,16 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext, openmp, Cocoa }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
|
, autoconf
|
||||||
|
, automake
|
||||||
|
, gettext
|
||||||
|
, libtool
|
||||||
|
, python3
|
||||||
|
, wxGTK
|
||||||
|
, openmp
|
||||||
|
, Cocoa
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "wxHexEditor";
|
pname = "wxHexEditor";
|
||||||
|
@ -11,10 +23,22 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj";
|
sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoconf automake ];
|
strictDeps = true;
|
||||||
buildInputs = [ wxGTK libtool python2 gettext ]
|
|
||||||
++ lib.optionals stdenv.cc.isClang [ openmp ]
|
nativeBuildInputs = [
|
||||||
++ lib.optionals stdenv.isDarwin [ Cocoa ];
|
autoconf
|
||||||
|
automake
|
||||||
|
gettext
|
||||||
|
libtool
|
||||||
|
python3
|
||||||
|
wxGTK
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = lib.optionals stdenv.cc.isClang [
|
||||||
|
openmp
|
||||||
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
Cocoa
|
||||||
|
];
|
||||||
|
|
||||||
preConfigure = "patchShebangs .";
|
preConfigure = "patchShebangs .";
|
||||||
|
|
||||||
|
@ -49,7 +73,7 @@ stdenv.mkDerivation rec {
|
||||||
wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes.
|
wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes.
|
||||||
'';
|
'';
|
||||||
homepage = "http://www.wxhexeditor.org/";
|
homepage = "http://www.wxhexeditor.org/";
|
||||||
license = lib.licenses.gpl2;
|
license = lib.licenses.gpl2Plus;
|
||||||
platforms = lib.platforms.unix;
|
platforms = lib.platforms.unix;
|
||||||
maintainers = with lib.maintainers; [ wegank ];
|
maintainers = with lib.maintainers; [ wegank ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
, pngSupport ? true
|
, pngSupport ? true
|
||||||
# Optional dependencies
|
# Optional dependencies
|
||||||
, cairo
|
, cairo
|
||||||
, librsvg
|
|
||||||
, libpng
|
, libpng
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -51,22 +50,21 @@ stdenv.mkDerivation rec {
|
||||||
tllist
|
tllist
|
||||||
fcft
|
fcft
|
||||||
] ++ lib.optional enableCairo cairo
|
] ++ lib.optional enableCairo cairo
|
||||||
++ lib.optional pngSupport libpng
|
++ lib.optional pngSupport libpng;
|
||||||
++ lib.optional svgSupport librsvg;
|
|
||||||
|
|
||||||
mesonBuildType = "release";
|
mesonBuildType = "release";
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
"-Denable-cairo=${if enableCairo then "enabled" else "disabled"}"
|
"-Denable-cairo=${if enableCairo then "enabled" else "disabled"}"
|
||||||
"-Dpng-backend=${if pngSupport then "libpng" else "none"}"
|
"-Dpng-backend=${if pngSupport then "libpng" else "none"}"
|
||||||
"-Dsvg-backend=${if svgSupport then "librsvg" else "none"}"
|
"-Dsvg-backend=${if svgSupport then "nanosvg" else "none"}"
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Wayland-native application launcher, similar to rofi’s drun mode";
|
description = "Wayland-native application launcher, similar to rofi’s drun mode";
|
||||||
homepage = "https://codeberg.org/dnkl/fuzzel";
|
homepage = "https://codeberg.org/dnkl/fuzzel";
|
||||||
license = licenses.mit;
|
license = with licenses; [ mit zlib ];
|
||||||
maintainers = with maintainers; [ fionera polykernel ];
|
maintainers = with maintainers; [ fionera polykernel rodrgz ];
|
||||||
platforms = with platforms; linux;
|
platforms = with platforms; linux;
|
||||||
changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}";
|
changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}";
|
||||||
};
|
};
|
||||||
|
|
|
@ -90,11 +90,11 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "brave";
|
pname = "brave";
|
||||||
version = "1.43.89";
|
version = "1.46.133";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||||
sha256 = "sha256-eqwqn4cvVzoEmh206ybG6PWWg56ct53wYyRBOQ8wN5g=";
|
sha256 = "sha256-362XVFFsVWR/H0mcn1XQh3tsemksEnqR5quOIwf2QQE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "cilium-cli";
|
pname = "cilium-cli";
|
||||||
version = "0.12.10";
|
version = "0.12.11";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cilium";
|
owner = "cilium";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-XDz98mMIRmzKTEsmhxMjcSoTfKwqTX4ekjrOnTzAGyk=";
|
sha256 = "sha256-50D3iH5KAWvX7lAPHY7cUKc4d4ww47ti2QOgdrfY1BY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
|
|
@ -11,11 +11,11 @@
|
||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
pname = "iterm2";
|
pname = "iterm2";
|
||||||
version = "3.4.17";
|
version = "3.4.18";
|
||||||
|
|
||||||
src = fetchzip {
|
src = fetchzip {
|
||||||
url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip";
|
url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip";
|
||||||
sha256 = "sha256-t7DWK1KqHChKR+ru0wYvdDOuJDBQBaOgyol1lMjMeTU=";
|
sha256 = "sha256-jXaymp0GIM+UD51z1zsgz8OBHP1LiqKFGvrzutw8ecY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontFixup = true;
|
dontFixup = true;
|
||||||
|
|
|
@ -16,7 +16,7 @@ index 24e137a5b..c17ccea8a 100644
|
||||||
$(TESTS):
|
$(TESTS):
|
||||||
@cd $(SRCDIR) && \
|
@cd $(SRCDIR) && \
|
||||||
- $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@)
|
- $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@)
|
||||||
+ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip LibGit2_jll --skip MozillaCACerts_jll --skip NetworkOptions --skip nghttp2_jll --skip Zlib_jll $@)
|
+ $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip LibGit2_jll --skip MozillaCACerts_jll --skip NetworkOptions --skip nghttp2_jll --skip Zlib_jll --skip MbedTLS_jll $@)
|
||||||
|
|
||||||
$(addprefix revise-, $(TESTS)): revise-% :
|
$(addprefix revise-, $(TESTS)): revise-% :
|
||||||
@cd $(SRCDIR) && \
|
@cd $(SRCDIR) && \
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
callPackage ./generic.nix (args // {
|
callPackage ./generic.nix (args // {
|
||||||
baseVersion = "2.19";
|
baseVersion = "2.19";
|
||||||
revision = "2";
|
revision = "3";
|
||||||
sha256 = "sha256-OvXxdhXGtc2Lgy0mn7bLTVTsZPnrCd2/Gt1Qk5QbTXU=";
|
sha256 = "sha256-2uBH85nFpH8IfbXT2dno8RrkmF0UySjXHaGv+AGALVU=";
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
|
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
|
||||||
ln -s botan-*.pc botan.pc || true
|
ln -s botan-*.pc botan.pc || true
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Cryptographic algorithms library";
|
description = "Cryptographic algorithms library";
|
||||||
maintainers = with maintainers; [ raskin ];
|
maintainers = with maintainers; [ raskin ];
|
||||||
|
|
|
@ -1,15 +0,0 @@
|
||||||
diff -Naur old-source/tomlcpp.hpp new-source/tomlcpp.hpp
|
|
||||||
--- tomlcpp/tomlcpp.hpp 1969-12-31 21:00:01.000000000 -0300
|
|
||||||
+++ tomlcpp/tomlcpp.hpp 2022-04-14 12:50:14.269775437 -0300
|
|
||||||
@@ -25,6 +25,11 @@
|
|
||||||
#ifndef TOML_HPP
|
|
||||||
#define TOML_HPP
|
|
||||||
|
|
||||||
+#include <memory>
|
|
||||||
+#include <string>
|
|
||||||
+#include <utility>
|
|
||||||
+#include <vector>
|
|
||||||
+
|
|
||||||
struct toml_table_t;
|
|
||||||
struct toml_array_t;
|
|
||||||
|
|
|
@ -1,24 +1,16 @@
|
||||||
{ lib
|
{ lib, stdenv, fetchFromGitHub }:
|
||||||
, stdenv
|
|
||||||
, fetchFromGitHub
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tomlcpp";
|
pname = "tomlcpp";
|
||||||
version = "0.pre+date=2022-05-01";
|
version = "0.pre+date=2022-06-25";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cktan";
|
owner = "cktan";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "59fcc6dc89fb3f4130a2865e41e1fa5b8c502e45";
|
rev = "4212f1fccf530e276a2e1b63d3f99fbfb84e86a4";
|
||||||
hash = "sha256-Uc6R5KnGIZXY0EJgFM4Xi7Jtxcu6l8yGh5xgFZPoJDM=";
|
hash = "sha256-PM3gURXhyTZr59BWuLHvltjKOlKUSBT9/rqTeX5V//k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Self-explaining
|
|
||||||
./0001-missing-headers.diff
|
|
||||||
];
|
|
||||||
|
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
|
|
||||||
installFlags = [
|
installFlags = [
|
||||||
|
|
|
@ -13,15 +13,19 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
old-openfst = openfst.overrideAttrs (self: {
|
old-openfst = openfst.overrideAttrs (prev: {
|
||||||
|
version = "kag-unstable-2022-05-06";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kkm000";
|
owner = "kkm000";
|
||||||
repo = "openfst";
|
repo = "openfst";
|
||||||
|
# required by https://github.com/daanzu/kaldi-fork-active-grammar/blob/e9c7d0ffca401cf312779d25f2c05a34b41ff696/cmake/third_party/openfst.cmake#L7
|
||||||
rev = "0bca6e76d24647427356dc242b0adbf3b5f1a8d9";
|
rev = "0bca6e76d24647427356dc242b0adbf3b5f1a8d9";
|
||||||
sha256 = "1802rr14a03zl1wa5a0x1fa412kcvbgprgkadfj5s6s3agnn11rx";
|
sha256 = "1802rr14a03zl1wa5a0x1fa412kcvbgprgkadfj5s6s3agnn11rx";
|
||||||
};
|
};
|
||||||
buildInputs = [ zlib ];
|
buildInputs = [ zlib ];
|
||||||
}); in
|
});
|
||||||
|
in
|
||||||
|
|
||||||
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
|
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
|
||||||
|
|
||||||
|
@ -66,6 +70,20 @@ stdenv.mkDerivation rec {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# Replace the shebangs for the various build scripts
|
# Replace the shebangs for the various build scripts
|
||||||
patchShebangs src
|
patchShebangs src
|
||||||
|
# Compatability with OpenBLAS 0.3.21
|
||||||
|
substituteInPlace src/matrix/cblas-wrappers.h \
|
||||||
|
--replace stptri_ LAPACK_stptri \
|
||||||
|
--replace dtptri_ LAPACK_dtptri \
|
||||||
|
--replace sgetrf_ LAPACK_sgetrf \
|
||||||
|
--replace dgetrf_ LAPACK_dgetrf \
|
||||||
|
--replace sgetri_ LAPACK_sgetri \
|
||||||
|
--replace dgetri_ LAPACK_dgetri \
|
||||||
|
--replace sgesvd_ LAPACK_sgesvd \
|
||||||
|
--replace dgesvd_ LAPACK_dgesvd \
|
||||||
|
--replace ssptri_ LAPACK_ssptri \
|
||||||
|
--replace dsptri_ LAPACK_dsptri \
|
||||||
|
--replace ssptrf_ LAPACK_ssptrf \
|
||||||
|
--replace dsptrf_ LAPACK_dsptrf
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyswitchbot";
|
pname = "pyswitchbot";
|
||||||
version = "0.20.5";
|
version = "0.20.7";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||||
owner = "Danielhiversen";
|
owner = "Danielhiversen";
|
||||||
repo = "pySwitchbot";
|
repo = "pySwitchbot";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-3yOZyCoCKNP0xgOFBb1d9jC3rvtiFMCCN7R+tQk+/6o=";
|
hash = "sha256-rT8QsaxP8kTw5PSpL3eO866aX2I46eHNj8XKxVO76WA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -42,6 +42,7 @@ buildPythonPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python library to control Switchbot IoT devices";
|
description = "Python library to control Switchbot IoT devices";
|
||||||
homepage = "https://github.com/Danielhiversen/pySwitchbot";
|
homepage = "https://github.com/Danielhiversen/pySwitchbot";
|
||||||
|
changelog = "https://github.com/Danielhiversen/pySwitchbot/releases/tag/${version}";
|
||||||
license = with licenses; [ mit ];
|
license = with licenses; [ mit ];
|
||||||
maintainers = with maintainers; [ fab ];
|
maintainers = with maintainers; [ fab ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
|
|
@ -2,14 +2,14 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "cargo-pgx";
|
pname = "cargo-pgx";
|
||||||
version = "0.5.6";
|
version = "0.6.0";
|
||||||
|
|
||||||
src = fetchCrate {
|
src = fetchCrate {
|
||||||
inherit version pname;
|
inherit version pname;
|
||||||
sha256 = "sha256-CbQWgt/M/QVKpuOzY04OEZNX4DauYPMz2404WQlAvTw=";
|
sha256 = "sha256-CXOInyT0fY17e4iuGhUpR9EPd2M8jauR5TKpPlhTJoQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-sqAOhSZXzqxOVkEbqpd+9MoXqEFlkFufQ8O1zAXPnLQ=";
|
cargoSha256 = "sha256-RtPFFIuurSPMhGLcGLOu0em1biimVkTaAKP5EUPtQ9U=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
|
|
@ -14,17 +14,18 @@
|
||||||
, winetricks
|
, winetricks
|
||||||
, wine
|
, wine
|
||||||
, glxinfo
|
, glxinfo
|
||||||
|
, xrandr
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "grapejuice";
|
pname = "grapejuice";
|
||||||
version = "6.2.2";
|
version = "7.2.0";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "BrinkerVII";
|
owner = "BrinkerVII";
|
||||||
repo = "grapejuice";
|
repo = "grapejuice";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-wwM3q8Z4bYZod7/KcGc/PXlyLQxLRPkF1TdtFcg8mNE=";
|
sha256 = "sha256-BNVoSJbGi+u2DHuAicOjEUpDlmu25vMWoBudbV1FLgM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -50,13 +51,14 @@ python3Packages.buildPythonApplication rec {
|
||||||
requests
|
requests
|
||||||
unidecode
|
unidecode
|
||||||
click
|
click
|
||||||
|
pydantic
|
||||||
];
|
];
|
||||||
|
|
||||||
dontWrapGApps = true;
|
dontWrapGApps = true;
|
||||||
|
|
||||||
makeWrapperArgs = [
|
makeWrapperArgs = [
|
||||||
"\${gappsWrapperArgs[@]}"
|
"\${gappsWrapperArgs[@]}"
|
||||||
"--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs wine winetricks pciutils glxinfo ]}"
|
"--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs wine winetricks pciutils glxinfo xrandr ]}"
|
||||||
# make xdg-open overrideable at runtime
|
# make xdg-open overrideable at runtime
|
||||||
"--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}"
|
"--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}"
|
||||||
];
|
];
|
||||||
|
@ -82,8 +84,8 @@ python3Packages.buildPythonApplication rec {
|
||||||
substituteInPlace src/grapejuice_common/paths.py \
|
substituteInPlace src/grapejuice_common/paths.py \
|
||||||
--replace 'return local_share() / "locale"' 'return Path("${placeholder "out"}/share/locale")'
|
--replace 'return local_share() / "locale"' 'return Path("${placeholder "out"}/share/locale")'
|
||||||
|
|
||||||
substituteInPlace src/grapejuice_common/features/settings.py \
|
substituteInPlace src/grapejuice_common/models/settings_model.py \
|
||||||
--replace 'k_default_wine_home: "",' 'k_default_wine_home: "${wine}",'
|
--replace 'default_wine_home: Optional[str] = ""' 'default_wine_home: Optional[str] = "${wine}"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
|
|
@ -204,7 +204,7 @@ let
|
||||||
changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}";
|
changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}";
|
||||||
license = lib.licenses.cddl;
|
license = lib.licenses.cddl;
|
||||||
platforms = lib.platforms.linux;
|
platforms = lib.platforms.linux;
|
||||||
maintainers = with lib.maintainers; [ hmenke jcumming jonringer wizeman globin ];
|
maintainers = with lib.maintainers; [ jcumming jonringer wizeman globin ];
|
||||||
mainProgram = "zfs";
|
mainProgram = "zfs";
|
||||||
# If your Linux kernel version is not yet supported by zfs, try zfsUnstable.
|
# If your Linux kernel version is not yet supported by zfs, try zfsUnstable.
|
||||||
# On NixOS set the option boot.zfs.enableUnstable.
|
# On NixOS set the option boot.zfs.enableUnstable.
|
||||||
|
|
|
@ -45,6 +45,6 @@ buildGoModule rec {
|
||||||
description = "A simple and extensible webmail.";
|
description = "A simple and extensible webmail.";
|
||||||
homepage = "https://git.sr.ht/~migadu/alps";
|
homepage = "https://git.sr.ht/~migadu/alps";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ gordias booklearner madonius ];
|
maintainers = with maintainers; [ gordias booklearner madonius hmenke ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,11 +10,11 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "pgadmin";
|
pname = "pgadmin";
|
||||||
version = "6.16";
|
version = "6.17";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
|
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
|
||||||
sha256 = "sha256-v2CfoV7QAzLcPXKY5nkUi9+HbHujiulUJS4GVBKxTY4=";
|
sha256 = "sha256-fcMNqki0namB5mRntlJUE9cN+axlw+7b8EA9aactlIw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
yarnDeps = mkYarnModules {
|
yarnDeps = mkYarnModules {
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
"copy-webpack-plugin": "^7.0.0",
|
"copy-webpack-plugin": "^7.0.0",
|
||||||
"core-js": "^3.2.1",
|
"core-js": "^3.2.1",
|
||||||
"cross-env": "^7.0.3",
|
"cross-env": "^7.0.3",
|
||||||
|
"css-loader": "^6.7.2",
|
||||||
"css-minimizer-webpack-plugin": "^3.0.0",
|
"css-minimizer-webpack-plugin": "^3.0.0",
|
||||||
"enzyme": "^3.11.0",
|
"enzyme": "^3.11.0",
|
||||||
"eslint": "^7.19.0",
|
"eslint": "^7.19.0",
|
||||||
|
@ -40,9 +41,10 @@
|
||||||
"imagemin-mozjpeg": "^10.0.0",
|
"imagemin-mozjpeg": "^10.0.0",
|
||||||
"imagemin-optipng": "^8.0.0",
|
"imagemin-optipng": "^8.0.0",
|
||||||
"imagemin-pngquant": "^9.0.2",
|
"imagemin-pngquant": "^9.0.2",
|
||||||
|
"imports-loader": "^4.0.1",
|
||||||
"is-docker": "^2.1.1",
|
"is-docker": "^2.1.1",
|
||||||
"istanbul-instrumenter-loader": "^3.0.1",
|
"istanbul-instrumenter-loader": "^3.0.1",
|
||||||
"jasmine-core": "^3.6.0",
|
"jasmine-core": "3.10.1",
|
||||||
"jasmine-enzyme": "^7.1.2",
|
"jasmine-enzyme": "^7.1.2",
|
||||||
"karma": "^6.3.15",
|
"karma": "^6.3.15",
|
||||||
"karma-babel-preprocessor": "^8.0.0",
|
"karma-babel-preprocessor": "^8.0.0",
|
||||||
|
@ -54,6 +56,7 @@
|
||||||
"karma-source-map-support": "^1.4.0",
|
"karma-source-map-support": "^1.4.0",
|
||||||
"karma-sourcemap-loader": "^0.3.7",
|
"karma-sourcemap-loader": "^0.3.7",
|
||||||
"karma-webpack": "^5.0.0",
|
"karma-webpack": "^5.0.0",
|
||||||
|
"loader-utils": "^3.2.1",
|
||||||
"mini-css-extract-plugin": "^1.3.5",
|
"mini-css-extract-plugin": "^1.3.5",
|
||||||
"popper.js": "^1.16.1",
|
"popper.js": "^1.16.1",
|
||||||
"postcss-loader": "^5.0.0",
|
"postcss-loader": "^5.0.0",
|
||||||
|
@ -63,13 +66,15 @@
|
||||||
"sass": "^1.24.4",
|
"sass": "^1.24.4",
|
||||||
"sass-loader": "^11.0.0",
|
"sass-loader": "^11.0.0",
|
||||||
"sass-resources-loader": "^2.2.1",
|
"sass-resources-loader": "^2.2.1",
|
||||||
"style-loader": "^2.0.0",
|
"shim-loader": "^1.0.1",
|
||||||
|
"style-loader": "^3.3.1",
|
||||||
"stylis": "^4.0.7",
|
"stylis": "^4.0.7",
|
||||||
"svgo": "^2.7.0",
|
"svgo": "^2.7.0",
|
||||||
"svgo-loader": "^2.2.0",
|
"svgo-loader": "^2.2.0",
|
||||||
"terser-webpack-plugin": "^5.1.1",
|
"terser-webpack-plugin": "^5.1.1",
|
||||||
"typescript": "^3.2.2",
|
"typescript": "^3.2.2",
|
||||||
"webfonts-loader": "^7.3.0",
|
"url-loader": "^4.1.1",
|
||||||
|
"webfonts-loader": "^7.5.2",
|
||||||
"webpack": "^5.21.2",
|
"webpack": "^5.21.2",
|
||||||
"webpack-bundle-analyzer": "^4.4.0",
|
"webpack-bundle-analyzer": "^4.4.0",
|
||||||
"webpack-cli": "^4.5.0",
|
"webpack-cli": "^4.5.0",
|
||||||
|
@ -96,7 +101,6 @@
|
||||||
"aspen-decorations": "^1.0.2",
|
"aspen-decorations": "^1.0.2",
|
||||||
"axios": "^0.21.1",
|
"axios": "^0.21.1",
|
||||||
"babelify": "~10.0.0",
|
"babelify": "~10.0.0",
|
||||||
"backbone": "1.4.0",
|
|
||||||
"bignumber.js": "^9.0.1",
|
"bignumber.js": "^9.0.1",
|
||||||
"bootstrap": "^4.3.1",
|
"bootstrap": "^4.3.1",
|
||||||
"bootstrap-datepicker": "^1.8.0",
|
"bootstrap-datepicker": "^1.8.0",
|
||||||
|
@ -110,14 +114,12 @@
|
||||||
"codemirror": "^5.59.2",
|
"codemirror": "^5.59.2",
|
||||||
"context-menu": "^2.0.0",
|
"context-menu": "^2.0.0",
|
||||||
"convert-units": "^2.3.4",
|
"convert-units": "^2.3.4",
|
||||||
"css-loader": "^5.0.1",
|
|
||||||
"cssnano": "^5.0.2",
|
"cssnano": "^5.0.2",
|
||||||
"dagre": "^0.8.4",
|
"dagre": "^0.8.4",
|
||||||
"date-fns": "^2.24.0",
|
"date-fns": "^2.24.0",
|
||||||
"diff-arrays-of-objects": "^1.1.8",
|
"diff-arrays-of-objects": "^1.1.8",
|
||||||
"html2canvas": "^1.0.0-rc.7",
|
"html2canvas": "^1.0.0-rc.7",
|
||||||
"immutability-helper": "^3.0.0",
|
"immutability-helper": "^3.0.0",
|
||||||
"imports-loader": "^2.0.0",
|
|
||||||
"insert-if": "^1.1.0",
|
"insert-if": "^1.1.0",
|
||||||
"ip-address": "^7.1.0",
|
"ip-address": "^7.1.0",
|
||||||
"jquery": "^3.6.0",
|
"jquery": "^3.6.0",
|
||||||
|
@ -160,15 +162,12 @@
|
||||||
"react-virtualized-auto-sizer": "^1.0.6",
|
"react-virtualized-auto-sizer": "^1.0.6",
|
||||||
"react-window": "^1.8.5",
|
"react-window": "^1.8.5",
|
||||||
"select2": "^4.0.13",
|
"select2": "^4.0.13",
|
||||||
"shim-loader": "^1.0.1",
|
|
||||||
"snapsvg-cjs": "^0.0.6",
|
"snapsvg-cjs": "^0.0.6",
|
||||||
"socket.io-client": "^4.5.0",
|
"socket.io-client": "^4.5.0",
|
||||||
"split.js": "^1.5.10",
|
"split.js": "^1.5.10",
|
||||||
"styled-components": "^5.2.1",
|
"styled-components": "^5.2.1",
|
||||||
"tempusdominus-bootstrap-4": "^5.1.2",
|
"tempusdominus-bootstrap-4": "^5.1.2",
|
||||||
"tempusdominus-core": "^5.19.3",
|
"tempusdominus-core": "^5.19.3",
|
||||||
"underscore": "^1.13.1",
|
|
||||||
"url-loader": "^1.1.2",
|
|
||||||
"valid-filename": "^2.0.1",
|
"valid-filename": "^2.0.1",
|
||||||
"webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8",
|
"webcabin-docker": "git+https://github.com/EnterpriseDB/wcDocker/#3df8aac825ee2892f4d824de273b779cc6dbcad8",
|
||||||
"wkx": "^0.5.0",
|
"wkx": "^0.5.0",
|
||||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
725
pkgs/tools/filesystems/httm/cargo-lock.patch
Normal file
725
pkgs/tools/filesystems/httm/cargo-lock.patch
Normal file
|
@ -0,0 +1,725 @@
|
||||||
|
diff --git i/Cargo.lock w/Cargo.lock
|
||||||
|
index d59e8af..2409033 100644
|
||||||
|
--- i/Cargo.lock
|
||||||
|
+++ w/Cargo.lock
|
||||||
|
@@ -8,16 +8,16 @@ version = "0.8.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107"
|
||||||
|
dependencies = [
|
||||||
|
- "cfg-if 1.0.0",
|
||||||
|
+ "cfg-if",
|
||||||
|
"once_cell",
|
||||||
|
"version_check",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "aho-corasick"
|
||||||
|
-version = "0.7.18"
|
||||||
|
+version = "0.7.20"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
|
||||||
|
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
|
||||||
|
dependencies = [
|
||||||
|
"memchr",
|
||||||
|
]
|
||||||
|
@@ -77,21 +77,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bumpalo"
|
||||||
|
-version = "3.10.0"
|
||||||
|
+version = "3.11.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
|
||||||
|
+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cc"
|
||||||
|
-version = "1.0.73"
|
||||||
|
+version = "1.0.77"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
|
||||||
|
-
|
||||||
|
-[[package]]
|
||||||
|
-name = "cfg-if"
|
||||||
|
-version = "0.1.10"
|
||||||
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
|
||||||
|
+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cfg-if"
|
||||||
|
@@ -101,13 +95,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "chrono"
|
||||||
|
-version = "0.4.22"
|
||||||
|
+version = "0.4.23"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
|
||||||
|
+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
|
||||||
|
dependencies = [
|
||||||
|
"iana-time-zone",
|
||||||
|
+ "js-sys",
|
||||||
|
"num-integer",
|
||||||
|
"num-traits",
|
||||||
|
+ "time 0.1.45",
|
||||||
|
+ "wasm-bindgen",
|
||||||
|
"winapi",
|
||||||
|
]
|
||||||
|
|
||||||
|
@@ -129,9 +126,9 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "clap_lex"
|
||||||
|
-version = "0.2.2"
|
||||||
|
+version = "0.2.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613"
|
||||||
|
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
|
||||||
|
dependencies = [
|
||||||
|
"os_str_bytes",
|
||||||
|
]
|
||||||
|
@@ -148,14 +145,13 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "console"
|
||||||
|
-version = "0.15.0"
|
||||||
|
+version = "0.15.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31"
|
||||||
|
+checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c"
|
||||||
|
dependencies = [
|
||||||
|
"encode_unicode",
|
||||||
|
+ "lazy_static",
|
||||||
|
"libc",
|
||||||
|
- "once_cell",
|
||||||
|
- "regex",
|
||||||
|
"terminal_size 0.1.17",
|
||||||
|
"winapi",
|
||||||
|
]
|
||||||
|
@@ -172,95 +168,72 @@ version = "0.8.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c"
|
||||||
|
dependencies = [
|
||||||
|
- "cfg-if 1.0.0",
|
||||||
|
- "crossbeam-channel 0.5.5",
|
||||||
|
+ "cfg-if",
|
||||||
|
+ "crossbeam-channel",
|
||||||
|
"crossbeam-deque",
|
||||||
|
"crossbeam-epoch",
|
||||||
|
"crossbeam-queue",
|
||||||
|
- "crossbeam-utils 0.8.9",
|
||||||
|
+ "crossbeam-utils",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossbeam-channel"
|
||||||
|
-version = "0.4.4"
|
||||||
|
+version = "0.5.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
|
||||||
|
+checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
|
||||||
|
dependencies = [
|
||||||
|
- "crossbeam-utils 0.7.2",
|
||||||
|
- "maybe-uninit",
|
||||||
|
-]
|
||||||
|
-
|
||||||
|
-[[package]]
|
||||||
|
-name = "crossbeam-channel"
|
||||||
|
-version = "0.5.5"
|
||||||
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
|
||||||
|
-dependencies = [
|
||||||
|
- "cfg-if 1.0.0",
|
||||||
|
- "crossbeam-utils 0.8.9",
|
||||||
|
+ "cfg-if",
|
||||||
|
+ "crossbeam-utils",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossbeam-deque"
|
||||||
|
-version = "0.8.1"
|
||||||
|
+version = "0.8.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
|
||||||
|
+checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
|
||||||
|
dependencies = [
|
||||||
|
- "cfg-if 1.0.0",
|
||||||
|
+ "cfg-if",
|
||||||
|
"crossbeam-epoch",
|
||||||
|
- "crossbeam-utils 0.8.9",
|
||||||
|
+ "crossbeam-utils",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossbeam-epoch"
|
||||||
|
-version = "0.9.9"
|
||||||
|
+version = "0.9.13"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d"
|
||||||
|
+checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg",
|
||||||
|
- "cfg-if 1.0.0",
|
||||||
|
- "crossbeam-utils 0.8.9",
|
||||||
|
- "memoffset",
|
||||||
|
- "once_cell",
|
||||||
|
+ "cfg-if",
|
||||||
|
+ "crossbeam-utils",
|
||||||
|
+ "memoffset 0.7.1",
|
||||||
|
"scopeguard",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossbeam-queue"
|
||||||
|
-version = "0.3.5"
|
||||||
|
+version = "0.3.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
|
||||||
|
+checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
|
||||||
|
dependencies = [
|
||||||
|
- "cfg-if 1.0.0",
|
||||||
|
- "crossbeam-utils 0.8.9",
|
||||||
|
+ "cfg-if",
|
||||||
|
+ "crossbeam-utils",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossbeam-utils"
|
||||||
|
-version = "0.7.2"
|
||||||
|
+version = "0.8.14"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
|
||||||
|
+checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
|
||||||
|
dependencies = [
|
||||||
|
- "autocfg",
|
||||||
|
- "cfg-if 0.1.10",
|
||||||
|
- "lazy_static",
|
||||||
|
-]
|
||||||
|
-
|
||||||
|
-[[package]]
|
||||||
|
-name = "crossbeam-utils"
|
||||||
|
-version = "0.8.9"
|
||||||
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978"
|
||||||
|
-dependencies = [
|
||||||
|
- "cfg-if 1.0.0",
|
||||||
|
- "once_cell",
|
||||||
|
+ "cfg-if",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cxx"
|
||||||
|
-version = "1.0.80"
|
||||||
|
+version = "1.0.83"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a"
|
||||||
|
+checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"cxxbridge-flags",
|
||||||
|
@@ -270,9 +243,9 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cxx-build"
|
||||||
|
-version = "1.0.80"
|
||||||
|
+version = "1.0.83"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827"
|
||||||
|
+checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"codespan-reporting",
|
||||||
|
@@ -285,15 +258,15 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cxxbridge-flags"
|
||||||
|
-version = "1.0.80"
|
||||||
|
+version = "1.0.83"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a"
|
||||||
|
+checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cxxbridge-macro"
|
||||||
|
-version = "1.0.80"
|
||||||
|
+version = "1.0.83"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7"
|
||||||
|
+checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
@@ -337,11 +310,11 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "defer-drop"
|
||||||
|
-version = "1.2.0"
|
||||||
|
+version = "1.3.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "828aca0e5e4341b0320a319209cbc6255b8b06254849ce8a5f33d33f7f2fa0f0"
|
||||||
|
+checksum = "f613ec9fa66a6b28cdb1842b27f9adf24f39f9afc4dcdd9fdecee4aca7945c57"
|
||||||
|
dependencies = [
|
||||||
|
- "crossbeam-channel 0.4.4",
|
||||||
|
+ "crossbeam-channel",
|
||||||
|
"once_cell",
|
||||||
|
]
|
||||||
|
|
||||||
|
@@ -382,7 +355,7 @@ version = "2.0.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
|
||||||
|
dependencies = [
|
||||||
|
- "cfg-if 1.0.0",
|
||||||
|
+ "cfg-if",
|
||||||
|
"dirs-sys-next",
|
||||||
|
]
|
||||||
|
|
||||||
|
@@ -399,9 +372,9 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "either"
|
||||||
|
-version = "1.6.1"
|
||||||
|
+version = "1.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
|
||||||
|
+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "encode_unicode"
|
||||||
|
@@ -447,20 +420,20 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "getrandom"
|
||||||
|
-version = "0.2.7"
|
||||||
|
+version = "0.2.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
|
||||||
|
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
|
||||||
|
dependencies = [
|
||||||
|
- "cfg-if 1.0.0",
|
||||||
|
+ "cfg-if",
|
||||||
|
"libc",
|
||||||
|
- "wasi",
|
||||||
|
+ "wasi 0.11.0+wasi-snapshot-preview1",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "hashbrown"
|
||||||
|
-version = "0.11.2"
|
||||||
|
+version = "0.12.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
|
||||||
|
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "hashbrown"
|
||||||
|
@@ -482,7 +455,7 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "httm"
|
||||||
|
-version = "0.17.9"
|
||||||
|
+version = "0.17.10"
|
||||||
|
dependencies = [
|
||||||
|
"clap",
|
||||||
|
"crossbeam",
|
||||||
|
@@ -495,8 +468,8 @@ dependencies = [
|
||||||
|
"proc-mounts",
|
||||||
|
"rayon",
|
||||||
|
"skim",
|
||||||
|
- "terminal_size 0.2.2",
|
||||||
|
- "time",
|
||||||
|
+ "terminal_size 0.2.3",
|
||||||
|
+ "time 0.3.17",
|
||||||
|
"which",
|
||||||
|
]
|
||||||
|
|
||||||
|
@@ -532,12 +505,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "indexmap"
|
||||||
|
-version = "1.8.2"
|
||||||
|
+version = "1.9.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"
|
||||||
|
+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg",
|
||||||
|
- "hashbrown 0.11.2",
|
||||||
|
+ "hashbrown 0.12.3",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
@@ -553,15 +526,19 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "io-lifetimes"
|
||||||
|
-version = "0.7.5"
|
||||||
|
+version = "1.0.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074"
|
||||||
|
+checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
|
||||||
|
+dependencies = [
|
||||||
|
+ "libc",
|
||||||
|
+ "windows-sys",
|
||||||
|
+]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "itoa"
|
||||||
|
-version = "1.0.2"
|
||||||
|
+version = "1.0.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
|
||||||
|
+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "js-sys"
|
||||||
|
@@ -580,9 +557,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "libc"
|
||||||
|
-version = "0.2.137"
|
||||||
|
+version = "0.2.138"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
|
||||||
|
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "link-cplusplus"
|
||||||
|
@@ -595,9 +572,9 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "linux-raw-sys"
|
||||||
|
-version = "0.0.46"
|
||||||
|
+version = "0.1.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
|
||||||
|
+checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "log"
|
||||||
|
@@ -605,7 +582,7 @@ version = "0.4.17"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
|
||||||
|
dependencies = [
|
||||||
|
- "cfg-if 1.0.0",
|
||||||
|
+ "cfg-if",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
@@ -618,12 +595,6 @@ dependencies = [
|
||||||
|
"nu-ansi-term",
|
||||||
|
]
|
||||||
|
|
||||||
|
-[[package]]
|
||||||
|
-name = "maybe-uninit"
|
||||||
|
-version = "2.0.0"
|
||||||
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
|
||||||
|
-
|
||||||
|
[[package]]
|
||||||
|
name = "memchr"
|
||||||
|
version = "2.5.0"
|
||||||
|
@@ -639,28 +610,37 @@ dependencies = [
|
||||||
|
"autocfg",
|
||||||
|
]
|
||||||
|
|
||||||
|
+[[package]]
|
||||||
|
+name = "memoffset"
|
||||||
|
+version = "0.7.1"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
|
||||||
|
+dependencies = [
|
||||||
|
+ "autocfg",
|
||||||
|
+]
|
||||||
|
+
|
||||||
|
[[package]]
|
||||||
|
name = "nix"
|
||||||
|
-version = "0.24.1"
|
||||||
|
+version = "0.24.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9"
|
||||||
|
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
- "cfg-if 1.0.0",
|
||||||
|
+ "cfg-if",
|
||||||
|
"libc",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "nix"
|
||||||
|
-version = "0.25.0"
|
||||||
|
+version = "0.25.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
|
||||||
|
+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg",
|
||||||
|
"bitflags",
|
||||||
|
- "cfg-if 1.0.0",
|
||||||
|
+ "cfg-if",
|
||||||
|
"libc",
|
||||||
|
- "memoffset",
|
||||||
|
+ "memoffset 0.6.5",
|
||||||
|
"pin-utils",
|
||||||
|
]
|
||||||
|
|
||||||
|
@@ -726,9 +706,9 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "os_str_bytes"
|
||||||
|
-version = "6.1.0"
|
||||||
|
+version = "6.4.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"
|
||||||
|
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "overload"
|
||||||
|
@@ -759,9 +739,9 @@ checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proc-macro2"
|
||||||
|
-version = "1.0.39"
|
||||||
|
+version = "1.0.47"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
|
||||||
|
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
|
||||||
|
dependencies = [
|
||||||
|
"unicode-ident",
|
||||||
|
]
|
||||||
|
@@ -777,9 +757,9 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "quote"
|
||||||
|
-version = "1.0.18"
|
||||||
|
+version = "1.0.21"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
|
||||||
|
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
]
|
||||||
|
@@ -801,17 +781,17 @@ version = "1.10.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
|
||||||
|
dependencies = [
|
||||||
|
- "crossbeam-channel 0.5.5",
|
||||||
|
+ "crossbeam-channel",
|
||||||
|
"crossbeam-deque",
|
||||||
|
- "crossbeam-utils 0.8.9",
|
||||||
|
+ "crossbeam-utils",
|
||||||
|
"num_cpus",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "redox_syscall"
|
||||||
|
-version = "0.2.13"
|
||||||
|
+version = "0.2.16"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
|
||||||
|
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
]
|
||||||
|
@@ -829,9 +809,9 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "regex"
|
||||||
|
-version = "1.6.0"
|
||||||
|
+version = "1.7.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
|
||||||
|
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
|
||||||
|
dependencies = [
|
||||||
|
"aho-corasick",
|
||||||
|
"memchr",
|
||||||
|
@@ -840,15 +820,15 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "regex-syntax"
|
||||||
|
-version = "0.6.27"
|
||||||
|
+version = "0.6.28"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
|
||||||
|
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rustix"
|
||||||
|
-version = "0.35.13"
|
||||||
|
+version = "0.36.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9"
|
||||||
|
+checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
"errno",
|
||||||
|
@@ -860,9 +840,9 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rustversion"
|
||||||
|
-version = "1.0.6"
|
||||||
|
+version = "1.0.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
|
||||||
|
+checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "scopeguard"
|
||||||
|
@@ -878,14 +858,14 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "serde"
|
||||||
|
-version = "1.0.137"
|
||||||
|
+version = "1.0.148"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
|
||||||
|
+checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "skim"
|
||||||
|
version = "0.10.2"
|
||||||
|
-source = "git+https://github.com/kimono-koans/skim?branch=httm-vendored#bf2b007ae7371a7cff4d93194033bd6c90cbf96c"
|
||||||
|
+source = "git+https://github.com/kimono-koans/skim?branch=httm-vendored#bca6554ebf09803fc429a59c89eb96428e920cc5"
|
||||||
|
dependencies = [
|
||||||
|
"beef",
|
||||||
|
"bitflags",
|
||||||
|
@@ -896,10 +876,11 @@ dependencies = [
|
||||||
|
"fuzzy-matcher",
|
||||||
|
"lazy_static",
|
||||||
|
"log",
|
||||||
|
- "nix 0.25.0",
|
||||||
|
+ "nix 0.25.1",
|
||||||
|
+ "once_cell",
|
||||||
|
"rayon",
|
||||||
|
"regex",
|
||||||
|
- "time",
|
||||||
|
+ "time 0.3.17",
|
||||||
|
"timer",
|
||||||
|
"tuikit",
|
||||||
|
"unicode-width",
|
||||||
|
@@ -914,9 +895,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "syn"
|
||||||
|
-version = "1.0.96"
|
||||||
|
+version = "1.0.105"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
|
||||||
|
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
@@ -955,9 +936,9 @@ dependencies = [
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "terminal_size"
|
||||||
|
-version = "0.2.2"
|
||||||
|
+version = "0.2.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a"
|
||||||
|
+checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907"
|
||||||
|
dependencies = [
|
||||||
|
"rustix",
|
||||||
|
"windows-sys",
|
||||||
|
@@ -971,18 +952,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "thiserror"
|
||||||
|
-version = "1.0.31"
|
||||||
|
+version = "1.0.37"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
|
||||||
|
+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
|
||||||
|
dependencies = [
|
||||||
|
"thiserror-impl",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "thiserror-impl"
|
||||||
|
-version = "1.0.31"
|
||||||
|
+version = "1.0.37"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
|
||||||
|
+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
@@ -998,6 +979,17 @@ dependencies = [
|
||||||
|
"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.17"
|
||||||
|
@@ -1030,7 +1022,8 @@ dependencies = [
|
||||||
|
[[package]]
|
||||||
|
name = "timer"
|
||||||
|
version = "0.2.0"
|
||||||
|
-source = "git+https://github.com/kimono-koans/timer.rs#85c9e56ab20ea530c934433636406f8b585bef59"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "31d42176308937165701f50638db1c31586f183f1aab416268216577aec7306b"
|
||||||
|
dependencies = [
|
||||||
|
"chrono",
|
||||||
|
]
|
||||||
|
@@ -1044,22 +1037,22 @@ dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
"lazy_static",
|
||||||
|
"log",
|
||||||
|
- "nix 0.24.1",
|
||||||
|
+ "nix 0.24.3",
|
||||||
|
"term",
|
||||||
|
"unicode-width",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unicode-ident"
|
||||||
|
-version = "1.0.1"
|
||||||
|
+version = "1.0.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
|
||||||
|
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unicode-width"
|
||||||
|
-version = "0.1.9"
|
||||||
|
+version = "0.1.10"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
|
||||||
|
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "utf8parse"
|
||||||
|
@@ -1094,6 +1087,12 @@ dependencies = [
|
||||||
|
"quote",
|
||||||
|
]
|
||||||
|
|
||||||
|
+[[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"
|
||||||
|
@@ -1106,7 +1105,7 @@ version = "0.2.83"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
|
||||||
|
dependencies = [
|
||||||
|
- "cfg-if 1.0.0",
|
||||||
|
+ "cfg-if",
|
||||||
|
"wasm-bindgen-macro",
|
||||||
|
]
|
||||||
|
|
|
@ -6,16 +6,18 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "httm";
|
pname = "httm";
|
||||||
version = "0.17.7";
|
version = "0.17.10";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "kimono-koans";
|
owner = "kimono-koans";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-ejDHQoL7YCcBQdS4zcavrHdyFoTIV0/FZPkaT15aFgo=";
|
sha256 = "sha256-xhsZaOsEYmtx3EcKbc7cIPvrUdXl3gyl5InZ1Va0U6E=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-Z5v/Jke50T8BI7nO0FVZHFFbOyN4PhQnrugrz4mZmdw=";
|
cargoPatches = [ ./cargo-lock.patch ];
|
||||||
|
|
||||||
|
cargoSha256 = "sha256-H8LOpNKsc9CxURB+ZcQT6Uhv4aw2sx8sNdDGDCkz2SU=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
|
|
@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||||
maintainers = with maintainers; [ artemist ];
|
maintainers = with maintainers; [ artemist ];
|
||||||
|
knownVulnerabilities = [ "CVE-2022-4104" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue