Merge release-23.05 into staging-next-23.05

This commit is contained in:
github-actions[bot]
2023-10-03 00:12:29 +00:00
committed by GitHub
31 changed files with 900 additions and 2077 deletions

View File

@@ -455,6 +455,11 @@ in mkLicense lset) ({
free = false;
};
fraunhofer-fdk = {
fullName = "Fraunhofer FDK AAC Codec Library";
spdxId = "FDK-AAC";
};
free = {
fullName = "Unspecified free software license";
};

View File

@@ -63,5 +63,6 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
maintainers = with maintainers; [ jk ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
knownVulnerabilities = [ "CVE-2023-5217" ];
};
}

View File

@@ -69,6 +69,7 @@ let
license = licenses.asl20;
maintainers = with maintainers; [ jk ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
knownVulnerabilities = [ "CVE-2023-5217" ];
};
in

View File

@@ -137,5 +137,6 @@ stdenv.mkDerivation rec {
license = licenses.osl3;
maintainers = with maintainers; [ ludovicopiero wrmilling ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
knownVulnerabilities = [ "CVE-2023-4863" ];
};
}

View File

@@ -2,9 +2,9 @@
let
versions = if stdenv.isLinux then {
stable = "0.0.30";
ptb = "0.0.46";
canary = "0.0.167";
development = "0.0.232";
ptb = "0.0.48";
canary = "0.0.169";
development = "0.0.234";
} else {
stable = "0.0.278";
ptb = "0.0.77";
@@ -20,15 +20,15 @@ let
};
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
hash = "sha256-omPqp8iyQpp5UxoOlp0+iaQG6yuKVVGaYhl7I643dqQ=";
hash = "sha256-Vea9Jm9qeU+bSFUGkAtd+3Goe6JvfT3KYX/Kt5UjFWc=";
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
hash = "sha256-ua99w5pJz8UZldMvYLB7SkcgAG2hQBdorbnugvFDktE=";
hash = "sha256-32eKiQ9EncEZNL6MlK8lKqo0ZoRQKOpADx62bDQ6tvQ=";
};
development = fetchurl {
url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
hash = "sha256-AsHdQvDLzflhuYO8V4R+2zjQYpRo+aPa8HYXc3taayY=";
hash = "sha256-R5UwgpXgb32mEohTzyRVXmumcgPl8UPan3UjmLFLxLo=";
};
};
x86_64-darwin = {

View File

@@ -99,5 +99,6 @@ stdenv.mkDerivation rec {
homepage = "https://getmailspring.com";
downloadPage = "https://github.com/Foundry376/Mailspring";
platforms = [ "x86_64-linux" ];
knownVulnerabilities = [ "CVE-2023-4863" ];
};
}

View File

@@ -1,15 +1,15 @@
From 310245bad66048624e199000a1c7eb9d68ce2b5c Mon Sep 17 00:00:00 2001
From 054e2e2092e3f20267a5d2046978df6d33c72712 Mon Sep 17 00:00:00 2001
From: Yaya <mak@nyantec.com>
Date: Tue, 23 May 2023 13:49:18 +0000
Subject: [PATCH] Remove unsupported database names
The only supported ones are main, ci, main_clusterwide.
---
config/database.yml.postgresql | 35 ----------------------------------
1 file changed, 35 deletions(-)
config/database.yml.postgresql | 37 ----------------------------------
1 file changed, 37 deletions(-)
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
index b210b9c412bc..900612080416 100644
index da9f458ff..2d6d44e37 100644
--- a/config/database.yml.postgresql
+++ b/config/database.yml.postgresql
@@ -26,13 +26,6 @@ production:
@@ -54,8 +54,8 @@ index b210b9c412bc..900612080416 100644
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
@@ -117,17 +96,3 @@ test: &test
prepared_statements: false
@@ -119,19 +98,3 @@ test: &test
reaping_frequency: nil
variables:
statement_timeout: 15s
- geo:
@@ -65,6 +65,7 @@ index b210b9c412bc..900612080416 100644
- username: postgres
- password:
- host: localhost
- reaping_frequency: nil
- embedding:
- adapter: postgresql
- encoding: unicode
@@ -72,6 +73,7 @@ index b210b9c412bc..900612080416 100644
- username: postgres
- password:
- host: localhost
- reaping_frequency: nil
--
2.38.4
2.40.1

View File

@@ -1,15 +1,15 @@
{
"version": "16.3.4",
"repo_hash": "sha256-VM3yH+6R8FyzwAhXtjbQsoMhPVALvDxQvmwyNZE0JCQ=",
"yarn_hash": "02g51sfpn065513n5ngcw6rqvzaws6yfq0y7gyj4lc4d8fhis088",
"version": "16.4.1",
"repo_hash": "sha256-gIoHv+Zt0WgxxL1GLz1iaK1g3uJNMbp+Umo6FbWEggY=",
"yarn_hash": "0106yyiy00cag36mgckiwfdvhz23fsnskigpd533kjrl32qr9d6l",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v16.3.4-ee",
"rev": "v16.4.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "16.3.4",
"GITLAB_PAGES_VERSION": "16.3.4",
"GITLAB_SHELL_VERSION": "14.26.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.10",
"GITLAB_WORKHORSE_VERSION": "16.3.4"
"GITALY_SERVER_VERSION": "16.4.1",
"GITLAB_PAGES_VERSION": "16.4.1",
"GITLAB_SHELL_VERSION": "14.28.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.9",
"GITLAB_WORKHORSE_VERSION": "16.4.1"
}
}

View File

