Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
49b966576c
|
|
@ -13688,6 +13688,14 @@
|
|||
fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298";
|
||||
}];
|
||||
};
|
||||
n8henrie = {
|
||||
name = "Nathan Henrie";
|
||||
github = "n8henrie";
|
||||
githubId = 1234956;
|
||||
"keys" = [{
|
||||
"fingerprint" = "F21A 6194 C9DB 9899 CD09 E24E 434B 2C14 B8C3 3422";
|
||||
}];
|
||||
};
|
||||
nadir-ishiguro = {
|
||||
github = "nadir-ishiguro";
|
||||
githubId = 23151917;
|
||||
|
|
|
|||
|
|
@ -1578,7 +1578,9 @@ in {
|
|||
rm "${cfg.statePath}/config/gitlab-workhorse.json"
|
||||
'';
|
||||
ExecStart =
|
||||
"${cfg.packages.gitlab-workhorse}/bin/workhorse "
|
||||
"${cfg.packages.gitlab-workhorse}/bin/${
|
||||
optionalString (lib.versionAtLeast (lib.getVersion cfg.packages.gitlab-workhorse) "16.10") "gitlab-"
|
||||
}workhorse "
|
||||
+ "-listenUmask 0 "
|
||||
+ "-listenNetwork unix "
|
||||
+ "-listenAddr /run/gitlab/gitlab-workhorse.socket "
|
||||
|
|
|
|||
|
|
@ -85,6 +85,8 @@ in
|
|||
|
||||
sv-kalender = callPackage ./manual-packages/sv-kalender { };
|
||||
|
||||
texpresso = callPackage ./manual-packages/texpresso { inherit (pkgs) texpresso; };
|
||||
|
||||
tree-sitter-langs = callPackage ./manual-packages/tree-sitter-langs { final = self; };
|
||||
|
||||
treesit-grammars = callPackage ./manual-packages/treesit-grammars { };
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
{ lib
|
||||
, trivialBuild
|
||||
, texpresso
|
||||
}:
|
||||
trivialBuild {
|
||||
pname = "texpresso";
|
||||
version = texpresso.version;
|
||||
src = texpresso.src;
|
||||
|
||||
preInstall = ''
|
||||
cd emacs
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (texpresso.meta) homepage license;
|
||||
description = "Emacs mode for TeXpresso";
|
||||
maintainers = [ lib.maintainers.alexarice ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.55.19";
|
||||
version = "0.55.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ag5EmgX4xWbKBhXVsGTu5EtjXV3deGETPtsM9IpOr7s=";
|
||||
hash = "sha256-F1+V99MxwPmtF4QHQ6/T1d8ss33R5qZOOP0B+xnGgzI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ijAg0Y/dfNxDS/Jov7QYjlTZ4N4/jDMH/zCV0jdVXRc=";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, cmake
|
||||
, pkg-config
|
||||
, ninja
|
||||
, gfortran
|
||||
, which
|
||||
, perl
|
||||
|
|
@ -14,15 +17,12 @@
|
|||
, gsl
|
||||
, netcdf
|
||||
, arpack
|
||||
, autoreconfHook
|
||||
, spglib
|
||||
, metis
|
||||
, scalapack
|
||||
, mpi
|
||||
, enableMpi ? true
|
||||
, python3
|
||||
, enableFma ? stdenv.hostPlatform.fmaSupport
|
||||
, enableFma4 ? stdenv.hostPlatform.fma4Support
|
||||
, enableAvx ? stdenv.hostPlatform.avx2Support
|
||||
, enableAvx512 ? stdenv.hostPlatform.avx512Support
|
||||
}:
|
||||
|
||||
assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
|
@ -30,21 +30,23 @@ assert (blas.isILP64 == arpack.isILP64);
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "octopus";
|
||||
version = "13.0";
|
||||
version = "14.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "octopus-code";
|
||||
repo = "octopus";
|
||||
rev = version;
|
||||
sha256 = "sha256-CZ+Qmv6aBQ6w11mLvTP6QAJzaGs+vmmXuNGnSyAqVDU=";
|
||||
sha256 = "sha256-wQ2I+10ZHLKamW3j6AUtq2KZVm6d29+JxYgwvBKz9DU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
perl
|
||||
procps
|
||||
autoreconfHook
|
||||
cmake
|
||||
gfortran
|
||||
pkg-config
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -57,34 +59,20 @@ stdenv.mkDerivation rec {
|
|||
netcdf
|
||||
arpack
|
||||
libvdwxc
|
||||
spglib
|
||||
metis
|
||||
(python3.withPackages (ps: [ ps.pyyaml ]))
|
||||
] ++ lib.optional enableMpi scalapack;
|
||||
|
||||
propagatedBuildInputs = lib.optional enableMpi mpi;
|
||||
propagatedUserEnvPkgs = lib.optional enableMpi mpi;
|
||||
|
||||
configureFlags = with lib; [
|
||||
"--with-yaml-prefix=${lib.getDev libyaml}"
|
||||
"--with-blas=-lblas"
|
||||
"--with-lapack=-llapack"
|
||||
"--with-fftw-prefix=${lib.getDev fftw}"
|
||||
"--with-gsl-prefix=${lib.getDev gsl}"
|
||||
"--with-libxc-prefix=${lib.getDev libxc}"
|
||||
"--with-libvdwxc"
|
||||
"--enable-openmp"
|
||||
]
|
||||
++ optional enableFma "--enable-fma3"
|
||||
++ optional enableFma4 "--enable-fma4"
|
||||
++ optional enableAvx "--enable-avx"
|
||||
++ optional enableAvx512 "--enable-avx512"
|
||||
++ optionals enableMpi [
|
||||
"--enable-mpi"
|
||||
"--with-scalapack=-lscalapack"
|
||||
"CC=mpicc"
|
||||
"FC=mpif90"
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "OCTOPUS_MPI" enableMpi)
|
||||
(lib.cmakeBool "OCTOPUS_ScaLAPACK" enableMpi)
|
||||
(lib.cmakeBool "OCTOPUS_OpenMP" true)
|
||||
];
|
||||
|
||||
|
||||
nativeCheckInputs = lib.optional.enableMpi mpi;
|
||||
doCheck = false;
|
||||
checkTarget = "check-short";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig
|
||||
, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
|
||||
, nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus
|
||||
, makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid
|
||||
, makeDesktopItem, openssl, wrapGAppsHook, makeShellWrapper, at-spi2-atk, at-spi2-core, libuuid
|
||||
, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon, git
|
||||
, libGL, zlib, cacert
|
||||
}:
|
||||
|
|
@ -106,7 +106,7 @@ let
|
|||
comment = "Graphical Git client from Axosoft";
|
||||
}) ];
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook ];
|
||||
nativeBuildInputs = [ copyDesktopItems (wrapGAppsHook.override { makeWrapper = makeShellWrapper; }) ];
|
||||
buildInputs = [ gtk3 gnome.adwaita-icon-theme ];
|
||||
|
||||
# avoid double-wrapping
|
||||
|
|
@ -124,6 +124,10 @@ let
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}")
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
pushd $out/share/${pname}
|
||||
for file in gitkraken chrome-sandbox chrome_crashpad_handler; do
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"version": "16.9.2",
|
||||
"repo_hash": "sha256-pvmbxCySSc+Ug4W3cpXA6L7E3/I6J2A0BpcjFbR3YEI=",
|
||||
"yarn_hash": "02vchjx17h6kk268pwrjqmrri0wa6vrljm7y5s23hwzir4v86slq",
|
||||
"version": "16.10.1",
|
||||
"repo_hash": "sha256-Bd2BvdWUJJm+hJZHFaW2PyMdaNTZWArpaQ3nY06BBBY=",
|
||||
"yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v16.9.2-ee",
|
||||
"rev": "v16.10.1-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "16.9.2",
|
||||
"GITLAB_PAGES_VERSION": "16.9.2",
|
||||
"GITLAB_SHELL_VERSION": "14.33.0",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.7.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "16.9.2"
|
||||
"GITALY_SERVER_VERSION": "16.10.1",
|
||||
"GITLAB_PAGES_VERSION": "16.10.1",
|
||||
"GITLAB_SHELL_VERSION": "14.34.0",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "16.10.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ let
|
|||
cp Cargo.lock $out
|
||||
'';
|
||||
};
|
||||
hash = "sha256-csasA2RH1vwRdF/9/BpFmh0AKsP3xtGmrhCx6mbVf6k=";
|
||||
hash = "sha256-7q2xWAsFkXHxkYNzIjPwJRy72xMXF278cpVzqGLt/9Y=";
|
||||
};
|
||||
|
||||
dontBuild = false;
|
||||
|
|
@ -112,6 +112,8 @@ let
|
|||
GITLAB_LOG_PATH = "log";
|
||||
FOSS_ONLY = !gitlabEnterprise;
|
||||
|
||||
SKIP_YARN_INSTALL = 1;
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
|
|
@ -142,11 +144,7 @@ let
|
|||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
bundle exec rake gettext:compile RAILS_ENV=production NODE_ENV=production
|
||||
bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production
|
||||
bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production
|
||||
bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production
|
||||
bundle exec rake gitlab:assets:check_page_bundle_mixins_css_for_sideeffects RAILS_ENV=production NODE_ENV=production
|
||||
bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production SKIP_YARN_INSTALL=true
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "16.9.2";
|
||||
version = "16.10.1";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
|
|
@ -18,10 +18,10 @@ let
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-YlSZq7+YtV9mhZDoNZ7QStbZLQ/Vtt8H2ZW84ONvCq8=";
|
||||
hash = "sha256-YMvxSQcvFj/ugTGjTThmwi1V9M+rc3fldrmChWzXKR8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aqwdeBjR8IGa1DsAXY1h7vq7OkuTgoDim5m40YKlcmo=";
|
||||
vendorHash = "sha256-zaldiRg7fk/HncpfR7k+dDprsOp1ziQHgX8B4l7bwe0=";
|
||||
|
||||
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-container-registry";
|
||||
version = "3.90.0";
|
||||
version = "3.91.0";
|
||||
rev = "v${version}-gitlab";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
|
|
@ -10,10 +10,10 @@ buildGoModule rec {
|
|||
owner = "gitlab-org";
|
||||
repo = "container-registry";
|
||||
inherit rev;
|
||||
hash = "sha256-bHRvvmVQFsdgYmVVucu1warn+SvCoIVh+C/U2uwi12E=";
|
||||
hash = "sha256-C6tCwVfVZ9CMP0X5NiOdPAuSz5yeu9LAnvOPrq2QLJo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Zv5Xz1T/ZUM/kyEgZJKbDuIN2nufoHVAn4kD3SuvJCg=";
|
||||
vendorHash = "sha256-KZWdM8Q8ipsgm7OoLyOuHo+4Vg2Nve+yZtTSUDgjOW4=";
|
||||
|
||||
patches = [
|
||||
./Disable-inmemory-storage-driver-test.patch
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-elasticsearch-indexer";
|
||||
version = "4.7.0";
|
||||
version = "4.8.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-elasticsearch-indexer";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-xkCG8PyOXQl2xqsq3INqYWGdcJpJgRsi/hB9creGTSM=";
|
||||
sha256 = "sha256-JHUDZmGlZGyvsB4wgAnNyIEtosZG4ajZ4eBGumH97ZI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1eyIRlrgEQ6iiM2tom5S92BlsyaPVKZzSU3+Mmdxi+4=";
|
||||
vendorHash = "sha256-ztRKXoXncY66XJVwlPn4ShLWTD4Cr0yYHoUdquJItDM=";
|
||||
|
||||
buildInputs = [ icu ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "16.9.2";
|
||||
version = "16.10.1";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-1ygIMatPcqvhjN5Zkuk0WXd9iW6fv3bLK9EZsIII/WM=";
|
||||
hash = "sha256-jUTUYbkUad2WrI8lkktd2pr3+GPraEUXT+efOb7JcKw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZjIjGZaZhxa3OvdaA4qD+Qza604mxe1u+zAUtIAKouo=";
|
||||
vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,21 +2,21 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-shell";
|
||||
version = "14.33.0";
|
||||
version = "14.34.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0C3ODs2NElJQ+A6x9lZxSParTZc3q4YqWsw7DxwhODo=";
|
||||
sha256 = "sha256-0LzZZn4kS5uRcj/uJgHvLvd6ZOLi1l4yaSqqRhmTYZs=";
|
||||
};
|
||||
|
||||
buildInputs = [ ruby libkrb5 ];
|
||||
|
||||
patches = [ ./remove-hardcoded-locations.patch ];
|
||||
|
||||
vendorHash = "sha256-sTAd/AbPx5WzBCzTDLvo/bDZcmz/xVhIhz9nFGBEYx4=";
|
||||
vendorHash = "sha256-RtZ9d3cempY8PxaCPFJ2uEEorem6NDURHZPirr0SUjU=";
|
||||
|
||||
postInstall = ''
|
||||
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "16.9.2";
|
||||
version = "16.10.1";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
|
||||
sourceRoot = "${src.name}/workhorse";
|
||||
|
||||
vendorHash = "sha256-RJ/CT8p1DpxmZcJLBeMDG77Zsn0Q6MiXsDcMK/LM2DA=";
|
||||
vendorHash = "sha256-bbKX22Tb2pM+Wnyl1ojdA1nmT40Z5R99mDP1hLD+lco=";
|
||||
buildInputs = [ git ];
|
||||
ldflags = [ "-X main.Version=${version}" ];
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir
|
|||
# https://gitlab.com/gitlab-org/gitlab/-/issues/375713
|
||||
#
|
||||
# See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails
|
||||
gem 'rails', '~> 7.0.8' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'rails', '~> 7.0.8.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
|
|
@ -49,10 +49,10 @@ gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|||
|
||||
gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
gem 'view_component', '~> 3.8.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'view_component', '~> 3.11.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
# Supported DBs
|
||||
gem 'pg', '~> 1.5.4' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'pg', '~> 1.5.6' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
|
|
@ -134,10 +134,10 @@ gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
|||
|
||||
# API
|
||||
gem 'grape', '~> 2.0.0', feature_category: :api
|
||||
gem 'grape-entity', '~> 0.10.0', feature_category: :api
|
||||
gem 'grape-entity', '~> 0.10.2', feature_category: :api
|
||||
gem 'grape-swagger', '~> 2.0.1', group: [:development, :test], feature_category: :api
|
||||
gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api
|
||||
gem 'grape-path-helpers', '~> 2.0.0', feature_category: :api
|
||||
gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api
|
||||
gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
# GraphQL API
|
||||
|
|
@ -148,7 +148,7 @@ gem 'apollo_upload_server', '~> 2.1.5', feature_category: :api
|
|||
gem 'graphlient', '~> 0.6.0', feature_category: :importers # Used by BulkImport feature (group::import)
|
||||
|
||||
# Generate Fake data
|
||||
gem 'ffaker', '~> 2.10' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'ffaker', '~> 2.23' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
gem 'hashie', '~> 5.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
|
|
@ -207,15 +207,15 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory
|
|||
gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'aws-sdk-core', '~> 3.191.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'aws-sdk-core', '~> 3.191.3' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'aws-sdk-s3', '~> 1.143.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'aws-sdk-s3', '~> 1.144.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
# Markdown and HTML processing
|
||||
gem 'html-pipeline', '~> 2.14.3', feature_category: :team_planning
|
||||
gem 'deckar01-task_list', '2.3.3', feature_category: :team_planning
|
||||
gem 'deckar01-task_list', '2.3.4', feature_category: :team_planning
|
||||
gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'commonmarker', '~> 0.23.10', feature_category: :team_planning
|
||||
gem 'kramdown', '~> 2.3.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
|
@ -230,7 +230,7 @@ gem 'asciidoctor-kroki', '~> 0.8.0', require: false # rubocop:todo Gemfile/Missi
|
|||
gem 'rouge', '~> 4.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'nokogiri', '~> 1.16' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'gitlab-glfm-markdown', '~> 0.0.12', feature_category: :team_planning
|
||||
gem 'gitlab-glfm-markdown', '~> 0.0.13', feature_category: :team_planning
|
||||
|
||||
# Calendar rendering
|
||||
gem 'icalendar' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
|
@ -240,7 +240,7 @@ gem 'diffy', '~> 3.4' # rubocop:todo Gemfile/MissingFeatureCategory
|
|||
gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning
|
||||
|
||||
# Application server
|
||||
gem 'rack', '~> 2.2.8' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'rack', '~> 2.2.8.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
# https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually
|
||||
gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
|
|
@ -277,7 +277,7 @@ gem 're2', '2.7.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|||
|
||||
# Misc
|
||||
|
||||
gem 'semver_dialects', '~> 1.6.1', feature_category: :static_application_security_testing
|
||||
gem 'semver_dialects', '~> 2.0', feature_category: :static_application_security_testing
|
||||
gem 'version_sorter', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'csv_builder', path: 'gems/csv_builder' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
|
|
@ -288,19 +288,20 @@ gem 'js_regex', '~> 3.8' # rubocop:todo Gemfile/MissingFeatureCategory
|
|||
gem 'device_detector' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
# Redis
|
||||
gem 'redis', '~> 4.8.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'redis-namespace', '~> 1.10.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'redis-namespace', '~> 1.10.0', feature_category: :redis
|
||||
gem 'redis', '~> 5.0.0', feature_category: :redis
|
||||
gem 'redis-clustering', '~> 5.0.0', feature_category: :redis
|
||||
gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
# Redis session store
|
||||
gem 'redis-actionpack', '~> 5.4.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
# Discord integration
|
||||
gem 'discordrb-webhooks', '~> 3.4', require: false, feature_category: :integrations
|
||||
gem 'discordrb-webhooks', '~> 3.5', require: false, feature_category: :integrations
|
||||
|
||||
# Jira integration
|
||||
gem 'jira-ruby', '~> 2.1.4', feature_category: :integrations
|
||||
gem 'atlassian-jwt', '~> 0.2.0', feature_category: :integrations
|
||||
gem 'jira-ruby', '~> 2.3.0', feature_category: :integrations
|
||||
gem 'atlassian-jwt', '~> 0.2.1', feature_category: :integrations
|
||||
|
||||
# Slack integration
|
||||
gem 'slack-messenger', '~> 2.3.4', feature_category: :integrations
|
||||
|
|
@ -340,9 +341,7 @@ gem 'gitlab_chronic_duration', '~> 0.12' # rubocop:todo Gemfile/MissingFeatureCa
|
|||
|
||||
gem 'rack-proxy', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
gem 'sassc-rails', '~> 2.1.0', feature_category: :shared, require: false
|
||||
gem 'cssbundling-rails', '1.3.3', feature_category: :shared, require: false
|
||||
gem 'autoprefixer-rails', '10.2.5.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'cssbundling-rails', '1.4.0', feature_category: :shared
|
||||
gem 'terser', '1.0.2' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
|
@ -378,7 +377,10 @@ gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|||
# I18n
|
||||
gem 'rails-i18n', '~> 7.0', feature_category: :internationalization
|
||||
gem 'gettext_i18n_rails', '~> 1.11.0', feature_category: :internationalization
|
||||
gem 'gettext', '~> 3.3', require: false, group: [:development, :test], feature_category: :internationalization
|
||||
gem 'gettext', '~> 3.4', '>= 3.4.9',
|
||||
require: false,
|
||||
group: [:development, :test],
|
||||
feature_category: :internationalization
|
||||
|
||||
gem 'batch-loader', '~> 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
|
|
@ -412,11 +414,11 @@ group :development do
|
|||
|
||||
gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
gem 'ruby-lsp', "~> 0.13.3", require: false, feature_category: :tooling
|
||||
gem 'ruby-lsp', "~> 0.14.4", require: false, feature_category: :tooling
|
||||
|
||||
gem 'ruby-lsp-rails', "~> 0.2.8", feature_category: :tooling
|
||||
gem 'ruby-lsp-rails', "~> 0.3.0", feature_category: :tooling
|
||||
|
||||
gem 'ruby-lsp-rspec', "~> 0.1.8", require: false, feature_category: :tooling
|
||||
gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling
|
||||
end
|
||||
|
||||
group :development, :test do
|
||||
|
|
@ -431,7 +433,7 @@ group :development, :test do
|
|||
|
||||
gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database
|
||||
gem 'factory_bot_rails', '~> 6.4.3' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'rspec-rails', '~> 6.1.0', feature_category: :shared
|
||||
gem 'rspec-rails', '~> 6.1.1', feature_category: :shared
|
||||
|
||||
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
|
||||
gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
|
@ -451,7 +453,7 @@ group :development, :test do
|
|||
# Profiling data from CI/CD pipelines
|
||||
gem 'influxdb-client', '~> 2.9', require: false # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
gem 'knapsack', '~> 1.21.1', feature_category: :tooling
|
||||
gem 'knapsack', '~> 1.22.0', feature_category: :tooling
|
||||
gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling
|
||||
gem 'test_file_finder', '~> 0.2.1', feature_category: :tooling
|
||||
|
||||
|
|
@ -474,7 +476,7 @@ group :development, :test do
|
|||
end
|
||||
|
||||
group :development, :test, :danger do
|
||||
gem 'gitlab-dangerfiles', '~> 4.6.0', require: false, feature_category: :tooling
|
||||
gem 'gitlab-dangerfiles', '~> 4.7.0', require: false, feature_category: :tooling
|
||||
end
|
||||
|
||||
group :development, :test, :coverage do
|
||||
|
|
@ -498,31 +500,31 @@ end
|
|||
group :test do
|
||||
gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling
|
||||
gem 'rspec_profiling', '~> 0.0.6', feature_category: :tooling
|
||||
gem 'rspec_profiling', '~> 0.0.8', feature_category: :tooling
|
||||
gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling
|
||||
gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling
|
||||
gem 'os', '~> 1.1', feature_category: :tooling
|
||||
gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling
|
||||
|
||||
gem 'capybara', '~> 3.40' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'selenium-webdriver', '~> 4.17' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'selenium-webdriver', '~> 4.18', '>= 4.18.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'webmock', '~> 3.20.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'webmock', '~> 3.22.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'test-prof', '~> 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'axe-core-rspec', '~> 4.8.0', feature_category: :tooling
|
||||
gem 'axe-core-rspec', '~> 4.8.2', feature_category: :tooling
|
||||
|
||||
# Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
|
||||
gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
gem 'gitlab_quality-test_tooling', '~> 1.14.2', require: false, feature_category: :tooling
|
||||
gem 'gitlab_quality-test_tooling', '~> 1.17.0', require: false, feature_category: :tooling
|
||||
end
|
||||
|
||||
gem 'octokit', '~> 8.0', feature_category: :importers
|
||||
|
|
@ -557,14 +559,14 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
|
|||
gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
# Gitaly GRPC protocol definitions
|
||||
gem 'gitaly', '~> 16.9.0-rc3', feature_category: :gitaly
|
||||
gem 'gitaly', '~> 16.10.0-rc1', feature_category: :gitaly
|
||||
|
||||
# KAS GRPC protocol definitions
|
||||
gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management
|
||||
|
||||
gem 'grpc', '~> 1.60.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
gem 'google-protobuf', '~> 3.25', '>= 3.25.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
gem 'toml-rb', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
||||
|
|
@ -577,7 +579,7 @@ gem 'gitlab-experiment', '~> 0.9.1', feature_category: :shared
|
|||
|
||||
# Structured logging
|
||||
gem 'lograge', '~> 0.5' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
gem 'grape_logging', '~> 1.8', feature_category: :api
|
||||
gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api
|
||||
|
||||
# DNS Lookup
|
||||
gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory
|
||||
|
|
|
|||
|
|
@ -203,70 +203,70 @@ GEM
|
|||
acme-client (2.0.11)
|
||||
faraday (>= 1.0, < 3.0.0)
|
||||
faraday-retry (~> 1.0)
|
||||
actioncable (7.0.8)
|
||||
actionpack (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
actioncable (7.0.8.1)
|
||||
actionpack (= 7.0.8.1)
|
||||
activesupport (= 7.0.8.1)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
actionmailbox (7.0.8)
|
||||
actionpack (= 7.0.8)
|
||||
activejob (= 7.0.8)
|
||||
activerecord (= 7.0.8)
|
||||
activestorage (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
actionmailbox (7.0.8.1)
|
||||
actionpack (= 7.0.8.1)
|
||||
activejob (= 7.0.8.1)
|
||||
activerecord (= 7.0.8.1)
|
||||
activestorage (= 7.0.8.1)
|
||||
activesupport (= 7.0.8.1)
|
||||
mail (>= 2.7.1)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
actionmailer (7.0.8)
|
||||
actionpack (= 7.0.8)
|
||||
actionview (= 7.0.8)
|
||||
activejob (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
actionmailer (7.0.8.1)
|
||||
actionpack (= 7.0.8.1)
|
||||
actionview (= 7.0.8.1)
|
||||
activejob (= 7.0.8.1)
|
||||
activesupport (= 7.0.8.1)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
net-imap
|
||||
net-pop
|
||||
net-smtp
|
||||
rails-dom-testing (~> 2.0)
|
||||
actionpack (7.0.8)
|
||||
actionview (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
actionpack (7.0.8.1)
|
||||
actionview (= 7.0.8.1)
|
||||
activesupport (= 7.0.8.1)
|
||||
rack (~> 2.0, >= 2.2.4)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||
actiontext (7.0.8)
|
||||
actionpack (= 7.0.8)
|
||||
activerecord (= 7.0.8)
|
||||
activestorage (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
actiontext (7.0.8.1)
|
||||
actionpack (= 7.0.8.1)
|
||||
activerecord (= 7.0.8.1)
|
||||
activestorage (= 7.0.8.1)
|
||||
activesupport (= 7.0.8.1)
|
||||
globalid (>= 0.6.0)
|
||||
nokogiri (>= 1.8.5)
|
||||
actionview (7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
actionview (7.0.8.1)
|
||||
activesupport (= 7.0.8.1)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
||||
activejob (7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
activejob (7.0.8.1)
|
||||
activesupport (= 7.0.8.1)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
activerecord (7.0.8)
|
||||
activemodel (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
activemodel (7.0.8.1)
|
||||
activesupport (= 7.0.8.1)
|
||||
activerecord (7.0.8.1)
|
||||
activemodel (= 7.0.8.1)
|
||||
activesupport (= 7.0.8.1)
|
||||
activerecord-explain-analyze (0.1.0)
|
||||
activerecord (>= 4)
|
||||
pg
|
||||
activestorage (7.0.8)
|
||||
actionpack (= 7.0.8)
|
||||
activejob (= 7.0.8)
|
||||
activerecord (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
activestorage (7.0.8.1)
|
||||
actionpack (= 7.0.8.1)
|
||||
activejob (= 7.0.8.1)
|
||||
activerecord (= 7.0.8.1)
|
||||
activesupport (= 7.0.8.1)
|
||||
marcel (~> 1.0)
|
||||
mini_mime (>= 1.1.0)
|
||||
activesupport (7.0.8)
|
||||
activesupport (7.0.8.1)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
|
|
@ -302,8 +302,6 @@ GEM
|
|||
atlassian-jwt (0.2.1)
|
||||
jwt (~> 2.1)
|
||||
attr_required (1.0.1)
|
||||
autoprefixer-rails (10.2.5.1)
|
||||
execjs (> 0)
|
||||
awesome_print (1.9.2)
|
||||
awrence (1.2.1)
|
||||
aws-eventstream (1.3.0)
|
||||
|
|
@ -311,7 +309,7 @@ GEM
|
|||
aws-sdk-cloudformation (1.41.0)
|
||||
aws-sdk-core (~> 3, >= 3.99.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-core (3.191.1)
|
||||
aws-sdk-core (3.191.3)
|
||||
aws-eventstream (~> 1, >= 1.3.0)
|
||||
aws-partitions (~> 1, >= 1.651.0)
|
||||
aws-sigv4 (~> 1.8)
|
||||
|
|
@ -319,7 +317,7 @@ GEM
|
|||
aws-sdk-kms (1.76.0)
|
||||
aws-sdk-core (~> 3, >= 3.188.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.143.0)
|
||||
aws-sdk-s3 (1.144.0)
|
||||
aws-sdk-core (~> 3, >= 3.191.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.8)
|
||||
|
|
@ -328,7 +326,7 @@ GEM
|
|||
axe-core-api (4.8.0)
|
||||
dumb_delegator
|
||||
virtus
|
||||
axe-core-rspec (4.8.0)
|
||||
axe-core-rspec (4.8.2)
|
||||
axe-core-api
|
||||
dumb_delegator
|
||||
virtus
|
||||
|
|
@ -392,7 +390,7 @@ GEM
|
|||
activesupport (>= 4.0.0)
|
||||
mime-types (>= 1.16)
|
||||
ssrf_filter (~> 1.0, < 1.1.0)
|
||||
cbor (0.5.9.6)
|
||||
cbor (0.5.9.8)
|
||||
character_set (1.8.0)
|
||||
charlock_holmes (0.7.7)
|
||||
chef-config (18.3.0)
|
||||
|
|
@ -435,7 +433,7 @@ GEM
|
|||
git
|
||||
css_parser (1.14.0)
|
||||
addressable
|
||||
cssbundling-rails (1.3.3)
|
||||
cssbundling-rails (1.4.0)
|
||||
railties (>= 6.0.0)
|
||||
cvss-suite (3.0.1)
|
||||
danger (9.4.2)
|
||||
|
|
@ -463,8 +461,8 @@ GEM
|
|||
dead_end (3.1.1)
|
||||
deb_version (1.0.2)
|
||||
debug_inspector (1.1.0)
|
||||
deckar01-task_list (2.3.3)
|
||||
html-pipeline
|
||||
deckar01-task_list (2.3.4)
|
||||
html-pipeline (~> 2.0)
|
||||
declarative (0.0.20)
|
||||
declarative_policy (1.1.0)
|
||||
deprecation_toolkit (1.5.1)
|
||||
|
|
@ -501,7 +499,7 @@ GEM
|
|||
diffy (3.4.2)
|
||||
digest-crc (0.6.5)
|
||||
rake (>= 12.0.0, < 14.0.0)
|
||||
discordrb-webhooks (3.4.2)
|
||||
discordrb-webhooks (3.5.0)
|
||||
rest-client (>= 2.0.0)
|
||||
docile (1.4.0)
|
||||
domain_name (0.5.20190701)
|
||||
|
|
@ -602,7 +600,7 @@ GEM
|
|||
faraday (>= 0.15)
|
||||
fast_blank (1.0.1)
|
||||
fast_gettext (2.3.0)
|
||||
ffaker (2.10.0)
|
||||
ffaker (2.23.0)
|
||||
ffi (1.15.5)
|
||||
ffi-compiler (1.0.1)
|
||||
ffi (>= 1.0.0)
|
||||
|
|
@ -685,14 +683,14 @@ GEM
|
|||
git (1.18.0)
|
||||
addressable (~> 2.8)
|
||||
rchardet (~> 1.8)
|
||||
gitaly (16.9.0.pre.rc3)
|
||||
gitaly (16.10.0.pre.rc1)
|
||||
grpc (~> 1.0)
|
||||
gitlab (4.19.0)
|
||||
httparty (~> 0.20)
|
||||
terminal-table (>= 1.5.1)
|
||||
gitlab-chronic (0.10.5)
|
||||
numerizer (~> 0.2)
|
||||
gitlab-dangerfiles (4.6.0)
|
||||
gitlab-dangerfiles (4.7.0)
|
||||
danger (>= 9.3.0)
|
||||
danger-gitlab (>= 8.0.0)
|
||||
rake (~> 13.0)
|
||||
|
|
@ -705,7 +703,7 @@ GEM
|
|||
fog-core (= 2.1.0)
|
||||
fog-json (~> 1.2.0)
|
||||
mime-types
|
||||
gitlab-glfm-markdown (0.0.12)
|
||||
gitlab-glfm-markdown (0.0.13)
|
||||
rb_sys (~> 0.9.86)
|
||||
gitlab-labkit (0.35.1)
|
||||
actionpack (>= 5.0.0, < 8.0.0)
|
||||
|
|
@ -741,7 +739,7 @@ GEM
|
|||
omniauth (>= 1.3, < 3)
|
||||
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
|
||||
rubyntlm (~> 0.5)
|
||||
gitlab_quality-test_tooling (1.14.2)
|
||||
gitlab_quality-test_tooling (1.17.0)
|
||||
activesupport (>= 6.1, < 7.1)
|
||||
amatch (~> 0.4.1)
|
||||
gitlab (~> 4.19)
|
||||
|
|
@ -828,7 +826,7 @@ GEM
|
|||
google-cloud-core (~> 1.6)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
mini_mime (~> 1.0)
|
||||
google-protobuf (3.25.2)
|
||||
google-protobuf (3.25.3)
|
||||
googleapis-common-protos (1.4.0)
|
||||
google-protobuf (~> 3.14)
|
||||
googleapis-common-protos-types (~> 1.2)
|
||||
|
|
@ -850,7 +848,7 @@ GEM
|
|||
mustermann-grape (~> 1.0.0)
|
||||
rack (>= 1.3.0)
|
||||
rack-accept
|
||||
grape-entity (0.10.0)
|
||||
grape-entity (0.10.2)
|
||||
activesupport (>= 3.0.0)
|
||||
multi_json (>= 1.3.2)
|
||||
grape-path-helpers (2.0.1)
|
||||
|
|
@ -968,8 +966,8 @@ GEM
|
|||
jaeger-client (1.1.0)
|
||||
opentracing (~> 0.3)
|
||||
thrift
|
||||
jaro_winkler (1.5.4)
|
||||
jira-ruby (2.1.4)
|
||||
jaro_winkler (1.5.6)
|
||||
jira-ruby (2.3.0)
|
||||
activesupport
|
||||
atlassian-jwt
|
||||
multipart-post
|
||||
|
|
@ -1011,7 +1009,7 @@ GEM
|
|||
kaminari-core (1.2.2)
|
||||
kas-grpc (0.4.0)
|
||||
grpc (~> 1.0)
|
||||
knapsack (1.21.1)
|
||||
knapsack (1.22.0)
|
||||
rake
|
||||
kramdown (2.3.2)
|
||||
rexml
|
||||
|
|
@ -1270,7 +1268,7 @@ GEM
|
|||
tty-color (~> 0.5)
|
||||
peek (1.1.0)
|
||||
railties (>= 4.0.0)
|
||||
pg (1.5.4)
|
||||
pg (1.5.6)
|
||||
pg_query (5.1.0)
|
||||
google-protobuf (>= 3.22.3)
|
||||
plist (3.7.0)
|
||||
|
|
@ -1285,7 +1283,7 @@ GEM
|
|||
prime (0.1.2)
|
||||
forwardable
|
||||
singleton
|
||||
prism (0.19.0)
|
||||
prism (0.24.0)
|
||||
proc_to_ast (0.1.0)
|
||||
coderay
|
||||
parser
|
||||
|
|
@ -1312,7 +1310,7 @@ GEM
|
|||
pyu-ruby-sasl (0.0.3.3)
|
||||
raabro (1.4.0)
|
||||
racc (1.6.2)
|
||||
rack (2.2.8)
|
||||
rack (2.2.8.1)
|
||||
rack-accept (0.4.5)
|
||||
rack (>= 0.4)
|
||||
rack-attack (6.7.0)
|
||||
|
|
@ -1334,20 +1332,20 @@ GEM
|
|||
rack-test (2.1.0)
|
||||
rack (>= 1.3)
|
||||
rack-timeout (0.6.3)
|
||||
rails (7.0.8)
|
||||
actioncable (= 7.0.8)
|
||||
actionmailbox (= 7.0.8)
|
||||
actionmailer (= 7.0.8)
|
||||
actionpack (= 7.0.8)
|
||||
actiontext (= 7.0.8)
|
||||
actionview (= 7.0.8)
|
||||
activejob (= 7.0.8)
|
||||
activemodel (= 7.0.8)
|
||||
activerecord (= 7.0.8)
|
||||
activestorage (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
rails (7.0.8.1)
|
||||
actioncable (= 7.0.8.1)
|
||||
actionmailbox (= 7.0.8.1)
|
||||
actionmailer (= 7.0.8.1)
|
||||
actionpack (= 7.0.8.1)
|
||||
actiontext (= 7.0.8.1)
|
||||
actionview (= 7.0.8.1)
|
||||
activejob (= 7.0.8.1)
|
||||
activemodel (= 7.0.8.1)
|
||||
activerecord (= 7.0.8.1)
|
||||
activestorage (= 7.0.8.1)
|
||||
activesupport (= 7.0.8.1)
|
||||
bundler (>= 1.15.0)
|
||||
railties (= 7.0.8)
|
||||
railties (= 7.0.8.1)
|
||||
rails-controller-testing (1.0.5)
|
||||
actionpack (>= 5.0.1.rc1)
|
||||
actionview (>= 5.0.1.rc1)
|
||||
|
|
@ -1361,9 +1359,9 @@ GEM
|
|||
rails-i18n (7.0.3)
|
||||
i18n (>= 0.7, < 2)
|
||||
railties (>= 6.0.0, < 8)
|
||||
railties (7.0.8)
|
||||
actionpack (= 7.0.8)
|
||||
activesupport (= 7.0.8)
|
||||
railties (7.0.8.1)
|
||||
actionpack (= 7.0.8.1)
|
||||
activesupport (= 7.0.8.1)
|
||||
method_source
|
||||
rake (>= 12.2)
|
||||
thor (~> 1.0)
|
||||
|
|
@ -1374,7 +1372,7 @@ GEM
|
|||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
rb_sys (0.9.86)
|
||||
rbtrace (0.4.14)
|
||||
rbtrace (0.5.1)
|
||||
ffi (>= 1.0.6)
|
||||
msgpack (>= 0.4.3)
|
||||
optimist (>= 3.0.0)
|
||||
|
|
@ -1385,13 +1383,19 @@ GEM
|
|||
json
|
||||
recursive-open-struct (1.1.3)
|
||||
redcarpet (3.6.0)
|
||||
redis (4.8.0)
|
||||
redis (5.0.8)
|
||||
redis-client (>= 0.17.0)
|
||||
redis-actionpack (5.4.0)
|
||||
actionpack (>= 5, < 8)
|
||||
redis-rack (>= 2.1.0, < 4)
|
||||
redis-store (>= 1.1.0, < 2)
|
||||
redis-client (0.19.0)
|
||||
redis-client (0.21.1)
|
||||
connection_pool
|
||||
redis-cluster-client (0.7.5)
|
||||
redis-client (~> 0.12)
|
||||
redis-clustering (5.0.8)
|
||||
redis (= 5.0.8)
|
||||
redis-cluster-client (>= 0.7.0)
|
||||
redis-namespace (1.10.0)
|
||||
redis (>= 4)
|
||||
redis-rack (3.0.0)
|
||||
|
|
@ -1454,7 +1458,7 @@ GEM
|
|||
rspec-parameterized-table_syntax (1.0.0)
|
||||
binding_of_caller
|
||||
rspec-parameterized-core (< 2)
|
||||
rspec-rails (6.1.0)
|
||||
rspec-rails (6.1.1)
|
||||
actionpack (>= 6.1)
|
||||
activesupport (>= 6.1)
|
||||
railties (>= 6.1)
|
||||
|
|
@ -1467,11 +1471,10 @@ GEM
|
|||
rspec-support (3.12.0)
|
||||
rspec_junit_formatter (0.6.0)
|
||||
rspec-core (>= 2, < 4, != 2.12.0)
|
||||
rspec_profiling (0.0.6)
|
||||
rspec_profiling (0.0.8)
|
||||
activerecord
|
||||
pg
|
||||
get_process_mem
|
||||
rails
|
||||
sqlite3
|
||||
rubocop (1.57.2)
|
||||
json (~> 2.3)
|
||||
language_server-protocol (>= 3.17.0)
|
||||
|
|
@ -1505,18 +1508,18 @@ GEM
|
|||
ruby-fogbugz (0.3.0)
|
||||
crack (~> 0.4)
|
||||
multipart-post (~> 2.0)
|
||||
ruby-lsp (0.13.3)
|
||||
ruby-lsp (0.14.4)
|
||||
language_server-protocol (~> 3.17.0)
|
||||
prism (>= 0.19.0, < 0.20)
|
||||
sorbet-runtime (>= 0.5.5685)
|
||||
ruby-lsp-rails (0.2.8)
|
||||
prism (>= 0.22.0, < 0.25)
|
||||
sorbet-runtime (>= 0.5.10782)
|
||||
ruby-lsp-rails (0.3.1)
|
||||
actionpack (>= 6.0)
|
||||
activerecord (>= 6.0)
|
||||
railties (>= 6.0)
|
||||
ruby-lsp (>= 0.13.0, < 0.14.0)
|
||||
ruby-lsp (>= 0.14.2, < 0.15.0)
|
||||
sorbet-runtime (>= 0.5.9897)
|
||||
ruby-lsp-rspec (0.1.8)
|
||||
ruby-lsp (~> 0.13.0)
|
||||
ruby-lsp-rspec (0.1.10)
|
||||
ruby-lsp (~> 0.14.0)
|
||||
ruby-magic (0.6.0)
|
||||
mini_portile2 (~> 2.8)
|
||||
ruby-openai (3.7.0)
|
||||
|
|
@ -1540,14 +1543,6 @@ GEM
|
|||
sanitize (6.0.2)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.12.0)
|
||||
sassc (2.4.0)
|
||||
ffi (~> 1.9)
|
||||
sassc-rails (2.1.2)
|
||||
railties (>= 4.0.0)
|
||||
sassc (>= 2.0)
|
||||
sprockets (> 3.0)
|
||||
sprockets-rails
|
||||
tilt
|
||||
sawyer (0.9.2)
|
||||
addressable (>= 2.3.5)
|
||||
faraday (>= 0.17.3, < 3)
|
||||
|
|
@ -1555,12 +1550,12 @@ GEM
|
|||
seed-fu (2.3.7)
|
||||
activerecord (>= 3.1)
|
||||
activesupport (>= 3.1)
|
||||
selenium-webdriver (4.17.0)
|
||||
selenium-webdriver (4.18.1)
|
||||
base64 (~> 0.2)
|
||||
rexml (~> 3.2, >= 3.2.5)
|
||||
rubyzip (>= 1.2.2, < 3.0)
|
||||
websocket (~> 1.0)
|
||||
semver_dialects (1.6.1)
|
||||
semver_dialects (2.0.0)
|
||||
deb_version (~> 1.0.1)
|
||||
pastel (~> 0.8.0)
|
||||
thor (~> 1.3)
|
||||
|
|
@ -1622,7 +1617,7 @@ GEM
|
|||
thor (~> 1.0)
|
||||
tilt (~> 2.0)
|
||||
yard (~> 0.9, >= 0.9.24)
|
||||
sorbet-runtime (0.5.11144)
|
||||
sorbet-runtime (0.5.11266)
|
||||
spamcheck (1.3.0)
|
||||
grpc (~> 1.0)
|
||||
spring (4.1.0)
|
||||
|
|
@ -1636,8 +1631,6 @@ GEM
|
|||
actionpack (>= 5.2)
|
||||
activesupport (>= 5.2)
|
||||
sprockets (>= 3.0.0)
|
||||
sqlite3 (1.6.0)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
ssh_data (1.3.0)
|
||||
ssrf_filter (1.0.8)
|
||||
stackprof (0.2.25)
|
||||
|
|
@ -1678,7 +1671,7 @@ GEM
|
|||
test_file_finder (0.2.1)
|
||||
faraday (>= 1.0, < 3.0, != 2.0.0)
|
||||
text (1.3.1)
|
||||
thor (1.3.0)
|
||||
thor (1.3.1)
|
||||
thread_safe (0.3.6)
|
||||
thrift (0.16.0)
|
||||
tilt (2.0.11)
|
||||
|
|
@ -1759,7 +1752,7 @@ GEM
|
|||
activesupport (>= 3.0)
|
||||
version_gem (1.1.0)
|
||||
version_sorter (2.3.0)
|
||||
view_component (3.8.0)
|
||||
view_component (3.11.0)
|
||||
activesupport (>= 5.2.0, < 8.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
method_source (~> 1.0)
|
||||
|
|
@ -1790,7 +1783,7 @@ GEM
|
|||
webfinger (1.2.0)
|
||||
activesupport
|
||||
httpclient (>= 2.4)
|
||||
webmock (3.20.0)
|
||||
webmock (3.22.0)
|
||||
addressable (>= 2.8.0)
|
||||
crack (>= 0.3.2)
|
||||
hashdiff (>= 0.4.0, < 2.0.0)
|
||||
|
|
@ -1833,14 +1826,13 @@ DEPENDENCIES
|
|||
asciidoctor-include-ext (~> 0.4.0)
|
||||
asciidoctor-kroki (~> 0.8.0)
|
||||
asciidoctor-plantuml (~> 0.0.16)
|
||||
atlassian-jwt (~> 0.2.0)
|
||||
atlassian-jwt (~> 0.2.1)
|
||||
attr_encrypted (~> 3.2.4)!
|
||||
autoprefixer-rails (= 10.2.5.1)
|
||||
awesome_print
|
||||
aws-sdk-cloudformation (~> 1)
|
||||
aws-sdk-core (~> 3.191.1)
|
||||
aws-sdk-s3 (~> 1.143.0)
|
||||
axe-core-rspec (~> 4.8.0)
|
||||
aws-sdk-core (~> 3.191.3)
|
||||
aws-sdk-s3 (~> 1.144.0)
|
||||
axe-core-rspec (~> 4.8.2)
|
||||
babosa (~> 2.0)
|
||||
base32 (~> 0.3.0)
|
||||
batch-loader (~> 2.0.1)
|
||||
|
|
@ -1866,11 +1858,11 @@ DEPENDENCIES
|
|||
countries (~> 4.0.0)
|
||||
creole (~> 0.5.0)
|
||||
crystalball (~> 0.7.0)
|
||||
cssbundling-rails (= 1.3.3)
|
||||
cssbundling-rails (= 1.4.0)
|
||||
csv_builder!
|
||||
cvss-suite (~> 3.0.1)
|
||||
database_cleaner-active_record (~> 2.1.0)
|
||||
deckar01-task_list (= 2.3.3)
|
||||
deckar01-task_list (= 2.3.4)
|
||||
declarative_policy (~> 1.1.0)
|
||||
deprecation_toolkit (~> 1.5.1)
|
||||
derailed_benchmarks
|
||||
|
|
@ -1881,7 +1873,7 @@ DEPENDENCIES
|
|||
devise-two-factor (~> 4.1.1)
|
||||
diff_match_patch (~> 0.1.0)!
|
||||
diffy (~> 3.4)
|
||||
discordrb-webhooks (~> 3.4)
|
||||
discordrb-webhooks (~> 3.5)
|
||||
doorkeeper (~> 5.6, >= 5.6.6)
|
||||
doorkeeper-openid_connect (~> 1.8, >= 1.8.7)
|
||||
duo_api (~> 1.3)
|
||||
|
|
@ -1896,7 +1888,7 @@ DEPENDENCIES
|
|||
faraday (~> 1.0)
|
||||
faraday_middleware-aws-sigv4 (~> 0.3.0)
|
||||
fast_blank (~> 1.0.1)
|
||||
ffaker (~> 2.10)
|
||||
ffaker (~> 2.23)
|
||||
flipper (~> 0.26.2)
|
||||
flipper-active_record (~> 0.26.2)
|
||||
flipper-active_support_cache_store (~> 0.26.2)
|
||||
|
|
@ -1907,15 +1899,15 @@ DEPENDENCIES
|
|||
fog-local (~> 0.8)
|
||||
fugit (~> 1.8.1)
|
||||
fuubar (~> 2.2.0)
|
||||
gettext (~> 3.3)
|
||||
gettext (~> 3.4, >= 3.4.9)
|
||||
gettext_i18n_rails (~> 1.11.0)
|
||||
gitaly (~> 16.9.0.pre.rc3)
|
||||
gitaly (~> 16.10.0.pre.rc1)
|
||||
gitlab-backup-cli!
|
||||
gitlab-chronic (~> 0.10.5)
|
||||
gitlab-dangerfiles (~> 4.6.0)
|
||||
gitlab-dangerfiles (~> 4.7.0)
|
||||
gitlab-experiment (~> 0.9.1)
|
||||
gitlab-fog-azure-rm (~> 1.8.0)
|
||||
gitlab-glfm-markdown (~> 0.0.12)
|
||||
gitlab-glfm-markdown (~> 0.0.13)
|
||||
gitlab-housekeeper!
|
||||
gitlab-http!
|
||||
gitlab-labkit (~> 0.35.1)
|
||||
|
|
@ -1934,7 +1926,7 @@ DEPENDENCIES
|
|||
gitlab-utils!
|
||||
gitlab_chronic_duration (~> 0.12)
|
||||
gitlab_omniauth-ldap (~> 2.2.0)
|
||||
gitlab_quality-test_tooling (~> 1.14.2)
|
||||
gitlab_quality-test_tooling (~> 1.17.0)
|
||||
gon (~> 6.4.0)
|
||||
google-apis-androidpublisher_v3 (~> 0.34.0)
|
||||
google-apis-cloudbilling_v1 (~> 0.21.0)
|
||||
|
|
@ -1950,15 +1942,15 @@ DEPENDENCIES
|
|||
google-cloud-artifact_registry-v1 (~> 0.11.0)
|
||||
google-cloud-compute-v1 (~> 2.6.0)
|
||||
google-cloud-storage (~> 1.45.0)
|
||||
google-protobuf (~> 3.25, >= 3.25.1)
|
||||
google-protobuf (~> 3.25, >= 3.25.3)
|
||||
googleauth (~> 1.8.1)
|
||||
gpgme (~> 2.0.23)
|
||||
grape (~> 2.0.0)
|
||||
grape-entity (~> 0.10.0)
|
||||
grape-path-helpers (~> 2.0.0)
|
||||
grape-entity (~> 0.10.2)
|
||||
grape-path-helpers (~> 2.0.1)
|
||||
grape-swagger (~> 2.0.1)
|
||||
grape-swagger-entity (~> 0.5.1)
|
||||
grape_logging (~> 1.8)
|
||||
grape_logging (~> 1.8, >= 1.8.4)
|
||||
graphiql-rails (~> 1.8.0)
|
||||
graphlient (~> 0.6.0)
|
||||
graphlyte (~> 1.0.0)
|
||||
|
|
@ -1980,7 +1972,7 @@ DEPENDENCIES
|
|||
ipaddr (~> 1.2.5)
|
||||
ipaddress (~> 0.8.3)
|
||||
ipynbdiff!
|
||||
jira-ruby (~> 2.1.4)
|
||||
jira-ruby (~> 2.3.0)
|
||||
js_regex (~> 3.8)
|
||||
json (~> 2.6.3)
|
||||
json_schemer (~> 0.2.18)
|
||||
|
|
@ -1988,7 +1980,7 @@ DEPENDENCIES
|
|||
jwt (~> 2.5)
|
||||
kaminari (~> 1.2.2)
|
||||
kas-grpc (~> 0.4.0)
|
||||
knapsack (~> 1.21.1)
|
||||
knapsack (~> 1.22.0)
|
||||
kramdown (~> 2.3.1)
|
||||
kubeclient (~> 4.11.0)
|
||||
lefthook (~> 1.5.6)
|
||||
|
|
@ -2041,13 +2033,13 @@ DEPENDENCIES
|
|||
openid_connect (= 1.3.0)
|
||||
openssl (~> 3.0)
|
||||
org-ruby (~> 0.9.12)
|
||||
os (~> 1.1)
|
||||
os (~> 1.1, >= 1.1.4)
|
||||
pact (~> 1.64)
|
||||
parallel (~> 1.19)
|
||||
parser (~> 3.3, >= 3.3.0.2)
|
||||
parslet (~> 1.8)
|
||||
peek (~> 1.1)
|
||||
pg (~> 1.5.4)
|
||||
pg (~> 1.5.6)
|
||||
pg_query (~> 5.1.0)
|
||||
png_quantizator (~> 0.2.1)
|
||||
premailer-rails (~> 1.10.3)
|
||||
|
|
@ -2056,21 +2048,22 @@ DEPENDENCIES
|
|||
pry-rails (~> 0.3.9)
|
||||
pry-shell (~> 0.6.4)
|
||||
puma (= 6.4.0)
|
||||
rack (~> 2.2.8)
|
||||
rack (~> 2.2.8.1)
|
||||
rack-attack (~> 6.7.0)
|
||||
rack-cors (~> 2.0.1)
|
||||
rack-oauth2 (~> 1.21.3)
|
||||
rack-proxy (~> 0.7.7)
|
||||
rack-timeout (~> 0.6.3)
|
||||
rails (~> 7.0.8)
|
||||
rails (~> 7.0.8.1)
|
||||
rails-controller-testing
|
||||
rails-i18n (~> 7.0)
|
||||
rainbow (~> 3.0)
|
||||
rbtrace (~> 0.4)
|
||||
re2 (= 2.7.0)
|
||||
recaptcha (~> 5.12)
|
||||
redis (~> 4.8.0)
|
||||
redis (~> 5.0.0)
|
||||
redis-actionpack (~> 5.4.0)
|
||||
redis-clustering (~> 5.0.0)
|
||||
redis-namespace (~> 1.10.0)
|
||||
request_store (~> 1.5.1)
|
||||
responders (~> 3.0)
|
||||
|
|
@ -2080,15 +2073,15 @@ DEPENDENCIES
|
|||
rqrcode (~> 2.0)
|
||||
rspec-benchmark (~> 0.6.0)
|
||||
rspec-parameterized (~> 1.0)
|
||||
rspec-rails (~> 6.1.0)
|
||||
rspec-rails (~> 6.1.1)
|
||||
rspec-retry (~> 0.6.2)
|
||||
rspec_junit_formatter
|
||||
rspec_profiling (~> 0.0.6)
|
||||
rspec_profiling (~> 0.0.8)
|
||||
rubocop
|
||||
ruby-fogbugz (~> 0.3.0)
|
||||
ruby-lsp (~> 0.13.3)
|
||||
ruby-lsp-rails (~> 0.2.8)
|
||||
ruby-lsp-rspec (~> 0.1.8)
|
||||
ruby-lsp (~> 0.14.4)
|
||||
ruby-lsp-rails (~> 0.3.0)
|
||||
ruby-lsp-rspec (~> 0.1.10)
|
||||
ruby-magic (~> 0.6)
|
||||
ruby-openai (~> 3.7)
|
||||
ruby-progressbar (~> 1.10)
|
||||
|
|
@ -2096,11 +2089,10 @@ DEPENDENCIES
|
|||
rubyzip (~> 2.3.2)
|
||||
rugged (~> 1.6)
|
||||
sanitize (~> 6.0.2)
|
||||
sassc-rails (~> 2.1.0)
|
||||
sd_notify (~> 0.1.0)
|
||||
seed-fu (~> 2.3.7)
|
||||
selenium-webdriver (~> 4.17)
|
||||
semver_dialects (~> 1.6.1)
|
||||
selenium-webdriver (~> 4.18, >= 4.18.1)
|
||||
semver_dialects (~> 2.0)
|
||||
sentry-rails (~> 5.10.0)
|
||||
sentry-raven (~> 3.1)
|
||||
sentry-ruby (~> 5.10.0)
|
||||
|
|
@ -2140,16 +2132,16 @@ DEPENDENCIES
|
|||
valid_email (~> 0.1)
|
||||
validates_hostname (~> 1.0.13)
|
||||
version_sorter (~> 2.3)
|
||||
view_component (~> 3.8.0)
|
||||
view_component (~> 3.11.0)
|
||||
vite_rails (~> 3.0.17)
|
||||
vite_ruby (~> 3.5.0)
|
||||
vmstat (~> 2.3.0)
|
||||
warning (~> 1.3.0)
|
||||
webauthn (~> 3.0)
|
||||
webmock (~> 3.20.0)
|
||||
webmock (~> 3.22.0)
|
||||
webrick (~> 1.8.1)
|
||||
wikicloth (= 0.8.1)
|
||||
yajl-ruby (~> 1.4.3)
|
||||
|
||||
BUNDLED WITH
|
||||
2.5.5
|
||||
2.5.6
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "117vxic67jnw6q637kmsb3ryj0x485295pz9a9y4z8xn9bdlsl0z";
|
||||
sha256 = "0j86qjs1zw34p0p7d5napa1vvwqlvm9nmv7ckxxhcba1qv4dspmw";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.8";
|
||||
version = "7.0.8.1";
|
||||
};
|
||||
actionmailbox = {
|
||||
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"];
|
||||
|
|
@ -28,10 +28,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1r8ldj2giaz8cn49qkdqn5zc29gbsr5ky4fg6r7ali0yh1xh684l";
|
||||
sha256 = "1f68h8cl6dqbz7mq3x43s0s82291nani3bz1hrxkk2qpgda23mw9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.8";
|
||||
version = "7.0.8.1";
|
||||
};
|
||||
actionmailer = {
|
||||
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"];
|
||||
|
|
@ -39,10 +39,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0w6gvj7ybniq89834hqww9rj2xypz9l91f8niwaws2yq1qklymr2";
|
||||
sha256 = "077j47jsg0wqwx5b13n4h0g3g409b6kfrlazpzgjpa3pal74f7sc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.8";
|
||||
version = "7.0.8.1";
|
||||
};
|
||||
actionpack = {
|
||||
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
|
|
@ -50,10 +50,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b";
|
||||
sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.8";
|
||||
version = "7.0.8.1";
|
||||
};
|
||||
actiontext = {
|
||||
dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"];
|
||||
|
|
@ -61,10 +61,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0i47r3n2m8qm002gx7c0lx1pv15pr2zy57dm8j38x960rsb655pp";
|
||||
sha256 = "044qi3zhzxlfq7slc2pb9ky9mdivp1m1sjyhjvnsi64ggq7cvr22";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.8";
|
||||
version = "7.0.8.1";
|
||||
};
|
||||
actionview = {
|
||||
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
|
|
@ -72,10 +72,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2";
|
||||
sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.8";
|
||||
version = "7.0.8.1";
|
||||
};
|
||||
activejob = {
|
||||
dependencies = ["activesupport" "globalid"];
|
||||
|
|
@ -83,32 +83,32 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1cn1ic7ml75jm0c10s7cm5mvcgfnafj0kjvvjavpjcxgz6lxcqyb";
|
||||
sha256 = "0yql9v4cd1xbqgnzlf3cv4a6sm26v2y4gsgcbbfgvfc0hhlfjklg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.8";
|
||||
version = "7.0.8.1";
|
||||
};
|
||||
activemodel = {
|
||||
dependencies = ["activesupport"];
|
||||
groups = ["default" "development" "test"];
|
||||
groups = ["default" "development" "monorepo" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm";
|
||||
sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.8";
|
||||
version = "7.0.8.1";
|
||||
};
|
||||
activerecord = {
|
||||
dependencies = ["activemodel" "activesupport"];
|
||||
groups = ["default" "test"];
|
||||
groups = ["default" "development" "monorepo" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj";
|
||||
sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.8";
|
||||
version = "7.0.8.1";
|
||||
};
|
||||
activerecord-explain-analyze = {
|
||||
dependencies = ["activerecord" "pg"];
|
||||
|
|
@ -137,10 +137,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0d6vm6alsp0g6f3548b615zxbz8l2wrmaikwgsf8kv11wf6swb4c";
|
||||
sha256 = "0f4g3589i5ii4gdfazv6d9rjinr16aarh6g12v8378ck7jll3mhz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.8";
|
||||
version = "7.0.8.1";
|
||||
};
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
|
||||
|
|
@ -148,10 +148,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5";
|
||||
sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.8";
|
||||
version = "7.0.8.1";
|
||||
};
|
||||
acts-as-taggable-on = {
|
||||
dependencies = ["activerecord"];
|
||||
|
|
@ -343,17 +343,6 @@ src:
|
|||
};
|
||||
version = "1.0.1";
|
||||
};
|
||||
autoprefixer-rails = {
|
||||
dependencies = ["execjs"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vlqwy2qkp39ibp7llj7ps53nvxav29c2yl451v1qdhj25zxc49p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "10.2.5.1";
|
||||
};
|
||||
awesome_print = {
|
||||
groups = ["development" "test"];
|
||||
platforms = [];
|
||||
|
|
@ -411,10 +400,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fy80878z21j8py03ddf1ycsndzmnmw4jkbzw1mlrglwav08yq7q";
|
||||
sha256 = "088nq8yz9n4p7pnhjwp9nbxlkj7jwchpkzvnl4nybfb1dkvk4dns";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.191.1";
|
||||
version = "3.191.3";
|
||||
};
|
||||
aws-sdk-kms = {
|
||||
dependencies = ["aws-sdk-core" "aws-sigv4"];
|
||||
|
|
@ -433,10 +422,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1safbxycz517m2v981z8kbmdiqx9jypl093ia0mcrskkgh4fyb3s";
|
||||
sha256 = "0ypg31pfzbd43n1m20cyf6gyrlv6m0c8hmk2p5hidy1y4pi34f6g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.143.0";
|
||||
version = "1.144.0";
|
||||
};
|
||||
aws-sigv4 = {
|
||||
dependencies = ["aws-eventstream"];
|
||||
|
|
@ -466,10 +455,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07niarqd2lrbgnw00biyigc48lbdv4vy68p57myliz7k82nizidj";
|
||||
sha256 = "14h4abf5h242a0vn2r05pkr8311qbxgkl63py7vbhx8bfpk1kq3i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.8.0";
|
||||
version = "4.8.2";
|
||||
};
|
||||
axiom-types = {
|
||||
dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
|
||||
|
|
@ -772,10 +761,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0511idr8xps9625nh3kxr68sdy6l3xy2kcz7r57g47fxb1v18jj3";
|
||||
sha256 = "1dsf9gjc2cj79vrnz2vgq573biqjw7ad4b0idm05xg6rb3y9gq4y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.9.6";
|
||||
version = "0.5.9.8";
|
||||
};
|
||||
CFPropertyList = {
|
||||
dependencies = ["rexml"];
|
||||
|
|
@ -1058,10 +1047,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0m8qgrh70982xfdcylrm4zgh7pxq9ps539icnc7bqh1awl8k78aa";
|
||||
sha256 = "1nzp4j1ll6llgbrvqk81gkz6fqgk33sx4k1fcvbm7v7h79jk8808";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.3";
|
||||
version = "1.4.0";
|
||||
};
|
||||
csv_builder = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1181,10 +1170,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0n67q9rb4gsfs8k2fsd08xcfx13z7mcyyyrb9hi0sv0yz3rvm2li";
|
||||
sha256 = "0rqn9jh45gsw045c6fm05875bpj2xbhnff5m5drmk9wy01zdrav6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.3";
|
||||
version = "2.3.4";
|
||||
};
|
||||
declarative = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1337,10 +1326,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0viw73jd9vs9f92a9q2vxcd29755h7w8jwz36jmvcdl2najainyg";
|
||||
sha256 = "1c933kq48sqja1a2fc4ki9w8x5ajl6lp67hslka5k05hwfyaiysj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.4.2";
|
||||
version = "3.5.0";
|
||||
};
|
||||
docile = {
|
||||
groups = ["coverage" "default" "development" "test"];
|
||||
|
|
@ -1876,14 +1865,14 @@ src:
|
|||
version = "2.3.0";
|
||||
};
|
||||
ffaker = {
|
||||
groups = ["development" "test"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01z5lpssjc0n8lm4xrlja0hh8lv4ngzbybjvd4rdkc5x9ddvh8s3";
|
||||
sha256 = "1644hpjg7k08dsjhljwg4grs49riaw6bxp5xf62jrac4q9fgnbcx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.10.0";
|
||||
version = "2.23.0";
|
||||
};
|
||||
ffi = {
|
||||
groups = ["default" "development" "kerberos" "puma" "test"];
|
||||
|
|
@ -2160,10 +2149,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07q9fmk4mddfn12vl3jvj80rxmhixkl99hxff7zi385rwphki8an";
|
||||
sha256 = "1nwc8mlpznq9b7rgcbxwzaj936pn0syjasxdhplpiz3iqbr64ca8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "16.9.0.pre.rc3";
|
||||
version = "16.10.0.pre.rc1";
|
||||
};
|
||||
gitlab = {
|
||||
dependencies = ["httparty" "terminal-table"];
|
||||
|
|
@ -2203,10 +2192,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07kl43xcjfwdlcfvr7ifzggl6zpmm8q0lj8phlk3db8xgnqkf6s4";
|
||||
sha256 = "1jj5w7h457cm2q0ds63kp29ybkq1h02gibn37y2r0wnbimm8fxi5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.6.0";
|
||||
version = "4.7.0";
|
||||
};
|
||||
gitlab-experiment = {
|
||||
dependencies = ["activesupport" "request_store"];
|
||||
|
|
@ -2236,10 +2225,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0mqwz2a4k9894d160k5a3mqm5g6p9rncgi4kx8w8dymbnz34bcli";
|
||||
sha256 = "0nk9kp3zb2x1hpqirq7x2qqpmfsqq4izprbicxjb20bqvm4mvvdb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.12";
|
||||
version = "0.0.13";
|
||||
};
|
||||
gitlab-housekeeper = {
|
||||
dependencies = ["activesupport" "awesome_print" "httparty" "rubocop"];
|
||||
|
|
@ -2433,10 +2422,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0n7ndhxkjkz7pfdqvcp90lxxias3lz2ssabpv5a5nxayilr47qwy";
|
||||
sha256 = "1d59k5c0y8vkmz7fjh7x455d4d19fpw4r9agv02vqyvp7glrbm34";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.14.2";
|
||||
version = "1.17.0";
|
||||
};
|
||||
globalid = {
|
||||
dependencies = ["activesupport"];
|
||||
|
|
@ -2728,10 +2717,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "02sh4rp14wmpfv9r7xrap6xgcakg0lk6zjvq1gsi5y38swhn2blw";
|
||||
sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.25.2";
|
||||
version = "3.25.3";
|
||||
};
|
||||
googleapis-common-protos = {
|
||||
dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"];
|
||||
|
|
@ -2790,14 +2779,14 @@ src:
|
|||
};
|
||||
grape-entity = {
|
||||
dependencies = ["activesupport" "multi_json"];
|
||||
groups = ["default"];
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1zic5fx8s0424vdarhslmxdqmfnlfv3k4prfyxrrwvf9pdy1xvcs";
|
||||
sha256 = "0wdm44s7l6jxqszybf58ar7699vlq7vj2zfsi8f9sh9mh5a89dcy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.10.0";
|
||||
version = "0.10.2";
|
||||
};
|
||||
grape-path-helpers = {
|
||||
dependencies = ["activesupport" "grape" "rake" "ruby2_keywords"];
|
||||
|
|
@ -3293,10 +3282,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh";
|
||||
sha256 = "10fd3i92897blalxfkgc0jjv0qqx31v7cm7j2b6a3b97an0bfz80";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.4";
|
||||
version = "1.5.6";
|
||||
};
|
||||
jira-ruby = {
|
||||
dependencies = ["activesupport" "atlassian-jwt" "multipart-post" "oauth"];
|
||||
|
|
@ -3304,10 +3293,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17nv98nz3jp7q5hbnniscavqh4xv53mnda1vxyg3ncn8raaw0rs2";
|
||||
sha256 = "0qpbc97sag426h4hgcizqq2njxx5fridzxq6mq5s93jazxmnxwmb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.4";
|
||||
version = "2.3.0";
|
||||
};
|
||||
jmespath = {
|
||||
groups = ["default"];
|
||||
|
|
@ -3454,10 +3443,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "056g86ndhq51303k4g3fhdfwhpr6cpzypxhlnp0wxjpbmli09xw2";
|
||||
sha256 = "1jqs9shqg3nd6j3kzbh8gxv7ix1n877y64kdjzbrwjgz6ksqs9mx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.21.1";
|
||||
version = "1.22.0";
|
||||
};
|
||||
kramdown = {
|
||||
dependencies = ["rexml"];
|
||||
|
|
@ -4614,14 +4603,14 @@ src:
|
|||
version = "1.1.0";
|
||||
};
|
||||
pg = {
|
||||
groups = ["default" "test"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4";
|
||||
sha256 = "071b55bhsz7mivlnp2kv0a11msnl7xg5awvk8mlflpl270javhsb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.4";
|
||||
version = "1.5.6";
|
||||
};
|
||||
pg_query = {
|
||||
dependencies = ["google-protobuf"];
|
||||
|
|
@ -4692,10 +4681,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0qiv9irrca2la1awqgvzsg7a17z2nydqyq43w4fhapdkq2l7xwa7";
|
||||
sha256 = "0pgxgng905jbhp0pr54w4w2pr4nqcq80ijj48204bj4x4nigj8ji";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.19.0";
|
||||
version = "0.24.0";
|
||||
};
|
||||
proc_to_ast = {
|
||||
dependencies = ["coderay" "parser" "unparser"];
|
||||
|
|
@ -4830,10 +4819,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv";
|
||||
sha256 = "10mpk0hl6hnv324fp1pfimi2nw9acj0z4gyhrph36qg84pk1s4m7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.8";
|
||||
version = "2.2.8.1";
|
||||
};
|
||||
rack-accept = {
|
||||
dependencies = ["rack"];
|
||||
|
|
@ -4939,10 +4928,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0rsqin156dawz7gzpy1ijs02afqcr4704vqj56s6yxng3a9ayhwf";
|
||||
sha256 = "1v9dp9sgh8kk32r23mj66zjni7w1dv2h7mbaxgmazsf59a43gsvx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.8";
|
||||
version = "7.0.8.1";
|
||||
};
|
||||
rails-controller-testing = {
|
||||
dependencies = ["actionpack" "actionview" "activesupport"];
|
||||
|
|
@ -4994,10 +4983,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj";
|
||||
sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.8";
|
||||
version = "7.0.8.1";
|
||||
};
|
||||
rainbow = {
|
||||
groups = ["coverage" "default" "development" "test"];
|
||||
|
|
@ -5056,10 +5045,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0s8prj0klfgpmpfcpdzbf149qrrsdxgnb6w6kkqc9gyars4vyaqn";
|
||||
sha256 = "1p65p6f917al0f07sn5ca9yj92f7mk52xgnp0ahqpyrb8r6sdjz8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.14";
|
||||
version = "0.5.1";
|
||||
};
|
||||
rchardet = {
|
||||
groups = ["default" "development"];
|
||||
|
|
@ -5124,14 +5113,15 @@ src:
|
|||
version = "4.3.3";
|
||||
};
|
||||
redis = {
|
||||
dependencies = ["redis-client"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0i4a8hxxcxci3n8hhlm9a8wa7a9m58r6sjvh4749v7362i8cy010";
|
||||
sha256 = "1n7k4sgx5vzsigp8c15flz4fclqy4j2a33vim7b2c2w5jyjhwxrv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.8.0";
|
||||
version = "5.0.8";
|
||||
};
|
||||
redis-actionpack = {
|
||||
dependencies = ["actionpack" "redis-rack" "redis-store"];
|
||||
|
|
@ -5150,10 +5140,32 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0k9jaqsdc2s2qm713pdv19dawk1b11vxnfclsps7ra2szwisznbf";
|
||||
sha256 = "0irk5j73aqhyv54q3vs88y5rp9a5fkvbdif7zn5q7m5d51h2375w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.19.0";
|
||||
version = "0.21.1";
|
||||
};
|
||||
redis-cluster-client = {
|
||||
dependencies = ["redis-client"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12p7wi39zaldk8lr484j4j6w49502fxayinfs9f7l58pvag1rz8j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.7.5";
|
||||
};
|
||||
redis-clustering = {
|
||||
dependencies = ["redis" "redis-cluster-client"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0rp1yrqpvi29ar6mlqsyk36nxgh1drijb4f5xa76c057n7iksbwf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.0.8";
|
||||
};
|
||||
redis-namespace = {
|
||||
dependencies = ["redis"];
|
||||
|
|
@ -5428,10 +5440,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dpmbq2awsjiwn300cafp9fbvv86dl7zrb760anhmm1qw8yzg1my";
|
||||
sha256 = "1clmx6qzdbpm1g8ycg38gjbqsbr8ccqi6hqyx88g8yckz1hrx55x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.1.0";
|
||||
version = "6.1.1";
|
||||
};
|
||||
rspec-retry = {
|
||||
dependencies = ["rspec-core"];
|
||||
|
|
@ -5466,15 +5478,15 @@ src:
|
|||
version = "0.6.0";
|
||||
};
|
||||
rspec_profiling = {
|
||||
dependencies = ["activerecord" "pg" "rails" "sqlite3"];
|
||||
dependencies = ["activerecord" "get_process_mem" "rails"];
|
||||
groups = ["test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0vkfizrwxgs029s9imz8g3p55ggncls709hf98brmv6wg5znjibs";
|
||||
sha256 = "0icl94f0mmw7g4h1qnsil0cw6zw7b5wv0ilxda01928vh5bf87mk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.6";
|
||||
version = "0.0.8";
|
||||
};
|
||||
rubocop = {
|
||||
dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
|
||||
|
|
@ -5581,10 +5593,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0b9aj7d1wh4s83mkfsvjgkikx83c7afyzy6k2940fx08hfrdqgb8";
|
||||
sha256 = "1v0dwirw4mq7qkf5a7wvagil4ppvk4dw4ln8hs6rmf2xrf56ga5f";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.13.3";
|
||||
version = "0.14.4";
|
||||
};
|
||||
ruby-lsp-rails = {
|
||||
dependencies = ["actionpack" "activerecord" "railties" "ruby-lsp" "sorbet-runtime"];
|
||||
|
|
@ -5592,10 +5604,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1j2pb9d9frdh6rpz5qcvhmqswqdmmxa392z2nv1rnk60cpxclc0p";
|
||||
sha256 = "033kxj55pywnc4cjqcfb2jvn96nsa93m93qd2p636jf5hkqazq41";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.8";
|
||||
version = "0.3.1";
|
||||
};
|
||||
ruby-lsp-rspec = {
|
||||
dependencies = ["ruby-lsp"];
|
||||
|
|
@ -5603,10 +5615,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18qfm86bafybm93kz1bn2z86gwaax3c57i25g4lzgv6pp9aj5nr1";
|
||||
sha256 = "0npxb9146yqfwpyx3bw375q8vx60ph2zgbvpai1dmgq8dfs3idki";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.8";
|
||||
version = "0.1.10";
|
||||
};
|
||||
ruby-magic = {
|
||||
dependencies = ["mini_portile2"];
|
||||
|
|
@ -5754,28 +5766,6 @@ src:
|
|||
};
|
||||
version = "6.0.2";
|
||||
};
|
||||
sassc = {
|
||||
dependencies = ["ffi"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.0";
|
||||
};
|
||||
sassc-rails = {
|
||||
dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1d9djmwn36a5m8a83bpycs48g8kh1n2xkyvghn7dr6zwh4wdyksz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.2";
|
||||
};
|
||||
sawyer = {
|
||||
dependencies = ["addressable" "faraday"];
|
||||
groups = ["danger" "default" "development" "test"];
|
||||
|
|
@ -5814,10 +5804,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0g3l3invk95w1f72mpp0r4hc3vsc3070c1xd1wg76kfg2r182xnq";
|
||||
sha256 = "1asysih4l1mv24wqxrbnz0c0454kw3dhqaj6nsa8pyn9fjjdms5b";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.17.0";
|
||||
version = "4.18.1";
|
||||
};
|
||||
semver_dialects = {
|
||||
dependencies = ["deb_version" "pastel" "thor" "tty-command"];
|
||||
|
|
@ -5825,10 +5815,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13jmbqzswvkq0xds2s1r6wnh78gfy2zbn35qvalhwj2qi4nmjpvf";
|
||||
sha256 = "11s5nr5v81qjlf2glgqjisvnv12vmwsmi9abbzqkb1nqjhw43691";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.1";
|
||||
version = "2.0.0";
|
||||
};
|
||||
sentry-rails = {
|
||||
dependencies = ["railties" "sentry-ruby"];
|
||||
|
|
@ -6076,10 +6066,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18280l1wgdmr9xhr4mzxr4ycskwbgjzd91vmdzx0dlp6xp2dydnb";
|
||||
sha256 = "1fsq1k58isarg6ycg2ix9sw9a6391y12ss48m3hcryqi902w7cny";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.11144";
|
||||
version = "0.5.11266";
|
||||
};
|
||||
spamcheck = {
|
||||
dependencies = ["grpc"];
|
||||
|
|
@ -6145,17 +6135,6 @@ src:
|
|||
};
|
||||
version = "3.4.2";
|
||||
};
|
||||
sqlite3 = {
|
||||
dependencies = ["mini_portile2"];
|
||||
groups = ["default" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0f24qp50mc1qg8yvv7b3x73mh78d6mzd3b7rqib1ixfbsdiayx1x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.0";
|
||||
};
|
||||
ssh_data = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
|
|
@ -6398,14 +6377,14 @@ src:
|
|||
version = "1.3.1";
|
||||
};
|
||||
thor = {
|
||||
groups = ["default" "development" "monorepo" "omnibus" "test"];
|
||||
groups = ["default" "development" "omnibus" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s";
|
||||
sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
};
|
||||
thread_safe = {
|
||||
groups = ["default" "test"];
|
||||
|
|
@ -6812,10 +6791,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1xn5q1mbhwalx16mj441pzbm8hkxdmwxwzdjcj86f3bfnpipzh9y";
|
||||
sha256 = "1zy51z0whkm3fdpsbi8v4j8h5h3ia1zkc2j28amiznpqqvfc7539";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.8.0";
|
||||
version = "3.11.0";
|
||||
};
|
||||
virtus = {
|
||||
dependencies = ["axiom-types" "coercible" "descendants_tracker"];
|
||||
|
|
@ -6909,10 +6888,10 @@ src:
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0rc3g9hhxi6v2l1cp9q3kcjd92bhmdbrb517l4v5pyzwq2nflcyc";
|
||||
sha256 = "13jb9q0qv9ajw1ajr4cawnqj4h0dws3w5j4v5n6v3xk7a8rnjzr7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.20.0";
|
||||
version = "3.22.0";
|
||||
};
|
||||
webrick = {
|
||||
groups = ["default" "development" "test"];
|
||||
|
|
|
|||
|
|
@ -3,9 +3,8 @@
|
|||
let
|
||||
inherit (lib) findFirst isString optional optionals;
|
||||
|
||||
makeCMakeFlags = { cmakeFlags ? [], ... }:
|
||||
cmakeFlags
|
||||
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([
|
||||
cmakeFlags' =
|
||||
optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([
|
||||
"-DCMAKE_SYSTEM_NAME=${findFirst isString "Generic" (optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"
|
||||
] ++ optionals (stdenv.hostPlatform.uname.processor != null) [
|
||||
"-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}"
|
||||
|
|
@ -24,6 +23,9 @@ let
|
|||
] ++ optionals stdenv.hostPlatform.isStatic [
|
||||
"-DCMAKE_LINK_SEARCH_START_STATIC=ON"
|
||||
]);
|
||||
|
||||
makeCMakeFlags = { cmakeFlags ? [], ... }: cmakeFlags ++ cmakeFlags';
|
||||
|
||||
in
|
||||
{
|
||||
inherit makeCMakeFlags;
|
||||
|
|
|
|||
|
|
@ -9,25 +9,25 @@ let
|
|||
else if isx86_32 then "x86"
|
||||
else platform.uname.processor;
|
||||
|
||||
makeMesonFlags = { mesonFlags ? [], ... }:
|
||||
let
|
||||
crossFile = builtins.toFile "cross-file.conf" ''
|
||||
[properties]
|
||||
bindgen_clang_arguments = ['-target', '${stdenv.targetPlatform.config}']
|
||||
needs_exe_wrapper = ${boolToString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)}
|
||||
crossFile = builtins.toFile "cross-file.conf" ''
|
||||
[properties]
|
||||
bindgen_clang_arguments = ['-target', '${stdenv.targetPlatform.config}']
|
||||
needs_exe_wrapper = ${boolToString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)}
|
||||
|
||||
[host_machine]
|
||||
system = '${stdenv.targetPlatform.parsed.kernel.name}'
|
||||
cpu_family = '${cpuFamily stdenv.targetPlatform}'
|
||||
cpu = '${stdenv.targetPlatform.parsed.cpu.name}'
|
||||
endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"}
|
||||
[host_machine]
|
||||
system = '${stdenv.targetPlatform.parsed.kernel.name}'
|
||||
cpu_family = '${cpuFamily stdenv.targetPlatform}'
|
||||
cpu = '${stdenv.targetPlatform.parsed.cpu.name}'
|
||||
endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"}
|
||||
|
||||
[binaries]
|
||||
llvm-config = 'llvm-config-native'
|
||||
rust = ['rustc', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}']
|
||||
'';
|
||||
crossFlags = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ];
|
||||
in crossFlags ++ mesonFlags;
|
||||
[binaries]
|
||||
llvm-config = 'llvm-config-native'
|
||||
rust = ['rustc', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}']
|
||||
'';
|
||||
|
||||
crossFlags = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ];
|
||||
|
||||
makeMesonFlags = { mesonFlags ? [], ... }: crossFlags ++ mesonFlags;
|
||||
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,343 @@
|
|||
From 21d57c61575e76d80f812ff332b808bcc714a47b Mon Sep 17 00:00:00 2001
|
||||
From: Quantenzitrone <general@dev.quantenzitrone.eu>
|
||||
Date: Tue, 19 Mar 2024 17:46:17 +0100
|
||||
Subject: [PATCH 1/2] libcryptsetup-rs: bump version to 0.9 #55
|
||||
|
||||
---
|
||||
Cargo.lock | 146 ++++++++++++++++++++++++++++++++++++++++-------------
|
||||
Cargo.toml | 2 +-
|
||||
2 files changed, 111 insertions(+), 37 deletions(-)
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 530d1d4..343390f 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -73,25 +73,51 @@ version = "0.59.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
|
||||
dependencies = [
|
||||
- "bitflags",
|
||||
+ "bitflags 1.3.2",
|
||||
"cexpr",
|
||||
"clang-sys",
|
||||
"lazy_static",
|
||||
"lazycell",
|
||||
"peeking_take_while",
|
||||
- "proc-macro2 1.0.44",
|
||||
- "quote 1.0.21",
|
||||
+ "proc-macro2 1.0.79",
|
||||
+ "quote 1.0.35",
|
||||
"regex",
|
||||
"rustc-hash",
|
||||
"shlex",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "bindgen"
|
||||
+version = "0.68.1"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"
|
||||
+dependencies = [
|
||||
+ "bitflags 2.5.0",
|
||||
+ "cexpr",
|
||||
+ "clang-sys",
|
||||
+ "lazy_static",
|
||||
+ "lazycell",
|
||||
+ "peeking_take_while",
|
||||
+ "proc-macro2 1.0.79",
|
||||
+ "quote 1.0.35",
|
||||
+ "regex",
|
||||
+ "rustc-hash",
|
||||
+ "shlex",
|
||||
+ "syn 2.0.53",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
+[[package]]
|
||||
+name = "bitflags"
|
||||
+version = "2.5.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
|
||||
+
|
||||
[[package]]
|
||||
name = "bstr"
|
||||
version = "0.2.17"
|
||||
@@ -166,7 +192,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"atty",
|
||||
- "bitflags",
|
||||
+ "bitflags 1.3.2",
|
||||
"strsim 0.8.0",
|
||||
"textwrap",
|
||||
"unicode-width",
|
||||
@@ -179,7 +205,7 @@ version = "0.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
|
||||
dependencies = [
|
||||
- "bitflags",
|
||||
+ "bitflags 1.3.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -317,8 +343,8 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
|
||||
dependencies = [
|
||||
"fnv",
|
||||
"ident_case",
|
||||
- "proc-macro2 1.0.44",
|
||||
- "quote 1.0.21",
|
||||
+ "proc-macro2 1.0.79",
|
||||
+ "quote 1.0.35",
|
||||
"strsim 0.9.3",
|
||||
"syn 1.0.101",
|
||||
]
|
||||
@@ -330,7 +356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
|
||||
dependencies = [
|
||||
"darling_core",
|
||||
- "quote 1.0.21",
|
||||
+ "quote 1.0.35",
|
||||
"syn 1.0.101",
|
||||
]
|
||||
|
||||
@@ -342,8 +368,8 @@ checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0"
|
||||
dependencies = [
|
||||
"darling",
|
||||
"derive_builder_core",
|
||||
- "proc-macro2 1.0.44",
|
||||
- "quote 1.0.21",
|
||||
+ "proc-macro2 1.0.79",
|
||||
+ "quote 1.0.35",
|
||||
"syn 1.0.101",
|
||||
]
|
||||
|
||||
@@ -354,8 +380,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef"
|
||||
dependencies = [
|
||||
"darling",
|
||||
- "proc-macro2 1.0.44",
|
||||
- "quote 1.0.21",
|
||||
+ "proc-macro2 1.0.79",
|
||||
+ "quote 1.0.35",
|
||||
"syn 1.0.101",
|
||||
]
|
||||
|
||||
@@ -381,8 +407,8 @@ version = "0.1.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.44",
|
||||
- "quote 1.0.21",
|
||||
+ "proc-macro2 1.0.79",
|
||||
+ "quote 1.0.35",
|
||||
"syn 1.0.101",
|
||||
"synstructure",
|
||||
]
|
||||
@@ -394,7 +420,8 @@ dependencies = [
|
||||
"ctap_hmac",
|
||||
"failure",
|
||||
"hex",
|
||||
- "libcryptsetup-rs",
|
||||
+ "libcryptsetup-rs 0.5.1",
|
||||
+ "libcryptsetup-rs 0.9.2",
|
||||
"ring",
|
||||
"rpassword",
|
||||
"serde",
|
||||
@@ -500,9 +527,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
-version = "0.2.133"
|
||||
+version = "0.2.153"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966"
|
||||
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
|
||||
|
||||
[[package]]
|
||||
name = "libcryptsetup-rs"
|
||||
@@ -513,7 +540,25 @@ dependencies = [
|
||||
"either",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
- "libcryptsetup-rs-sys",
|
||||
+ "libcryptsetup-rs-sys 0.2.1",
|
||||
+ "pkg-config",
|
||||
+ "semver",
|
||||
+ "serde_json",
|
||||
+ "uuid",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "libcryptsetup-rs"
|
||||
+version = "0.9.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "67dd3f8d51b4feb4acc765c063d45434fb7926fe979b20ee6f95dcd974b4dc0c"
|
||||
+dependencies = [
|
||||
+ "bitflags 2.5.0",
|
||||
+ "either",
|
||||
+ "lazy_static",
|
||||
+ "libc",
|
||||
+ "libcryptsetup-rs-sys 0.3.0",
|
||||
+ "log",
|
||||
"pkg-config",
|
||||
"semver",
|
||||
"serde_json",
|
||||
@@ -526,7 +571,19 @@ version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0af91b644699911c839309edbb8c8f6addd61e6b9553aa6d02ba71c37597afbe"
|
||||
dependencies = [
|
||||
- "bindgen",
|
||||
+ "bindgen 0.59.2",
|
||||
+ "cc",
|
||||
+ "pkg-config",
|
||||
+ "semver",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "libcryptsetup-rs-sys"
|
||||
+version = "0.3.0"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "20fc299fd05078d353a895d940fc463d1008d94258fc8096c095467549324707"
|
||||
+dependencies = [
|
||||
+ "bindgen 0.68.1",
|
||||
"cc",
|
||||
"pkg-config",
|
||||
"semver",
|
||||
@@ -542,6 +599,12 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
+[[package]]
|
||||
+name = "log"
|
||||
+version = "0.4.21"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
|
||||
+
|
||||
[[package]]
|
||||
name = "maybe-uninit"
|
||||
version = "2.0.0"
|
||||
@@ -636,8 +699,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
|
||||
dependencies = [
|
||||
"proc-macro-error-attr",
|
||||
- "proc-macro2 1.0.44",
|
||||
- "quote 1.0.21",
|
||||
+ "proc-macro2 1.0.79",
|
||||
+ "quote 1.0.35",
|
||||
"syn 1.0.101",
|
||||
"version_check",
|
||||
]
|
||||
@@ -648,8 +711,8 @@ version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.44",
|
||||
- "quote 1.0.21",
|
||||
+ "proc-macro2 1.0.79",
|
||||
+ "quote 1.0.35",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
@@ -664,9 +727,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
-version = "1.0.44"
|
||||
+version = "1.0.79"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
|
||||
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
@@ -682,11 +745,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
-version = "1.0.21"
|
||||
+version = "1.0.35"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
|
||||
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.44",
|
||||
+ "proc-macro2 1.0.79",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -931,8 +994,8 @@ version = "1.0.145"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.44",
|
||||
- "quote 1.0.21",
|
||||
+ "proc-macro2 1.0.79",
|
||||
+ "quote 1.0.35",
|
||||
"syn 1.0.101",
|
||||
]
|
||||
|
||||
@@ -984,8 +1047,8 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro-error",
|
||||
- "proc-macro2 1.0.44",
|
||||
- "quote 1.0.21",
|
||||
+ "proc-macro2 1.0.79",
|
||||
+ "quote 1.0.35",
|
||||
"syn 1.0.101",
|
||||
]
|
||||
|
||||
@@ -1006,8 +1069,19 @@ version = "1.0.101"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.44",
|
||||
- "quote 1.0.21",
|
||||
+ "proc-macro2 1.0.79",
|
||||
+ "quote 1.0.35",
|
||||
+ "unicode-ident",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "syn"
|
||||
+version = "2.0.53"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
|
||||
+dependencies = [
|
||||
+ "proc-macro2 1.0.79",
|
||||
+ "quote 1.0.35",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
@@ -1017,8 +1091,8 @@ version = "0.12.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
|
||||
dependencies = [
|
||||
- "proc-macro2 1.0.44",
|
||||
- "quote 1.0.21",
|
||||
+ "proc-macro2 1.0.79",
|
||||
+ "quote 1.0.35",
|
||||
"syn 1.0.101",
|
||||
"unicode-xid 0.2.4",
|
||||
]
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 7edf572..9386e13 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -31,7 +31,7 @@ hex = "0.3.2"
|
||||
ring = "0.13.5"
|
||||
failure = "0.1.5"
|
||||
rpassword = "4.0.1"
|
||||
-libcryptsetup-rs = "0.5.1"
|
||||
+libcryptsetup-rs = "0.9"
|
||||
structopt = "0.3.2"
|
||||
|
||||
[profile.release]
|
||||
--
|
||||
2.43.2
|
||||
|
||||
|
|
@ -0,0 +1,654 @@
|
|||
From 3b097c545c3e6ffd1cd91d5ea73f20853b11d645 Mon Sep 17 00:00:00 2001
|
||||
From: Quantenzitrone <general@dev.quantenzitrone.eu>
|
||||
Date: Tue, 19 Mar 2024 17:46:55 +0100
|
||||
Subject: [PATCH 2/2] cargo update
|
||||
|
||||
---
|
||||
Cargo.lock | 281 ++++++++++++++++++++++++++++++++---------------------
|
||||
1 file changed, 170 insertions(+), 111 deletions(-)
|
||||
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 343390f..036047d 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -4,9 +4,9 @@ version = 3
|
||||
|
||||
[[package]]
|
||||
name = "addr2line"
|
||||
-version = "0.17.0"
|
||||
+version = "0.21.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
|
||||
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
|
||||
dependencies = [
|
||||
"gimli",
|
||||
]
|
||||
@@ -17,6 +17,15 @@ version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
|
||||
|
||||
+[[package]]
|
||||
+name = "aho-corasick"
|
||||
+version = "1.1.2"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
|
||||
+dependencies = [
|
||||
+ "memchr",
|
||||
+]
|
||||
+
|
||||
[[package]]
|
||||
name = "ansi_term"
|
||||
version = "0.12.1"
|
||||
@@ -54,9 +63,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
||||
|
||||
[[package]]
|
||||
name = "backtrace"
|
||||
-version = "0.3.66"
|
||||
+version = "0.3.69"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
|
||||
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
|
||||
dependencies = [
|
||||
"addr2line",
|
||||
"cc",
|
||||
@@ -69,9 +78,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "bindgen"
|
||||
-version = "0.59.2"
|
||||
+version = "0.63.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
|
||||
+checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"cexpr",
|
||||
@@ -84,6 +93,7 @@ dependencies = [
|
||||
"regex",
|
||||
"rustc-hash",
|
||||
"shlex",
|
||||
+ "syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -118,23 +128,11 @@ version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
|
||||
|
||||
-[[package]]
|
||||
-name = "bstr"
|
||||
-version = "0.2.17"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
|
||||
-dependencies = [
|
||||
- "lazy_static",
|
||||
- "memchr",
|
||||
- "regex-automata",
|
||||
- "serde",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "byteorder"
|
||||
-version = "1.4.3"
|
||||
+version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
|
||||
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
||||
|
||||
[[package]]
|
||||
name = "cbor-codec"
|
||||
@@ -148,9 +146,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
-version = "1.0.73"
|
||||
+version = "1.0.90"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
|
||||
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
|
||||
|
||||
[[package]]
|
||||
name = "cexpr"
|
||||
@@ -175,9 +173,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "clang-sys"
|
||||
-version = "1.4.0"
|
||||
+version = "1.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
|
||||
+checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
|
||||
dependencies = [
|
||||
"glob",
|
||||
"libc",
|
||||
@@ -282,22 +280,21 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "csv"
|
||||
-version = "1.1.6"
|
||||
+version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
|
||||
+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
|
||||
dependencies = [
|
||||
- "bstr",
|
||||
"csv-core",
|
||||
- "itoa 0.4.8",
|
||||
+ "itoa",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "csv-core"
|
||||
-version = "0.1.10"
|
||||
+version = "0.1.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
|
||||
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
@@ -346,7 +343,7 @@ dependencies = [
|
||||
"proc-macro2 1.0.79",
|
||||
"quote 1.0.35",
|
||||
"strsim 0.9.3",
|
||||
- "syn 1.0.101",
|
||||
+ "syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -357,7 +354,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
|
||||
dependencies = [
|
||||
"darling_core",
|
||||
"quote 1.0.35",
|
||||
- "syn 1.0.101",
|
||||
+ "syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -370,7 +367,7 @@ dependencies = [
|
||||
"derive_builder_core",
|
||||
"proc-macro2 1.0.79",
|
||||
"quote 1.0.35",
|
||||
- "syn 1.0.101",
|
||||
+ "syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -382,14 +379,14 @@ dependencies = [
|
||||
"darling",
|
||||
"proc-macro2 1.0.79",
|
||||
"quote 1.0.35",
|
||||
- "syn 1.0.101",
|
||||
+ "syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "either"
|
||||
-version = "1.8.0"
|
||||
+version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
|
||||
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
|
||||
|
||||
[[package]]
|
||||
name = "failure"
|
||||
@@ -409,7 +406,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.79",
|
||||
"quote 1.0.35",
|
||||
- "syn 1.0.101",
|
||||
+ "syn 1.0.109",
|
||||
"synstructure",
|
||||
]
|
||||
|
||||
@@ -450,9 +447,9 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
-version = "0.2.7"
|
||||
+version = "0.2.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
|
||||
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"libc",
|
||||
@@ -461,15 +458,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gimli"
|
||||
-version = "0.26.2"
|
||||
+version = "0.28.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
|
||||
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
|
||||
|
||||
[[package]]
|
||||
name = "glob"
|
||||
-version = "0.3.0"
|
||||
+version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
|
||||
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
@@ -503,15 +500,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
-version = "0.4.8"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
|
||||
-
|
||||
-[[package]]
|
||||
-name = "itoa"
|
||||
-version = "1.0.3"
|
||||
+version = "1.0.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
|
||||
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
@@ -540,7 +531,7 @@ dependencies = [
|
||||
"either",
|
||||
"lazy_static",
|
||||
"libc",
|
||||
- "libcryptsetup-rs-sys 0.2.1",
|
||||
+ "libcryptsetup-rs-sys 0.2.4",
|
||||
"pkg-config",
|
||||
"semver",
|
||||
"serde_json",
|
||||
@@ -567,11 +558,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "libcryptsetup-rs-sys"
|
||||
-version = "0.2.1"
|
||||
+version = "0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "0af91b644699911c839309edbb8c8f6addd61e6b9553aa6d02ba71c37597afbe"
|
||||
+checksum = "d7c355c283a470a1a09924182b3606999786979697753df3c2206948dcd8f4eb"
|
||||
dependencies = [
|
||||
- "bindgen 0.59.2",
|
||||
+ "bindgen 0.63.0",
|
||||
"cc",
|
||||
"pkg-config",
|
||||
"semver",
|
||||
@@ -591,12 +582,12 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
-version = "0.7.3"
|
||||
+version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
|
||||
+checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
|
||||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
- "winapi",
|
||||
+ "windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -613,9 +604,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
-version = "2.5.0"
|
||||
+version = "2.7.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
||||
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
@@ -634,18 +625,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
||||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
-version = "0.5.4"
|
||||
+version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
|
||||
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
|
||||
dependencies = [
|
||||
"adler",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "nom"
|
||||
-version = "7.1.1"
|
||||
+version = "7.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
|
||||
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
"minimal-lexical",
|
||||
@@ -664,18 +655,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
-version = "0.2.15"
|
||||
+version = "0.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
|
||||
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
|
||||
dependencies = [
|
||||
"autocfg 1.1.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "object"
|
||||
-version = "0.29.0"
|
||||
+version = "0.32.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
|
||||
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
@@ -688,9 +679,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
|
||||
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
-version = "0.3.25"
|
||||
+version = "0.3.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
|
||||
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-error"
|
||||
@@ -701,7 +692,7 @@ dependencies = [
|
||||
"proc-macro-error-attr",
|
||||
"proc-macro2 1.0.79",
|
||||
"quote 1.0.35",
|
||||
- "syn 1.0.101",
|
||||
+ "syn 1.0.109",
|
||||
"version_check",
|
||||
]
|
||||
|
||||
@@ -892,24 +883,32 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
-version = "1.6.0"
|
||||
+version = "1.10.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
|
||||
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
|
||||
dependencies = [
|
||||
+ "aho-corasick",
|
||||
+ "memchr",
|
||||
+ "regex-automata",
|
||||
"regex-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
-version = "0.1.10"
|
||||
+version = "0.4.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
|
||||
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
|
||||
+dependencies = [
|
||||
+ "aho-corasick",
|
||||
+ "memchr",
|
||||
+ "regex-syntax",
|
||||
+]
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
-version = "0.6.27"
|
||||
+version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
|
||||
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
|
||||
|
||||
[[package]]
|
||||
name = "ring"
|
||||
@@ -948,9 +947,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustc-demangle"
|
||||
-version = "0.1.21"
|
||||
+version = "0.1.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
|
||||
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
|
||||
|
||||
[[package]]
|
||||
name = "rustc-hash"
|
||||
@@ -960,61 +959,64 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
|
||||
|
||||
[[package]]
|
||||
name = "rustc-serialize"
|
||||
-version = "0.3.24"
|
||||
+version = "0.3.25"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
|
||||
+checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401"
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
-version = "1.0.11"
|
||||
+version = "1.0.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
|
||||
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
-version = "1.1.0"
|
||||
+version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
||||
|
||||
[[package]]
|
||||
name = "semver"
|
||||
-version = "1.0.14"
|
||||
+version = "1.0.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
|
||||
+checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
-version = "1.0.145"
|
||||
+version = "1.0.197"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
|
||||
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
|
||||
+dependencies = [
|
||||
+ "serde_derive",
|
||||
+]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
-version = "1.0.145"
|
||||
+version = "1.0.197"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
|
||||
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.79",
|
||||
"quote 1.0.35",
|
||||
- "syn 1.0.101",
|
||||
+ "syn 2.0.53",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
-version = "1.0.85"
|
||||
+version = "1.0.114"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
|
||||
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
|
||||
dependencies = [
|
||||
- "itoa 1.0.3",
|
||||
+ "itoa",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "shlex"
|
||||
-version = "1.1.0"
|
||||
+version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
|
||||
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
@@ -1049,7 +1051,7 @@ dependencies = [
|
||||
"proc-macro-error",
|
||||
"proc-macro2 1.0.79",
|
||||
"quote 1.0.35",
|
||||
- "syn 1.0.101",
|
||||
+ "syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1065,9 +1067,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
-version = "1.0.101"
|
||||
+version = "1.0.109"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
|
||||
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.79",
|
||||
"quote 1.0.35",
|
||||
@@ -1093,7 +1095,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.79",
|
||||
"quote 1.0.35",
|
||||
- "syn 1.0.101",
|
||||
+ "syn 1.0.109",
|
||||
"unicode-xid 0.2.4",
|
||||
]
|
||||
|
||||
@@ -1108,9 +1110,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "time"
|
||||
-version = "0.1.44"
|
||||
+version = "0.1.45"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
|
||||
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"wasi 0.10.0+wasi-snapshot-preview1",
|
||||
@@ -1119,21 +1121,21 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
-version = "1.0.4"
|
||||
+version = "1.0.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
|
||||
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-segmentation"
|
||||
-version = "1.10.0"
|
||||
+version = "1.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
|
||||
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
-version = "0.1.10"
|
||||
+version = "0.1.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
|
||||
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-xid"
|
||||
@@ -1155,9 +1157,9 @@ checksum = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
|
||||
|
||||
[[package]]
|
||||
name = "uuid"
|
||||
-version = "1.1.2"
|
||||
+version = "1.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
|
||||
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
@@ -1207,3 +1209,60 @@ 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-targets"
|
||||
+version = "0.52.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
|
||||
+dependencies = [
|
||||
+ "windows_aarch64_gnullvm",
|
||||
+ "windows_aarch64_msvc",
|
||||
+ "windows_i686_gnu",
|
||||
+ "windows_i686_msvc",
|
||||
+ "windows_x86_64_gnu",
|
||||
+ "windows_x86_64_gnullvm",
|
||||
+ "windows_x86_64_msvc",
|
||||
+]
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_aarch64_gnullvm"
|
||||
+version = "0.52.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_aarch64_msvc"
|
||||
+version = "0.52.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_i686_gnu"
|
||||
+version = "0.52.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_i686_msvc"
|
||||
+version = "0.52.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_x86_64_gnu"
|
||||
+version = "0.52.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_x86_64_gnullvm"
|
||||
+version = "0.52.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
|
||||
+
|
||||
+[[package]]
|
||||
+name = "windows_x86_64_msvc"
|
||||
+version = "0.52.4"
|
||||
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
|
||||
--
|
||||
2.43.2
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
cryptsetup,
|
||||
pkg-config,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fido2luks";
|
||||
version = "0.2.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shimunn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-bXwaFiRHURvS5KtTqIj+3GlGNbEulDgMDP51ZiO1w9o=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
./0001-libcryptsetup-rs-bump-version-to-0.9-55.patch
|
||||
./0002-cargo-update.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = [ cryptsetup ];
|
||||
|
||||
cargoHash = "sha256-BcwcgQzNH1p9pOVbelaGTN7bKqDgvxD4Red2JeavpJQ=";
|
||||
|
||||
meta = {
|
||||
description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";
|
||||
homepage = "https://github.com/shimunn/fido2luks";
|
||||
license = lib.licenses.mpl20;
|
||||
maintainers = with lib.maintainers; [ mmahut ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -15,19 +15,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "halloy";
|
||||
version = "2024.3";
|
||||
version = "2024.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "squidowl";
|
||||
repo = "halloy";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9yEkM65c8R71oQ0C54xZqwRh609+HSaq4Hb8izNM52A=";
|
||||
hash = "sha256-F/yQYLYrq3MZFV6igQe4sQi84ChIKCCPdS5151nD6hs=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"iced-0.12.0" = "sha256-LtmAJDUMp42S4E+CjOM6Q7doAKOZkmJCN/49gsq3v/A=";
|
||||
"iced-0.13.0-dev" = "sha256-8L0AoHPwRUeCiJK/N0NTs1Nl4BX0wbM7SLgundhvra0=";
|
||||
"winit-0.29.10" = "sha256-YoXJEvEhMvk3pK5EbXceVFeJEJLL6KTjiw0kBJxgHIE=";
|
||||
};
|
||||
};
|
||||
|
|
@ -83,7 +83,8 @@ rustPlatform.buildRustPackage rec {
|
|||
'');
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 assets/linux/org.squidowl.halloy.png $out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png
|
||||
install -Dm644 assets/linux/icons/hicolor/128x128/apps/org.squidowl.halloy.png \
|
||||
$out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "maa-cli";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaaAssistantArknights";
|
||||
repo = "maa-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pAtv6gCLFKRwUQEF6kD2bCPGpQGzahsfq/tAnQjrZrw=";
|
||||
hash = "sha256-LeEIbfDQ+GO3gNmdpWGTNkpbhSqLz4fYQ+MdcrcbDk0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [ "git2" "core_installer" ];
|
||||
|
||||
cargoHash = "sha256-KjI/5vl7oKVtXYehGLgi9jcaO4Y/TceL498rCPGHMD0=";
|
||||
cargoHash = "sha256-tkUJH7oFY5eZ5A7J+qzeyHlqOUnTipf6o+leZz7KOiQ=";
|
||||
|
||||
# maa-cli would only seach libMaaCore.so and resources in itself's path
|
||||
# https://github.com/MaaAssistantArknights/maa-cli/issues/67
|
||||
|
|
@ -55,6 +55,10 @@ rustPlatform.buildRustPackage rec {
|
|||
--bash <($out/bin/maa complete bash) \
|
||||
--fish <($out/bin/maa complete fish) \
|
||||
--zsh <($out/bin/maa complete zsh)
|
||||
|
||||
mkdir -p manpage
|
||||
$out/bin/maa mangen --path manpage
|
||||
installManPage manpage/*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,17 +1,35 @@
|
|||
{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, wrapQtAppsHook }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, sane-backends
|
||||
, nss
|
||||
, autoPatchelfHook
|
||||
, lib
|
||||
, libsForQt5
|
||||
, pkcs11helper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "masterpdfeditor";
|
||||
version = "5.9.35";
|
||||
version = "5.9.82";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz";
|
||||
sha256 = "sha256-c5DYS0PQemZ8Sql2KjnuMspCLDJzU95rsbuIdoxWDM0=";
|
||||
sha256 = "sha256-CbrhhQJ0iiXz8hUJEi+/xb2ZGbunuPuIIgmCRgJhNVU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ];
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [ nss qtbase qtsvg sane-backends stdenv.cc.cc ];
|
||||
buildInputs = with libsForQt5; [
|
||||
nss
|
||||
qtbase
|
||||
qtsvg
|
||||
sane-backends
|
||||
stdenv.cc.cc
|
||||
pkcs11helper
|
||||
];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
|
|
@ -22,14 +40,14 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out/bin
|
||||
|
||||
substituteInPlace masterpdfeditor5.desktop \
|
||||
--replace 'Exec=/opt/master-pdf-editor-5' "Exec=$out/bin" \
|
||||
--replace 'Path=/opt/master-pdf-editor-5' "Path=$out/bin" \
|
||||
--replace 'Icon=/opt/master-pdf-editor-5' "Icon=$out/share/pixmaps"
|
||||
--replace-fail 'Exec=/opt/master-pdf-editor-5' "Exec=$out/bin" \
|
||||
--replace-fail 'Path=/opt/master-pdf-editor-5' "Path=$out/bin" \
|
||||
--replace-fail 'Icon=/opt/master-pdf-editor-5' "Icon=$out/share/pixmaps"
|
||||
|
||||
install -Dm644 -t $out/share/pixmaps masterpdfeditor5.png
|
||||
install -Dm644 -t $out/share/applications masterpdfeditor5.desktop
|
||||
install -Dm755 -t $p masterpdfeditor5
|
||||
install -Dm644 license.txt $out/share/$name/LICENSE
|
||||
install -Dm644 license_en.txt $out/share/$name/LICENSE
|
||||
ln -s $p/masterpdfeditor5 $out/bin/masterpdfeditor5
|
||||
cp -v -r stamps templates lang fonts $p
|
||||
|
||||
|
|
@ -43,5 +61,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.unfreeRedistributable;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ cmcdragonkai ];
|
||||
mainProgram = "masterpdfeditor5";
|
||||
};
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
, rustPlatform
|
||||
, libarchive
|
||||
, openssl
|
||||
, rust-jemalloc-sys
|
||||
, sqlite
|
||||
, pkg-config
|
||||
, nixosTests
|
||||
|
|
@ -27,6 +28,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [
|
||||
libarchive
|
||||
openssl
|
||||
rust-jemalloc-sys
|
||||
sqlite
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocenaudio";
|
||||
version = "3.13.4";
|
||||
version = "3.13.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=v${version}";
|
||||
hash = "sha256-vE+xwwkBXIksy+6oygLDsrT8mFfHYIGcb6+8KMZe0no=";
|
||||
hash = "sha256-9eDDllf6D2hAhjztPhi1MrUky7zQfiE4uLAbfRDx+7s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1265,7 +1265,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "librqbit"
|
||||
version = "5.5.3"
|
||||
version = "5.5.4"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-stream",
|
||||
|
|
@ -1318,7 +1318,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "librqbit-bencode"
|
||||
version = "2.2.1"
|
||||
version = "2.2.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"librqbit-buffers",
|
||||
|
|
@ -1329,7 +1329,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "librqbit-buffers"
|
||||
version = "2.2.1"
|
||||
version = "3.0.0"
|
||||
dependencies = [
|
||||
"librqbit-clone-to-owned",
|
||||
"serde",
|
||||
|
|
@ -1341,7 +1341,7 @@ version = "2.2.1"
|
|||
|
||||
[[package]]
|
||||
name = "librqbit-core"
|
||||
version = "3.6.1"
|
||||
version = "3.6.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"directories",
|
||||
|
|
@ -1362,7 +1362,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "librqbit-dht"
|
||||
version = "5.0.1"
|
||||
version = "5.0.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"backoff",
|
||||
|
|
@ -1388,7 +1388,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "librqbit-peer-protocol"
|
||||
version = "3.5.0"
|
||||
version = "3.5.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bincode",
|
||||
|
|
@ -1403,16 +1403,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "librqbit-sha1-wrapper"
|
||||
version = "2.2.1"
|
||||
version = "3.0.0"
|
||||
dependencies = [
|
||||
"crypto-hash",
|
||||
"openssl",
|
||||
"sha1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "librqbit-tracker-comms"
|
||||
version = "1.0.0"
|
||||
version = "1.0.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-stream",
|
||||
|
|
@ -2070,7 +2068,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rqbit"
|
||||
version = "5.5.3"
|
||||
version = "5.5.4"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"bytes",
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rqbit";
|
||||
version = "5.5.3";
|
||||
version = "5.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ikatson";
|
||||
repo = "rqbit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-r/ff/Z/nsmQEWCVvmS0hGKXRuzIoDGhzfIRAxC6EaZk=";
|
||||
hash = "sha256-o+v/h51F9xXzMLSkRJfmXddKskMXTF2p5LEIcoXvh74=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,56 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
chromium,
|
||||
chromedriver,
|
||||
python3,
|
||||
}:
|
||||
buildNpmPackage {
|
||||
pname = "single-file-cli";
|
||||
version = "1.1.49";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gildas-lormeau";
|
||||
repo = "single-file-cli";
|
||||
rev = "af0f6f119edd8bf82bce3860fa55cfad869ac874";
|
||||
hash = "sha256-5pozqrIIanoLF4eugLxPRsUaoUYJurliovFFBYO/mC4=";
|
||||
};
|
||||
npmDepsHash = "sha256-wiBpWw9nb/pWVGIc4Vl/IxxR5ic0LzLMMr3WxRNvYdM=";
|
||||
|
||||
nativeCheckInputs = [chromium chromedriver];
|
||||
doCheck = stdenv.isLinux;
|
||||
|
||||
postBuild = ''
|
||||
patchShebangs ./single-file
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
${python3}/bin/python -m http.server --bind 127.0.0.1 &
|
||||
pid=$!
|
||||
|
||||
./single-file \
|
||||
--browser-headless \
|
||||
--web-driver-executable-path=chromedriver \
|
||||
--back-end=webdriver-chromium \
|
||||
http://127.0.0.1:8000
|
||||
|
||||
grep -F 'Page saved with SingleFile' 'Directory listing for'*.html
|
||||
|
||||
kill $pid
|
||||
wait
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "CLI tool for saving a faithful copy of a complete web page in a single HTML file";
|
||||
homepage = "https://github.com/gildas-lormeau/single-file-cli";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [n8henrie];
|
||||
mainProgram = "single-file";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
diff --git a/src/source/common/ddesktopservicesthread.h b/src/source/common/ddesktopservicesthread.h
|
||||
index 49313744..456a5e96 100644
|
||||
--- a/src/source/common/ddesktopservicesthread.h
|
||||
+++ b/src/source/common/ddesktopservicesthread.h
|
||||
@@ -8,10 +8,14 @@
|
||||
|
||||
#include <QThread>
|
||||
|
||||
+#include <dtkwidget_global.h>
|
||||
+#include <dtkgui_global.h>
|
||||
#include <DDesktopServices>
|
||||
#include <QDebug>
|
||||
#include <QFileInfo>
|
||||
+
|
||||
DWIDGET_USE_NAMESPACE
|
||||
+DGUI_USE_NAMESPACE
|
||||
|
||||
// 文管打开文件目录线程
|
||||
class DDesktopServicesThread : public QThread
|
||||
|
||||
|
|
@ -20,22 +20,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deepin-compressor";
|
||||
version = "5.12.24";
|
||||
version = "6.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-XNhG28VZifQrl3TZfx/OHnsAOo0eKrhGKDk+OjOYD8k=";
|
||||
hash = "sha256-DUpYb1xNmWpBcKo9kajeVm/+z4yj2OBE+qOyEkCHbUI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-fix-build-on-new-dtk.diff
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/source/common/pluginmanager.cpp \
|
||||
--replace-fail "/usr/lib/" "$out/lib/"
|
||||
--replace-fail "/usr/lib" "$out/lib"
|
||||
substituteInPlace src/desktop/deepin-compressor.desktop \
|
||||
--replace-fail "/usr" "$out"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -28,6 +28,45 @@
|
|||
, eggInstallHook
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (builtins) unsafeGetAttrPos;
|
||||
inherit (lib)
|
||||
elem optionalString max stringLength fixedWidthString getName
|
||||
optional optionals optionalAttrs hasSuffix escapeShellArgs
|
||||
extendDerivation head splitString isBool;
|
||||
|
||||
leftPadName = name: against: let
|
||||
len = max (stringLength name) (stringLength against);
|
||||
in fixedWidthString len " " name;
|
||||
|
||||
isPythonModule = drv:
|
||||
# all pythonModules have the pythonModule attribute
|
||||
(drv ? "pythonModule")
|
||||
# Some pythonModules are turned in to a pythonApplication by setting the field to false
|
||||
&& (!isBool drv.pythonModule);
|
||||
|
||||
isMismatchedPython = drv: drv.pythonModule != python;
|
||||
|
||||
withDistOutput' = lib.flip elem ["pyproject" "setuptools" "wheel"];
|
||||
|
||||
isBootstrapInstallPackage' = lib.flip elem [ "flit-core" "installer" ];
|
||||
|
||||
isBootstrapPackage' = lib.flip elem ([
|
||||
"build" "packaging" "pyproject-hooks" "wheel"
|
||||
] ++ optionals (python.pythonOlder "3.11") [
|
||||
"tomli"
|
||||
]);
|
||||
|
||||
isSetuptoolsDependency' = lib.flip elem [ "setuptools" "wheel" ];
|
||||
|
||||
cleanAttrs = lib.flip removeAttrs [
|
||||
"disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format"
|
||||
"disabledTestPaths" "outputs" "stdenv"
|
||||
"dependencies" "optional-dependencies" "build-system"
|
||||
];
|
||||
|
||||
in
|
||||
|
||||
{ name ? "${attrs.pname}-${attrs.version}"
|
||||
|
||||
# Build-time dependencies for the package
|
||||
|
|
@ -128,29 +167,15 @@ let
|
|||
else
|
||||
"setuptools";
|
||||
|
||||
withDistOutput = lib.elem format' ["pyproject" "setuptools" "wheel"];
|
||||
withDistOutput = withDistOutput' format';
|
||||
|
||||
name_ = name;
|
||||
|
||||
validatePythonMatches = attrName: let
|
||||
isPythonModule = drv:
|
||||
# all pythonModules have the pythonModule attribute
|
||||
(drv ? "pythonModule")
|
||||
# Some pythonModules are turned in to a pythonApplication by setting the field to false
|
||||
&& (!builtins.isBool drv.pythonModule);
|
||||
isMismatchedPython = drv: drv.pythonModule != python;
|
||||
|
||||
optionalLocation = let
|
||||
pos = builtins.unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs;
|
||||
in lib.optionalString (pos != null) " at ${pos.file}:${toString pos.line}:${toString pos.column}";
|
||||
|
||||
leftPadName = name: against: let
|
||||
len = lib.max (lib.stringLength name) (lib.stringLength against);
|
||||
in lib.strings.fixedWidthString len " " name;
|
||||
|
||||
throwMismatch = drv: let
|
||||
validatePythonMatches = let
|
||||
throwMismatch = attrName: drv: let
|
||||
myName = "'${namePrefix}${name}'";
|
||||
theirName = "'${drv.name}'";
|
||||
optionalLocation = let
|
||||
pos = unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs;
|
||||
in optionalString (pos != null) " at ${pos.file}:${toString pos.line}:${toString pos.column}";
|
||||
in throw ''
|
||||
Python version mismatch in ${myName}:
|
||||
|
||||
|
|
@ -173,64 +198,51 @@ let
|
|||
* If ${theirName} provides executables that are called at run time, pass its
|
||||
bin path to makeWrapperArgs:
|
||||
|
||||
makeWrapperArgs = [ "--prefix PATH : ''${lib.makeBinPath [ ${lib.getName drv } ] }" ];
|
||||
makeWrapperArgs = [ "--prefix PATH : ''${lib.makeBinPath [ ${getName drv } ] }" ];
|
||||
|
||||
${optionalLocation}
|
||||
'';
|
||||
|
||||
checkDrv = drv:
|
||||
if (isPythonModule drv) && (isMismatchedPython drv)
|
||||
then throwMismatch drv
|
||||
checkDrv = attrName: drv:
|
||||
if (isPythonModule drv) && (isMismatchedPython drv) then throwMismatch attrName drv
|
||||
else drv;
|
||||
|
||||
in inputs: builtins.map (checkDrv) inputs;
|
||||
in attrName: inputs: map (checkDrv attrName) inputs;
|
||||
|
||||
isBootstrapInstallPackage = builtins.elem (attrs.pname or null) [
|
||||
"flit-core" "installer"
|
||||
];
|
||||
isBootstrapInstallPackage = isBootstrapInstallPackage' (attrs.pname or null);
|
||||
|
||||
isBootstrapPackage = isBootstrapInstallPackage || builtins.elem (attrs.pname or null) ([
|
||||
"build" "packaging" "pyproject-hooks" "wheel"
|
||||
] ++ lib.optionals (python.pythonOlder "3.11") [
|
||||
"tomli"
|
||||
]);
|
||||
isBootstrapPackage = isBootstrapInstallPackage || isBootstrapPackage' (attrs.pname or null);
|
||||
|
||||
isSetuptoolsDependency = builtins.elem (attrs.pname or null) [
|
||||
"setuptools" "wheel"
|
||||
];
|
||||
isSetuptoolsDependency = isSetuptoolsDependency' (attrs.pname or null);
|
||||
|
||||
passthru =
|
||||
attrs.passthru or { }
|
||||
// {
|
||||
updateScript = let
|
||||
filename = builtins.head (lib.splitString ":" self.meta.position);
|
||||
filename = head (splitString ":" self.meta.position);
|
||||
in attrs.passthru.updateScript or [ update-python-libraries filename ];
|
||||
}
|
||||
// lib.optionalAttrs (dependencies != []) {
|
||||
// optionalAttrs (dependencies != []) {
|
||||
inherit dependencies;
|
||||
}
|
||||
// lib.optionalAttrs (optional-dependencies != {}) {
|
||||
// optionalAttrs (optional-dependencies != {}) {
|
||||
inherit optional-dependencies;
|
||||
}
|
||||
// lib.optionalAttrs (build-system != []) {
|
||||
// optionalAttrs (build-system != []) {
|
||||
inherit build-system;
|
||||
};
|
||||
|
||||
# Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
|
||||
self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [
|
||||
"disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format"
|
||||
"disabledTestPaths" "outputs" "stdenv"
|
||||
"dependencies" "optional-dependencies" "build-system"
|
||||
]) // {
|
||||
self = toPythonModule (stdenv.mkDerivation ((cleanAttrs attrs) // {
|
||||
|
||||
name = namePrefix + name_;
|
||||
name = namePrefix + name;
|
||||
|
||||
nativeBuildInputs = [
|
||||
python
|
||||
wrapPython
|
||||
ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)?
|
||||
pythonRemoveTestsDirHook
|
||||
] ++ lib.optionals (catchConflicts && !isBootstrapPackage && !isSetuptoolsDependency) [
|
||||
] ++ optionals (catchConflicts && !isBootstrapPackage && !isSetuptoolsDependency) [
|
||||
#
|
||||
# 1. When building a package that is also part of the bootstrap chain, we
|
||||
# must ignore conflicts after installation, because there will be one with
|
||||
|
|
@ -240,13 +252,13 @@ let
|
|||
# because the hook that checks for conflicts uses setuptools.
|
||||
#
|
||||
pythonCatchConflictsHook
|
||||
] ++ lib.optionals removeBinBytecode [
|
||||
] ++ optionals removeBinBytecode [
|
||||
pythonRemoveBinBytecodeHook
|
||||
] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
|
||||
] ++ optionals (hasSuffix "zip" (attrs.src.name or "")) [
|
||||
unzip
|
||||
] ++ lib.optionals (format' == "setuptools") [
|
||||
] ++ optionals (format' == "setuptools") [
|
||||
setuptoolsBuildHook
|
||||
] ++ lib.optionals (format' == "pyproject") [(
|
||||
] ++ optionals (format' == "pyproject") [(
|
||||
if isBootstrapPackage then
|
||||
pypaBuildHook.override {
|
||||
inherit (python.pythonOnBuildForHost.pkgs.bootstrap) build;
|
||||
|
|
@ -261,24 +273,24 @@ let
|
|||
}
|
||||
else
|
||||
pythonRuntimeDepsCheckHook
|
||||
)] ++ lib.optionals (format' == "wheel") [
|
||||
)] ++ optionals (format' == "wheel") [
|
||||
wheelUnpackHook
|
||||
] ++ lib.optionals (format' == "egg") [
|
||||
] ++ optionals (format' == "egg") [
|
||||
eggUnpackHook eggBuildHook eggInstallHook
|
||||
] ++ lib.optionals (format' != "other") [(
|
||||
] ++ optionals (format' != "other") [(
|
||||
if isBootstrapInstallPackage then
|
||||
pypaInstallHook.override {
|
||||
inherit (python.pythonOnBuildForHost.pkgs.bootstrap) installer;
|
||||
}
|
||||
else
|
||||
pypaInstallHook
|
||||
)] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
|
||||
)] ++ optionals (stdenv.buildPlatform == stdenv.hostPlatform) [
|
||||
# This is a test, however, it should be ran independent of the checkPhase and checkInputs
|
||||
pythonImportsCheckHook
|
||||
] ++ lib.optionals (python.pythonAtLeast "3.3") [
|
||||
] ++ optionals (python.pythonAtLeast "3.3") [
|
||||
# Optionally enforce PEP420 for python3
|
||||
pythonNamespacesHook
|
||||
] ++ lib.optionals withDistOutput [
|
||||
] ++ optionals withDistOutput [
|
||||
pythonOutputDistHook
|
||||
] ++ nativeBuildInputs ++ build-system;
|
||||
|
||||
|
|
@ -299,7 +311,7 @@ let
|
|||
doCheck = false;
|
||||
doInstallCheck = attrs.doCheck or true;
|
||||
nativeInstallCheckInputs = [
|
||||
] ++ lib.optionals (format' == "setuptools") [
|
||||
] ++ optionals (format' == "setuptools") [
|
||||
# Longer-term we should get rid of this and require
|
||||
# users of this function to set the `installCheckPhase` or
|
||||
# pass in a hook that sets it.
|
||||
|
|
@ -307,14 +319,14 @@ let
|
|||
] ++ nativeCheckInputs;
|
||||
installCheckInputs = checkInputs;
|
||||
|
||||
postFixup = lib.optionalString (!dontWrapPythonPrograms) ''
|
||||
postFixup = optionalString (!dontWrapPythonPrograms) ''
|
||||
wrapPythonPrograms
|
||||
'' + attrs.postFixup or "";
|
||||
|
||||
# Python packages built through cross-compilation are always for the host platform.
|
||||
disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonOnBuildForHost ];
|
||||
disallowedReferences = optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonOnBuildForHost ];
|
||||
|
||||
outputs = outputs ++ lib.optional withDistOutput "dist";
|
||||
outputs = outputs ++ optional withDistOutput "dist";
|
||||
|
||||
inherit passthru;
|
||||
|
||||
|
|
@ -323,15 +335,15 @@ let
|
|||
platforms = python.meta.platforms;
|
||||
isBuildPythonPackage = python.meta.platforms;
|
||||
} // meta;
|
||||
} // lib.optionalAttrs (attrs?checkPhase) {
|
||||
} // optionalAttrs (attrs?checkPhase) {
|
||||
# If given use the specified checkPhase, otherwise use the setup hook.
|
||||
# Longer-term we should get rid of `checkPhase` and use `installCheckPhase`.
|
||||
installCheckPhase = attrs.checkPhase;
|
||||
} // lib.optionalAttrs (disabledTestPaths != []) {
|
||||
disabledTestPaths = lib.escapeShellArgs disabledTestPaths;
|
||||
} // optionalAttrs (disabledTestPaths != []) {
|
||||
disabledTestPaths = escapeShellArgs disabledTestPaths;
|
||||
}));
|
||||
|
||||
in lib.extendDerivation
|
||||
in extendDerivation
|
||||
(disabled -> throw "${name} not supported for interpreter ${python.executable}")
|
||||
passthru
|
||||
self
|
||||
|
|
|
|||
|
|
@ -63,6 +63,14 @@ stdenv.mkDerivation rec {
|
|||
# sometimes fail due to this
|
||||
checkFlagsArray = [ "ARGS=--timeout 10000" ];
|
||||
|
||||
postFixup = ''
|
||||
# _IMPORT_PREFIX, used to point to lib, points to dev output. Every package using the generated
|
||||
# cmake file will thus look for the library in the dev output instead of out.
|
||||
# Use the absolute path to $out instead to fix the issue.
|
||||
substituteInPlace $dev/lib/cmake/scalapack-${version}/scalapack-targets-release.cmake \
|
||||
--replace "\''${_IMPORT_PREFIX}" "$out"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.netlib.org/scalapack/";
|
||||
description = "Library of high-performance linear algebra routines for parallel distributed memory machines";
|
||||
|
|
|
|||
|
|
@ -7,30 +7,35 @@
|
|||
, isodate
|
||||
, leather
|
||||
, lxml
|
||||
, nose
|
||||
, parsedatetime
|
||||
, pyicu
|
||||
, pynose
|
||||
, python-slugify
|
||||
, pytimeparse
|
||||
, pythonOlder
|
||||
, pytimeparse
|
||||
, pytz
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "agate";
|
||||
version = "1.9.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wireservice";
|
||||
repo = pname;
|
||||
repo = "agate";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-I7jvZA/m06kUuUcfglySaroDbJ5wbgiF2lb84EFPmpw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
babel
|
||||
isodate
|
||||
leather
|
||||
|
|
@ -43,7 +48,7 @@ buildPythonPackage rec {
|
|||
cssselect
|
||||
glibcLocales
|
||||
lxml
|
||||
nose
|
||||
pynose
|
||||
pyicu
|
||||
pytz
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, nose
|
||||
, numba
|
||||
, numpy
|
||||
, pynose
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, torchvision
|
||||
, scikit-learn
|
||||
, scipy
|
||||
, setuptools
|
||||
, torchvision
|
||||
, tqdm
|
||||
}:
|
||||
|
||||
|
|
@ -31,11 +31,11 @@ buildPythonPackage rec {
|
|||
sed -i '/"nose"/d' setup.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
numba
|
||||
numpy
|
||||
scipy
|
||||
|
|
@ -43,10 +43,10 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
nose
|
||||
pynose
|
||||
pytestCheckHook
|
||||
torchvision
|
||||
scikit-learn
|
||||
torchvision
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -27,11 +27,6 @@ buildPythonPackage rec {
|
|||
hash = "sha256-WU8q6A3q24xrCOjhMi1C4lj0DULIDWiG2E4BQ/kLWiM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "setuptools_scm>=8" "setuptools_scm"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
|
|
@ -43,14 +38,17 @@ buildPythonPackage rec {
|
|||
can
|
||||
crccheck
|
||||
diskcache
|
||||
matplotlib
|
||||
textparser
|
||||
];
|
||||
|
||||
passthru.optional-dependencies.plot = [
|
||||
matplotlib
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
parameterized
|
||||
pytestCheckHook
|
||||
];
|
||||
] ++ passthru.optional-dependencies.plot;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cantools"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "censys";
|
||||
version = "2.2.11";
|
||||
version = "2.2.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -27,15 +27,20 @@ buildPythonPackage rec {
|
|||
owner = "censys";
|
||||
repo = "censys-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/aB8rsyymNTXJLsf/IkA6o7M/mzyao10cl7kbxHEzGc=";
|
||||
hash = "sha256-Gw3JbAdg/ObWdD6vl8Wuct6VCcP4GAZbiesXSSnW1Mg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace-fail "--cov" ""
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
argcomplete
|
||||
backoff
|
||||
requests
|
||||
|
|
@ -57,11 +62,6 @@ buildPythonPackage rec {
|
|||
"rich"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace "--cov" ""
|
||||
'';
|
||||
|
||||
# The tests want to write a configuration file
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
|
@ -74,10 +74,10 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Python API wrapper for the Censys Search Engine (censys.io)";
|
||||
mainProgram = "censys";
|
||||
homepage = "https://github.com/censys/censys-python";
|
||||
changelog = "https://github.com/censys/censys-python/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "censys";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "lacuscore";
|
||||
version = "1.8.10";
|
||||
version = "1.9.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "ail-project";
|
||||
repo = "LacusCore";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-X3Bs/eMkpobRqiGB70ujvaIO1xWftEBZFyR9i5eN7/A=";
|
||||
hash = "sha256-DUgMql/KCy8g63HvA7qbrv9qia+nchPLIkufWmUXKDg=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "2.3.0";
|
||||
version = "2.3.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -30,14 +30,14 @@ buildPythonPackage rec {
|
|||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-HiksPxV5VTIOV71J0zlC8iiXmF85a0dTYjjnWthhdGY=";
|
||||
hash = "sha256-kydZgOiQHDovQ5RwyLru2nyHoCEVZClq8wJit/mnbvU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
bleak
|
||||
dotmap
|
||||
pexpect
|
||||
|
|
@ -73,50 +73,14 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
disabledTests = [
|
||||
# AttributeError: 'HardwareMessage'...
|
||||
"test_handleFromRadio_with_my_info"
|
||||
"test_handleFromRadio_with_node_info"
|
||||
"test_main_ch_longsfast_on_non_primary_channel"
|
||||
"test_main_ch_set_name_with_ch_index"
|
||||
"test_main_configure_with_camel_case_keys"
|
||||
"test_main_configure_with_snake_case"
|
||||
"test_main_export_config_called_from_main"
|
||||
"test_main_export_config_use_camel"
|
||||
"test_main_export_config"
|
||||
"test_main_get_with_invalid"
|
||||
"test_main_get_with_valid_values_camel"
|
||||
"test_main_getPref_invalid_field_camel"
|
||||
"test_main_getPref_invalid_field"
|
||||
"test_main_getPref_valid_field_bool_camel"
|
||||
"test_main_getPref_valid_field_bool"
|
||||
"test_main_getPref_valid_field_camel"
|
||||
"test_main_getPref_valid_field_string_camel"
|
||||
"test_main_getPref_valid_field_string"
|
||||
"test_main_getPref_valid_field"
|
||||
"test_main_set_invalid_wifi_passwd"
|
||||
"test_main_set_valid_camel_case"
|
||||
"test_main_set_valid_wifi_passwd"
|
||||
"test_main_set_valid"
|
||||
"test_main_set_with_invalid"
|
||||
"test_main_setPref_ignore_incoming_0"
|
||||
"test_main_setPref_ignore_incoming_123"
|
||||
"test_main_setPref_invalid_field_camel"
|
||||
"test_main_setPref_invalid_field"
|
||||
"test_main_setPref_valid_field_int_as_string"
|
||||
"test_readGPIOs"
|
||||
"test_onGPIOreceive"
|
||||
"test_setURL_empty_url"
|
||||
"test_watchGPIOs"
|
||||
"test_writeConfig_with_no_radioConfig"
|
||||
"test_writeGPIOs"
|
||||
"test_reboot"
|
||||
"test_shutdown"
|
||||
"test_main_sendtext"
|
||||
"test_main_sendtext_with_channel"
|
||||
"test_MeshInterface"
|
||||
"test_getNode_not_local"
|
||||
"test_getNode_not_local_timeout"
|
||||
"test_main_onConnected_exception"
|
||||
# TypeError
|
||||
"test_main_info"
|
||||
"test_main_support"
|
||||
"test_main_info_with_tcp_interfa"
|
||||
"test_main_no_proto"
|
||||
"test_main_info_with_seriallog_stdout"
|
||||
"test_main_info_with_seriallog_output_txt"
|
||||
"test_support_info"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "playwrightcapture";
|
||||
version = "1.23.14";
|
||||
version = "1.24.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "Lookyloo";
|
||||
repo = "PlaywrightCapture";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZOElXI2JSo+/wPw58WjCO7hiOUutfC2TvBFAP2DpT7I=";
|
||||
hash = "sha256-+2BxXgIC595FM3FDIbFjFpWIEkqQrDILWFjQkyN5nao=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -2,27 +2,43 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, nose
|
||||
, pynose
|
||||
, pexpect
|
||||
, pyserial
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygatt";
|
||||
version = "4.0.5";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "peplin";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1zdfxidiw0l8n498sy0l33n90lz49n25x889cx6jamjr7frlcihd";
|
||||
repo = "pygatt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DUZGsztZViVNZwmhXoRN5FOQ7BgUeI0SsYgCHlvsrv0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
postPatch = ''
|
||||
# Not support for Python < 3.4
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "'enum-compat'" "" \
|
||||
--replace-fail "'coverage >= 3.7.1'," "" \
|
||||
--replace-fail "'nose >= 1.3.7'" ""
|
||||
substituteInPlace tests/bgapi/test_bgapi.py \
|
||||
--replace-fail "assertEquals" "assertEqual"
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
pyserial
|
||||
];
|
||||
|
||||
|
|
@ -34,25 +50,22 @@ buildPythonPackage rec {
|
|||
# For cross compilation the doCheck is false and therefor the
|
||||
# nativeCheckInputs not included. We have to include nose here, since
|
||||
# setup.py requires nose unconditionally.
|
||||
nose
|
||||
pynose
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
]
|
||||
++ passthru.optional-dependencies.GATTTOOL;
|
||||
] ++ passthru.optional-dependencies.GATTTOOL;
|
||||
|
||||
postPatch = ''
|
||||
# Not support for Python < 3.4
|
||||
substituteInPlace setup.py --replace "'enum-compat'" ""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pygatt" ];
|
||||
pythonImportsCheck = [
|
||||
"pygatt"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper the BGAPI for accessing Bluetooth LE Devices";
|
||||
homepage = "https://github.com/peplin/pygatt";
|
||||
changelog = "https://github.com/peplin/pygatt/blob/v${version}/CHANGELOG.rst";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoverkiz";
|
||||
version = "1.13.9";
|
||||
format = "pyproject";
|
||||
version = "1.13.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -25,19 +25,19 @@ buildPythonPackage rec {
|
|||
owner = "iMicknl";
|
||||
repo = "python-overkiz-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-J1nsRB9KYg3yUuxQV79/Udjjkux+BE4YcawpRJcSYHI=";
|
||||
hash = "sha256-05S0tCfCXgvkheUBVDGX8my0c7SCi/ran2emjaGWd9s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'pyhumps = "^3.0.2,!=3.7.3"' 'pyhumps = "^3.0.2"'
|
||||
--replace-fail 'pyhumps = "^3.0.2,!=3.7.3"' 'pyhumps = "^3.0.2"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohttp
|
||||
attrs
|
||||
backoff
|
||||
|
|
|
|||
|
|
@ -1,21 +1,40 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, nose }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pynose
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytimeparse";
|
||||
version = "1.1.8";
|
||||
format = "setuptools";
|
||||
pname = "pytimeparse";
|
||||
version = "1.1.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e86136477be924d7e670646a98561957e8ca7308d44841e21f5ddea757556a0a";
|
||||
};
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
nativeCheckInputs = [ nose ];
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-6GE2R3vpJNfmcGRqmFYZV+jKcwjUSEHiH13ep1dVago=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A small Python library to parse various kinds of time expressions";
|
||||
homepage = "https://github.com/wroberts/pytimeparse";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ vrthra ];
|
||||
};
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pynose
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pytimeparse"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to parse various kinds of time expressions";
|
||||
homepage = "https://github.com/wroberts/pytimeparse";
|
||||
changelog = "https://github.com/wroberts/pytimeparse/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ vrthra ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "speechrecognition";
|
||||
version = "3.10.1";
|
||||
version = "3.10.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,14 +22,14 @@ buildPythonPackage rec {
|
|||
owner = "Uberi";
|
||||
repo = "speech_recognition";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-lO1CW4j5aBnPtemNGsW8cytSa/H+Tb4Jpbfh4Z/0WHk=";
|
||||
hash = "sha256-yMitfMfCGgfq4sgzPstxNYDkAQ4VCewT2jgumODvAnE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
requests
|
||||
typing-extensions
|
||||
];
|
||||
|
|
|
|||
|
|
@ -31,14 +31,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tempest";
|
||||
version = "37.0.0";
|
||||
version = "38.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-z9DCHlBetJ4wWcwfzIWf+TLKKNcCTKzpVs+2zgmuAyc=";
|
||||
hash = "sha256-2WmSN4NrH5/y5iAuYaaVuZkuh1ym14jFj7OXw8Jfxtc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "wsgidav";
|
||||
version = "4.3.1";
|
||||
version = "4.3.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "mar10";
|
||||
repo = "wsgidav";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jgn4bculVIXfMx3Or3pKF478UOzCL8nhEeNvOeGyjPI=";
|
||||
hash = "sha256-93+8h+vRLnspQ/lmdjKYpzSEJSKcqCkB4qRqTuKHNRA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
version = "1.25.0";
|
||||
version = "1.26.0";
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "sqlc";
|
||||
|
|
@ -11,11 +11,11 @@ buildGoModule {
|
|||
owner = "sqlc-dev";
|
||||
repo = "sqlc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VrR/oSGyKtbKHfQaiLQ9oKyWC1Y7lTZO1aUSS5bCkKY=";
|
||||
hash = "sha256-o23FQytw+zpkmTTxxxunHx3NvLF5q0ZSl1NV+D+XKww=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-C5OOTAYoSt4anz1B/NGDHY5NhxfyTZ6EHis04LFnMPM=";
|
||||
vendorHash = "sha256-T4DUuZg1yVxSgw/SXgajpvYwzfYZYxzLE3F7U9bpUTw=";
|
||||
|
||||
subPackages = [ "cmd/sqlc" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "heroku";
|
||||
version = "8.11.0";
|
||||
version = "8.11.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://cli-assets.heroku.com/versions/8.11.0/a525d5e/heroku-v8.11.0-a525d5e-linux-x64.tar.xz";
|
||||
hash = "sha256-0G/ZRffPUHQy5iU64x92pjLd6pFCfEABugnSfYiUXHQ=";
|
||||
url = "https://cli-assets.heroku.com/versions/8.11.1/6dbf5e0/heroku-v8.11.1-6dbf5e0-linux-x64.tar.xz";
|
||||
hash = "sha256-/gZnVxnWqxz1vp+FXpTnlqF8Z8mdkNbh/eUsJcIq+II=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "refinery-cli";
|
||||
version = "0.8.12";
|
||||
version = "0.8.13";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "refinery_cli";
|
||||
inherit version;
|
||||
sha256 = "sha256-ftti/+Zl9/8CsrlEI5gZQF0M33vzl5aK3X/EfCujtY4=";
|
||||
sha256 = "sha256-5PncxxJ63WGwJk4MexqOJZQEhdoe4WMz8gsHZgjxBPM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KlZTgg/Y4cXy5DR8iT4olVTF0kq1g5AQm3Sjpmrl6lk=";
|
||||
cargoHash = "sha256-C0/11Ky5mXcEFPxa72jkJLg/DDxPz/Jmmfa2oHpHF6k=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchCrate
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, rustfmt
|
||||
, cacert
|
||||
, openssl
|
||||
, darwin
|
||||
|
|
@ -12,38 +13,31 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dioxus-cli";
|
||||
version = "0.4.3";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-TWcuEobYH2xpuwB1S63HoP/WjH3zHXTnlXXvOcYIZG8=";
|
||||
hash = "sha256-iNlJLDxb8v7x19q0iaAnGmtmoPjMW8YXzbx5Fcf8Yws=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ozbGK46uq3qXZifyTY7DDX1+vQuDJuSOJZw35vwcuxY=";
|
||||
cargoHash = "sha256-6XKNBLDNWYd5+O7buHupXzVss2jCdh3wu9mXVLivH44=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config cacert ];
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
];
|
||||
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
nativeCheckInputs = [ rustfmt ];
|
||||
|
||||
checkFlags = [
|
||||
# requires network access
|
||||
"--skip=server::web::proxy::test::add_proxy"
|
||||
"--skip=server::web::proxy::test::add_proxy_trailing_slash"
|
||||
];
|
||||
|
||||
# Omitted: --doc
|
||||
# Can be removed after 0.4.3 or when https://github.com/DioxusLabs/dioxus/pull/1706 is resolved
|
||||
# Matches upstream package test CI https://github.com/DioxusLabs/dioxus/blob/544ca5559654c8490ce444c3cbd85c1bfb8479da/Makefile.toml#L94-L108
|
||||
cargoTestFlags = [
|
||||
"--lib"
|
||||
"--bins"
|
||||
"--tests"
|
||||
"--examples"
|
||||
];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = dioxus-cli;
|
||||
command = "${meta.mainProgram} --version";
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libremines";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bollos00";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LejDXjli+AEVGp23y+ez/NyJY/8w7uHcOij6RsDwIH4=";
|
||||
hash = "sha256-TQwjEgtqAvKnrpia6VloRgFwtq5TNDmxU+ZWjtEK/n8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake wrapQtAppsHook ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
let
|
||||
data = stdenv.mkDerivation(finalAttrs: {
|
||||
pname = "path-of-building-data";
|
||||
version = "2.41.0";
|
||||
version = "2.42.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PathOfBuildingCommunity";
|
||||
repo = "PathOfBuilding";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-XoRoKvlfBtlKyur1AZ+VjYc5URyX2/fof05h6Vs+vok=";
|
||||
hash = "sha256-OxAyB+tMszQktGvxlGL/kc+Wt0iInFYY0qHNjK6EnSg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -69,10 +69,7 @@ ecmPostHook() {
|
|||
}
|
||||
postHooks+=(ecmPostHook)
|
||||
|
||||
xdgDataSubdirs=( \
|
||||
"config.kcfg" "kconf_update" "knotifications6" "icons" "locale" "sounds" "templates" \
|
||||
"wallpapers" "applications" "desktop-directories" "mime" "appdata" "dbus-1" \
|
||||
)
|
||||
xdgDataSubdirs=("config.kcfg" "kconf_update" "knotifications6" "icons" "locale" "mime")
|
||||
|
||||
# ecmHostPathsSeen is an associative array of the paths that have already been
|
||||
# seen by ecmHostPathHook.
|
||||
|
|
@ -108,19 +105,7 @@ ecmHostPathHook() {
|
|||
fi
|
||||
done
|
||||
|
||||
local manDir="$1/man"
|
||||
if [ -d "$manDir" ]
|
||||
then
|
||||
qtWrapperArgs+=(--prefix MANPATH : "$manDir")
|
||||
fi
|
||||
|
||||
local infoDir="$1/info"
|
||||
if [ -d "$infoDir" ]
|
||||
then
|
||||
qtWrapperArgs+=(--prefix INFOPATH : "$infoDir")
|
||||
fi
|
||||
|
||||
if [ -d "$1/dbus-1" ]
|
||||
if [ -d "$1/share/dbus-1" ]
|
||||
then
|
||||
propagatedUserEnvPkgs+=" $1"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -10,7 +10,9 @@ let
|
|||
concatMapStrings
|
||||
concatMapStringsSep
|
||||
concatStrings
|
||||
filter
|
||||
findFirst
|
||||
head
|
||||
isDerivation
|
||||
length
|
||||
concatMap
|
||||
|
|
@ -29,6 +31,14 @@ let
|
|||
toList
|
||||
isList
|
||||
elem
|
||||
;
|
||||
|
||||
inherit (lib.meta)
|
||||
availableOn
|
||||
;
|
||||
|
||||
inherit (lib.generators)
|
||||
toPretty
|
||||
;
|
||||
|
||||
# If we're in hydra, we can dispense with the more verbose error
|
||||
|
|
@ -84,7 +94,7 @@ let
|
|||
# was `licenses: lib.lists.any (l: !l.free or true) licenses;`
|
||||
# which always evaluates to `!true` for strings.
|
||||
else if isString licenses then false
|
||||
else lib.lists.any (l: !l.free or true) licenses;
|
||||
else any (l: !l.free or true) licenses;
|
||||
|
||||
hasUnfreeLicense = attrs: hasLicense attrs && isUnfree attrs.meta.license;
|
||||
|
||||
|
|
@ -94,7 +104,7 @@ let
|
|||
isMarkedBroken = attrs: attrs.meta.broken or false;
|
||||
|
||||
hasUnsupportedPlatform =
|
||||
pkg: !(lib.meta.availableOn hostPlatform pkg);
|
||||
pkg: !(availableOn hostPlatform pkg);
|
||||
|
||||
isMarkedInsecure = attrs: (attrs.meta.knownVulnerabilities or []) != [];
|
||||
|
||||
|
|
@ -364,7 +374,7 @@ let
|
|||
[ ]
|
||||
else
|
||||
[ "key 'meta.${k}' has invalid value; expected ${metaTypes.${k}.name}, got\n ${
|
||||
lib.generators.toPretty { indent = " "; } v
|
||||
toPretty { indent = " "; } v
|
||||
}" ]
|
||||
else
|
||||
[ "key 'meta.${k}' is unrecognized; expected one of: \n [${concatMapStringsSep ", " (x: "'${x}'") (attrNames metaTypes)}]" ];
|
||||
|
|
@ -414,7 +424,7 @@ let
|
|||
else if !allowBroken && attrs.meta.broken or false then
|
||||
{ valid = "no"; reason = "broken"; errormsg = "is marked as broken"; }
|
||||
else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then
|
||||
let toPretty = lib.generators.toPretty {
|
||||
let toPretty' = toPretty {
|
||||
allowPrettyValues = true;
|
||||
indent = " ";
|
||||
};
|
||||
|
|
@ -422,8 +432,8 @@ let
|
|||
errormsg = ''
|
||||
is not available on the requested hostPlatform:
|
||||
hostPlatform.config = "${hostPlatform.config}"
|
||||
package.meta.platforms = ${toPretty (attrs.meta.platforms or [])}
|
||||
package.meta.badPlatforms = ${toPretty (attrs.meta.badPlatforms or [])}
|
||||
package.meta.platforms = ${toPretty' (attrs.meta.platforms or [])}
|
||||
package.meta.badPlatforms = ${toPretty' (attrs.meta.badPlatforms or [])}
|
||||
'';
|
||||
}
|
||||
else if !(hasAllowedInsecure attrs) then
|
||||
|
|
@ -436,6 +446,18 @@ let
|
|||
# -----
|
||||
else { valid = "yes"; });
|
||||
|
||||
getRepository = let
|
||||
getSrcs = attrs:
|
||||
if attrs ? src
|
||||
then
|
||||
[ attrs.src ]
|
||||
else
|
||||
filter (src: src ? meta.homepage) attrs.srcs;
|
||||
getHomePages = map (src: src.meta.homepage);
|
||||
unlist = list:
|
||||
if length list == 1 then head list
|
||||
else list;
|
||||
in attrs: unlist (getHomePages (getSrcs attrs));
|
||||
|
||||
# The meta attribute is passed in the resulting attribute set,
|
||||
# but it's not part of the actual derivation, i.e., it's not
|
||||
|
|
@ -447,6 +469,7 @@ let
|
|||
commonMeta = { validity, attrs, pos ? null, references ? [ ] }:
|
||||
let
|
||||
outputs = attrs.outputs or [ "out" ];
|
||||
hasOutput = out: builtins.elem out outputs;
|
||||
in
|
||||
optionalAttrs (attrs ? src.meta.homepage || attrs ? srcs && isList attrs.srcs && any (src: src ? meta.homepage) attrs.srcs) {
|
||||
# should point to an http-browsable source tree, if available.
|
||||
|
|
@ -454,22 +477,7 @@ let
|
|||
# this could be handled a lot easier if we nulled it instead
|
||||
# of having it be undefined, but that wouldn't match the
|
||||
# other attributes.
|
||||
repository = let
|
||||
getSrcs = attrs:
|
||||
if attrs ? src
|
||||
then
|
||||
[ attrs.src ]
|
||||
else
|
||||
lib.filter (src: src ? meta.homepage) attrs.srcs;
|
||||
getHomePages = srcs: map (src: src.meta.homepage) srcs;
|
||||
unlist = list:
|
||||
if lib.length list == 1
|
||||
then
|
||||
lib.elemAt list 0
|
||||
else
|
||||
list;
|
||||
in
|
||||
unlist (getHomePages (getSrcs attrs));
|
||||
repository = getRepository attrs;
|
||||
} // {
|
||||
# `name` derivation attribute includes cross-compilation cruft,
|
||||
# is under assert, and is sanitized.
|
||||
|
|
@ -487,10 +495,13 @@ let
|
|||
# Services and users should specify outputs explicitly,
|
||||
# unless they are comfortable with this default.
|
||||
outputsToInstall =
|
||||
let
|
||||
hasOutput = out: builtins.elem out outputs;
|
||||
in
|
||||
[ (findFirst hasOutput null ([ "bin" "out" ] ++ outputs)) ]
|
||||
[
|
||||
(
|
||||
if hasOutput "bin" then "bin"
|
||||
else if hasOutput "out" then "out"
|
||||
else findFirst hasOutput null outputs
|
||||
)
|
||||
]
|
||||
++ optional (hasOutput "man") "man";
|
||||
}
|
||||
// attrs.meta or { }
|
||||
|
|
|
|||
|
|
@ -2,16 +2,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "bartib";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nikolassv";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ph3rsrhcyi272bv5018pw185zn7fvp5fqj24yh9rjrz8x7iawib";
|
||||
sha256 = "sha256-eVLacxKD8seD8mxVN1D3HhKZkIDXsEsSisZnFbmhpSk=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-1ZFwX7NKIainer7o9dIMxwyycdGW8K9euLHad/tF95w=";
|
||||
cargoSha256 = "sha256-s/oGv7/0LgNpdGu6dnvvbxDgFDvcvcHL01dSPxhMVWE=";
|
||||
preConfigure = ''
|
||||
cargo metadata --offline
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "starship";
|
||||
version = "1.18.1";
|
||||
version = "1.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starship";
|
||||
repo = "starship";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MaOlLOdZM6rSnIj98gzuxVICSGUAqXNE8oIzsHAY6E0=";
|
||||
hash = "sha256-84FyKhSP2EZZkQJRhNPTYs2BYppylk50GiIck8pN3l4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles cmake ];
|
||||
|
|
@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
|
|||
cp docs/public/presets/toml/*.toml $presetdir
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-EuCls/xxMpith92lu8vADDTeQUTaBEEYsQ994lDPGqQ=";
|
||||
cargoHash = "sha256-Fu8KfWHCQUPSiT1aMSS0Il/S02YXdEqKMA2nsliUu8E=";
|
||||
|
||||
nativeCheckInputs = [ git ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, cryptsetup
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fido2luks";
|
||||
version = "0.2.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shimunn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-bXwaFiRHURvS5KtTqIj+3GlGNbEulDgMDP51ZiO1w9o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
|
||||
|
||||
buildInputs = [ cryptsetup ];
|
||||
|
||||
cargoSha256 = "sha256-MPji87jYJjYtDAXO+v/Z4XRtCKo+ftsNvmlBrM9iMTk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";
|
||||
homepage = "https://github.com/shimunn/fido2luks";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ prusnak mmahut ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.70.3";
|
||||
version = "3.71.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eTxqNsTcdYqflY5i6tV/4uL9jV2MPwVeWspXfjX8Xmc=";
|
||||
hash = "sha256-PxaZl3OV3bAbZzKVxHO8MuwqO2c16w4MNypsZpVOQTU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-VYF9QIlshfFkNbfEQlJsp1SbGsGVTwnGLdKprKOeB74=";
|
||||
vendorHash = "sha256-xU6mUhSgB9DMyVMo2tTd5uNyrDoFsY2zMaTKSPBcgwM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -8078,8 +8078,6 @@ with pkgs;
|
|||
|
||||
flux = callPackage ../development/compilers/flux { };
|
||||
|
||||
fido2luks = callPackage ../tools/security/fido2luks { };
|
||||
|
||||
fierce = callPackage ../tools/security/fierce { };
|
||||
|
||||
figlet = callPackage ../tools/misc/figlet { };
|
||||
|
|
@ -8775,8 +8773,6 @@ with pkgs;
|
|||
|
||||
halftone = callPackage ../applications/graphics/halftone { };
|
||||
|
||||
halloy = callPackage ../applications/networking/irc/halloy { };
|
||||
|
||||
harminv = callPackage ../development/libraries/science/chemistry/harminv { };
|
||||
|
||||
igrep = callPackage ../tools/text/igrep {
|
||||
|
|
@ -29845,8 +29841,6 @@ with pkgs;
|
|||
|
||||
anilibria-winmaclinux = libsForQt5.callPackage ../applications/video/anilibria-winmaclinux { };
|
||||
|
||||
masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { };
|
||||
|
||||
masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { };
|
||||
|
||||
master_me = callPackage ../applications/audio/master_me {
|
||||
|
|
|
|||
Loading…
Reference in New Issue