@@ -3,17 +3,10 @@
, fetchFromGitHub
, buildGoModule
, pkg-config
# libgit2 + dependencies
, libgit2
, http-parser
, openssl
, pcre
, zlib
}:
let
version = "16.3.4";
version = "16.4.1";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -24,17 +17,16 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-5fNRoxWNBky7dJLFg+OyshfIcAqCAj41hvfrQRPIuzg=";
hash = "sha256-t3d72l/Na0qv+jezT/YhAUbG9DSSe9pyixQjTALTxvk=";
};
vendorHash = "sha256-abyouKgn31yO3+oeowtxZcuvS6mazVM8zOMEFsyw4C0=";
vendorHash = "sha256-Nlq1l1f389DC854rFznEu2Viv0T7Y1cD1Ht0o2N304o=";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
tags = [ "static,system_libgit2" ];
tags = [ "static" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libgit2 openssl zlib pcre http-parser ];
doCheck = false;
};
@@ -42,7 +34,7 @@ let
auxBins = buildGoModule ({
pname = "gitaly-aux";
subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-git2go" "cmd/gitaly-lfs-smudge" "cmd/gitaly-gpg" ];
subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-lfs-smudge" "cmd/gitaly-gpg" ];
} // commonOpts);
in
buildGoModule ({

View File

@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "gitlab-container-registry";
version = "3.82.0";
version = "3.84.0";
rev = "v${version}-gitlab";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
sha256 = "sha256-umlpGpeN7sWe8524+wjdYYJegLdc+eQqlgySLWL0a+k=";
sha256 = "sha256-VdLovX3/y0fME74YlpPxjNPAwFpr1urAHJYO24VJ4AE=";
};
vendorHash = "sha256-hFGuzTM9+Zb8BmUoFG059eqM53AzOmi1DeBnF68WSoc=";
vendorHash = "sha256-ZFQixOgcB8GqgZPIbjMJEYOlg9cD+wAMZF7mwWaNSXI=";
patches = [
./Disable-inmemory-storage-driver-test.patch

View File

@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "gitlab-elasticsearch-indexer";
version = "4.3.8";
version = "4.3.9";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-elasticsearch-indexer";
rev = "v${version}";
sha256 = "sha256-CePFRk+Dpndv4BtINUn8/Y4fhuO4sCyh4+erjfIHZvI=";
sha256 = "sha256-/jo44MlLWZCSUWFW2rJSqugNYZCXEs5pfj0f6fZs4zg=";
};
vendorHash = "sha256-SEYHROFFaR7m7K6l4+zipX0QNYWpbf8qI4pAp1pKAsY=";
vendorHash = "sha256-TQ6E5eckZNVL6zzaS9m0izWnQitqfpc4MAEoQOVasnA=";
buildInputs = [ icu ];
nativeBuildInputs = [ pkg-config ];

View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "16.3.4";
version = "16.4.1";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-hz5YCQi1O+/ana/Vpawh2nQj7fmcI6huvKFTG9rVDjw=";
hash = "sha256-aUpuzgFbxMJwKjTn+QAudOeMBSLtLTjaTmwe25f6qxg=";
};
vendorHash = "sha256-Pdb+bWsECe7chgvPKFGXxVAWb+AbGF6khVJSdDsHqKM=";
vendorHash = "sha256-ko0ycT8HlqVfXf7tck0xcs6rDJMpHxjSoI59gTLgqDQ=";
subPackages = [ "." ];
meta = with lib; {

View File

@@ -2,19 +2,19 @@
buildGoModule rec {
pname = "gitlab-shell";
version = "14.26.0";
version = "14.28.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "sha256-nDnPldBQy4Zg0uZshxSmcEl0ggmqg6CyNWc/I3szonI=";
sha256 = "sha256-w/Td4J4t/xrkR5LmFTcAD5U9ZR3HDGqLNxpjkDC0pi4=";
};
buildInputs = [ ruby libkrb5 ];
patches = [ ./remove-hardcoded-locations.patch ];
vendorSha256 = "sha256-Lqo0fdrYEHOKjF/XT3c1VjVQc1YxeBy6yW69IxXZAow=";
vendorHash = "sha256-EIJSBUUsWvA93OAyBNey2WA2sV+7YSWbsC1RnWf6nrI=";
postInstall = ''
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin

View File

@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.3.4";
version = "16.4.1";
src = fetchFromGitLab {
owner = data.owner;
@@ -16,7 +16,7 @@ buildGoModule rec {
sourceRoot = "source/workhorse";
vendorSha256 = "sha256-Gitap0cWRubtWLJcT8oVg9FKcN9FhXbVy/t2tgaZ93Q=";
vendorHash = "sha256-C6FVTOY3CdO2y6mKuvgEWDZnWevRTxeOefRF2EbXDv8=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;

View File

@@ -19,6 +19,8 @@ gem 'rails', '~> 7.0.6'
gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab'
gem 'vite_rails'
gem 'bootsnap', '~> 1.16.0', require: false
gem 'openssl', '~> 3.0'
@@ -36,10 +38,10 @@ gem 'responders', '~> 3.0'
gem 'sprockets', '~> 3.7.0'
gem 'view_component', '~> 3.2.0'
gem 'view_component', '~> 3.5.0'
# Supported DBs
gem 'pg', '~> 1.5.3'
gem 'pg', '~> 1.5.4'
gem 'neighbor', '~> 0.2.3'
@@ -58,7 +60,7 @@ gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-en
gem 'bcrypt', '~> 3.1', '>= 3.1.14'
gem 'doorkeeper', '~> 5.6', '>= 5.6.6'
gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7'
gem 'rexml', '~> 3.2.5'
gem 'rexml', '~> 3.2.6'
gem 'ruby-saml', '~> 1.15.0'
gem 'omniauth', '~> 2.1.0'
gem 'omniauth-auth0', '~> 3.1'
@@ -91,7 +93,7 @@ gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos
# Spam and anti-bot protection
gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails'
gem 'akismet', '~> 3.0'
gem 'invisible_captcha', '~> 2.0.0'
gem 'invisible_captcha', '~> 2.1.0'
# Two-factor authentication
gem 'devise-two-factor', '~> 4.0.2'
@@ -99,7 +101,7 @@ gem 'rqrcode-rails3', '~> 0.1.7'
gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted'
# GitLab Pages
gem 'validates_hostname', '~> 1.0.11'
gem 'validates_hostname', '~> 1.0.13'
gem 'rubyzip', '~> 2.3.2', require: 'zip'
# GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0'
@@ -111,7 +113,7 @@ gem 'browser', '~> 5.3.1'
gem 'ohai', '~> 17.9'
# GPG
gem 'gpgme', '~> 2.0.22'
gem 'gpgme', '~> 2.0.23'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
@@ -122,13 +124,13 @@ gem 'net-ldap', '~> 0.17.1'
# API
gem 'grape', '~> 1.7.1'
gem 'grape-entity', '~> 0.10.0'
gem 'rack-cors', '~> 1.1.1', require: 'rack/cors'
gem 'rack-cors', '~> 2.0.1', require: 'rack/cors'
gem 'grape-swagger', '~> 1.6.1', group: [:development, :test]
gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test]
# GraphQL API
gem 'graphql', '~> 1.13.12'
gem 'graphiql-rails', '~> 1.8'
gem 'graphql', '~> 1.13.19'
gem 'graphiql-rails', '~> 1.8.0'
gem 'apollo_upload_server', '~> 2.1.0'
gem 'graphql-docs', '~> 2.1.0', group: [:development, :test]
gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
@@ -177,9 +179,6 @@ gem 'google-apis-serviceusage_v1', '~> 0.28.0'
gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0'
gem 'google-apis-androidpublisher_v3', '~> 0.34.0'
# for aws storage
gem 'unf', '~> 0.1.4'
# Seed data
gem 'seed-fu', '~> 2.3.7'
@@ -187,15 +186,15 @@ gem 'seed-fu', '~> 2.3.7'
gem 'elasticsearch-model', '~> 7.2'
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
gem 'elasticsearch-api', '7.13.3'
gem 'aws-sdk-core', '~> 3.180.3'
gem 'aws-sdk-core', '~> 3.181.1'
gem 'aws-sdk-cloudformation', '~> 1'
gem 'aws-sdk-s3', '~> 1.132.1'
gem 'aws-sdk-s3', '~> 1.134.0'
gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.14.3'
gem 'deckar01-task_list', '2.3.2'
gem 'deckar01-task_list', '2.3.3'
gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup'
gem 'commonmarker', '~> 0.23.10'
gem 'kramdown', '~> 2.3.1'
@@ -225,7 +224,7 @@ gem 'rack', '~> 2.2.8'
gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base'
group :puma do
gem 'puma', '~> 6.3', require: false
gem 'puma', '~> 6.3', '>= 6.3.1', require: false
gem 'sd_notify', '~> 0.1.0', require: false
end
@@ -245,7 +244,7 @@ gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', requir
gem 'fugit', '~> 1.8.1'
# HTTP requests
gem 'httparty', '~> 0.20.0'
gem 'httparty', '~> 0.21.0'
# Colored output to console
gem 'rainbow', '~> 3.0'
@@ -254,7 +253,7 @@ gem 'rainbow', '~> 3.0'
gem 'ruby-progressbar', '~> 1.10'
# Linear-time regex library for untrusted regular expressions
gem 're2', '~> 1.7.0'
gem 're2', '2.0.0'
# Misc
@@ -302,16 +301,14 @@ gem 'ruby-openai', '~> 3.7'
gem 'circuitbox', '2.0.0'
# Sanitize user input
gem 'sanitize', '~> 6.0'
gem 'sanitize', '~> 6.0.2'
gem 'babosa', '~> 2.0'
# Sanitizes SVG input
gem 'loofah', '~> 2.21.3'
# Working with license
# Detects the open source license the repository includes
# This version needs to be in sync with gitlab-org/gitaly
gem 'licensee', '~> 9.15'
# Used to provide license templates
gem 'licensee', '~> 9.16'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.7'
@@ -320,13 +317,13 @@ gem 'charlock_holmes', '~> 0.7.7'
gem 'ruby-magic', '~> 0.6'
# Faster blank
gem 'fast_blank'
gem 'fast_blank', '~> 1.0.1'
# Parse time & duration
gem 'gitlab-chronic', '~> 0.10.5'
gem 'gitlab_chronic_duration', '~> 0.10.6.2'
gem 'gitlab_chronic_duration', '~> 0.11'
gem 'rack-proxy', '~> 0.7.6'
gem 'rack-proxy', '~> 0.7.7'
gem 'sassc-rails', '~> 2.1.0'
gem 'autoprefixer-rails', '10.2.5.1'
@@ -334,7 +331,7 @@ gem 'terser', '1.0.2'
gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client'
gem 'addressable', '~> 2.8'
gem 'tanuki_emoji', '~> 0.6'
gem 'tanuki_emoji', '~> 0.7'
gem 'gon', '~> 6.4.0'
gem 'request_store', '~> 1.5.1'
gem 'base32', '~> 0.3.0'
@@ -362,7 +359,6 @@ gem 'gitlab-labkit', '~> 0.34.0'
gem 'thrift', '>= 0.16.0'
# I18n
gem 'ruby_parser', '~> 3.20', require: false
gem 'rails-i18n', '~> 7.0'
gem 'gettext_i18n_rails', '~> 1.11.0'
gem 'gettext_i18n_rails_js', '~> 1.3'
@@ -381,7 +377,7 @@ gem 'snowplow-tracker', '~> 0.8.0'
# Metrics
gem 'webrick', '~> 1.8.1', require: false
gem 'prometheus-client-mmap', '~> 0.27', require: 'prometheus/client'
gem 'prometheus-client-mmap', '~> 0.28', require: 'prometheus/client'
gem 'warning', '~> 1.3.0'
@@ -447,7 +443,7 @@ group :development, :test do
end
group :development, :test, :danger do
gem 'gitlab-dangerfiles', '~> 3.13.0', require: false
gem 'gitlab-dangerfiles', '~> 4.0.0', require: false
end
group :development, :test, :coverage do
@@ -477,13 +473,13 @@ group :test do
gem 'capybara', '~> 3.39', '>= 3.39.2'
gem 'capybara-screenshot', '~> 1.0.26'
gem 'selenium-webdriver', '= 4.11.0'
gem 'selenium-webdriver', '= 4.12.0'
gem 'graphlyte', '~> 1.0.0'
gem 'shoulda-matchers', '~> 5.1.0', require: false
gem 'email_spec', '~> 2.2.0'
gem 'webmock', '~> 3.18.1'
gem 'webmock', '~> 3.19.1'
gem 'rails-controller-testing'
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 1.2.2'
@@ -494,10 +490,10 @@ group :test do
# Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
gem 'derailed_benchmarks', require: false
gem 'gitlab_quality-test_tooling', '~> 0.9.3', require: false
gem 'gitlab_quality-test_tooling', '~> 1.0.0', require: false
end
gem 'octokit', '~> 4.15'
gem 'octokit', '~> 6.0'
gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room'
@@ -529,23 +525,23 @@ gem 'ssh_data', '~> 1.3'
gem 'spamcheck', '~> 1.3.0'
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 16.2.0-rc4'
gem 'gitaly', '~> 16.3.0-rc1'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.2.0'
gem 'grpc', '~> 1.55.0'
gem 'google-protobuf', '~> 3.23', '>= 3.23.4'
gem 'google-protobuf', '~> 3.24', '>= 3.24.3'
gem 'toml-rb', '~> 2.2.0'
# Feature toggles
gem 'flipper', '~> 0.25.0'
gem 'flipper-active_record', '~> 0.25.0'
gem 'flipper-active_support_cache_store', '~> 0.25.0'
gem 'flipper', '~> 0.26.2'
gem 'flipper-active_record', '~> 0.26.2'
gem 'flipper-active_support_cache_store', '~> 0.26.2'
gem 'unleash', '~> 3.2.2'
gem 'gitlab-experiment', '~> 0.7.1'
gem 'gitlab-experiment', '~> 0.8.0'
# Structured logging
gem 'lograge', '~> 0.5'
@@ -575,7 +571,7 @@ gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: f
gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer'
# File encryption
gem 'lockbox', '~> 1.1.1'
gem 'lockbox', '~> 1.3.0'
# Email validation
gem 'valid_email', '~> 0.1'

View File

@@ -100,7 +100,7 @@ PATH
specs:
mail-smtp_pool (0.1.0)
connection_pool (~> 2.0)
mail (~> 2.7)
mail (~> 2.8)
PATH
remote: vendor/gems/microsoft_graph_mailer
@@ -265,7 +265,7 @@ GEM
aws-sdk-cloudformation (1.41.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.180.3)
aws-sdk-core (3.181.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
@@ -273,8 +273,8 @@ GEM
aws-sdk-kms (1.64.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.132.1)
aws-sdk-core (~> 3, >= 3.179.0)
aws-sdk-s3 (1.134.0)
aws-sdk-core (~> 3, >= 3.181.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.6)
aws-sigv4 (1.6.0)
@@ -389,18 +389,18 @@ GEM
css_parser (1.14.0)
addressable
cvss-suite (3.0.1)
danger (8.6.1)
danger (9.3.1)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
cork (~> 0.1)
faraday (>= 0.9.0, < 2.0)
faraday (>= 0.9.0, < 3.0)
faraday-http-cache (~> 2.0)
git (~> 1.7)
git (~> 1.13)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.0)
no_proxy_fix
octokit (~> 4.7)
octokit (~> 6.0)
terminal-table (>= 1, < 4)
danger-gitlab (8.0.0)
danger
@@ -409,7 +409,7 @@ GEM
date (3.3.3)
dead_end (3.1.1)
debug_inspector (1.1.0)
deckar01-task_list (2.3.2)
deckar01-task_list (2.3.3)
html-pipeline
declarative (0.0.20)
declarative_policy (1.1.0)
@@ -459,6 +459,7 @@ GEM
doorkeeper (>= 5.5, < 5.7)
jwt (>= 2.5)
dotenv (2.7.6)
dry-cli (1.0.0)
dry-core (1.0.0)
concurrent-ruby (~> 1.0)
zeitwerk (~> 2.6)
@@ -502,7 +503,7 @@ GEM
escape_utils (1.2.1)
et-orbi (1.2.7)
tzinfo
ethon (0.15.0)
ethon (0.16.0)
ffi (>= 1.15.0)
excon (0.99.0)
execjs (2.8.1)
@@ -549,7 +550,7 @@ GEM
faraday_middleware-multi_json (0.0.6)
faraday_middleware
multi_json
fast_blank (1.0.0)
fast_blank (1.0.1)
fast_gettext (2.3.0)
ffaker (2.10.0)
ffi (1.15.5)
@@ -560,13 +561,14 @@ GEM
libyajl2 (>= 1.2)
filelock (1.1.1)
find_a_port (1.0.1)
flipper (0.25.0)
flipper-active_record (0.25.0)
flipper (0.26.2)
concurrent-ruby (< 2)
flipper-active_record (0.26.2)
activerecord (>= 4.2, < 8)
flipper (~> 0.25.0)
flipper-active_support_cache_store (0.25.0)
flipper (~> 0.26.2)
flipper-active_support_cache_store (0.26.2)
activesupport (>= 4.2, < 8)
flipper (~> 0.25.0)
flipper (~> 0.26.2)
fog-aliyun (0.4.0)
addressable (~> 2.8.0)
aliyun-sdk (~> 0.8.0)
@@ -632,20 +634,21 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
git (1.11.0)
git (1.18.0)
addressable (~> 2.8)
rchardet (~> 1.8)
gitaly (16.2.0.pre.rc4)
gitaly (16.3.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 (3.13.0)
danger (>= 8.4.5)
gitlab-dangerfiles (4.0.0)
danger (>= 9.3.0)
danger-gitlab (>= 8.0.0)
rake
gitlab-experiment (0.7.1)
gitlab-experiment (0.8.0)
activesupport (>= 3.0)
request_store (>= 1.0)
gitlab-fog-azure-rm (1.8.0)
@@ -675,14 +678,14 @@ GEM
rubocop-performance (~> 1.15)
rubocop-rails (~> 2.17)
rubocop-rspec (~> 2.22)
gitlab_chronic_duration (0.10.6.2)
gitlab_chronic_duration (0.11.0)
numerizer (~> 0.2)
gitlab_omniauth-ldap (2.2.0)
net-ldap (~> 0.16)
omniauth (>= 1.3, < 3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
gitlab_quality-test_tooling (0.9.3)
gitlab_quality-test_tooling (1.0.0)
activesupport (>= 6.1, < 7.1)
gitlab (~> 4.19)
http (~> 5.0)
@@ -752,7 +755,7 @@ GEM
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
google-protobuf (3.23.4)
google-protobuf (3.24.3)
googleapis-common-protos (1.4.0)
google-protobuf (~> 3.14)
googleapis-common-protos-types (~> 1.2)
@@ -766,7 +769,7 @@ GEM
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
gpgme (2.0.22)
gpgme (2.0.23)
mini_portile2 (~> 2.7)
grape (1.7.1)
activesupport
@@ -799,7 +802,7 @@ GEM
faraday_middleware
graphql-client
graphlyte (1.0.0)
graphql (1.13.12)
graphql (1.13.19)
graphql-client (0.17.0)
activesupport (>= 3.0)
graphql (~> 1.10)
@@ -867,11 +870,11 @@ GEM
http-cookie (1.0.5)
domain_name (~> 0.5)
http-form_data (2.3.0)
httparty (0.20.0)
mime-types (~> 3.0)
httparty (0.21.0)
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
i18n_data (0.13.1)
icalendar (2.8.0)
@@ -880,8 +883,8 @@ GEM
ice_nine (0.11.2)
imagen (0.1.8)
parser (>= 2.5, != 2.5.1.1)
invisible_captcha (2.0.0)
rails (>= 5.0)
invisible_captcha (2.1.0)
rails (>= 5.2)
ipaddr (1.2.5)
ipaddress (0.8.3)
jaeger-client (1.1.0)
@@ -959,10 +962,10 @@ GEM
tomlrb (>= 1.3, < 2.1)
with_env (= 1.1.0)
xml-simple (~> 1.1.9)
licensee (9.15.2)
licensee (9.16.0)
dotenv (~> 2.0)
octokit (~> 4.20)
reverse_markdown (~> 1.0)
octokit (>= 4.20, < 7.0)
reverse_markdown (>= 1, < 3)
rugged (>= 0.24, < 2.0)
thor (>= 0.19, < 2.0)
listen (3.7.1)
@@ -972,7 +975,7 @@ GEM
ffi-compiler (~> 1.0)
rake (~> 13.0)
locale (2.1.3)
lockbox (1.1.1)
lockbox (1.3.0)
lograge (0.11.2)
actionpack (>= 4)
activesupport (>= 4)
@@ -1014,7 +1017,7 @@ GEM
mini_histogram (0.3.1)
mini_magick (4.10.1)
mini_mime (1.1.2)
mini_portile2 (2.8.2)
mini_portile2 (2.8.4)
minitest (5.11.3)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
@@ -1072,7 +1075,7 @@ GEM
rack (>= 1.2, < 4)
snaky_hash (~> 2.0)
version_gem (~> 1.1)
octokit (4.25.1)
octokit (6.1.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
ohai (17.9.0)
@@ -1189,7 +1192,7 @@ GEM
tty-color (~> 0.5)
peek (1.1.0)
railties (>= 4.0.0)
pg (1.5.3)
pg (1.5.4)
pg_query (4.2.3)
google-protobuf (>= 3.22.3)
plist (3.6.0)
@@ -1207,7 +1210,7 @@ GEM
coderay
parser
unparser
prometheus-client-mmap (0.27.0)
prometheus-client-mmap (0.28.0)
rb_sys (~> 0.9)
pry (0.14.2)
coderay (~> 1.1)
@@ -1222,7 +1225,7 @@ GEM
tty-markdown
tty-prompt
public_suffix (5.0.0)
puma (6.3.0)
puma (6.3.1)
nio4r (~> 2.0)
pyu-ruby-sasl (0.0.3.3)
raabro (1.4.0)
@@ -1232,7 +1235,7 @@ GEM
rack (>= 0.4)
rack-attack (6.7.0)
rack (>= 1.0, < 4)
rack-cors (1.1.1)
rack-cors (2.0.1)
rack (>= 2.0.0)
rack-oauth2 (1.21.3)
activesupport
@@ -1242,7 +1245,7 @@ GEM
rack (>= 2.1.0)
rack-protection (2.2.2)
rack
rack-proxy (0.7.6)
rack-proxy (0.7.7)
rack
rack-test (2.1.0)
rack (>= 1.3)
@@ -1293,7 +1296,8 @@ GEM
rbtree (0.4.6)
rchardet (1.8.0)
rdoc (6.3.2)
re2 (1.7.0)
re2 (2.0.0)
mini_portile2 (~> 2.8.4)
recaptcha (5.12.3)
json
recursive-open-struct (1.1.3)
@@ -1329,7 +1333,7 @@ GEM
retriable (3.1.2)
reverse_markdown (1.4.0)
nokogiri
rexml (3.2.5)
rexml (3.2.6)
rinku (2.0.0)
rotp (6.2.0)
rouge (4.1.3)
@@ -1425,8 +1429,6 @@ GEM
rexml
ruby-statistics (3.0.0)
ruby2_keywords (0.0.5)
ruby_parser (3.20.0)
sexp_processor (~> 4.16)
rubyntlm (0.6.3)
rubypants (0.2.0)
rubyzip (2.3.2)
@@ -1434,7 +1436,7 @@ GEM
safe_yaml (1.0.4)
safety_net_attestation (0.4.0)
jwt (~> 2.0)
sanitize (6.0.0)
sanitize (6.0.2)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
sass (3.5.5)
@@ -1457,7 +1459,7 @@ GEM
seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
selenium-webdriver (4.11.0)
selenium-webdriver (4.12.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
@@ -1476,7 +1478,6 @@ GEM
sentry-ruby (~> 5.8.0)
sidekiq (>= 3.0)
set (1.0.2)
sexp_processor (4.16.1)
shellany (0.0.1)
shoulda-matchers (5.1.0)
activesupport (>= 5.2.0)
@@ -1567,7 +1568,7 @@ GEM
ffi (~> 1.1)
sysexits (1.2.0)
table_print (1.5.7)
tanuki_emoji (0.6.0)
tanuki_emoji (0.7.0)
telesign (2.2.4)
net-http-persistent (>= 3.0.0, < 5.0)
telesignenterprise (2.2.2)
@@ -1659,12 +1660,12 @@ GEM
validate_url (1.0.15)
activemodel (>= 3.0.0)
public_suffix
validates_hostname (1.0.11)
validates_hostname (1.0.13)
activerecord (>= 3.0)
activesupport (>= 3.0)
version_gem (1.1.0)
version_sorter (2.3.0)
view_component (3.2.0)
view_component (3.5.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
@@ -1672,6 +1673,13 @@ GEM
axiom-types (~> 0.1)
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
vite_rails (3.0.15)
railties (>= 5.1, < 8)
vite_ruby (~> 3.0, >= 3.2.2)
vite_ruby (3.3.4)
dry-cli (>= 0.7, < 2)
rack-proxy (~> 0.6, >= 0.6.1)
zeitwerk (~> 2.2)
vmstat (2.3.0)
warden (1.2.9)
rack (>= 2.0.9)
@@ -1688,7 +1696,7 @@ GEM
webfinger (1.2.0)
activesupport
httpclient (>= 2.4)
webmock (3.18.1)
webmock (3.19.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
@@ -1737,8 +1745,8 @@ DEPENDENCIES
autoprefixer-rails (= 10.2.5.1)
awesome_print
aws-sdk-cloudformation (~> 1)
aws-sdk-core (~> 3.180.3)
aws-sdk-s3 (~> 1.132.1)
aws-sdk-core (~> 3.181.1)
aws-sdk-s3 (~> 1.134.0)
axe-core-rspec
babosa (~> 2.0)
base32 (~> 0.3.0)
@@ -1768,7 +1776,7 @@ DEPENDENCIES
csv_builder!
cvss-suite (~> 3.0.1)
database_cleaner (~> 1.7.0)
deckar01-task_list (= 2.3.2)
deckar01-task_list (= 2.3.3)
declarative_policy (~> 1.1.0)
deprecation_toolkit (~> 1.5.1)
derailed_benchmarks
@@ -1793,11 +1801,11 @@ DEPENDENCIES
factory_bot_rails (~> 6.2.0)
faraday (~> 1.0)
faraday_middleware-aws-sigv4 (~> 0.3.0)
fast_blank
fast_blank (~> 1.0.1)
ffaker (~> 2.10)
flipper (~> 0.25.0)
flipper-active_record (~> 0.25.0)
flipper-active_support_cache_store (~> 0.25.0)
flipper (~> 0.26.2)
flipper-active_record (~> 0.26.2)
flipper-active_support_cache_store (~> 0.26.2)
fog-aliyun (~> 0.4)
fog-aws (~> 3.18)
fog-core (= 2.1.0)
@@ -1808,10 +1816,10 @@ DEPENDENCIES
gettext (~> 3.3)
gettext_i18n_rails (~> 1.11.0)
gettext_i18n_rails_js (~> 1.3)
gitaly (~> 16.2.0.pre.rc4)
gitaly (~> 16.3.0.pre.rc1)
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 3.13.0)
gitlab-experiment (~> 0.7.1)
gitlab-dangerfiles (~> 4.0.0)
gitlab-experiment (~> 0.8.0)
gitlab-fog-azure-rm (~> 1.8.0)
gitlab-labkit (~> 0.34.0)
gitlab-license (~> 2.3)
@@ -1824,9 +1832,9 @@ DEPENDENCIES
gitlab-sidekiq-fetcher!
gitlab-styles (~> 10.1.0)
gitlab-utils!
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_chronic_duration (~> 0.11)
gitlab_omniauth-ldap (~> 2.2.0)
gitlab_quality-test_tooling (~> 0.9.3)
gitlab_quality-test_tooling (~> 1.0.0)
gon (~> 6.4.0)
google-apis-androidpublisher_v3 (~> 0.34.0)
google-apis-cloudbilling_v1 (~> 0.21.0)
@@ -1839,18 +1847,18 @@ DEPENDENCIES
google-apis-serviceusage_v1 (~> 0.28.0)
google-apis-sqladmin_v1beta4 (~> 0.41.0)
google-cloud-storage (~> 1.44.0)
google-protobuf (~> 3.23, >= 3.23.4)
gpgme (~> 2.0.22)
google-protobuf (~> 3.24, >= 3.24.3)
gpgme (~> 2.0.23)
grape (~> 1.7.1)
grape-entity (~> 0.10.0)
grape-path-helpers (~> 1.7.1)
grape-swagger (~> 1.6.1)
grape-swagger-entity (~> 0.5.1)
grape_logging (~> 1.8)
graphiql-rails (~> 1.8)
graphiql-rails (~> 1.8.0)
graphlient (~> 0.5.0)
graphlyte (~> 1.0.0)
graphql (~> 1.13.12)
graphql (~> 1.13.19)
graphql-docs (~> 2.1.0)
grpc (~> 1.55.0)
gssapi (~> 1.3.1)
@@ -1862,9 +1870,9 @@ DEPENDENCIES
health_check (~> 3.0)
html-pipeline (~> 2.14.3)
html2text
httparty (~> 0.20.0)
httparty (~> 0.21.0)
icalendar
invisible_captcha (~> 2.0.0)
invisible_captcha (~> 2.1.0)
ipaddr (~> 1.2.5)
ipaddress (~> 0.8.3)
ipynbdiff!
@@ -1882,9 +1890,9 @@ DEPENDENCIES
lefthook (~> 1.4.7)
letter_opener_web (~> 2.0.0)
license_finder (~> 7.0)
licensee (~> 9.15)
licensee (~> 9.16)
listen (~> 3.7)
lockbox (~> 1.1.1)
lockbox (~> 1.3.0)
lograge (~> 0.5)
loofah (~> 2.21.3)
lookbook (~> 2.0, >= 2.0.1)
@@ -1904,7 +1912,7 @@ DEPENDENCIES
net-protocol (~> 0.1.3)
nokogiri (~> 1.15, >= 1.15.4)
oauth2 (~> 2.0)
octokit (~> 4.15)
octokit (~> 6.0)
ohai (~> 17.9)
oj (~> 3.13.21)
oj-introspect (~> 0.7)
@@ -1934,20 +1942,20 @@ DEPENDENCIES
parser (~> 3.2, >= 3.2.2.3)
parslet (~> 1.8)
peek (~> 1.1)
pg (~> 1.5.3)
pg (~> 1.5.4)
pg_query (~> 4.2.3)
png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.27)
prometheus-client-mmap (~> 0.28)
pry-byebug
pry-rails (~> 0.3.9)
pry-shell (~> 0.6.4)
puma (~> 6.3)
puma (~> 6.3, >= 6.3.1)
rack (~> 2.2.8)
rack-attack (~> 6.7.0)
rack-cors (~> 1.1.1)
rack-cors (~> 2.0.1)
rack-oauth2 (~> 1.21.3)
rack-proxy (~> 0.7.6)
rack-proxy (~> 0.7.7)
rack-timeout (~> 0.6.3)
rails (~> 7.0.6)
rails-controller-testing
@@ -1955,7 +1963,7 @@ DEPENDENCIES
rainbow (~> 3.0)
rbtrace (~> 0.4)
rdoc (~> 6.3.2)
re2 (~> 1.7.0)
re2 (= 2.0.0)
recaptcha (~> 5.12)
redis (~> 4.8.0)
redis-actionpack (~> 5.3.0)
@@ -1963,7 +1971,7 @@ DEPENDENCIES
request_store (~> 1.5.1)
responders (~> 3.0)
retriable (~> 3.1.2)
rexml (~> 3.2.5)
rexml (~> 3.2.6)
rouge (~> 4.1.3)
rqrcode-rails3 (~> 0.1.7)
rspec-benchmark (~> 0.6.0)
@@ -1979,14 +1987,13 @@ DEPENDENCIES
ruby-openai (~> 3.7)
ruby-progressbar (~> 1.10)
ruby-saml (~> 1.15.0)
ruby_parser (~> 3.20)
rubyzip (~> 2.3.2)
rugged (~> 1.6)
sanitize (~> 6.0)
sanitize (~> 6.0.2)
sassc-rails (~> 2.1.0)
sd_notify (~> 0.1.0)
seed-fu (~> 2.3.7)
selenium-webdriver (= 4.11.0)
selenium-webdriver (= 4.12.0)
semver_dialects (~> 1.2.1)
sentry-rails (~> 5.8.0)
sentry-raven (~> 3.1)
@@ -2012,7 +2019,7 @@ DEPENDENCIES
stackprof (~> 0.2.25)
state_machines-activerecord (~> 0.8.0)
sys-filesystem (~> 1.4.3)
tanuki_emoji (~> 0.6)
tanuki_emoji (~> 0.7)
telesignenterprise (~> 2.2)
terser (= 1.0.2)
test-prof (~> 1.2.2)
@@ -2023,19 +2030,19 @@ DEPENDENCIES
truncato (~> 0.7.12)
typhoeus (~> 1.4.0)
undercover (~> 0.4.4)
unf (~> 0.1.4)
unleash (~> 3.2.2)
valid_email (~> 0.1)
validates_hostname (~> 1.0.11)
validates_hostname (~> 1.0.13)
version_sorter (~> 2.3)
view_component (~> 3.2.0)
view_component (~> 3.5.0)
vite_rails
vmstat (~> 2.3.0)
warning (~> 1.3.0)
webauthn (~> 3.0)
webmock (~> 3.18.1)
webmock (~> 3.19.1)
webrick (~> 1.8.1)
wikicloth (= 0.8.1)
yajl-ruby (~> 1.4.3)
BUNDLED WITH
2.4.18
2.4.19

View File

@@ -411,10 +411,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lc3j74v49b2akyimfnsx3vsgi1i3068cpchn358l0dv27aib6c2";
sha256 = "1qnwh40d45pqm77dayvh1zdlb5xjbbj7hv29s8nhxj7c3qkl4bpb";
type = "gem";
};
version = "3.180.3";
version = "3.181.1";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -433,10 +433,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0iciakii0vcm16x0fivs5hwwhy3n8j1f9d7pimxr05yplnxizh6a";
sha256 = "1fbz259as60xnf563z9byp8blq5fsc81h92h3wicai4bmz45w4r5";
type = "gem";
};
version = "1.132.1";
version = "1.134.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@@ -1067,10 +1067,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1n6zbkkinlv2hp4ig5c170d1ckbbdf8rgxmykfm3m3gn865vapnr";
sha256 = "1x8xwn2l7avc6h08vgrkxyb6ga7slip5x8lynswmzd0y32ngnw4h";
type = "gem";
};
version = "8.6.1";
version = "9.3.1";
};
danger-gitlab = {
dependencies = ["danger" "gitlab"];
@@ -1129,10 +1129,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01c8vv0xwbhlyhiagj93b1hlm2n0rmj4sw62nbc0jhyj90jhj6as";
sha256 = "0n67q9rb4gsfs8k2fsd08xcfx13z7mcyyyrb9hi0sv0yz3rvm2li";
type = "gem";
};
version = "2.3.2";
version = "2.3.3";
};
declarative = {
groups = ["default"];
@@ -1344,6 +1344,16 @@ src:
};
version = "2.7.6";
};
dry-cli = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w39jms4bsggxvl23cxanhccv1ngb6nqxsqhi784v5bjz1lx3si8";
type = "gem";
};
version = "1.0.0";
};
dry-core = {
dependencies = ["concurrent-ruby" "zeitwerk"];
groups = ["default" "development" "test"];
@@ -1570,10 +1580,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288";
sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v";
type = "gem";
};
version = "0.15.0";
version = "0.16.0";
};
excon = {
groups = ["default"];
@@ -1810,10 +1820,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56";
sha256 = "1shpmamyzyhyxmv95r96ja5rylzaw60r19647d0fdm7y2h2c77r6";
type = "gem";
};
version = "1.0.0";
version = "1.0.1";
};
fast_gettext = {
groups = ["default"];
@@ -1888,14 +1898,15 @@ src:
version = "1.0.1";
};
flipper = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pbsd7p9aij9ffw621wl841hj319vv677n69jk4qndxqa9kpgcnc";
sha256 = "127ryr9107719rfk9k638fxk2p38cnbz23h9ghxxbckiv4474mvd";
type = "gem";
};
version = "0.25.0";
version = "0.26.2";
};
flipper-active_record = {
dependencies = ["activerecord" "flipper"];
@@ -1903,10 +1914,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zxn7qp16xwk289xa3f8sqy4dg8difcsjc8rx44nmk72cnack9c5";
sha256 = "1g10lck7p3776r2dshz185rd1hjzv47z95bhgpk7bxz2ikpsxpk1";
type = "gem";
};
version = "0.25.0";
version = "0.26.2";
};
flipper-active_support_cache_store = {
dependencies = ["activesupport" "flipper"];
@@ -1914,10 +1925,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06skgdfb43g6i40b5rx61yqgq16wwd8knvswnrva1l889fcvz0kj";
sha256 = "1c6j2frspzafqmha5wlkpv05n5vfzrglbprpgj1dxiz5s4x8ily2";
type = "gem";
};
version = "0.25.0";
version = "0.26.2";
};
fog-aliyun = {
dependencies = ["addressable" "aliyun-sdk" "fog-core" "fog-json" "ipaddress" "xml-simple"];
@@ -2104,15 +2115,15 @@ src:
version = "1.3.0";
};
git = {
dependencies = ["rchardet"];
dependencies = ["addressable" "rchardet"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wd0rvz6cybqm9svcx427hgpcz804am64s0sxxrh72i9m16vm5by";
sha256 = "0rf4603ffvdlvnzx1nmh2x5j8lic3p24115sm7bx6p2nwii09f69";
type = "gem";
};
version = "1.11.0";
version = "1.18.0";
};
gitaly = {
dependencies = ["grpc"];
@@ -2120,10 +2131,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z2ilb738q3fbk91yzgz1z2y1ws80v17glxvh7abfdqmzdi6cx88";
sha256 = "0hsccw9njvvsic0qn5x1aia0yz66sy4bsw1pixc5jf2g990wrnam";
type = "gem";
};
version = "16.2.0.pre.rc4";
version = "16.3.0.pre.rc1";
};
gitlab = {
dependencies = ["httparty" "terminal-table"];
@@ -2153,10 +2164,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bd17qkjskzcrm406iz1a06s6hy1sy61xv7bz0kq8lqzzv3ym090";
sha256 = "04j81xsasbfzc9xs0sgizc76qj26ka629yrcd9l6m3iqj0byiaz3";
type = "gem";
};
version = "3.13.0";
version = "4.0.0";
};
gitlab-experiment = {
dependencies = ["activesupport" "request_store"];
@@ -2164,10 +2175,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "093q9b2nv010n10axlhz68gxdi0xs176hd9wm758nhl3marxsv8n";
sha256 = "1yfk2w86nzw8mksahs70ai0d860kdj25lpvlka4xv77i18zggqml";
type = "gem";
};
version = "0.7.1";
version = "0.8.0";
};
gitlab-fog-azure-rm = {
dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types"];
@@ -2299,10 +2310,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yq5a4vs96xz5yxqkfwcvzw0riww7mf87j1s2s7rb6yagpz4rnkd";
sha256 = "19jba5gxlb25mvd85rn3hfzyzsqw4cq7ml13mzq1y0x94hbj1zf2";
type = "gem";
};
version = "0.10.6.2";
version = "0.11.0";
};
gitlab_omniauth-ldap = {
dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
@@ -2321,10 +2332,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1w408mlqkf430bm7g1slp7l5crwvvqbmbynhidc9jx3i9d8g6lcp";
sha256 = "1nriqgy9rlnachzrq63xakskdgjg9b3bdgh2fb2b63kai8bbwc5h";
type = "gem";
};
version = "0.9.3";
version = "1.0.0";
};
globalid = {
dependencies = ["activesupport"];
@@ -2572,10 +2583,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1dq5lgkxhagqr8zjrwr10zi8rldbg2vhis2m5q86v5q9415ylfgj";
sha256 = "0pcl4x4cw3snl5xzs99lm82m9xkfs8vm1a8dfrc34pwb77mwrwv3";
type = "gem";
};
version = "3.23.4";
version = "3.24.3";
};
googleapis-common-protos = {
dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"];
@@ -2616,10 +2627,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qn87vxdsaq1szcvq39rnz38cgqllncdxmiyghnbzl7x5aah8sbw";
sha256 = "010wr6nnifi952bx4v5c49q25yx1g8lhib5wiv2sg7bip3yvlyy8";
type = "gem";
};
version = "2.0.22";
version = "2.0.23";
};
grape = {
dependencies = ["activesupport" "builder" "dry-types" "mustermann-grape" "rack" "rack-accept"];
@@ -2724,10 +2735,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hvsv6ig6d8syr4vasa8vcc090kbawwflk5m1j6kl681y9n6d0hx";
sha256 = "0njsbxx82vqi8hdn4nad62abmh0x0w3mis3mq79q3xr11srisn23";
type = "gem";
};
version = "1.13.12";
version = "1.13.19";
};
graphql-client = {
dependencies = ["activesupport" "graphql"];
@@ -2985,15 +2996,15 @@ src:
version = "2.3.0";
};
httparty = {
dependencies = ["mime-types" "multi_xml"];
dependencies = ["mini_mime" "multi_xml"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rs8c5wga6f1acyaj90d2hlv307gh2flfpb8y48wdk2si812l3a9";
sha256 = "050jzsa6fbfvy2rldhk7mf1sigildaqvbplfz2zs6c0zlzwppvq0";
type = "gem";
};
version = "0.20.0";
version = "0.21.0";
};
httpclient = {
groups = ["default"];
@@ -3007,14 +3018,14 @@ src:
};
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default" "development" "test"];
groups = ["default" "development" "monorepo" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
type = "gem";
};
version = "1.12.0";
version = "1.14.1";
};
i18n_data = {
groups = ["default"];
@@ -3074,10 +3085,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hn06njrwbxhxs2myr04fq3spqn38b8wm3irvkll91qv3p5yv0d3";
sha256 = "07ibhphcvf9lfaar9g78cazbdrp03dzfks53bcaiss8vxgrm5d02";
type = "gem";
};
version = "2.0.0";
version = "2.1.0";
};
ipaddr = {
groups = ["default"];
@@ -3394,10 +3405,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v9x94h19b20wc551vs9a0yvk44w2y3g9ng07fflk26s8jsmjsab";
sha256 = "0i4hs0vbgp0w3pdddr37zhydm16af122rmr0w39v3nqrj1ir65kv";
type = "gem";
};
version = "9.15.2";
version = "9.16.0";
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
@@ -3436,10 +3447,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h1a3h3rfv3094pn5zn7d3c066dmhx9i380mhqa1qyagqla6pw8a";
sha256 = "1sm365iplg1iscizckjm6zy57zs0350czi9afqfnvig0wh35i3na";
type = "gem";
};
version = "1.1.1";
version = "1.3.0";
};
lograge = {
dependencies = ["actionpack" "activesupport" "railties" "request_store"];
@@ -3642,14 +3653,14 @@ src:
version = "1.1.2";
};
mini_portile2 = {
groups = ["default" "development" "test"];
groups = ["default" "development" "monorepo" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6";
sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq";
type = "gem";
};
version = "2.8.2";
version = "2.8.4";
};
minitest = {
groups = ["development" "test"];
@@ -4002,10 +4013,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15lvy06h276jryxg19258b2yqaykf0567sp0n16yipywhbp94860";
sha256 = "1gxh0x910qvah2sm9fbxn8jjy3pgwskyd3gm703zf182hafll3lj";
type = "gem";
};
version = "4.25.1";
version = "6.1.1";
};
ohai = {
dependencies = ["chef-config" "chef-utils" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "train-core" "wmi-lite"];
@@ -4439,10 +4450,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zcvxmfa8hxkhpp59fhxyxy1arp70f11zi1jh9c7bsdfspifb7kb";
sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4";
type = "gem";
};
version = "1.5.3";
version = "1.5.4";
};
pg_query = {
dependencies = ["google-protobuf"];
@@ -4525,10 +4536,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rvh5xmvhzdm74g4n93ny3kg1xb4dki6l194xjrh1yp8aaimfvvi";
sha256 = "0yyd1mvzbv64jc700d2vvdcr4cmb2gwf68368g0bwp1ybn64xqgk";
type = "gem";
};
version = "0.27.0";
version = "0.28.0";
};
pry = {
dependencies = ["coderay" "method_source"];
@@ -4590,10 +4601,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v7fmv0n4bhdcwh60dgza44iqai5pg34f5pzm4vh4i5fwx7mpqxh";
sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c";
type = "gem";
};
version = "6.3.0";
version = "6.3.1";
};
pyu-ruby-sasl = {
groups = ["default"];
@@ -4663,10 +4674,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jvs0mq8jrsz86jva91mgql16daprpa3qaipzzfvngnnqr5680j7";
sha256 = "02lvkg1nb4z3zc2nry545dap7a64bb9h2k8waxfz0jkabkgnpimw";
type = "gem";
};
version = "1.1.1";
version = "2.0.1";
};
rack-oauth2 = {
dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
@@ -4696,10 +4707,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a62439xwn5v6hsl9s11hdk4wj58czhcbg7lminv23mnkc0ca147";
sha256 = "12jw7401j543fj8cc83lmw72d8k6bxvkp9rvbifi88hh01blnsj4";
type = "gem";
};
version = "0.7.6";
version = "0.7.7";
};
rack-test = {
dependencies = ["rack"];
@@ -4881,14 +4892,15 @@ src:
version = "6.3.2";
};
re2 = {
dependencies = ["mini_portile2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00yryimbkm1k85n99f81n7cripkmh14459c9pmb7prl9nbiikkqc";
sha256 = "09c9f692ixym8sqk26f175jw53a00h2s4xad6z141axpi2mmy1q9";
type = "gem";
};
version = "1.7.0";
version = "2.0.0";
};
recaptcha = {
dependencies = ["json"];
@@ -5071,14 +5083,14 @@ src:
version = "1.4.0";
};
rexml = {
groups = ["danger" "default" "development" "test"];
groups = ["coverage" "danger" "default" "development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
type = "gem";
};
version = "3.2.5";
version = "3.2.6";
};
rinku = {
groups = ["default"];
@@ -5446,17 +5458,6 @@ src:
};
version = "0.0.5";
};
ruby_parser = {
dependencies = ["sexp_processor"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qybplg87pv6kxwyh4nkfn7pa4cisiajbfvh22dzkkbzxyxwil0p";
type = "gem";
};
version = "3.20.0";
};
rubyntlm = {
groups = ["default"];
platforms = [];
@@ -5524,10 +5525,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zq8pxmsd1abw18zz6mazsm2jfpwmbgdxbpawb7bmwvkb2c5yyc1";
sha256 = "1kymrjdpbmn4yaml3aaqyj1dzj8gqmm9h030dc2rj5mvja7fpi28";
type = "gem";
};
version = "6.0.0";
version = "6.0.2";
};
sass = {
dependencies = ["sass-listen"];
@@ -5611,10 +5612,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ws0mh230l1pvyxcrlcr48w01alfhprjs1jbd8yrn463drsr2yac";
sha256 = "0jwll13m7bqph4lgl75m7vwd175k657znwa7qn9qkf5dcxdjkcjs";
type = "gem";
};
version = "4.11.0";
version = "4.12.0";
};
semver_dialects = {
dependencies = ["pastel" "thor" "tty-command"];
@@ -5681,16 +5682,6 @@ src:
};
version = "1.0.2";
};
sexp_processor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p0r92dyffx6wkgazv3wi4m2yfm39kvvr9cjp2f57az5pgsdpajw";
type = "gem";
};
version = "4.16.1";
};
shellany = {
groups = ["default" "test"];
platforms = [];
@@ -6095,10 +6086,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0an1311bpyhd9kzak1qpd4jks336i47gbvx3zdrnn1rdxppimsac";
sha256 = "11z9m8jcys8q8h8prqdr1frppm0mjdh8if7c1rm2qyq8v19g83fi";
type = "gem";
};
version = "0.6.0";
version = "0.7.0";
};
telesign = {
dependencies = ["net-http-persistent"];
@@ -6580,10 +6571,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hxqza44pvk6x6vb91cvllhw71hqziby06dk1s94rh9f6khbl1nm";
sha256 = "06fspma67flsvwl3gfyrv2572l15pjsmqsncz5yp4kqbriw03i7a";
type = "gem";
};
version = "1.0.11";
version = "1.0.13";
};
version_gem = {
groups = ["default"];
@@ -6611,10 +6602,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08jc9k4qqazbf5frhdril5084adm90rs1lqbnqq3yfdm2dgaiyhx";
sha256 = "1bz86m3bbnhy8j1gmpm76jcgqfyjafqwyxjdd1bk2f5jmgswvqy3";
type = "gem";
};
version = "3.2.0";
version = "3.5.0";
};
virtus = {
dependencies = ["axiom-types" "coercible" "descendants_tracker"];
@@ -6627,6 +6618,28 @@ src:
};
version = "2.0.0";
};
vite_rails = {
dependencies = ["railties" "vite_ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0q7qbi3npw47xza8spvd8ni0x0ahjb6lkd12y9a4pqppxn555v5q";
type = "gem";
};
version = "3.0.15";
};
vite_ruby = {
dependencies = ["dry-cli" "rack-proxy" "zeitwerk"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "036qi8w4qzglhqrrrrkc0m7ivfzmagsdyj61r0h27p56hn1l6ph2";
type = "gem";
};
version = "3.3.4";
};
vmstat = {
groups = ["default"];
platforms = [];
@@ -6686,10 +6699,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1myj44wvbbqvv18ragv3ihl0h61acgnfwrnj3lccdgp49bgmbjal";
sha256 = "0vfispr7wd2p1fs9ckn1qnby1yyp4i1dl7qz8n482iw977iyxrza";
type = "gem";
};
version = "3.18.1";
version = "3.19.1";
};
webrick = {
groups = ["default" "development" "test"];

View File

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A high-quality implementation of the AAC codec from Android";
homepage = "https://sourceforge.net/projects/opencore-amr/";
license = licenses.asl20;
license = licenses.fraunhofer-fdk;
maintainers = with maintainers; [ codyopel ];
platforms = platforms.all;
};

View File

@@ -630,6 +630,9 @@ in
re2 = attrs: {
buildInputs = [ re2 ];
buildFlags = [
"--enable-system-libraries"
];
};
rest-client = attrs: {

View File

@@ -6,8 +6,8 @@
, buildWebExtension ? false
}:
let
version = "1.4.7";
gitHash = "25a1d93";
version = "1.5.3";
gitHash = "6227777";
in
buildNpmPackage rec {
pname = "vencord";
@@ -17,7 +17,7 @@ buildNpmPackage rec {
owner = "Vendicated";
repo = "Vencord";
rev = "v${version}";
sha256 = "sha256-bSLPZJyBKws+6IE4YTgQTMau5yKpHJdq5tw6Jg1Uc/s=";
sha256 = "sha256-yRbFXjPJq0Ui7JW6YhlfnDf+YWyO5qzJTntEyFLVcVY=";
};
ESBUILD_BINARY_PATH = lib.getExe (esbuild.override {
@@ -36,13 +36,15 @@ buildNpmPackage rec {
# Supresses an error about esbuild's version.
npmRebuildFlags = [ "|| true" ];
npmDepsHash = "sha256-GoVVOLg20oi0MJGLqevpiqHDM/7yaRJSQnM/tt+AkQ8=";
makeCacheWritable = true;
npmDepsHash = "sha256-/aEyvEmVCqKKgRvqoz7CSz17HTAxPMBBL47JsE3RcI4=";
npmFlags = [ "--legacy-peer-deps" ];
npmBuildScript = if buildWebExtension then "buildWeb" else "build";
npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];
prePatch = ''
cp ${./package-lock.json} ./package-lock.json
chmod +w ./package-lock.json
'';
VENCORD_HASH = gitHash;

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +1,7 @@
{
"testing": {
"version": "6.6-rc2",
"hash": "sha256:1hbva5vsfi48h82ll4kmhzm5hxp7340bj2smwgvjikam26icaj54"
"version": "6.6-rc4",
"hash": "sha256:0r7cfigh7rcrnzpdi40s6jnzhjgiamb6prixl4n2x8489n6zxfr9"
},
"6.5": {
"version": "6.5.5",

View File

@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.10.180-rt89"; # updated by ./update-rt.sh
version = "5.10.194-rt95"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -17,14 +17,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0a8cicvcyl5w4vi7gxhgd59ny44gj9cbv4z5pnwn9jgny55rm0ys";
sha256 = "15fr7krhpmqz0xqjg78m2xvfllbni3xh8xyhxh9ni31ppd3mw394";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "00m6psnjam26x70f8wpssvjp6v49dyllp356fpfbhjqmj7y142bm";
sha256 = "02p01a9jpv92v0dfg6hj90wcrgy3sqjpaadrw44mnsqk4q5ndh70";
};
}; in [ rt-patch ] ++ kernelPatches;

View File

@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.15.129-rt67"; # updated by ./update-rt.sh
version = "5.15.133-rt69"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0ribh1jalbnapfrjzjk5kqg6nypalkn5ayin5cwkwiziwiycj3km";
sha256 = "1paxzzcagc7s8i491zjny43rxhfamafyly438kj8hyw96iwmx17g";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1qh2v8i2sa334mkfwx9k8jjvqpp21bj2wmvvdib8wfxbnjnj3vzy";
sha256 = "0iikbpb1wcf7fm18j230cd4p4cksr0k6041c8w0gvznws8mr3dww";
};
}; in [ rt-patch ] ++ kernelPatches;

View File

@@ -6,7 +6,7 @@
, ... } @ args:
let
version = "5.4.254-rt85"; # updated by ./update-rt.sh
version = "5.4.257-rt87"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -14,14 +14,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "1iyrm2xql15ifhy2b939ywrrc44yd41b79sjjim4vqxmc6lqsq2i";
sha256 = "1w1x91slzg9ggakqhyxnmvz77v2cwfk8bz0knrpgz9qya9q5jxrf";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0vq5lrqqy7yspznbbkla2cjakz7w1n8qvg31a856qs6abynwrw6x";
sha256 = "0rgkk5ibagsyz9in12clzn7szsw1i3m96s8wy5yxwa26aaa2wki7";
};
}; in [ rt-patch ] ++ kernelPatches;

View File

@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "exim";
version = "4.96";
version = "4.96.1";
src = fetchurl {
url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz";
hash = "sha256-KZpWknsus0d9qv08W9oCvGflxOWJinrq8nQIdSeM8aM=";
hash = "sha256-k6wHVcMX4f276ozLcKhoh2vfMUhpKJHHKtD+gWdnAz0=";
};
enableParallelBuilding = true;

View File

@@ -1,25 +1,28 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, libuuid, lz4 }:
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib
, fuseSupport ? stdenv.isLinux
}:
stdenv.mkDerivation rec {
pname = "erofs-utils";
version = "1.6";
version = "1.7";
outputs = [ "out" "man" ];
src = fetchurl {
url =
"https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${version}.tar.gz";
sha256 = "sha256-2/Gtrv8buFMrKacsip4ZGTjJOJlGdw3HY9PFnm8yBXE=";
hash = "sha256-tutSm7Qj6y3XecnanCYyhVSItLkeI1U6Mc4j8Rycziw=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ fuse libuuid lz4 ];
buildInputs = [ util-linux lz4 zlib ]
++ lib.optionals fuseSupport [ fuse ];
configureFlags = [ "--enable-fuse" ];
configureFlags = lib.optionals fuseSupport [ "--enable-fuse" ];
meta = with lib; {
description = "Userspace utilities for linux-erofs file system";
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ ehmry ];
maintainers = with maintainers; [ ehmry nikstur ];
platforms = platforms.linux;
};
}

View File

@@ -1,634 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "aho-corasick"
version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
dependencies = [
"memchr",
]
[[package]]
name = "ansi_term"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
dependencies = [
"winapi",
]
[[package]]
name = "atty"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi",
"libc",
"winapi",
]
[[package]]
name = "az"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973"
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bumpalo"
version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
[[package]]
name = "cc"
version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "console_error_panic_hook"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
dependencies = [
"cfg-if",
"wasm-bindgen",
]
[[package]]
name = "dirs"
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"
dependencies = [
"dirs-sys",
]
[[package]]
name = "dirs-next"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
dependencies = [
"cfg-if",
"dirs-sys-next",
]
[[package]]
name = "dirs-sys"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
dependencies = [
"libc",
"redox_users",
"winapi",
]
[[package]]
name = "dirs-sys-next"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
dependencies = [
"libc",
"redox_users",
"winapi",
]
[[package]]
name = "fs2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
dependencies = [
"libc",
"winapi",
]
[[package]]
name = "getrandom"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
dependencies = [
"cfg-if",
"libc",
"wasi",
]
[[package]]
name = "gmp-mpfr-sys"
version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b560063e2ffa8ce9c2ef9bf487f2944a97deca5b8de0b5bcd0ae6437ef8b75f"
dependencies = [
"libc",
"windows-sys",
]
[[package]]
name = "hermit-abi"
version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
dependencies = [
"libc",
]
[[package]]
name = "js-sys"
version = "0.3.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "kalk"
version = "3.0.3"
dependencies = [
"gmp-mpfr-sys",
"lazy_static",
"regex",
"rug",
"test-case",
"wasm-bindgen",
"wasm-bindgen-test",
]
[[package]]
name = "kalker"
version = "2.0.3"
dependencies = [
"ansi_term",
"atty",
"dirs",
"kalk",
"lazy_static",
"regex",
"rustyline",
"seahorse",
"winres",
]
[[package]]
name = "lazy_static"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.141"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
[[package]]
name = "log"
version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [
"cfg-if",
]
[[package]]
name = "memchr"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "nix"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
dependencies = [
"bitflags",
"cc",
"cfg-if",
"libc",
]
[[package]]
name = "once_cell"
version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
[[package]]
name = "proc-macro2"
version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
dependencies = [
"proc-macro2",
]
[[package]]
name = "redox_syscall"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
"bitflags",
]
[[package]]
name = "redox_users"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
"getrandom",
"redox_syscall",
"thiserror",
]
[[package]]
name = "regex"
version = "1.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax",
]
[[package]]
name = "regex-syntax"
version = "0.6.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "rug"
version = "1.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "555e8b44763d034526db899c88cd56ccc4486cd38b444c8aa0e79d4e70ae5a34"
dependencies = [
"az",
"gmp-mpfr-sys",
"libc",
]
[[package]]
name = "rustyline"
version = "7.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8227301bfc717136f0ecbd3d064ba8199e44497a0bdd46bb01ede4387cfd2cec"
dependencies = [
"bitflags",
"cfg-if",
"dirs-next",
"fs2",
"libc",
"log",
"memchr",
"nix",
"scopeguard",
"unicode-segmentation",
"unicode-width",
"utf8parse",
"winapi",
]
[[package]]
name = "scoped-tls"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
[[package]]
name = "scopeguard"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "seahorse"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bee1fe454786f1d236a07cb3d3adcbaca96e9ba42d23bc58de059937bb059bd"
[[package]]
name = "serde"
version = "1.0.160"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
[[package]]
name = "syn"
version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "syn"
version = "2.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "test-case"
version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9e5f048404b43e8ae66dce036163515b6057024cf58c6377be501f250bd3c6a"
dependencies = [
"cfg-if",
"proc-macro2",
"quote",
"syn 1.0.109",
"version_check",
]
[[package]]
name = "thiserror"
version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.15",
]
[[package]]
name = "toml"
version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
dependencies = [
"serde",
]
[[package]]
name = "unicode-ident"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
[[package]]
name = "unicode-segmentation"
version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
[[package]]
name = "unicode-width"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "utf8parse"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "version_check"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
"syn 1.0.109",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
version = "0.4.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
dependencies = [
"cfg-if",
"js-sys",
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
]
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
[[package]]
name = "wasm-bindgen-test"
version = "0.3.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db36fc0f9fb209e88fb3642590ae0205bb5a56216dabd963ba15879fe53a30b"
dependencies = [
"console_error_panic_hook",
"js-sys",
"scoped-tls",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasm-bindgen-test-macro",
]
[[package]]
name = "wasm-bindgen-test-macro"
version = "0.3.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0734759ae6b3b1717d661fe4f016efcfb9828f5edb4520c18eaee05af3b43be9"
dependencies = [
"proc-macro2",
"quote",
]
[[package]]
name = "web-sys"
version = "0.3.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
dependencies = [
"js-sys",
"wasm-bindgen",
]
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-sys"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
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.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
name = "windows_aarch64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_i686_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_x86_64_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "winres"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c"
dependencies = [
"toml",
]

View File

@@ -8,32 +8,31 @@
rustPlatform.buildRustPackage rec {
pname = "kalker";
version = "2.0.3";
version = "2.0.4";
src = fetchFromGitHub {
owner = "PaddiM8";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Pj3rcjEbUt+pnmbOZlv2JIvUhVdeiXYDKc5FED6qO7E=";
hash = "sha256-8tJi4PRGhNCndiMRdZUvCSdx/+p9OhJyJ3AbD+PucSo=";
};
cargoLock = {
lockFile = ./Cargo.lock;
};
cargoHash = "sha256-rGy4tkjjPiV2lpdOtfqjsXgBgi/x+45K4KeUDhyfQoA=";
buildInputs = [ gmp mpfr libmpc ];
outputs = [ "out" "lib" ];
postPatch = ''
ln -s ${./Cargo.lock} Cargo.lock
# Cargo.lock is outdated
preConfigure = ''
cargo metadata --offline
'';
postInstall = ''
moveToOutput "lib" "$lib"
'';
CARGO_FEATURE_USE_SYSTEM_LIBS = "1";
env.CARGO_FEATURE_USE_SYSTEM_LIBS = "1";
meta = with lib; {
homepage = "https://kalker.strct.net";

View File

@@ -30,11 +30,11 @@ let
in
stdenv.mkDerivation rec {
pname = "tor";
version = "0.4.8.6";
version = "0.4.8.7";
src = fetchurl {
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
sha256 = "sha256-VS2JX8r2bHzStQ9avmO3iEsw/tJUEVvnv7kjaAc1UIg=";
sha256 = "sha256-sg0rnHTbKKAMB/CQ7lsCQbK2hPOv3szMa4AIkxxVdJE=";
};
outputs = [ "out" "geoip" ];

View File

@@ -7050,6 +7050,8 @@ with pkgs;
ecmtools = callPackage ../tools/cd-dvd/ecm-tools { };
erofs-utils = callPackage ../tools/filesystems/erofs-utils { };
e2tools = callPackage ../tools/filesystems/e2tools { };
e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { };
@@ -7946,9 +7948,7 @@ with pkgs;
gitleaks = callPackage ../tools/security/gitleaks { };
gitaly = callPackage ../applications/version-management/gitlab/gitaly {
libgit2 = libgit2_1_5;
};
gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { };
@@ -26731,8 +26731,6 @@ with pkgs;
dstat = callPackage ../os-specific/linux/dstat { };
erofs-utils = callPackage ../os-specific/linux/erofs-utils { };
evdev-proto = callPackage ../os-specific/bsd/freebsd/evdev-proto { };
fscryptctl = callPackage ../os-specific/linux/fscryptctl { };