Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
- pkgs/development/python-modules/flask-security-too/default.nix
This commit is contained in:
Martin Weinelt 2024-03-19 17:30:09 +01:00
commit 7762462405
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
89 changed files with 1093 additions and 837 deletions

View File

@ -6276,6 +6276,16 @@
githubId = 541748;
name = "Felipe Espinoza";
};
federicoschonborn = {
name = "Federico Damián Schonborn";
email = "federicoschonborn@disroot.org";
github = "FedericoSchonborn";
githubId = 62166915;
matrix = "@FedericoDSchonborn:matrix.org";
keys = [
{ fingerprint = "C43F 4052 D289 3B73 33F8 0259 E4F6 F544 DE9E 29E8"; }
];
};
fedx-sudo = {
email = "fedx-sudo@pm.me";
github = "FedX-sudo";

View File

@ -99,6 +99,7 @@ with lib.maintainers; {
budgie = {
members = [
bobby285271
federicoschonborn
];
scope = "Maintain Budgie desktop environment";
shortName = "Budgie";

View File

@ -1439,6 +1439,8 @@ in {
nodejs
gnupg
"${cfg.packages.gitlab}/share/gitlab/vendor/gems/sidekiq-${cfg.packages.gitlab.rubyEnv.gems.sidekiq.version}"
# Needed for GitLab project imports
gnutar
gzip
@ -1452,7 +1454,12 @@ in {
TimeoutSec = "infinity";
Restart = "always";
WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
ExecStart="${cfg.packages.gitlab.rubyEnv}/bin/sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production";
ExecStart = utils.escapeSystemdExecArgs [
"${cfg.packages.gitlab}/share/gitlab/bin/sidekiq-cluster"
"-e" "production"
"-r" "."
"*" # all queue groups
];
};
};
@ -1550,7 +1557,7 @@ in {
gnutar
gzip
openssh
gitlab-workhorse
cfg.packages.gitlab-workhorse
];
serviceConfig = {
Type = "simple";

View File

@ -236,9 +236,9 @@ in
};
services.hedgedoc.settings = {
defaultNotePath = lib.mkDefault "${cfg.package}/public/default.md";
docsPath = lib.mkDefault "${cfg.package}/public/docs";
viewPath = lib.mkDefault "${cfg.package}/public/views";
defaultNotePath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/default.md";
docsPath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/docs";
viewPath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/views";
};
systemd.services.hedgedoc = {
@ -263,7 +263,7 @@ in
Group = name;
Restart = "always";
ExecStart = "${cfg.package}/bin/hedgedoc";
ExecStart = lib.getExe cfg.package;
RuntimeDirectory = [ name ];
StateDirectory = [ name ];
WorkingDirectory = "/run/${name}";

View File

@ -44,6 +44,8 @@ let
enableSshSocket = config.services.openssh.startWhenNeeded;
};
in {
meta.maintainers = lib.teams.budgie.members;
options = {
services.xserver.desktopManager.budgie = {
enable = mkEnableOption (mdDoc "the Budgie desktop");

View File

@ -61,14 +61,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'")
machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie.budgie-desktop-with-plugins.pname}'")
with subtest("Open Budgie Control Center"):
with subtest("Open run dialog"):
machine.send_key("alt-f2")
machine.wait_until_succeeds("pgrep -f budgie-run-dialog")
machine.wait_for_window("budgie-run-dialog")
machine.sleep(3)
machine.send_chars("Budgie Control Center", delay=0.5)
machine.screenshot("quick_search")
machine.send_chars("\n")
machine.sleep(2)
machine.screenshot("run_dialog")
machine.send_key("esc")
with subtest("Open Budgie Control Center"):
machine.succeed("${su "budgie-control-center >&2 &"}")
machine.wait_for_window("Budgie Control Center")
with subtest("Lock the screen"):

View File

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pt2-clone";
version = "1.66.1";
version = "1.67";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "pt2-clone";
rev = "v${finalAttrs.version}";
sha256 = "sha256-j7VPC1sj1Q+wL2TBgv06uYLPqym8F57HG1SRvj0Ggeo=";
sha256 = "sha256-fTUTXwS6A72zhKkANlSljQVvPeN5rOTyuyb8vLxYfdk=";
};
nativeBuildInputs = [ cmake ];

View File

@ -2,7 +2,6 @@
, lib
, fetchFromGitHub
, cmake
, gitMinimal
, pkg-config
, alsa-lib
, freetype
@ -23,15 +22,12 @@ stdenv.mkDerivation rec {
owner = "surge-synthesizer";
repo = "surge";
rev = "release_xt_${version}";
branchName = "release-xt/${version}";
fetchSubmodules = true;
leaveDotGit = true;
sha256 = "sha256-q6qs/OhIakF+Gc8Da3pnfkUGYDUoJbvee0o8dfrRI2U=";
sha256 = "sha256-xcbZ5TC2W2PVzAkpoKPFIgW1oRGaC+ynQYot3cb5NAQ=";
};
nativeBuildInputs = [
cmake
gitMinimal
pkg-config
];

View File

@ -15,6 +15,13 @@ buildGoModule rec {
subPackages = [ "." ];
checkFlags = [
# Test fails with:
# 'x509_test.go:201: server did not report bad certificate error;
# instead errored with [...] tls: unknown certificate authority (*url.Error)'
"-skip=^TestUntrustedClientCert$"
];
meta = {
homepage = "https://decred.org";
description = "A secure Decred wallet daemon written in Go (golang)";

View File

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
"-Dvapi=false"
];
meta = with lib; {
meta = {
description = "An implementation of the KDE Connect protocol, built on GNOME platform libraries";
mainProgram = "valent";
longDescription = ''
@ -82,8 +82,8 @@ stdenv.mkDerivation rec {
'';
homepage = "https://valent.andyholmes.ca";
changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md";
license = with licenses; [ gpl3Plus cc0 cc-by-sa-30 ];
maintainers = with maintainers; [ aleksana ];
platforms = platforms.linux;
license = with lib.licenses; [ gpl3Plus cc0 cc-by-sa-30 ];
maintainers = with lib.maintainers; [ aleksana federicoschonborn ];
platforms = lib.platforms.linux;
};
}

View File

@ -2,6 +2,7 @@
, stdenv
, bash
, fetchFromGitHub
, fetchFromGitLab
, SDL2
, alsa-lib
, catch2_3
@ -72,6 +73,17 @@ let
rev = "0.10.1";
hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw=";
};
wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec {
version = "0.4.17";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "pipewire";
repo = "wireplumber";
rev = version;
hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI=";
};
});
in
stdenv.mkDerivation (finalAttrs: {
pname = "waybar";
@ -138,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional traySupport libdbusmenu-gtk3
++ lib.optional udevSupport udev
++ lib.optional upowerSupport upower
++ lib.optional wireplumberSupport wireplumber
++ lib.optional wireplumberSupport wireplumber_0_4
++ lib.optional (cavaSupport || pipewireSupport) pipewire
++ lib.optional (!stdenv.isLinux) libinotify-kqueue;

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helm-unittest";
version = "0.4.2";
version = "0.4.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-51Cx8V0cvuyBLFVmOWpA8X/kpDR67Q5EYZct44ED/ys=";
hash = "sha256-2ymsh+GWCjpiTVRIuf0i9+wz6WnwpG0QP6tErabSEFk=";
};
vendorHash = "sha256-6tXQ2fbn1ZzImx8luxetXHNj3gIUt217rjXJPxMpjTw=";
vendorHash = "sha256-ftD913mz9ziO3XWCdsbONrgMlBIc0uX4gq3NQmkXbs0=";
# NOTE: Remove the install and upgrade hooks.
postPatch = ''

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.55.15";
version = "0.55.18";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-luVYnuvsLHfkSZVCjzGB34ffbNzuKjEFmxQfgdY+YpQ=";
hash = "sha256-66yNRBh4WzArHL/yPn6IuLXt2YEthnufkcR2sw7LJYQ=";
};
vendorHash = "sha256-KXAN8WNKFfGbV7YQRhwgFBM0g+rbHe+MIuaR5/7khAs=";
vendorHash = "sha256-ijAg0Y/dfNxDS/Jov7QYjlTZ4N4/jDMH/zCV0jdVXRc=";
doCheck = false;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vcluster";
version = "0.19.1";
version = "0.19.4";
src = fetchFromGitHub {
owner = "loft-sh";
repo = pname;
repo = "vcluster";
rev = "v${version}";
hash = "sha256-W9BSLGUrW8Us+yYQLIz3oY8JKJSo43cL+oWQQf3xWJE=";
hash = "sha256-fzHaB+EeS8Gr1EVlxAZzKDYgv3Jij4LwmYaXN4tjYBg=";
};
vendorHash = null;
@ -45,12 +45,13 @@ buildGoModule rec {
command = "vcluster --version";
};
meta = with lib; {
meta = {
changelog = "https://github.com/loft-sh/vcluster/releases/tag/v${version}";
description = "Create fully functional virtual Kubernetes clusters";
mainProgram = "vcluster";
downloadPage = "https://github.com/loft-sh/vcluster";
homepage = "https://www.vcluster.com/";
license = licenses.asl20;
maintainers = with maintainers; [ peterromfeldhk berryp qjoly ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ berryp peterromfeldhk qjoly superherointj ];
};
}

View File

@ -36,8 +36,10 @@ buildGoModule rec {
passthru.tests = { inherit (nixosTests) magnetico; };
meta = with lib; {
# Build fails with Go >=1.21, couldn't be fixed by updating module dependencies.
broken = true;
description = "Autonomous (self-hosted) BitTorrent DHT search engine suite";
homepage = "https://github.com/boramalper/magnetico";
homepage = "https://github.com/ireun/magnetico";
license = licenses.agpl3;
badPlatforms = platforms.darwin;
maintainers = with maintainers; [ rnhmjoj ];

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "storj-uplink";
version = "1.100.2";
version = "1.100.3";
src = fetchFromGitHub {
owner = "storj";
repo = "storj";
rev = "v${version}";
hash = "sha256-wc6oK1zn04/1nwis9ndpkQc8dwY/J85zZbhkwmNFLek=";
hash = "sha256-/aR6M/zL7xL+ujmGgu9J8Toiy7/0ou76nYJ0vwd5RVM=";
};
subPackages = [ "cmd/uplink" ];

View File

@ -1,15 +1,15 @@
{
"version": "16.8.1",
"repo_hash": "sha256-95YdEAUYoFDFX4COI6NnI6tDB+NLnihlJdUDM8NixXA=",
"yarn_hash": "1yhl4l2dln9ck4nbjjrlyjx17nxk4h12gb5hqjh4dq3rz3az3jvx",
"version": "16.9.2",
"repo_hash": "sha256-pvmbxCySSc+Ug4W3cpXA6L7E3/I6J2A0BpcjFbR3YEI=",
"yarn_hash": "02vchjx17h6kk268pwrjqmrri0wa6vrljm7y5s23hwzir4v86slq",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v16.8.1-ee",
"rev": "v16.9.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "16.8.1",
"GITLAB_PAGES_VERSION": "16.8.1",
"GITALY_SERVER_VERSION": "16.9.2",
"GITLAB_PAGES_VERSION": "16.9.2",
"GITLAB_SHELL_VERSION": "14.33.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.6.0",
"GITLAB_WORKHORSE_VERSION": "16.8.1"
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.7.0",
"GITLAB_WORKHORSE_VERSION": "16.9.2"
}
}

View File

@ -49,7 +49,7 @@ let
cp Cargo.lock $out
'';
};
hash = "sha256-I5w/roDgnRe5eyXo0wiRcoWPpXEtpL3kOl9eDg99t/w=";
hash = "sha256-csasA2RH1vwRdF/9/BpFmh0AKsP3xtGmrhCx6mbVf6k=";
};
dontBuild = false;

View File

@ -6,7 +6,7 @@
}:
let
version = "16.8.1";
version = "16.9.2";
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-yR8O9F6THymKKHbnfh67NhEcNNBz7XHja/fpeTmVoe0=";
hash = "sha256-YlSZq7+YtV9mhZDoNZ7QStbZLQ/Vtt8H2ZW84ONvCq8=";
};
vendorHash = "sha256-AkL/BbCrqgXyvfiMxzMIXeZwh5aFL2a2+myk/4YXMNc=";
vendorHash = "sha256-aqwdeBjR8IGa1DsAXY1h7vq7OkuTgoDim5m40YKlcmo=";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];

View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "gitlab-container-registry";
version = "3.88.0";
version = "3.90.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-egslb+8+RsDjpL5xQpdCU3QwFH59grRCkODQnAkZe/0=";
hash = "sha256-bHRvvmVQFsdgYmVVucu1warn+SvCoIVh+C/U2uwi12E=";
};
vendorHash = "sha256-IFXIr0xYJCKM5VUHQV+4S/+FEAhFEjbMaU+9JWIh8cA=";
vendorHash = "sha256-Zv5Xz1T/ZUM/kyEgZJKbDuIN2nufoHVAn4kD3SuvJCg=";
patches = [
./Disable-inmemory-storage-driver-test.patch

View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "gitlab-elasticsearch-indexer";
version = "4.6.0";
version = "4.7.0";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-elasticsearch-indexer";
rev = "v${version}";
sha256 = "sha256-HlT3Uj/DWbyK4xGq7SjKjZ90sww6oMiMDo05mtv6rTA=";
sha256 = "sha256-xkCG8PyOXQl2xqsq3INqYWGdcJpJgRsi/hB9creGTSM=";
};
vendorHash = "sha256-YUH/agSy/shHmHRXlfDtgumbka6BjX5NTxgvlNJS4hQ=";
vendorHash = "sha256-1eyIRlrgEQ6iiM2tom5S92BlsyaPVKZzSU3+Mmdxi+4=";
buildInputs = [ icu ];
nativeBuildInputs = [ pkg-config ];

View File

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "16.8.1";
version = "16.9.2";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-Wj15GHm+5Xd5wq4C3dH+i94jh7pecHM6KCDugLm5YAA=";
hash = "sha256-1ygIMatPcqvhjN5Zkuk0WXd9iW6fv3bLK9EZsIII/WM=";
};
vendorHash = "sha256-9yogTSdEij/YwWGm3gz7jMn2AZcI+o7aEnjBvJ8E3vA=";
vendorHash = "sha256-ZjIjGZaZhxa3OvdaA4qD+Qza604mxe1u+zAUtIAKouo=";
subPackages = [ "." ];
meta = with lib; {

View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.8.1";
version = "16.9.2";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
@ -17,7 +17,7 @@ buildGoModule rec {
sourceRoot = "${src.name}/workhorse";
vendorHash = "sha256-OcdfanSlH1ZUmKlhzMOD3oNySx1o92Is7EDf1Z3953A=";
vendorHash = "sha256-RJ/CT8p1DpxmZcJLBeMDG77Zsn0Q6MiXsDcMK/LM2DA=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;

View File

@ -28,7 +28,7 @@ gem 'rails', '~> 7.0.8' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'bootsnap', '~> 1.17.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'bootsnap', '~> 1.18.3', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'openssl', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'ipaddr', '~> 1.2.5' # rubocop:todo Gemfile/MissingFeatureCategory
@ -141,11 +141,11 @@ gem 'grape-path-helpers', '~> 2.0.0', feature_category: :api
gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory
# GraphQL API
gem 'graphql', '~> 2.0.27', feature_category: :api
gem 'graphql', '~> 2.2.5', feature_category: :api
gem 'graphql-docs', '~> 4.0.0', group: [:development, :test], feature_category: :api
gem 'graphiql-rails', '~> 1.8.0', feature_category: :api
gem 'apollo_upload_server', '~> 2.1.5', feature_category: :api
gem 'graphlient', '~> 0.5.0', feature_category: :importers # Used by BulkImport feature (group::import)
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
@ -196,6 +196,10 @@ gem 'google-apis-serviceusage_v1', '~> 0.28.0' # rubocop:todo Gemfile/MissingFea
gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'googleauth', '~> 1.8.1', feature_category: :shared
gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared
gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared
# Seed data
gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory
@ -203,9 +207,9 @@ 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.190.2' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-core', '~> 3.191.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-s3', '~> 1.142.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-s3', '~> 1.143.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
@ -226,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.11', feature_category: :team_planning
gem 'gitlab-glfm-markdown', '~> 0.0.12', feature_category: :team_planning
# Calendar rendering
gem 'icalendar' # rubocop:todo Gemfile/MissingFeatureCategory
@ -252,7 +256,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeat
gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Background jobs
gem 'sidekiq', '~> 7.1.6' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :shared
gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory
@ -269,11 +273,11 @@ gem 'rainbow', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'ruby-progressbar', '~> 1.10' # rubocop:todo Gemfile/MissingFeatureCategory
# Linear-time regex library for untrusted regular expressions
gem 're2', '2.6.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 're2', '2.7.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Misc
gem 'semver_dialects', '~> 1.5', feature_category: :static_application_security_testing
gem 'semver_dialects', '~> 1.6.1', 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
@ -336,7 +340,8 @@ 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' # 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 'terser', '1.0.2' # rubocop:todo Gemfile/MissingFeatureCategory
@ -347,7 +352,7 @@ gem 'gon', '~> 6.4.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'request_store', '~> 1.5.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'base32', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-license', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-license', '~> 2.4', feature_category: :shared
# Protect against bruteforcing
gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory
@ -360,14 +365,14 @@ gem 'sentry-sidekiq', '~> 5.10.0', feature_category: :error_tracking
# PostgreSQL query parsing
#
gem 'pg_query', '~> 4.2.3' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'pg_query', '~> 5.1.0', feature_category: :database
gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-http', path: 'gems/gitlab-http' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'premailer-rails', '~> 1.10.3' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-labkit', '~> 0.35.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-labkit', '~> 0.35.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory
# I18n
@ -388,12 +393,12 @@ gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Metrics
gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'prometheus-client-mmap', '~> 1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
group :development do
gem 'lefthook', '~> 1.5.5', require: false, feature_category: :tooling
gem 'lefthook', '~> 1.5.6', require: false, feature_category: :tooling
gem 'rubocop', feature_category: :tooling
gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory
@ -407,7 +412,7 @@ group :development do
gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'ruby-lsp', "~> 0.13.2", require: false, feature_category: :tooling
gem 'ruby-lsp', "~> 0.13.3", require: false, feature_category: :tooling
gem 'ruby-lsp-rails', "~> 0.2.8", feature_category: :tooling
@ -498,15 +503,15 @@ group :test do
gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling
gem 'os', '~> 1.1', feature_category: :tooling
gem 'capybara', '~> 3.39', '>= 3.39.2' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'capybara', '~> 3.40' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'selenium-webdriver', '~> 4.16' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'selenium-webdriver', '~> 4.17' # 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.19.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'webmock', '~> 3.20.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
@ -517,10 +522,10 @@ group :test do
# 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.11.0', require: false, feature_category: :tooling
gem 'gitlab_quality-test_tooling', '~> 1.14.2', require: false, feature_category: :tooling
end
gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'octokit', '~> 8.0', feature_category: :importers
gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
@ -552,14 +557,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.7.0-rc1', feature_category: :gitaly
gem 'gitaly', '~> 16.9.0-rc3', feature_category: :gitaly
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.3.0', feature_category: :deployment_management
gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management
gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'grpc', '~> 1.60.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'google-protobuf', '~> 3.25', '>= 3.25.2' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'google-protobuf', '~> 3.25', '>= 3.25.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'toml-rb', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
@ -634,7 +639,7 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' # rubocop:todo Gemfile/Missi
gem 'arr-pm', '~> 0.0.12' # rubocop:todo Gemfile/MissingFeatureCategory
# Remote Development
gem 'devfile', '~> 0.0.24.pre.alpha1', feature_category: :remote_development
gem 'devfile', '~> 0.0.25.pre.alpha1', feature_category: :remote_development
# Apple plist parsing
gem 'CFPropertyList', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
@ -652,4 +657,4 @@ gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-sdk', feature_category: :application_instrumentation
gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation

View File

@ -34,6 +34,7 @@ PATH
specs:
gitlab-housekeeper (0.1.0)
activesupport
awesome_print
httparty
rubocop
@ -177,6 +178,15 @@ PATH
nokogiri (>= 1.4.4)
omniauth (~> 2.0)
PATH
remote: vendor/gems/sidekiq-7.1.6
specs:
sidekiq (7.1.6)
concurrent-ruby (< 2)
connection_pool (>= 2.3.0)
rack (>= 2.2.4)
redis-client (>= 0.14.0)
PATH
remote: vendor/gems/sidekiq-reliable-fetch
specs:
@ -301,7 +311,7 @@ GEM
aws-sdk-cloudformation (1.41.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.190.2)
aws-sdk-core (3.191.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
@ -309,8 +319,8 @@ GEM
aws-sdk-kms (1.76.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.142.0)
aws-sdk-core (~> 3, >= 3.189.0)
aws-sdk-s3 (1.143.0)
aws-sdk-core (~> 3, >= 3.191.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0)
@ -337,6 +347,7 @@ GEM
babosa (2.0.0)
backport (1.2.0)
base32 (0.3.2)
base64 (0.2.0)
batch-loader (2.0.1)
bcrypt (3.1.18)
benchmark (0.2.0)
@ -353,7 +364,7 @@ GEM
bindata (2.4.11)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
bootsnap (1.17.1)
bootsnap (1.18.3)
msgpack (~> 1.2)
browser (5.3.1)
builder (3.2.4)
@ -364,11 +375,11 @@ GEM
bundler (>= 1.2.0, < 3)
thor (~> 1.0)
byebug (11.1.3)
capybara (3.39.2)
capybara (3.40.0)
addressable
matrix
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
nokogiri (~> 1.11)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
@ -382,8 +393,7 @@ GEM
mime-types (>= 1.16)
ssrf_filter (~> 1.0, < 1.1.0)
cbor (0.5.9.6)
character_set (1.4.1)
sorted_set (~> 1.0)
character_set (1.8.0)
charlock_holmes (0.7.7)
chef-config (18.3.0)
addressable
@ -425,8 +435,10 @@ GEM
git
css_parser (1.14.0)
addressable
cssbundling-rails (1.3.3)
railties (>= 6.0.0)
cvss-suite (3.0.1)
danger (9.3.1)
danger (9.4.2)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
@ -437,7 +449,7 @@ GEM
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.0)
no_proxy_fix
octokit (~> 6.0)
octokit (>= 4.0)
terminal-table (>= 1, < 4)
danger-gitlab (8.0.0)
danger
@ -471,7 +483,7 @@ GEM
thor (>= 0.19, < 2)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devfile (0.0.24.pre.alpha1)
devfile (0.0.25.pre.alpha1)
device_detector (1.0.0)
devise (4.9.3)
bcrypt (~> 3.0)
@ -651,7 +663,7 @@ GEM
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
fuzzyurl (0.9.0)
gapic-common (0.18.0)
gapic-common (0.20.0)
faraday (>= 1.9, < 3.a)
faraday-retry (>= 1.0, < 3.a)
google-protobuf (~> 3.14)
@ -673,7 +685,7 @@ GEM
git (1.18.0)
addressable (~> 2.8)
rchardet (~> 1.8)
gitaly (16.7.0.pre.rc1)
gitaly (16.9.0.pre.rc3)
grpc (~> 1.0)
gitlab (4.19.0)
httparty (~> 0.20)
@ -693,9 +705,9 @@ GEM
fog-core (= 2.1.0)
fog-json (~> 1.2.0)
mime-types
gitlab-glfm-markdown (0.0.11)
gitlab-glfm-markdown (0.0.12)
rb_sys (~> 0.9.86)
gitlab-labkit (0.35.0)
gitlab-labkit (0.35.1)
actionpack (>= 5.0.0, < 8.0.0)
activesupport (>= 5.0.0, < 8.0.0)
grpc (>= 1.37)
@ -703,7 +715,7 @@ GEM
opentracing (~> 0.4)
pg_query (>= 4.2.3, < 6.0)
redis (> 3.0.0, < 6.0.0)
gitlab-license (2.3.0)
gitlab-license (2.4.0)
gitlab-mail_room (0.0.24)
jwt (>= 2.0)
net-imap (>= 0.2.1)
@ -712,7 +724,7 @@ GEM
redis-namespace (>= 1.8.2)
gitlab-markup (1.9.0)
gitlab-net-dns (0.9.2)
gitlab-sdk (0.2.3)
gitlab-sdk (0.3.0)
activesupport (>= 5.2.0)
rake (~> 13.0)
snowplow-tracker (~> 0.8.0)
@ -729,14 +741,15 @@ GEM
omniauth (>= 1.3, < 3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
gitlab_quality-test_tooling (1.11.0)
activesupport (>= 6.1, < 7.2)
gitlab_quality-test_tooling (1.14.2)
activesupport (>= 6.1, < 7.1)
amatch (~> 0.4.1)
gitlab (~> 4.19)
http (~> 5.0)
nokogiri (~> 1.10)
parallel (>= 1, < 2)
rainbow (>= 3, < 4)
rspec-parameterized (~> 1.0.0)
table_print (= 1.5.7)
zeitwerk (>= 2, < 3)
globalid (1.1.0)
@ -783,12 +796,27 @@ GEM
google-apis-core (>= 0.9.1, < 2.a)
google-apis-storage_v1 (0.29.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-artifact_registry-v1 (0.11.0)
gapic-common (>= 0.20.0, < 2.a)
google-cloud-errors (~> 1.0)
google-cloud-location (>= 0.4, < 2.a)
grpc-google-iam-v1 (~> 1.1)
google-cloud-common (1.1.0)
google-protobuf (~> 3.14)
googleapis-common-protos-types (~> 1.2)
google-cloud-compute-v1 (2.6.0)
gapic-common (>= 0.20.0, < 2.a)
google-cloud-common (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.0)
google-cloud-location (0.6.0)
gapic-common (>= 0.20.0, < 2.a)
google-cloud-errors (~> 1.0)
google-cloud-profiler-v2 (0.4.0)
gapic-common (>= 0.18.0, < 2.a)
google-cloud-errors (~> 1.0)
@ -807,10 +835,9 @@ GEM
grpc (~> 1.27)
googleapis-common-protos-types (1.5.0)
google-protobuf (~> 3.14)
googleauth (1.3.0)
googleauth (1.8.1)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
@ -843,13 +870,14 @@ GEM
graphiql-rails (1.8.0)
railties
sprockets-rails
graphlient (0.5.0)
graphlient (0.6.0)
faraday (>= 1.0)
faraday_middleware
graphql-client
graphlyte (1.0.0)
graphql (2.0.27)
graphql-client (0.18.0)
graphql (2.2.5)
racc (~> 1.4)
graphql-client (0.19.0)
activesupport (>= 3.0)
graphql
graphql-docs (4.0.0)
@ -860,9 +888,13 @@ GEM
gemoji (~> 3.0)
graphql (~> 2.0)
html-pipeline (~> 2.14, >= 2.14.3)
grpc (1.58.0)
google-protobuf (~> 3.23)
grpc (1.60.0)
google-protobuf (~> 3.25)
googleapis-common-protos-types (~> 1.0)
grpc-google-iam-v1 (1.5.0)
google-protobuf (~> 3.18)
googleapis-common-protos (~> 1.4)
grpc (~> 1.41)
gssapi (1.3.1)
ffi (>= 1.0.1)
guard (2.16.2)
@ -977,7 +1009,7 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
kas-grpc (0.3.0)
kas-grpc (0.4.0)
grpc (~> 1.0)
knapsack (1.21.1)
rake
@ -993,7 +1025,7 @@ GEM
language_server-protocol (3.17.0.3)
launchy (2.5.0)
addressable (~> 2.7)
lefthook (1.5.5)
lefthook (1.5.6)
letter_opener (1.7.0)
launchy (~> 2.2)
letter_opener_web (2.0.0)
@ -1009,9 +1041,9 @@ GEM
tomlrb (>= 1.3, < 2.1)
with_env (= 1.1.0)
xml-simple (~> 1.1.9)
licensee (9.16.0)
licensee (9.16.1)
dotenv (~> 2.0)
octokit (>= 4.20, < 7.0)
octokit (>= 4.20, < 9.0)
reverse_markdown (>= 1, < 3)
rugged (>= 0.24, < 2.0)
thor (>= 0.19, < 2.0)
@ -1055,7 +1087,6 @@ GEM
actionpack (>= 5.2)
activerecord (>= 5.2)
matrix (0.4.2)
memoist (0.16.2)
memory_profiler (1.0.1)
method_source (1.0.0)
mime-types (3.5.1)
@ -1124,7 +1155,7 @@ GEM
rack (>= 1.2, < 4)
snaky_hash (~> 2.0)
version_gem (~> 1.1)
octokit (6.1.1)
octokit (8.0.0)
faraday (>= 1, < 3)
sawyer (~> 0.9)
ohai (18.1.3)
@ -1240,7 +1271,7 @@ GEM
peek (1.1.0)
railties (>= 4.0.0)
pg (1.5.4)
pg_query (4.2.3)
pg_query (5.1.0)
google-protobuf (>= 3.22.3)
plist (3.7.0)
png_quantizator (0.2.1)
@ -1259,7 +1290,7 @@ GEM
coderay
parser
unparser
prometheus-client-mmap (1.1.0)
prometheus-client-mmap (1.1.1)
rb_sys (~> 0.9.86)
protocol (2.0.0)
ruby_parser (~> 3.0)
@ -1347,9 +1378,8 @@ GEM
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rbtree (0.4.6)
rchardet (1.8.0)
re2 (2.6.0)
re2 (2.7.0)
mini_portile2 (~> 2.8.5)
recaptcha (5.12.3)
json
@ -1475,7 +1505,7 @@ GEM
ruby-fogbugz (0.3.0)
crack (~> 0.4)
multipart-post (~> 2.0)
ruby-lsp (0.13.2)
ruby-lsp (0.13.3)
language_server-protocol (~> 3.17.0)
prism (>= 0.19.0, < 0.20)
sorbet-runtime (>= 0.5.5685)
@ -1497,7 +1527,8 @@ GEM
rexml
ruby-statistics (3.0.0)
ruby2_keywords (0.0.5)
ruby_parser (3.20.3)
ruby_parser (3.21.0)
racc (~> 1.5)
sexp_processor (~> 4.16)
rubyntlm (0.6.3)
rubypants (0.2.0)
@ -1511,7 +1542,7 @@ GEM
nokogiri (>= 1.12.0)
sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.0)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
@ -1524,11 +1555,12 @@ GEM
seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
selenium-webdriver (4.16.0)
selenium-webdriver (4.17.0)
base64 (~> 0.2)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
semver_dialects (1.5.0)
semver_dialects (1.6.1)
deb_version (~> 1.0.1)
pastel (~> 0.8.0)
thor (~> 1.3)
@ -1543,22 +1575,16 @@ GEM
sentry-sidekiq (5.10.0)
sentry-ruby (~> 5.10.0)
sidekiq (>= 3.0)
set (1.0.2)
sexp_processor (4.17.0)
sexp_processor (4.17.1)
shellany (0.0.1)
shoulda-matchers (5.1.0)
activesupport (>= 5.2.0)
sidekiq (7.1.6)
concurrent-ruby (< 2)
connection_pool (>= 2.3.0)
rack (>= 2.2.4)
redis-client (>= 0.14.0)
sidekiq-cron (1.12.0)
fugit (~> 1.8)
globalid (>= 1.0.1)
sidekiq (>= 6)
sigdump (0.2.4)
signet (0.17.0)
signet (0.18.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
@ -1597,9 +1623,6 @@ GEM
tilt (~> 2.0)
yard (~> 0.9, >= 0.9.24)
sorbet-runtime (0.5.11144)
sorted_set (1.0.3)
rbtree
set (~> 1.0)
spamcheck (1.3.0)
grpc (~> 1.0)
spring (4.1.0)
@ -1767,7 +1790,7 @@ GEM
webfinger (1.2.0)
activesupport
httpclient (>= 2.4)
webmock (3.19.1)
webmock (3.20.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
@ -1815,8 +1838,8 @@ DEPENDENCIES
autoprefixer-rails (= 10.2.5.1)
awesome_print
aws-sdk-cloudformation (~> 1)
aws-sdk-core (~> 3.190.2)
aws-sdk-s3 (~> 1.142.0)
aws-sdk-core (~> 3.191.1)
aws-sdk-s3 (~> 1.143.0)
axe-core-rspec (~> 4.8.0)
babosa (~> 2.0)
base32 (~> 0.3.0)
@ -1825,12 +1848,12 @@ DEPENDENCIES
benchmark-ips (~> 2.11.0)
benchmark-memory (~> 0.1)
better_errors (~> 2.10.1)
bootsnap (~> 1.17.1)
bootsnap (~> 1.18.3)
browser (~> 5.3.1)
bullet (~> 7.1.2)
bundler-audit (~> 0.9.1)
bundler-checksum (~> 0.1.0)!
capybara (~> 3.39, >= 3.39.2)
capybara (~> 3.40)
capybara-screenshot (~> 1.0.26)
carrierwave (~> 1.3)
charlock_holmes (~> 0.7.7)
@ -1843,6 +1866,7 @@ DEPENDENCIES
countries (~> 4.0.0)
creole (~> 0.5.0)
crystalball (~> 0.7.0)
cssbundling-rails (= 1.3.3)
csv_builder!
cvss-suite (~> 3.0.1)
database_cleaner-active_record (~> 2.1.0)
@ -1850,7 +1874,7 @@ DEPENDENCIES
declarative_policy (~> 1.1.0)
deprecation_toolkit (~> 1.5.1)
derailed_benchmarks
devfile (~> 0.0.24.pre.alpha1)
devfile (~> 0.0.25.pre.alpha1)
device_detector
devise (~> 4.9.3)
devise-pbkdf2-encryptable (~> 0.0.0)!
@ -1885,17 +1909,17 @@ DEPENDENCIES
fuubar (~> 2.2.0)
gettext (~> 3.3)
gettext_i18n_rails (~> 1.11.0)
gitaly (~> 16.7.0.pre.rc1)
gitaly (~> 16.9.0.pre.rc3)
gitlab-backup-cli!
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 4.6.0)
gitlab-experiment (~> 0.9.1)
gitlab-fog-azure-rm (~> 1.8.0)
gitlab-glfm-markdown (~> 0.0.11)
gitlab-glfm-markdown (~> 0.0.12)
gitlab-housekeeper!
gitlab-http!
gitlab-labkit (~> 0.35.0)
gitlab-license (~> 2.3)
gitlab-labkit (~> 0.35.1)
gitlab-license (~> 2.4)
gitlab-mail_room (~> 0.0.24)
gitlab-markup (~> 1.9.0)
gitlab-net-dns (~> 0.9.2)
@ -1903,14 +1927,14 @@ DEPENDENCIES
gitlab-rspec_flaky!
gitlab-safe_request_store!
gitlab-schema-validation!
gitlab-sdk
gitlab-sdk (~> 0.3.0)
gitlab-secret_detection!
gitlab-sidekiq-fetcher!
gitlab-styles (~> 11.0.0)
gitlab-utils!
gitlab_chronic_duration (~> 0.12)
gitlab_omniauth-ldap (~> 2.2.0)
gitlab_quality-test_tooling (~> 1.11.0)
gitlab_quality-test_tooling (~> 1.14.2)
gon (~> 6.4.0)
google-apis-androidpublisher_v3 (~> 0.34.0)
google-apis-cloudbilling_v1 (~> 0.21.0)
@ -1923,8 +1947,11 @@ DEPENDENCIES
google-apis-serviceusage_v1 (~> 0.28.0)
google-apis-sqladmin_v1beta4 (~> 0.41.0)
google-apis-storage_v1 (~> 0.29)
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.2)
google-protobuf (~> 3.25, >= 3.25.1)
googleauth (~> 1.8.1)
gpgme (~> 2.0.23)
grape (~> 2.0.0)
grape-entity (~> 0.10.0)
@ -1933,11 +1960,11 @@ DEPENDENCIES
grape-swagger-entity (~> 0.5.1)
grape_logging (~> 1.8)
graphiql-rails (~> 1.8.0)
graphlient (~> 0.5.0)
graphlient (~> 0.6.0)
graphlyte (~> 1.0.0)
graphql (~> 2.0.27)
graphql (~> 2.2.5)
graphql-docs (~> 4.0.0)
grpc (~> 1.58.0)
grpc (~> 1.60.0)
gssapi (~> 1.3.1)
guard-rspec
haml_lint (~> 0.53)
@ -1960,11 +1987,11 @@ DEPENDENCIES
jsonb_accessor (~> 1.3.10)
jwt (~> 2.5)
kaminari (~> 1.2.2)
kas-grpc (~> 0.3.0)
kas-grpc (~> 0.4.0)
knapsack (~> 1.21.1)
kramdown (~> 2.3.1)
kubeclient (~> 4.11.0)
lefthook (~> 1.5.5)
lefthook (~> 1.5.6)
letter_opener_web (~> 2.0.0)
license_finder (~> 7.0)
licensee (~> 9.16)
@ -1989,7 +2016,7 @@ DEPENDENCIES
net-protocol (~> 0.1.3)
nokogiri (~> 1.16)
oauth2 (~> 2.0)
octokit (~> 6.0)
octokit (~> 8.0)
ohai (~> 18.1)
oj (~> 3.13.21)
oj-introspect (~> 0.7)
@ -2021,10 +2048,10 @@ DEPENDENCIES
parslet (~> 1.8)
peek (~> 1.1)
pg (~> 1.5.4)
pg_query (~> 4.2.3)
pg_query (~> 5.1.0)
png_quantizator (~> 0.2.1)
premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 1.1)
prometheus-client-mmap (~> 1.1, >= 1.1.1)
pry-byebug
pry-rails (~> 0.3.9)
pry-shell (~> 0.6.4)
@ -2040,7 +2067,7 @@ DEPENDENCIES
rails-i18n (~> 7.0)
rainbow (~> 3.0)
rbtrace (~> 0.4)
re2 (= 2.6.0)
re2 (= 2.7.0)
recaptcha (~> 5.12)
redis (~> 4.8.0)
redis-actionpack (~> 5.4.0)
@ -2059,7 +2086,7 @@ DEPENDENCIES
rspec_profiling (~> 0.0.6)
rubocop
ruby-fogbugz (~> 0.3.0)
ruby-lsp (~> 0.13.2)
ruby-lsp (~> 0.13.3)
ruby-lsp-rails (~> 0.2.8)
ruby-lsp-rspec (~> 0.1.8)
ruby-magic (~> 0.6)
@ -2072,14 +2099,14 @@ DEPENDENCIES
sassc-rails (~> 2.1.0)
sd_notify (~> 0.1.0)
seed-fu (~> 2.3.7)
selenium-webdriver (~> 4.16)
semver_dialects (~> 1.5)
selenium-webdriver (~> 4.17)
semver_dialects (~> 1.6.1)
sentry-rails (~> 5.10.0)
sentry-raven (~> 3.1)
sentry-ruby (~> 5.10.0)
sentry-sidekiq (~> 5.10.0)
shoulda-matchers (~> 5.1.0)
sidekiq (~> 7.1.6)
sidekiq!
sidekiq-cron (~> 1.12.0)
sigdump (~> 0.2.4)
simple_po_parser (~> 1.1.6)
@ -2119,10 +2146,10 @@ DEPENDENCIES
vmstat (~> 2.3.0)
warning (~> 1.3.0)
webauthn (~> 3.0)
webmock (~> 3.19.1)
webmock (~> 3.20.0)
webrick (~> 1.8.1)
wikicloth (= 0.8.1)
yajl-ruby (~> 1.4.3)
BUNDLED WITH
2.5.4
2.5.5

View File

@ -411,10 +411,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z9f8ypvpwj3sfqh3nlnhrq7ryhrv7isqzg370fba27zpy7bv5sx";
sha256 = "0fy80878z21j8py03ddf1ycsndzmnmw4jkbzw1mlrglwav08yq7q";
type = "gem";
};
version = "3.190.2";
version = "3.191.1";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -433,10 +433,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sfpipfdmixpc0madfx1yvpwpv52fdhxfx4bmvrjxzb6ra78ikbr";
sha256 = "1safbxycz517m2v981z8kbmdiqx9jypl093ia0mcrskkgh4fyb3s";
type = "gem";
};
version = "1.142.0";
version = "1.143.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -534,6 +534,16 @@ src:
};
version = "0.3.2";
};
base64 = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
type = "gem";
};
version = "0.2.0";
};
batch-loader = {
groups = ["default"];
platforms = [];
@ -653,10 +663,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "028qif22isxa5sg5gf1322d0qjhir5rr0jpkaiwcic4lspacdcnv";
sha256 = "1srlq3gqirzdkhv12ljpnp5cb0f8jfrl3n8xs9iivyz2c7khvdyp";
type = "gem";
};
version = "1.17.1";
version = "1.18.3";
};
browser = {
groups = ["default"];
@ -730,10 +740,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n";
sha256 = "1vxfah83j6zpw3v5hic0j70h519nvmix2hbszmjwm8cfawhagns2";
type = "gem";
};
version = "3.39.2";
version = "3.40.0";
};
capybara-screenshot = {
dependencies = ["capybara" "launchy"];
@ -779,15 +789,14 @@ src:
version = "3.0.5";
};
character_set = {
dependencies = ["sorted_set"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ql0kxnpbblggyn8hx511pghpqf8xv3ng2kbybwwdi11bg1il6zp";
sha256 = "0l9z2pihzc11f0jpq2sx789zwpmwf5nyhsjps45zzvfs5931fwrb";
type = "gem";
};
version = "1.4.1";
version = "1.8.0";
};
charlock_holmes = {
groups = ["default"];
@ -1043,6 +1052,17 @@ src:
};
version = "1.14.0";
};
cssbundling-rails = {
dependencies = ["railties"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0m8qgrh70982xfdcylrm4zgh7pxq9ps539icnc7bqh1awl8k78aa";
type = "gem";
};
version = "1.3.3";
};
csv_builder = {
groups = ["default"];
platforms = [];
@ -1068,10 +1088,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x8xwn2l7avc6h08vgrkxyb6ga7slip5x8lynswmzd0y32ngnw4h";
sha256 = "104x4p9rmk8frf4l858p171vjaif7mqgxspx61d26c0hfg355ra3";
type = "gem";
};
version = "9.3.1";
version = "9.4.2";
};
danger-gitlab = {
dependencies = ["danger" "gitlab"];
@ -1224,10 +1244,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0036nfmz7dz5jwagm4k3hshrkmm3w2473q38bhnr06dmxlkgrfvj";
sha256 = "1p11hv0a2s4m29vvyr7z22wjr9f4cfmdjnqidrv62rfcg9r73w0g";
type = "gem";
};
version = "0.0.24.pre.alpha1";
version = "0.0.25.pre.alpha1";
};
device_detector = {
groups = ["default"];
@ -2075,10 +2095,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1awn2k5b2sji74vr0xhg0v68h1y0msqpkwq5z8k31mp2ii9mmmbg";
sha256 = "0rlka373b2iva4dz2diz2zx7jyx617hwqvnfx2hs5xs0nh24fc5g";
type = "gem";
};
version = "0.18.0";
version = "0.20.0";
};
gemoji = {
groups = ["default" "development" "test"];
@ -2140,10 +2160,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xqi0f0pf7cj110b981nx95wql3i4knzvc6417ym3yvbvsxjyand";
sha256 = "07q9fmk4mddfn12vl3jvj80rxmhixkl99hxff7zi385rwphki8an";
type = "gem";
};
version = "16.7.0.pre.rc1";
version = "16.9.0.pre.rc3";
};
gitlab = {
dependencies = ["httparty" "terminal-table"];
@ -2216,13 +2236,13 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z0h4bvfvlwyfx8ia03lr9dlpy38n75v2wxh424v6fhy4z08ycab";
sha256 = "0mqwz2a4k9894d160k5a3mqm5g6p9rncgi4kx8w8dymbnz34bcli";
type = "gem";
};
version = "0.0.11";
version = "0.0.12";
};
gitlab-housekeeper = {
dependencies = ["activesupport" "httparty" "rubocop"];
dependencies = ["activesupport" "awesome_print" "httparty" "rubocop"];
groups = ["development" "test"];
platforms = [];
source = {
@ -2247,20 +2267,20 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ya6r3ij0fzz6p50h157bn224n7405nwak6lx80ppvil9sm0dzr6";
sha256 = "1m41by1hly50yq9vsz5pbrb51yryf46n9pm7wnrinaisccrinl79";
type = "gem";
};
version = "0.35.0";
version = "0.35.1";
};
gitlab-license = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ms1kf5nmclsnmd2xa9k273asmb73ivaykwrb3g7sq263j3y7jk0";
sha256 = "082ycgvq7j0kyqrbx8shipqk3lgz6i279caf1ljvk9h5wsqqy8zx";
type = "gem";
};
version = "2.3.0";
version = "2.4.0";
};
gitlab-mail_room = {
dependencies = ["jwt" "net-imap" "oauth2" "redis" "redis-namespace"];
@ -2339,10 +2359,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mnhl888n4zfwhmfy3f1pj0k1rzjwpf16a1ic7wb22l64252g4g8";
sha256 = "00w9p1h3awari07vh33h65y1l1jh7sgym8fzgcp5q5aihha0y9i2";
type = "gem";
};
version = "0.2.3";
version = "0.3.0";
};
gitlab-secret_detection = {
dependencies = ["parallel" "re2" "toml-rb"];
@ -2408,15 +2428,15 @@ src:
version = "2.2.0";
};
gitlab_quality-test_tooling = {
dependencies = ["activesupport" "amatch" "gitlab" "http" "nokogiri" "parallel" "rainbow" "table_print" "zeitwerk"];
dependencies = ["activesupport" "amatch" "gitlab" "http" "nokogiri" "parallel" "rainbow" "rspec-parameterized" "table_print" "zeitwerk"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0anhwfn9dnd8zkjwkq3qycjswfxqksfnwvl7dr6azz2zvjnxnii1";
sha256 = "0n7ndhxkjkz7pfdqvcp90lxxias3lz2ssabpv5a5nxayilr47qwy";
type = "gem";
};
version = "1.11.0";
version = "1.14.2";
};
globalid = {
dependencies = ["activesupport"];
@ -2605,6 +2625,39 @@ src:
};
version = "0.29.0";
};
google-cloud-artifact_registry-v1 = {
dependencies = ["gapic-common" "google-cloud-errors" "google-cloud-location" "grpc-google-iam-v1"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gkq82lsjz3yw9w819ifdqx9ixcbgydr5myy64wnczknx7fd505s";
type = "gem";
};
version = "0.11.0";
};
google-cloud-common = {
dependencies = ["google-protobuf" "googleapis-common-protos-types"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yxmdxx933q48397jsczsmpshr4b61izv3spnhvzxd24s67v13bk";
type = "gem";
};
version = "1.1.0";
};
google-cloud-compute-v1 = {
dependencies = ["gapic-common" "google-cloud-common" "google-cloud-errors"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07hly5qbdy0qddw48biw0ybi2cx13861l5i09mj2abzw7yrmjq5r";
type = "gem";
};
version = "2.6.0";
};
google-cloud-core = {
dependencies = ["google-cloud-env" "google-cloud-errors"];
groups = ["default"];
@ -2637,6 +2690,17 @@ src:
};
version = "1.3.0";
};
google-cloud-location = {
dependencies = ["gapic-common" "google-cloud-errors"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1l6j0i8flfdzl9c7db990632jmn5v7bmbh1i6x0sqp3f2p59jv1q";
type = "gem";
};
version = "0.6.0";
};
google-cloud-profiler-v2 = {
dependencies = ["gapic-common" "google-cloud-errors"];
groups = ["default"];
@ -2692,15 +2756,15 @@ src:
version = "1.5.0";
};
googleauth = {
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
dependencies = ["faraday" "jwt" "multi_json" "os" "signet"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hpwgwhk0lmnknkw8kbdfxn95qqs6aagpq815l5fkw9w6mi77pai";
sha256 = "1ry9v23kndgx2pxq9v31l68k9lnnrcz1w4v75bkxq88jmbddljl1";
type = "gem";
};
version = "1.3.0";
version = "1.8.1";
};
gpgme = {
dependencies = ["mini_portile2"];
@ -2796,10 +2860,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14pjw0hd9rmfc687yj1cfd8jjy8gh7k6zn6w9syvcl1f2hb98b0g";
sha256 = "1h652p91zdbdigb155vhdlh0lnq4ia8wlg5y5h0ibhlf9i5ndn5q";
type = "gem";
};
version = "0.5.0";
version = "0.6.0";
};
graphlyte = {
groups = ["test"];
@ -2812,14 +2876,15 @@ src:
version = "1.0.0";
};
graphql = {
dependencies = ["racc"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dlb8hbgs7yas59pwf4k7qrczbgkvrpcjqd2f5cmjj02fxdbwn8z";
sha256 = "0zmw8gslwqaydxvmvan0m2rpbgxplm77kwp64bg051cvnasb9vhm";
type = "gem";
};
version = "2.0.27";
version = "2.2.5";
};
graphql-client = {
dependencies = ["activesupport" "graphql"];
@ -2827,10 +2892,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02r5qvfr176n051mp1c79xbpjhjqm92kk4118r0fbp131y0xralq";
sha256 = "1iv9d6l14h05vnhrzmm5fn2cnjb469an28c9z7c6p4bgjy0rssgy";
type = "gem";
};
version = "0.18.0";
version = "0.19.0";
};
graphql-docs = {
dependencies = ["commonmarker" "dartsass" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline"];
@ -2849,10 +2914,21 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00lx7sql179ak7rx5vg76z45y558d5wj0gldql4qjcaxjnzcryqc";
sha256 = "1bzkhy5yy4a8nlp89wwfw9bv4h358gsa9rvzn6i2y0z2ha5vmgqn";
type = "gem";
};
version = "1.58.0";
version = "1.60.0";
};
grpc-google-iam-v1 = {
dependencies = ["google-protobuf" "googleapis-common-protos" "grpc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kip34n9604j2cc9rkplv5ljq0n8f4aizix4yr8rginsa38md8yf";
type = "gem";
};
version = "1.5.0";
};
gssapi = {
dependencies = ["ffi"];
@ -3367,10 +3443,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12md9pbh0m2yfx0vy81dyn40ibdnhzm6b7kfwra66pkjwrac9pvq";
sha256 = "13bkqrdz1rdn23nn0zni7vdvwnm34apgi3xy42djhhxl698888dv";
type = "gem";
};
version = "0.3.0";
version = "0.4.0";
};
knapsack = {
dependencies = ["rake"];
@ -3442,10 +3518,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ac5r000h6rp7gdwyxr1n8hsg5b88gwbdkq87pbcjzps9li6n6nz";
sha256 = "1rc7fzg4rjchyv7rd6vlz35hg5n8k5625s78hj12zji0xhg1jznc";
type = "gem";
};
version = "1.5.5";
version = "1.5.6";
};
letter_opener = {
dependencies = ["launchy"];
@ -3496,10 +3572,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i4hs0vbgp0w3pdddr37zhydm16af122rmr0w39v3nqrj1ir65kv";
sha256 = "05g5w9c4jlfhwn0hfz117s1c7hfdm5yn7cywr4mah7xr41yvbh04";
type = "gem";
};
version = "9.16.0";
version = "9.16.1";
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
@ -3648,16 +3724,6 @@ src:
};
version = "0.4.2";
};
memoist = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55";
type = "gem";
};
version = "0.16.2";
};
memory_profiler = {
groups = ["default" "development" "test"];
platforms = [];
@ -4115,10 +4181,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gxh0x910qvah2sm9fbxn8jjy3pgwskyd3gm703zf182hafll3lj";
sha256 = "11fhv1a43c51jkgmqf62aypf9yw74lc6ph4qmzsh2bydwwzbwqn3";
type = "gem";
};
version = "6.1.1";
version = "8.0.0";
};
ohai = {
dependencies = ["chef-config" "chef-utils" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "train-core" "wmi-lite"];
@ -4563,10 +4629,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15ynrzqsmmbmxib8ri8n9k6z3l6rwd91j7y1mghm33nfgdf9bj8w";
sha256 = "0p8ljf694qvrf5875ljg6kp7gvmndy8490kasjzcq22ghryg9xxp";
type = "gem";
};
version = "4.2.3";
version = "5.1.0";
};
plist = {
groups = ["default"];
@ -4648,10 +4714,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "19mi424kwalrzdm7cvzjx2w0rw778mxqb75y9wn20nc277nxglvb";
sha256 = "0vg47xx3wgg24snqc6ychb08mbcyrjmvxym9fg69cpa4xvj133fx";
type = "gem";
};
version = "1.1.0";
version = "1.1.1";
};
protocol = {
dependencies = ["ruby_parser"];
@ -4995,16 +5061,6 @@ src:
};
version = "0.4.14";
};
rbtree = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1z0h1x7fpkzxamnvbw1nry64qd6n0nqkwprfair29z94kd3a9vhl";
type = "gem";
};
version = "0.4.6";
};
rchardet = {
groups = ["default" "development"];
platforms = [];
@ -5021,10 +5077,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sj80r3gy4sb27mrgc6pwcf2lra669p8p81axdv2p5pfm6k3mqbq";
sha256 = "1p0kxb1gwrsv2r38jwgsg8b5k2xx966qmrc6aajfncpzm398i79i";
type = "gem";
};
version = "2.6.0";
version = "2.7.0";
};
recaptcha = {
dependencies = ["json"];
@ -5525,10 +5581,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g1vdas991rv6lrjppjxjbfyzif4jxbncrcg9shgzrmibzilbnwr";
sha256 = "0b9aj7d1wh4s83mkfsvjgkikx83c7afyzy6k2940fx08hfrdqgb8";
type = "gem";
};
version = "0.13.2";
version = "0.13.3";
};
ruby-lsp-rails = {
dependencies = ["actionpack" "activerecord" "railties" "ruby-lsp" "sorbet-runtime"];
@ -5616,15 +5672,15 @@ src:
version = "0.0.5";
};
ruby_parser = {
dependencies = ["sexp_processor"];
dependencies = ["racc" "sexp_processor"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j8w4mqhqaw53jd27cfhq1mq02d1r606x9fmrpfzz0fwjnk8j8ld";
sha256 = "0sy5y7w89ii5iqym7b21glcwxqg8kizxfy8a7kcxq0j65wyqjhiq";
type = "gem";
};
version = "3.20.3";
version = "3.21.0";
};
rubyntlm = {
groups = ["default"];
@ -5715,10 +5771,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18mgdjxdzpbw92zrllynxw7jn7yihi85j3dg7i4f6c39w1scqkbn";
sha256 = "1d9djmwn36a5m8a83bpycs48g8kh1n2xkyvghn7dr6zwh4wdyksz";
type = "gem";
};
version = "2.1.0";
version = "2.1.2";
};
sawyer = {
dependencies = ["addressable" "faraday"];
@ -5753,15 +5809,15 @@ src:
version = "2.3.7";
};
selenium-webdriver = {
dependencies = ["rexml" "rubyzip" "websocket"];
dependencies = ["base64" "rexml" "rubyzip" "websocket"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qy3whgdg6q5bi6mzbq5gc94rxnkasdhdx3c73z3a955krj16w13";
sha256 = "0g3l3invk95w1f72mpp0r4hc3vsc3070c1xd1wg76kfg2r182xnq";
type = "gem";
};
version = "4.16.0";
version = "4.17.0";
};
semver_dialects = {
dependencies = ["deb_version" "pastel" "thor" "tty-command"];
@ -5769,10 +5825,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bj9r98ilpgg0w0h80wydfssr7kv65y0v2afsf1azhf9mymz3000";
sha256 = "13jmbqzswvkq0xds2s1r6wnh78gfy2zbn35qvalhwj2qi4nmjpvf";
type = "gem";
};
version = "1.5.0";
version = "1.6.1";
};
sentry-rails = {
dependencies = ["railties" "sentry-ruby"];
@ -5818,25 +5874,15 @@ src:
};
version = "5.10.0";
};
set = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00ick64s6066idlylbxhpjmxf56h1l22c8xp0mg4j8963zga9zq2";
type = "gem";
};
version = "1.0.2";
};
sexp_processor = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vzz9mhg4kkdqf179pm30i204h7iskanxrk53j0csf0qrrs4iajd";
sha256 = "182x05kpdjlckh31qizws50fz7sjk86yjjfmy45z61q3f930j4ci";
type = "gem";
};
version = "4.17.0";
version = "4.17.1";
};
shellany = {
groups = ["default" "test"];
@ -5864,9 +5910,8 @@ src:
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18j3g31ps6ga9nzza0z0d00qjrn810fhkhx2pqi3rvxwsmkdlnbq";
type = "gem";
path = "${src}/vendor/gems/sidekiq-7.1.6";
type = "path";
};
version = "7.1.6";
};
@ -5897,10 +5942,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0100rclkhagf032rg3r0gf3f4znrvvvqrimy6hpa73f21n9k2a0x";
sha256 = "0fzakk5y7zzii76zlkynpp1c764mzkkfg4mpj18f5pf2xp1aikb6";
type = "gem";
};
version = "0.17.0";
version = "0.18.0";
};
simple_po_parser = {
groups = ["development" "test"];
@ -6036,17 +6081,6 @@ src:
};
version = "0.5.11144";
};
sorted_set = {
dependencies = ["rbtree" "set"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0brpwv68d7m9qbf5js4bg8bmg4v7h4ghz312jv9cnnccdvp8nasg";
type = "gem";
};
version = "1.0.3";
};
spamcheck = {
dependencies = ["grpc"];
groups = ["default"];
@ -6875,10 +6909,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vfispr7wd2p1fs9ckn1qnby1yyp4i1dl7qz8n482iw977iyxrza";
sha256 = "0rc3g9hhxi6v2l1cp9q3kcjd92bhmdbrb517l4v5pyzwq2nflcyc";
type = "gem";
};
version = "3.19.1";
version = "3.20.0";
};
webrick = {
groups = ["default" "development" "test"];

View File

@ -6,6 +6,7 @@
, xorg
, stdenv
, python3
, makeBinaryWrapper
, libsixel
, mpv
, CoreFoundation
@ -19,7 +20,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "Siriusmart";
repo = pname;
repo = "youtube-tui";
rev = "v${version}";
hash = "sha256-FOiK3yQcQuwdCEjBtRPW4iBd+8uNsvZ6l5tclHVzL+M=";
};
@ -34,6 +35,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
pkg-config
python3
makeBinaryWrapper
];
buildInputs = [
@ -47,6 +49,12 @@ rustPlatform.buildRustPackage rec {
AppKit
];
# sixel-sys is dynamically linked to libsixel
postInstall = lib.optionalString stdenv.isDarwin ''
wrapProgram $out/bin/youtube-tui \
--prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}"
'';
meta = with lib; {
description = "An aesthetically pleasing YouTube TUI written in Rust";
homepage = "https://siriusmart.github.io/youtube-tui";

View File

@ -36,6 +36,12 @@ buildGoModule rec {
doCheck = false;
meta = with lib; {
# butler cannot be build with Go >=1.21
# See https://github.com/itchio/butler/issues/256
# and https://github.com/itchio/dmcunrar-go/issues/1
# The dependency causing the issue is marked as 'no maintainence intended'.
# Last butler release is from 05/2021.
broken = true;
description = "Command-line itch.io helper";
homepage = "https://github.com/itchio/butler";
license = licenses.mit;

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "eiwd";
version = "2.14-1";
version = "2.16-1";
src = fetchFromGitHub {
owner = "illiliti";
repo = "eiwd";
rev = finalAttrs.version;
hash = "sha256-9d7XDA98qMA6Myeik2Tpj0x6yd5VQozt+FHl0U3da50=";
hash = "sha256-TQA9aVdXGX2hje7lRQ8T9QDpSTYGpB5cIDlNYsUg/dM=";
fetchSubmodules = true;
};

View File

@ -12,6 +12,7 @@
, lua
, openal
, pkg-config
, strip-nondeterminism
, stdenv
, zip
, zlib
@ -31,6 +32,7 @@ stdenv.mkDerivation (finalAttrs:{
nativeBuildInputs = [
autoreconfHook
pkg-config
strip-nondeterminism
zip
];
@ -50,6 +52,11 @@ stdenv.mkDerivation (finalAttrs:{
strictDeps = true;
# Make sure that the build timestamp is not included in the archive
postFixup = ''
strip-nondeterminism --type zip $out/share/fs-uae/fs-uae.dat
'';
meta = {
homepage = "https://fs-uae.net";
description = "An accurate, customizable Amiga Emulator";

View File

@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
homepage = "https://github.com/awslabs/mountpoint-s3";
description = "A simple, high-throughput file client for mounting an Amazon S3 bucket as a local file system.";
license = licenses.amazonsl;
license = licenses.asl20;
maintainers = with maintainers; [ lblasc ];
platforms = platforms.linux;
};

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "namespace-cli";
version = "0.0.350";
version = "0.0.351";
src = fetchFromGitHub {
owner = "namespacelabs";
repo = "foundation";
rev = "v${version}";
hash = "sha256-qMtmB/KMMkMfU2AyE2pcjiy3wUwyQUpcP6rMkZk3SMI=";
hash = "sha256-DN/YHPb2/bPzE/EgkuCN0hat8UnwV+6fpay7t4Utlv8=";
};
vendorHash = "sha256-a/e+xPOD9BDSlKknmfcX2tTMyIUrzKxqtUpFXcFIDSE=";

View File

@ -6,13 +6,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "oelint-adv";
version = "4.4.1";
version = "4.4.4";
format = "setuptools";
src = fetchPypi {
inherit version;
pname = "oelint_adv";
hash = "sha256-Yv0GCz0vZTVrnFjHFIl4XF/jbVD4DJ4J6V6+X5IllJ8=";
hash = "sha256-ELWVQzlC56EYy0op42jKmRsuVnSZfz2fQATWOlhxWbk=";
};
propagatedBuildInputs = with python3.pkgs; [

View File

@ -0,0 +1,37 @@
{ lib
, fetchFromGitHub
, python3
}:
python3.pkgs.buildPythonApplication rec {
pname = "opshin";
version = "0.20.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "OpShin";
repo = "opshin";
rev = version;
hash = "sha256-fJlPeVAuEf80FVxdXnaKASLmjMEgz6ysXenUY72+sos=";
};
propagatedBuildInputs = with python3.pkgs; [
setuptools
poetry-core
uplc
pluthon
pycardano
frozenlist2
astunparse
ordered-set
];
meta = with lib; {
description = "A simple pythonic programming language for Smart Contracts on Cardano";
homepage = "https://opshin.dev";
license = licenses.mit;
maintainers = with maintainers; [ t4ccer ];
mainProgram = "opshin";
};
}

View File

@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "txr";
version = "293";
version = "294";
src = fetchurl {
url = "https://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2";
hash = "sha256-b8Ia5zMvmPl681rTyhgI0AQ8TIU4TE5768/Oln42+lw=";
hash = "sha256-QdkN4FwobGRPQNQGcHC62Wi5hwQqsgyLo9etYYEfqDc=";
};
buildInputs = [ libffi ];

View File

@ -47,12 +47,12 @@ stdenv.mkDerivation (finalAttrs: {
--replace "update-desktop-database -q" "update-desktop-database $out/share/applications"
'';
meta = with lib; {
meta = {
description = "Simple GUI that displays the protocols implemented by a Wayland compositor";
homepage = "https://gitlab.freedesktop.org/serebit/waycheck";
license = licenses.asl20;
maintainers = with maintainers; [ julienmalka ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ julienmalka federicoschonborn ];
mainProgram = "waycheck";
platforms = platforms.linux;
platforms = lib.platforms.linux;
};
})

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "xplr";
version = "0.21.5";
version = "0.21.7";
src = fetchFromGitHub {
owner = "sayanarijit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Ofr9xJH/wVlBJ1n1MMecSP8SltYwjdhb7tmkTsOMoX8=";
sha256 = "sha256-ZitwO/XfNrlTFNepQ5Wyk1A7cwlNm6+26nPHdZ8Wh3c=";
};
cargoHash = "sha256-1wzqWGp0qPn2sQ1v0+6NAxvIxqCIVuN0WwpNddj71Xc=";
cargoHash = "sha256-mfSVjm0s/tLjjygwu8TuKn92mFM3Ui6TEHkIzS0eEOA=";
# fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin
env = lib.optionalAttrs (stdenv.isx86_64 && stdenv.isDarwin) {

View File

@ -2,11 +2,11 @@
buildGraalvmNativeImage rec {
pname = "yamlscript";
version = "0.1.41";
version = "0.1.45";
src = fetchurl {
url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar";
hash = "sha256-/Kke7MH0DsBpo8AEIr8XVDKqbSshz0Ql8S5KzrPB9jk=";
hash = "sha256-Gh1O6nAJq1D55Gjp93WtpqI5YxgheC7TbEdbP/jzIn8=";
};
executable = "ys";

View File

@ -0,0 +1,77 @@
diff --git a/helpers/generate-fonts-runner.sh b/helpers/generate-fonts-runner.sh
index 21267e50f..873b5c664 100755
--- a/helpers/generate-fonts-runner.sh
+++ b/helpers/generate-fonts-runner.sh
@@ -25,10 +25,10 @@ mkdir -p "$build_dir"
# Change these to enable/disable formats
# Remember to update font/README.md accordingly
-methods_black=(glyf)
-methods_color=(cbdt glyf_colr_0 glyf_colr_1 sbix picosvgz untouchedsvgz)
+#methods_black=(glyf)
+#methods_color=(cbdt glyf_colr_0 glyf_colr_1 sbix picosvgz untouchedsvgz)
-saturations=(black color)
+#saturations=(black color)
for saturation in "${saturations[@]}"; do
case "$saturation" in
black)
@@ -43,6 +43,7 @@ for saturation in "${saturations[@]}"; do
mkdir -p "$build_dir/$saturation"
for method in "${methods[@]}"; do
+ if [ -z "$method" ]; then continue; fi
cat >"$build_dir/$saturation/OpenMoji-$saturation-$method.toml" <<-EOF
output_file = "$build_dir/$saturation/OpenMoji-$saturation-$method.ttf"
color_format = "$method"
@@ -55,10 +56,7 @@ default = 400
[master.regular]
style_name = "Regular"
-
-# To quickly check build reverse comments below
-srcs = ["/mnt/$saturation/svg/*.svg"]
-# srcs = ["/mnt/$saturation/svg/1F923.svg", "/mnt/$saturation/svg/1F1E9-1F1F0.svg"]
+srcs = ["$(pwd)/$saturation/svg/*.svg"]
[master.regular.position]
wght = 400
@@ -71,7 +69,7 @@ EOF
for method in "${methods[@]}"; do
# Generate XML for font
sed "s/Color/${saturation^}/;" \
- /mnt/data/OpenMoji-Color.ttx \
+ data/OpenMoji-Color.ttx \
> "$build_dir/$saturation/OpenMoji-$saturation-$method.ttx"
# Add version to XML
@@ -89,25 +87,21 @@ EOF
# Compress with WOFF2
woff2_compress "$build_dir/fonts/OpenMoji-$saturation-$method/OpenMoji-$saturation-$method.ttf"
-
- # Generate font demo
- /mnt/helpers/generate-font-demo.js "OpenMoji-$saturation-$method.woff2" "$build_dir/fonts/OpenMoji-$saturation-$method"
done
done
-for colr_version in 0 1; do
+for colr_version in "${maximumColorVersions[@]}"; do
+ if [ -z "$colr_version" ]; then continue; fi
# Make TTF with both COLR and SVG font data in it
mkdir -p "$build_dir/fonts/OpenMoji-color-colr${colr_version}_svg"
- maximum_color \
+ maximum_color --build_dir="$build_dir/color" \
"$build_dir/fonts/OpenMoji-color-glyf_colr_${colr_version}/OpenMoji-color-glyf_colr_${colr_version}.ttf"\
--output_file "$build_dir/fonts/OpenMoji-color-colr${colr_version}_svg/OpenMoji-color-colr${colr_version}_svg.ttf"
woff2_compress "$build_dir/fonts/OpenMoji-color-colr${colr_version}_svg/OpenMoji-color-colr${colr_version}_svg.ttf"
- /mnt/helpers/generate-font-demo.js\
- "OpenMoji-color-colr${colr_version}_svg.woff2"\
- "$build_dir/fonts/OpenMoji-color-colr${colr_version}_svg"
+ rm -rf "$build_dir/fonts/OpenMoji-color-glyf_colr_${colr_version}"
done
echo "Done building fonts!"

View File

@ -1,93 +1,85 @@
{ lib
, stdenv
, stdenvNoCC
, fetchFromGitHub
, fetchpatch
, scfbuild
, fontforge
, node-glob
, libuninameslist
, nodejs
, nodePackages
, nanoemoji
, python3Packages
, variant ? "color" # "color" or "black"
, woff2
, xmlstarlet
# available color formats: ["cbdt" "glyf_colr_0" "glyf_colr_1" "sbix" "picosvgz" "untouchedsvgz"]
# available black formats: ["glyf"]
, fontFormats ? [ "glyf" "cbdt" "glyf_colr_0" "glyf_colr_1" ]
# when at least one of the glyf_colr_0/1 formats is specified, whether to build maximum color fonts
# "none" to not build any, "svg" to build colr+svg, "bitmap" to build cbdt+colr+svg fonts
, buildMaximumColorFonts ? "bitmap"
}:
let
filename = builtins.replaceStrings
[ "color" "black" ]
[ "OpenMoji-Color.ttf" "OpenMoji-Black.ttf" ]
variant;
# all available methods
methods = {
black = [ "glyf" ];
color = [ "cbdt" "glyf_colr_0" "glyf_colr_1" "sbix" "picosvgz" "untouchedsvgz" ];
};
in
# With newer fontforge the build hangs, see
# https://github.com/NixOS/nixpkgs/issues/167869
# Patches etc taken from
# https://github.com/NixOS/nixpkgs/commit/69da642a5a9bb433138ba1b13c8d56fb5bb6ec05
fontforge-20201107 = fontforge.overrideAttrs (old: rec {
version = "20201107";
src = fetchFromGitHub {
owner = "fontforge";
repo = "fontforge";
rev = version;
sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc=";
};
patches = [
(fetchpatch {
url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch";
sha256 = "u3D9od2xLECNEHhZ+8dkuv9818tPkdP6y/Tvd9CADJg=";
})
(fetchpatch {
url = "https://github.com/fontforge/fontforge/commit/69e263b2aff29ad22f97f13935cfa97a1eabf207.patch";
sha256 = "06yyf90605aq6ppfiz83mqkdmnaq5418axp9jgsjyjq78b00xb29";
})
];
buildInputs = old.buildInputs ++ [ libuninameslist ];
});
scfbuild-with-fontforge-20201107 = scfbuild.override (old: {
fontforge = fontforge-20201107;
});
assert lib.asserts.assertEachOneOf "fontFormats" fontFormats (methods.black ++ methods.color);
assert lib.asserts.assertOneOf "buildMaximumColorFonts" buildMaximumColorFonts [ "none" "bitmap" "svg" ];
in stdenv.mkDerivation rec {
stdenvNoCC.mkDerivation rec {
pname = "openmoji";
version = "14.0.0";
version = "15.0.0";
src = fetchFromGitHub {
owner = "hfg-gmuend";
repo = pname;
rev = version;
sha256 = "sha256-XnSRSlWXOMeSaO6dKaOloRg3+sWS4BSaro4bPqOyKmE=";
hash = "sha256-659ONkHU45Z2789ay0yLero9j5nFWhslpJad++4oNN8=";
};
nativeBuildInputs = [
scfbuild-with-fontforge-20201107
nodejs
node-glob
nodePackages.lodash
patches = [
# fix paths and variables for nix build and skip generating font demos
./build.patch
];
postPatch = ''
# this is API change in glob >9
substituteInPlace helpers/generate-font-glyphs.js \
--replace "require('glob').sync" "require('glob').globSync"
nativeBuildInputs = [
nanoemoji
python3Packages.fonttools
woff2
xmlstarlet
];
methods_black = builtins.filter (m: builtins.elem m fontFormats) methods.black;
methods_color = builtins.filter (m: builtins.elem m fontFormats) methods.color;
saturations = lib.optional (methods_black != [ ]) "black" ++ lib.optional (methods_color != [ ]) "color";
maximumColorVersions = lib.optionals (buildMaximumColorFonts != "none") (
lib.optional (builtins.elem "glyf_colr_0" fontFormats) "0"
++ lib.optional (builtins.elem "glyf_colr_1" fontFormats) "1"
);
postPatch = lib.optionalString (buildMaximumColorFonts == "bitmap") ''
substituteInPlace helpers/generate-fonts-runner.sh \
--replace 'maximum_color' 'maximum_color --bitmaps'
'';
buildPhase = ''
runHook preBuild
node helpers/generate-font-glyphs.js
cd font
scfbuild -c scfbuild-${variant}.yml
bash helpers/generate-fonts-runner.sh "$(pwd)/build" "${version}"
runHook postBuild
'';
installPhase = ''
install -Dm644 ${filename} $out/share/fonts/truetype/${filename}
runHook preInstall
mkdir -p $out/share/fonts/truetype $out/share/fonts/woff2
cp build/fonts/*/*.ttf $out/share/fonts/truetype/
cp build/fonts/*/*.woff2 $out/share/fonts/woff2/
runHook postInstall
'';
meta = with lib; {
license = licenses.cc-by-sa-40;
maintainers = with maintainers; [ fgaz ];
maintainers = with maintainers; [ _999eagle fgaz ];
platforms = platforms.all;
homepage = "https://openmoji.org/";
downloadPage = "https://github.com/hfg-gmuend/openmoji/releases";

View File

@ -1,5 +1,5 @@
{ lib
, buildGo120Module
, buildGoModule
, fetchFromGitHub
, substituteAll
, v2ray-domain-list-community
@ -11,18 +11,18 @@ let
geosite_data = "${v2ray-domain-list-community}/share/v2ray/geosite.dat";
};
in
buildGo120Module {
buildGoModule {
pname = "sing-geosite";
inherit (v2ray-domain-list-community) version;
src = fetchFromGitHub {
owner = "SagerNet";
repo = "sing-geosite";
rev = "4a32d56c1705f77668beb5828df0b0a051efdeb9";
hash = "sha256-P/EBcwJI2G9327BNi84R+q6BABx9DEKpN6ETTp8Q4NU=";
rev = "bbd9f11bb9245463bf9d5614b74014fe5803b989";
hash = "sha256-UQChYKgN5JZk+KZ2c5Ffh/rQi6/TVeFQkbH6mpLx4x8=";
};
vendorHash = "sha256-uQOmUXT2wd40DwwTCMnFFKd47eu+BPBDjiCGtUNFoKY=";
vendorHash = "sha256-C6idJDUp6AFe50tQ+4mmZsxuOKH8JSeC1p7XVRZ224E=";
patchPhase = ''
sed -i -e '/func main()/,/^}/d' -e '/"io"/a "io/ioutil"' main.go

View File

@ -1,5 +1,6 @@
{ lib
, stdenvNoCC
, fetchpatch
, fetchFromGitHub
, pkgsBuildBuild
, jq
@ -8,18 +9,18 @@
}:
let
generator = pkgsBuildBuild.buildGo120Module {
generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-geoip";
version = "unstable-2023-10-11";
version = "202403140037";
src = fetchFromGitHub {
owner = "v2fly";
repo = "geoip";
rev = "3182dda7b38c900f28505b91a44b09ec486e6f36";
hash = "sha256-KSRgof78jScwnUeMtryj34J0mBsM/x9hFE4H9WtZUuM=";
rev = version;
hash = "sha256-nqobjgeDvD5RYvCVVd14XC/tb/+SVfvdQUFZ3gfeDrI=";
};
vendorHash = "sha256-rlRazevKnWy/Ig143s8TZgV3JlQMlHID9rnncLYhQDc=";
vendorHash = "sha256-cuKcrYAzjIt6Z4wYg5R6JeL413NDwTub2fZndXEKdTo=";
meta = with lib; {
description = "GeoIP for V2Ray";

View File

@ -26,12 +26,12 @@ stdenv.mkDerivation rec {
extensionPortalSlug = "valent";
};
meta = with lib; {
meta = {
description = "GNOME Shell integration for Valent";
homepage = "https://valent.andyholmes.ca/";
changelog = "https://github.com/andyholmes/gnome-shell-extension-valent/blob/${src.rev}/CHANGELOG.md";
license = licenses.gpl3Plus;
maintainers = [ ];
platforms = platforms.linux;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ federicoschonborn ];
platforms = lib.platforms.linux;
};
}

View File

@ -13,6 +13,6 @@ mkXfceDerivation {
meta = {
description = "Windowing concept abstraction library for X11 and Wayland";
license = lib.licenses.lgpl21Plus;
maintainers = lib.teams.xfce.members;
maintainers = lib.teams.xfce.members ++ [ lib.maintainers.federicoschonborn ];
};
}

View File

@ -1,189 +0,0 @@
{ lib
, stdenv
, fetchurl
, tzdata
, substituteAll
, iana-etc
, Security
, Foundation
, xcbuild
, mailcap
, buildPackages
, pkgsBuildTarget
, threadsCross
, testers
, skopeo
, buildGo120Module
}:
let
useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV;
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap117.nix { };
skopeoTest = skopeo.override { buildGoModule = buildGo120Module; };
goarch = platform: {
"aarch64" = "arm64";
"arm" = "arm";
"armv5tel" = "arm";
"armv6l" = "arm";
"armv7l" = "arm";
"i686" = "386";
"mips" = "mips";
"mips64el" = "mips64le";
"mipsel" = "mipsle";
"powerpc64le" = "ppc64le";
"riscv64" = "riscv64";
"s390x" = "s390x";
"x86_64" = "amd64";
}.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}");
# We need a target compiler which is still runnable at build time,
# to handle the cross-building case where build != host == target
targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
isCross = stdenv.buildPlatform != stdenv.targetPlatform;
in
stdenv.mkDerivation (finalAttrs: {
pname = "go";
version = "1.20.14";
src = fetchurl {
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
hash = "sha256-Gu8yGg4+OLfpHS1+tkBAZmyr3Md9OD3jyVItDWm2f04=";
};
strictDeps = true;
buildInputs = [ ]
++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ];
depsBuildTarget = lib.optional isCross targetCC;
depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package;
postPatch = ''
patchShebangs .
'';
patches = [
(substituteAll {
src = ./iana-etc-1.17.patch;
iana = iana-etc;
})
# Patch the mimetype database location which is missing on NixOS.
# but also allow static binaries built with NixOS to run outside nix
(substituteAll {
src = ./mailcap-1.17.patch;
inherit mailcap;
})
# prepend the nix path to the zoneinfo files but also leave the original value for static binaries
# that run outside a nix server
(substituteAll {
src = ./tzdata-1.19.patch;
inherit tzdata;
})
./remove-tools-1.11.patch
./go_no_vendor_checks-1.16.patch
];
GOOS = stdenv.targetPlatform.parsed.kernel.name;
GOARCH = goarch stdenv.targetPlatform;
# GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
# Go will nevertheless build a for host system that we will copy over in
# the install phase.
GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
GOHOSTARCH = goarch stdenv.buildPlatform;
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
# to be different from CC/CXX
CC_FOR_TARGET =
if isCross then
"${targetCC}/bin/${targetCC.targetPrefix}cc"
else
null;
CXX_FOR_TARGET =
if isCross then
"${targetCC}/bin/${targetCC.targetPrefix}c++"
else
null;
GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]);
GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
CGO_ENABLED = 1;
GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go";
buildPhase = ''
runHook preBuild
export GOCACHE=$TMPDIR/go-cache
# this is compiled into the binary
export GOROOT_FINAL=$out/share/go
export PATH=$(pwd)/bin:$PATH
${lib.optionalString isCross ''
# Independent from host/target, CC should produce code for the building system.
# We only set it when cross-compiling.
export CC=${buildPackages.stdenv.cc}/bin/cc
''}
ulimit -a
pushd src
./make.bash
popd
runHook postBuild
'';
preInstall = ''
# Contains the wrong perl shebang when cross compiling,
# since it is not used for anything we can deleted as well.
rm src/regexp/syntax/make_perl_groups.pl
'' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then ''
mv bin/*_*/* bin
rmdir bin/*_*
${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) ''
rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH}
''}
'' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''
rm -rf bin/*_*
${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) ''
rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH}
''}
'');
installPhase = ''
runHook preInstall
mkdir -p $GOROOT_FINAL
cp -a bin pkg src lib misc api doc $GOROOT_FINAL
mkdir -p $out/bin
ln -s $GOROOT_FINAL/bin/* $out/bin
runHook postInstall
'';
disallowedReferences = [ goBootstrap ];
passthru = {
inherit goBootstrap skopeoTest;
tests = {
skopeo = testers.testVersion { package = skopeoTest; };
version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "go version";
version = "go${finalAttrs.version}";
};
};
};
meta = with lib; {
changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}";
description = "The Go Programming language";
homepage = "https://go.dev/";
license = licenses.bsd3;
maintainers = teams.golang.members;
platforms = platforms.darwin ++ platforms.linux;
mainProgram = "go";
};
})

View File

@ -15,32 +15,22 @@
let
enableFeature = yes: if yes then "ON" else "OFF";
versions = lib.importJSON ./versions.json;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "duckdb";
version = "0.10.0";
inherit (versions) rev version;
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-qGUq0iYTaLNHKqbXNLRmvqHMqunvIlP991IKb4qdSt4=";
# to update run:
# nix-shell maintainers/scripts/update.nix --argstr path duckdb
inherit (versions) hash;
owner = "duckdb";
repo = "duckdb";
rev = "refs/tags/v${finalAttrs.version}";
};
patches = [
# remove calls to git and set DUCKDB_VERSION to version
(substituteAll {
src = ./version.patch;
version = "v${version}";
})
# add missing file needed for httpfs compile
# remove on next update
(fetchpatch {
name = "missing-httpfs-file.patch";
url = "https://github.com/duckdb/duckdb/commit/3d7aa3ed46ecf5f18122559e385b75f1f5e9aba8.patch";
hash = "sha256-Q4IHCpMpxn86OquUZdEF7P0nHEPOcWS0TQijTkvBYbQ=";
})
];
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [ cmake ninja python3 ];
buildInputs = [ openssl ]
@ -48,22 +38,22 @@ stdenv.mkDerivation rec {
++ lib.optionals withOdbc [ unixODBC ];
cmakeFlags = [
"-DDUCKDB_EXTENSION_CONFIGS=${src}/.github/config/in_tree_extensions.cmake"
"-DDUCKDB_EXTENSION_CONFIGS=${finalAttrs.src}/.github/config/in_tree_extensions.cmake"
"-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}"
"-DJDBC_DRIVER=${enableFeature withJdbc}"
] ++ lib.optionals doInstallCheck [
"-DOVERRIDE_GIT_DESCRIBE=v${finalAttrs.version}-0-g${finalAttrs.rev}"
] ++ lib.optionals finalAttrs.doInstallCheck [
# development settings
"-DBUILD_UNITTESTS=ON"
];
doInstallCheck = true;
preInstallCheck = ''
export HOME="$(mktemp -d)"
'' + lib.optionalString stdenv.isDarwin ''
export DYLD_LIBRARY_PATH="$out/lib''${DYLD_LIBRARY_PATH:+:}''${DYLD_LIBRARY_PATH}"
postInstall = ''
mkdir -p $lib
mv $out/lib $lib
'';
doInstallCheck = true;
installCheckPhase =
let
excludes = map (pattern: "exclude:'${pattern}'") ([
@ -105,26 +95,29 @@ stdenv.mkDerivation rec {
"test/sql/copy/csv/auto/test_csv_auto.test"
# test expects installed file timestamp to be > 2024
"test/sql/table_function/read_text_and_blob.test"
# can re-enable next update (broken for 0.10.0)
"test/sql/secrets/create_secret_non_writable_persistent_dir.test"
# https://github.com/duckdb/duckdb/issues/10722
"test/sql/types/nested/list/list_aggregate_dict.test"
# fails with Out of Memory Error
"test/sql/copy/parquet/batched_write/batch_memory_usage.test"
# wants http connection
"test/sql/copy/csv/test_mixed_lines.test"
] ++ lib.optionals stdenv.isAarch64 [
"test/sql/aggregate/aggregates/test_kurtosis.test"
"test/sql/aggregate/aggregates/test_skewness.test"
"test/sql/function/list/aggregates/skewness.test"
]);
LD_LIBRARY_PATH = lib.optionalString stdenv.isDarwin "DY" + "LD_LIBRARY_PATH";
in
''
runHook preInstallCheck
./test/unittest ${toString excludes}
HOME="$(mktemp -d)" ${LD_LIBRARY_PATH}="$lib/lib" ./test/unittest ${toString excludes}
runHook postInstallCheck
'';
passthru.updateScript = ./update.sh;
meta = with lib; {
changelog = "https://github.com/duckdb/duckdb/releases/tag/v${version}";
changelog = "https://github.com/duckdb/duckdb/releases/tag/v${finalAttrs.version}";
description = "Embeddable SQL OLAP Database Management System";
homepage = "https://duckdb.org/";
license = licenses.mit;
@ -132,4 +125,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ costrouc cpcloud ];
platforms = platforms.all;
};
}
})

View File

@ -0,0 +1,45 @@
#!/usr/bin/env nix-shell
#!nix-shell --pure -i bash -p cacert curl jq moreutils nix-prefetch
# shellcheck shell=bash
set -euo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
nixpkgs=$(while [[ ! -e .git ]]; do [[ ${PWD} != / ]] || exit 1; cd ..; done; echo "${PWD}")
repo=duckdb
owner=duckdb
msg() {
echo "$*" >&2
}
json_get() {
jq -r "$1" < 'versions.json'
}
json_set() {
jq --arg x "$2" "$1 = \$x" < 'versions.json' | sponge 'versions.json'
}
get_latest() {
curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s \
"https://api.github.com/repos/${owner}/${repo}/releases/latest" | jq -r .tag_name
}
get_sha() {
curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s \
"https://api.github.com/repos/${owner}/${repo}/git/ref/tags/$1" | jq -r .object.sha
}
tag=$(get_latest)
version=${tag/v/}
[[ ${version} = $(json_get .version) ]] && { msg "${version} is up to date"; exit 0; }
sha=$(get_sha "${tag}")
sri=$(nix-prefetch -I nixpkgs="${nixpkgs}" -E "duckdb.overrideAttrs { version = \"${version}\"; }")
json_set ".version" "${version}"
json_set ".rev" "${sha}"
json_set ".hash" "${sri}"

View File

@ -1,58 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b49e11288..0a4a69b9a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -244,52 +244,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
set(SUN TRUE)
endif()
-find_package(Git)
-if(Git_FOUND)
- if (NOT DEFINED GIT_COMMIT_HASH)
- execute_process(
- COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- RESULT_VARIABLE GIT_RESULT
- OUTPUT_VARIABLE GIT_COMMIT_HASH
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- endif()
- execute_process(
- COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- OUTPUT_VARIABLE GIT_LAST_TAG
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(
- COMMAND ${GIT_EXECUTABLE} describe --tags --long
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- OUTPUT_VARIABLE GIT_ITERATION
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-else()
- message("Git NOT FOUND")
-endif()
-
-if(GIT_RESULT EQUAL "0")
- string(REGEX REPLACE "v([0-9]+).[0-9]+.[0-9]+" "\\1" DUCKDB_MAJOR_VERSION "${GIT_LAST_TAG}")
- string(REGEX REPLACE "v[0-9]+.([0-9]+).[0-9]+" "\\1" DUCKDB_MINOR_VERSION "${GIT_LAST_TAG}")
- string(REGEX REPLACE "v[0-9]+.[0-9]+.([0-9]+)" "\\1" DUCKDB_PATCH_VERSION "${GIT_LAST_TAG}")
- string(REGEX REPLACE ".*-([0-9]+)-.*" "\\1" DUCKDB_DEV_ITERATION "${GIT_ITERATION}")
-
- if(DUCKDB_DEV_ITERATION EQUAL 0)
- # on a tag; directly use the version
- set(DUCKDB_VERSION "${GIT_LAST_TAG}")
- else()
- # not on a tag, increment the patch version by one and add a -devX suffix
- math(EXPR DUCKDB_PATCH_VERSION "${DUCKDB_PATCH_VERSION}+1")
- set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}")
- endif()
-else()
- # fallback for when building from tarball
- set(DUCKDB_MAJOR_VERSION 0)
- set(DUCKDB_MINOR_VERSION 0)
- set(DUCKDB_PATCH_VERSION 1)
- set(DUCKDB_DEV_ITERATION 0)
- set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}")
-endif()
+set(DUCKDB_VERSION "@version@")
message(STATUS "git hash ${GIT_COMMIT_HASH}, version ${DUCKDB_VERSION}")

View File

@ -0,0 +1,5 @@
{
"version": "0.10.1",
"rev": "4a89d97db8a5a23a15f3025c8d2d2885337c2637",
"hash": "sha256-/j/DaUzsfACI5Izr4lblkYmIEmKsOXr760UTwC0l/qg="
}

View File

@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: {
cmake
];
meta = with lib; {
meta = {
description = "The fastest JSON library in C";
homepage = "https://github.com/ibireme/yyjson";
changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ federicoschonborn ];
};
})

View File

@ -362,7 +362,7 @@ let
nyxt-gtk = build-asdf-system {
pname = "nyxt";
version = "3.11.4";
version = "3.11.5";
lispLibs = (with super; [
alexandria
@ -445,6 +445,8 @@ let
"slynk/profiler" "slynk/stickers" "slynk/indentation"
"slynk/retro" ];
}))
iterate
symbol-munger
]) ++ (with self; [
history-tree
nhooks
@ -457,7 +459,6 @@ let
nfiles
cl-containers
# remove this override after quicklisp one is updated.
# Because of building failure with new sbcl, the slime version is different from the nyxt pinned one
(swank.overrideAttrs (final: prev: {
src = pkgs.fetchFromGitHub {
owner = "slime";
@ -472,8 +473,8 @@ let
src = pkgs.fetchFromGitHub {
owner = "atlas-engineer";
repo = "nyxt";
rev = "3.11.4";
hash = "sha256-5LhpcuQTioOXZtzwN9B1vWo/xsYXxn9fSKRCdhSPM7A=";
rev = "3.11.5";
hash = "sha256-l3igC4jfCvx7Q0WO2Zf2ByWLz7sCteYdW1rNvwrc97g=";
};
nativeBuildInputs = [ pkgs.makeWrapper ];

View File

@ -11,16 +11,16 @@
buildPythonPackage rec {
pname = "aiocurrencylayer";
version = "1.0.5";
format = "pyproject";
version = "1.0.6";
pyproject = true;
disabled = pythonOlder "3.9";
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "home-assistant-ecosystem";
repo = pname;
repo = "aiocurrencylayer";
rev = "refs/tags/${version}";
hash = "sha256-468OBQV7ISnPRUfi/CM3dCh1ez0jwSVnM6DduPvAgPI=";
hash = "sha256-VOzgWN+dDPaGEcahFPSWjBR989b9eNkx4zcnI9o2Xiw=";
};
nativeBuildInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "app-model";
version = "0.2.4";
version = "0.2.5";
pyproject = true;
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "pyapp-kit";
repo = "app-model";
rev = "refs/tags/v${version}";
hash = "sha256-idie99ditHJG/6rv97LDaF71iTjjgJyhLiTrbkQmbts=";
hash = "sha256-lnsaplJJk+c0hdHyQPH98ssppxBXqj/O0K6xlRfk+Oc=";
};
nativeBuildInputs = [

View File

@ -39,7 +39,7 @@
buildPythonPackage rec {
pname = "diffusers";
version = "0.27.0";
version = "0.27.1";
pyproject = true;
disabled = pythonOlder "3.8";
@ -48,7 +48,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = "diffusers";
rev = "refs/tags/v${version}";
hash = "sha256-h7IdukvQr+B/Au70nK0Qc4FpkDiCMsIZuPAWsiCdnUo=";
hash = "sha256-GwFibsxMhWqirFn5cG9GfDZAtVWRx+BCqDBiQV6wuYU=";
};
nativeBuildInputs = [

View File

@ -14,7 +14,7 @@
}:
buildPythonPackage rec {
inherit (duckdb) patches pname src version;
inherit (duckdb) patches pname rev src version;
pyproject = true;
postPatch = (duckdb.postPatch or "") + ''
@ -31,8 +31,11 @@ buildPythonPackage rec {
env = {
BUILD_HTTPFS = 1;
DUCKDB_BUILD_UNITY = 1;
OVERRIDE_GIT_DESCRIBE="v${version}-0-g${rev}";
};
dontPretendSetuptoolsSCMVersion = true;
nativeBuildInputs = [
pybind11
setuptools-scm

View File

@ -1,11 +1,12 @@
{ stdenv, lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "Durus";
pname = "durus";
version = "4.2";
src = fetchPypi {
inherit version pname;
pname = "Durus";
inherit version;
sha256 = "sha256:1gzxg43zawwgqjrfixvcrilwpikb1ix9b7710rsl5ffk7q50yi3c";
};

View File

@ -3,7 +3,6 @@
, fetchPypi
, pythonOlder
, setuptools
, fetchpatch
# extras: babel
, babel
@ -43,13 +42,12 @@
, peewee
, pony
, pytestCheckHook
, python-dateutil
, zxcvbn
}:
buildPythonPackage rec {
pname = "flask-security-too";
version = "5.4.1";
version = "5.4.2";
pyproject = true;
disabled = pythonOlder "3.7";
@ -57,7 +55,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "Flask-Security-Too";
inherit version;
hash = "sha256-Ay7+gk+zuUlXtw0LDdsnvSa22z+yE6VR1guu9QmiFvw=";
hash = "sha256-dzVHHC5Lsh6rUC+cOyNEe/uHVTzkObhFffgSvFOfKoI=";
};
nativeBuildInputs = [
@ -106,8 +104,8 @@ buildPythonPackage rec {
peewee
pony
pytestCheckHook
python-dateutil
zxcvbn
freezegun
]
++ passthru.optional-dependencies.babel
++ passthru.optional-dependencies.common

View File

@ -0,0 +1,32 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, setuptools
}:
buildPythonPackage rec {
pname = "frozenlist2";
version = "1.0.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "rohanpm";
repo = "frozenlist2";
rev = "v${version}";
hash = "sha256-fF0oFZ2q1wRH7IKBlCjm3Za4xtEMSHyEaGL09rHgtTY=";
};
propagatedBuildInputs = [
setuptools
];
pythonImportsCheck = [ "frozenlist2" ];
meta = with lib; {
description = "An immutable list for Python";
homepage = "https://github.com/rohanpm/frozenlist2";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ t4ccer ];
};
}

View File

@ -0,0 +1,40 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, setuptools
, poetry-core
}:
buildPythonPackage rec {
pname = "graphlib-backport";
version = "1.1.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "mariushelf";
repo = "graphlib_backport";
rev = version;
hash = "sha256-ssJLtBQH8sSnccgcAKLKfYpPyw5U0RIm1F66/Er81lo=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'poetry>=1.0' 'poetry-core' \
--replace 'poetry.masonry.api' 'poetry.core.masonry.api'
'';
propagatedBuildInputs = [
setuptools
poetry-core
];
pythonImportsCheck = [ "graphlib" ];
meta = with lib; {
description = "Backport of the Python 3.9 graphlib module for Python 3.6+";
homepage = "https://github.com/mariushelf/graphlib_backport";
license = licenses.psfl;
maintainers = with maintainers; [ t4ccer ];
};
}

View File

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, future, pyusb, ipython, pygreat }:
buildPythonPackage rec {
pname = "GreatFET";
pname = "greatfet";
version = "2019.5.1.dev0";
src = fetchFromGitHub {
@ -30,5 +30,3 @@ buildPythonPackage rec {
maintainers = with lib.maintainers; [ mog ];
};
}

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "in-n-out";
version = "0.1.9";
version = "0.2.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "in_n_out";
inherit version;
hash = "sha256-if65ROQg+vQtPCVCFFaBtNVxRDVZMsK4WWlfzcT5oto=";
hash = "sha256-hKJb2/DKl2Dd+rgndujNJWddriHKDpVuIKwOcwL8oZ8=";
};
nativeBuildInputs = [

View File

@ -43,12 +43,12 @@ let
else ceres-solver;
in
buildPythonPackage rec {
pname = "OpenSfM";
pname = "opensfm";
version = "unstable-2023-12-09";
src = fetchFromGitHub {
owner = "mapillary";
repo = pname;
repo = "OpenSfM";
rev = "7f170d0dc352340295ff480378e3ac37d0179f8e";
sha256 = "sha256-l/HTVenC+L+GpMNnDgnSGZ7+Qd2j8b8cuTs3SmORqrg=";
};

View File

@ -0,0 +1,39 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, setuptools
, pythonOlder
# Python deps
, uplc
, graphlib-backport
, ordered-set
}:
buildPythonPackage rec {
pname = "pluthon";
version = "0.4.6";
format = "pyproject";
src = fetchFromGitHub {
owner = "OpShin";
repo = "pluthon";
rev = version;
hash = "sha256-ZmBkbglSbBfVhA4yP0tJdwpJiFpJ7vX0A321ldQF0lA=";
};
propagatedBuildInputs = [
setuptools
uplc
ordered-set
] ++ lib.optionals (pythonOlder "3.9") graphlib-backport;
pythonImportsCheck = [ "pluthon" ];
meta = with lib; {
description = "Pluto-like programming language for Cardano Smart Contracts in Python";
homepage = "https://github.com/OpShin/pluthon";
license = licenses.mit;
maintainers = with maintainers; [ t4ccer ];
};
}

View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonRelaxDepsHook
# Python deps
, blockfrost-python
, cachetools
@ -41,6 +42,10 @@ in buildPythonPackage rec {
hash = "sha256-LP/W8IC2del476fGFq10VMWwMrbAoCCcZOngA8unBM0=";
};
nativeBuildInputs = [
pythonRelaxDepsHook
];
propagatedBuildInputs = [
blockfrost-python
cachetools
@ -58,6 +63,8 @@ in buildPythonPackage rec {
websocket-client
];
pythonRelaxDeps = [ "typeguard" ];
pythonImportsCheck = [ "pycardano" ];
meta = with lib; {

View File

@ -0,0 +1,41 @@
{ lib
, fetchFromGitHub
, python3
, pkg-config
}:
python3.pkgs.buildPythonPackage {
pname = "python-secp256k1-cardano";
version = "0.2.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "OpShin";
repo = "python-secp256k1";
rev = "5a8f761a4b9a1594653cc4deebadc3398b07533c"; # No tags in repo
hash = "sha256-6bE4/G2gW2F8h5FWtI3TZ6FtijsB/slvFT/SIVv7VIY=";
};
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = with python3.pkgs; [ cffi secp256k1 ];
nativeCheckInputs = [ python3.pkgs.pytestCheckHook ];
# Tests expect .so files and are failing
doCheck = false;
preConfigure = ''
cp -r ${python3.pkgs.secp256k1.src} libsecp256k1
export INCLUDE_DIR=${python3.pkgs.secp256k1}/include
export LIB_DIR=${python3.pkgs.secp256k1}/lib
'';
meta = {
homepage = "https://github.com/OpShin/python-secp256k1";
description = "A fork of python-secp256k1, fixing the commit hash of libsecp256k1 to a Cardano compatible version";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ t4ccer ];
};
}

View File

@ -3,26 +3,31 @@
, fetchPypi
, pytestCheckHook
, pythonOlder
, setuptools
, zeep
}:
buildPythonPackage rec {
pname = "python-stdnum";
version = "1.19";
format = "setuptools";
version = "1.20";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-Ez7IL1Y5DqdMGQVp6Y8vsUuGmAix1UeFcI8i0P6tiz8=";
hash = "sha256-rSos8usCXeQIIQI182tK4xJS3jGGJAzKqBJuEXy4JpA=";
};
postPatch = ''
substituteInPlace setup.cfg \
--replace " --cov=stdnum --cov-report=term-missing:skip-covered --cov-report=html" ""
--replace-fail " --cov=stdnum --cov-report=term-missing:skip-covered --cov-report=html" ""
'';
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [
pytestCheckHook
];

View File

@ -7,12 +7,13 @@
}:
buildPythonPackage rec {
pname = "Sanic-Auth";
pname = "sanic-auth";
version = "0.3.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
pname = "Sanic-Auth";
inherit version;
sha256 = "0dc24ynqjraqwgvyk0g9bj87zgpq4xnssl24hnsn7l5vlkmk8198";
};

View File

@ -4,11 +4,12 @@
}:
buildPythonPackage rec {
pname = "SocksiPy-branch";
pname = "socksipy-branch";
version = "1.01";
src = fetchPypi {
inherit pname version;
pname = "SocksiPy-branch";
inherit version;
sha256 = "01l41v4g7fy9fzvinmjxy6zcbhgqaif8dhdqm4w90fwcw9h51a8p";
};

View File

@ -20,7 +20,7 @@
let
pname = "torchmetrics";
version = "1.3.1";
version = "1.3.2";
in
buildPythonPackage {
inherit pname version;
@ -32,7 +32,7 @@ buildPythonPackage {
owner = "Lightning-AI";
repo = "torchmetrics";
rev = "refs/tags/v${version}";
hash = "sha256-ZFpLoF4t1ld2c3exX9H8AYG0XQM7MKmWe/I8XZmdrZw=";
hash = "sha256-0lverGF8HVlnwWmnCjScWoSfWPLZlMF2cHDG+uxNCCQ=";
};
propagatedBuildInputs = [

View File

@ -5,11 +5,12 @@
}:
buildPythonPackage rec {
pname = "ufoProcessor";
pname = "ufoprocessor";
version = "1.9.0";
src = fetchPypi {
inherit pname version;
pname = "ufoProcessor";
inherit version;
sha256 = "0ns11aamgavgsfj8qf5kq7dvzmgl0mhr1cbych2f075ipfdvva5s";
extension = "zip";
};

View File

@ -0,0 +1,55 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, pythonRelaxDepsHook
# Python deps
, frozenlist2
, python-secp256k1-cardano
, setuptools
, poetry-core
, frozendict
, cbor2
, rply
, pycardano
}:
buildPythonPackage rec {
pname = "uplc";
version = "0.6.9";
format = "pyproject";
src = fetchFromGitHub {
owner = "OpShin";
repo = "uplc";
rev = version;
hash = "sha256-djJMNXijMVzMVzw8NZSe3YFRGyAPqdvr0P374Za5XkU=";
};
nativeBuildInputs = [
pythonRelaxDepsHook
];
propagatedBuildInputs = [
setuptools
poetry-core
frozendict
cbor2
frozenlist2
rply
pycardano
python-secp256k1-cardano
];
pythonRelaxDeps = [ "pycardano" "rply" ];
pythonImportsCheck = [ "uplc" ];
meta = with lib; {
description = "Python implementation of untyped plutus language core";
homepage = "https://opshin.dev";
license = licenses.mit;
maintainers = with maintainers; [ t4ccer ];
mainProgram = "opshin";
};
}

View File

@ -312,8 +312,8 @@ in
cp -R ext/fast_mmaped_file_rs $out
'';
};
hash = if lib.versionAtLeast attrs.version "1.1.0"
then "sha256-tSyoCEBtMMkFfPynaMx8oc9bO7I+Pf6Y/f3Ld8uwlEE="
hash = if lib.versionAtLeast attrs.version "1.1.1"
then "sha256-RsN5XWX7Mj2ORccM0eczY+44WXsbXNTnJVcCMvnOATk="
else "sha256-XuQZPbFWqPHlrJvllkvLl1FjKeoAUbi8oKDrS2rY1KM=";
};
nativeBuildInputs = [

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "earthly";
version = "0.8.5";
version = "0.8.6";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
hash = "sha256-vNgRI/LQZPILwYdIGk6BB+Yb36rEHv6kHZARq0+TF9Q=";
hash = "sha256-APmWF3RrUvXqfvs8MpOMeV3Q6N6GRJXd/sTd9EmIGnQ=";
};
vendorHash = "sha256-14aaGrEJBdSo1hZf37xUO2S/q6YlaSqJuQCzP/PVkr8=";
vendorHash = "sha256-cdq0gbaTY7IXSoqZcxqkN5in5xtZZTaP0MQRypqJoCU=";
subPackages = [ "cmd/earthly" "cmd/debugger" ];
CGO_ENABLED = 0;

View File

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "goconvey";
version = "1.8.1";
version = "1.8.1-unstable-2024-03-06";
excludedPackages = "web/server/watch/integration_testing";
src = fetchFromGitHub {
owner = "smartystreets";
repo = "goconvey";
rev = "v${version}";
hash = "sha256-6SrlPsOqRxNNwEYx2t1v+rEHnQ58GvJtjo87SZo/Omk=";
rev = "a50310f1e3e53e63e2d23eb904f853aa388a5988";
hash = "sha256-w5eX/n6Wu2gYgCIhgtjqH3lNckWIDaN4r80cJW3JqFo=";
};
vendorHash = "sha256-020bxa0LErrvRKe3HirCWZDaBQFfKsWgl4mxfLtl1lg=";
vendorHash = "sha256-P4J/CZY95ks08DC+gSqG+eanL3zoiaoz1d9/ZvBoc9Q=";
ldflags = [ "-s" "-w" ];

View File

@ -2,17 +2,16 @@
buildGoModule rec {
pname = "gomacro";
rev = "b4c3ab9b218fd12f22759354f4f3e37635828d1f";
version = "20210131-${lib.strings.substring 0 7 rev}";
version = "2.7-unstable-2024-01-07";
src = fetchFromGitHub {
owner = "cosmos72";
repo = "gomacro";
inherit rev;
hash = "sha256-zxiEt/RR7g5Q0wMLuRaybnT5dFfPCyvt0PvDjL9BJDI=";
rev = "bf232d031933810d4a5382e17ce6c4b042a24304";
hash = "sha256-16u3eByFmnY12M2CEhSJKLIT0KP9nbvTv+BnqWwNTcg=";
};
vendorHash = "sha256-fQYuav0pT+/fGq0fmOWlsiVxA9tGV4JV8X7G3E6BZMU=";
vendorHash = "sha256-ok71QlBHGasGVt+CGwGqhgmx5JLkQcdlU/KX+W1A5Ws=";
subPackages = [ "." ];

View File

@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "semantic-release";
version = "23.0.3";
version = "23.0.5";
src = fetchFromGitHub {
owner = "semantic-release";
repo = "semantic-release";
rev = "v${version}";
hash = "sha256-Oi0WlGcgVx/ykp6laR20RosF+1P3jAEXBS1F43KGsUM=";
hash = "sha256-/VOa/V6kly92JjhW5a0b9xNdxVYCPYRJx5IiwmQ2d1U=";
};
npmDepsHash = "sha256-fPONvfJK4cnKG6qYHh8WRN1ZCcIZxe2PVaXuMGHFB3Y=";
npmDepsHash = "sha256-CG2LcIAfX5dfJz0oSMwt83ra804U/qLpnNDilSEgRSI=";
dontNpmBuild = true;

View File

@ -16,6 +16,10 @@ buildGoModule rec {
doCheck = false;
meta = with lib; {
# Won't build with Go >1.20 because of outdated quic-go dependency and interface mismatches on update.
# https://github.com/libp2p/go-libp2p-daemon/issues/291
broken = true;
description = "a libp2p-backed daemon wrapping the functionalities of go-libp2p for use in other languages";
homepage = "https://github.com/libp2p/go-libp2p-daemon";
license = licenses.mit;
maintainers = with maintainers; [ fare ];

View File

@ -5,12 +5,12 @@
}:
let
version = "0.4.9";
version = "0.4.10";
src = fetchFromGitHub {
owner = "zinclabs";
repo = "zincsearch";
rev = "v${version}";
hash = "sha256-NIrLhbtpk1mFbWRFPxkH1r4mBiwT488MYBjRgIV7igE=";
hash = "sha256-lScwnmu4hM78Va7Yi5HA0E5f2WQXrZaeqjRYJYxnQ5E=";
};
webui = buildNpmPackage {
@ -40,7 +40,7 @@ buildGoModule rec {
cp -r ${webui}/share/zinc-ui web/dist
'';
vendorHash = "sha256-kP7QlES7VpZrOS4TGOFB9qciXGBEUVqzVLhz+2KiK98=";
vendorHash = "sha256-SZG5/ISGblpcwwR/HOKxFl9SthXpE+IYS0S+4HYtHos=";
subPackages = [ "cmd/zincsearch" ];
ldflags = [
@ -52,7 +52,7 @@ buildGoModule rec {
meta = with lib; {
description = "A lightweight alternative to elasticsearch that requires minimal resources, written in Go";
mainProgram = "zincsearch";
homepage = "https://zinc.dev";
homepage = "https://zincsearch-docs.zinc.dev/";
license = licenses.asl20;
maintainers = with maintainers; [ dit7ya ];
};

View File

@ -2,6 +2,7 @@
, stdenv
, buildGoModule
, fetchFromGitHub
, fetchpatch
, trezor-udev-rules
, AppKit
}:
@ -21,6 +22,13 @@ buildGoModule rec {
vendorHash = "sha256-wXgAmZEXdM4FcMCQbAs+ydXshCAMu7nl/yVv/3sqaXE=";
patches = [
(fetchpatch {
url = "https://github.com/trezor/trezord-go/commit/616473d53a8ae49f1099e36ab05a2981a08fa606.patch";
hash = "sha256-yKTwgqWr4L6XEPV85A6D1wpRdpef8hkIbl4LrRmOyuo=";
})
];
propagatedBuildInputs = lib.optionals stdenv.isLinux [ trezor-udev-rules ]
++ lib.optionals stdenv.isDarwin [ AppKit ];

View File

@ -75,6 +75,7 @@ in stdenv.mkDerivation {
yarn --immutable-cache
yarn run build
rm bin/heroku
patchShebangs bin/*
runHook postBuild
@ -83,13 +84,19 @@ in stdenv.mkDerivation {
installPhase = ''
runHook preInstall
mkdir -p $out
cp -R {app.js,bin,lib,locales,node_modules,package.json,public} $out
mkdir -p $out/share/hedgedoc
cp -r bin $out
cp -r {app.js,lib,locales,node_modules,package.json,public} $out/share/hedgedoc
for bin in $out/bin/*; do
wrapProgram $bin \
--set NODE_ENV production \
--set NODE_PATH "$out/share/hedgedoc/lib/node_modules"
done
makeWrapper ${nodejs}/bin/node $out/bin/hedgedoc \
--add-flags $out/app.js \
--add-flags $out/share/hedgedoc/app.js \
--set NODE_ENV production \
--set NODE_PATH "$out/lib/node_modules"
--set NODE_PATH "$out/share/hedgedoc/lib/node_modules"
runHook postInstall
'';

View File

@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Like neofetch, but much faster because written in C";
homepage = "https://github.com/fastfetch-cli/fastfetch";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ gerg-l khaneliman ];
maintainers = with lib.maintainers; [ gerg-l khaneliman federicoschonborn ];
platforms = lib.platforms.all;
mainProgram = "fastfetch";
};

View File

@ -15,11 +15,11 @@ let
in
tcl.mkTclDerivation rec {
pname = "remind";
version = "04.03.02";
version = "04.03.03";
src = fetchurl {
url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
sha256 = "sha256-tL5Ntb/RIoT9mKcdU1ndBo/pGwhtIsRnTV0lL6Sg1Vw=";
sha256 = "sha256-+/vX6Nu0F84mZcEnd9jFlaVKbJIQQOJiPsxspKF+klQ=";
};
propagatedBuildInputs = tclLibraries;

View File

@ -2,24 +2,24 @@
buildGoModule rec {
pname = "gost";
version = "2.11.5";
version = "2.11.5-unstable-2024-02-02";
src = fetchFromGitHub {
owner = "ginuerzh";
repo = "gost";
rev = "v${version}";
sha256 = "sha256-UBjrWeBw9+qKQ/+1T1W/3e0vrigp540URIyM2d9iCE8=";
rev = "fd57e80709aba9581757b1cd63b7d8f75e2385d2";
sha256 = "sha256-GkXsiUcH5hppgkkt4ddVMLm5riUDORVhjWBGHZXti5A=";
};
patches = [
# Add go1.20 support. Remove with the next release.
# Bump quic-go to v0.41.0 for go 1.22 compatibility.
(fetchpatch {
url = "https://github.com/ginuerzh/gost/commit/0f7376bd10c913c7e6b1e7e02dd5fd7769975d78.patch";
hash = "sha256-pQNCvl7/huNrkM3+XHkGnvLYCzdjbMV6nef1KcMnKEw=";
url = "https://github.com/ginuerzh/gost/pull/1016/commits/c2e3f7e493bbb6ff1bc348f36e1a148d9d0c16ad.patch";
hash = "sha256-9OtuPIzzCymMAVbrDuhhPcxcac69gjAUm4ykXbH/pbo=";
})
];
vendorHash = "sha256-wAdNfhSPj9JUcI6Gcja6nRy68bVhV8B4PARR0WS9rjQ=";
vendorHash = "sha256-mq95eHyW8XkqyLApSqVB3bv5VFSu6FuPap/mTQj8a9M=";
postPatch = ''
substituteInPlace http2_test.go \

View File

@ -1,6 +1,7 @@
{ lib
, buildGoModule
, fetchFromGitHub
, fetchpatch
, installShellFiles
}:
@ -15,9 +16,18 @@ buildGoModule rec {
hash = "sha256-84t7qhLafNyPLgHmFQUsizEn6Us44dDTercGEm9lup4=";
};
patches = [
# Fix build failure with Go 1.21 by updating go4.org/unsafe/assume-no-moving-gc
# See https://github.com/labctl/labctl/pull/4
(fetchpatch {
url = "https://github.com/labctl/labctl/commit/615d05e94b991362beddce71c7ee34eae7fc93ff.patch";
hash = "sha256-4JrXSsg8rfuH6i8XyLd/qO6AibkRMDBIpfT8r1yS75c=";
})
];
nativeBuildInputs = [ installShellFiles ];
vendorHash = "sha256-vJ9aTMVwKrqjckdfCMvheTSG+gEtMLLQuBCz8Wc5blE=";
vendorHash = "sha256-Ycr/IZckIFysS9Goes58hhgh96UMRHjYWfWlQU23mXk=";
ldflags = [
"-X=github.com/labctl/labctl/app.version=${version}"

View File

@ -27,6 +27,9 @@ buildGoModule rec {
'';
meta = with lib; {
# Doesn't build with Go >=1.21
# https://github.com/norouter/norouter/issues/165
broken = true;
description = "Tool to handle unprivileged networking by using multiple loopback addresses";
homepage = "https://github.com/norouter/norouter";
license = licenses.asl20;

View File

@ -1,20 +1,23 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule {
pname = "confd";
version = "0.16.0";
rev = "v${version}";
version = "0.16-unstable-2023-12-09";
goPackagePath = "github.com/kelseyhightower/confd";
subPackages = [ "./" ];
src = fetchFromGitHub {
inherit rev;
owner = "kelseyhightower";
repo = "confd";
sha256 = "0q7r6dkgirnmqi3rhqdaai88jqzw52l6jdrrwsf2qq0hva09961p";
rev = "919444eb6cf721d198b2bb18581d0f0b3734d107";
hash = "sha256-/HlL+vxERSOUKIxdtlZDZrpYjGXon3KMwoYUcp8iOug=";
};
vendorHash = null;
subPackages = [ "." ];
ldflags = [ "-s" "-w" ];
meta = {
description = "Manage local application configuration files using templates and data from etcd or consul";
homepage = "https://github.com/kelseyhightower/confd";

View File

@ -2,37 +2,33 @@
, stdenv
, fetchFromGitHub
, autoreconfHook
, libewf
, ant
, jdk
, perl
, stripJavaArchivesHook
, afflib
, libewf
, openssl
, zlib
, openjdk
, perl
, ant
}:
stdenv.mkDerivation rec {
version = "4.12.1";
stdenv.mkDerivation (finalAttrs: {
pname = "sleuthkit";
version = "4.12.1"; # Note: when updating don't forget to also update the rdeps outputHash
sleuthsrc = fetchFromGitHub {
src = fetchFromGitHub {
owner = "sleuthkit";
repo = "sleuthkit";
rev = "${pname}-${version}";
rev = "sleuthkit-${finalAttrs.version}";
hash = "sha256-q51UY2lIcLijycNaq9oQIwUXpp/1mfc3oPN4syOPF44=";
};
# Fetch libraries using a fixed output derivation
rdeps = stdenv.mkDerivation rec {
rdeps = stdenv.mkDerivation {
name = "sleuthkit-${finalAttrs.version}-deps";
inherit (finalAttrs) src;
version = "1.0";
pname = "sleuthkit-deps";
nativeBuildInputs = [
openjdk
ant
];
src = sleuthsrc;
nativeBuildInputs = [ ant jdk ];
# unpack, build, install
dontConfigure = true;
@ -48,7 +44,6 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
export IVY_HOME=$NIX_BUILD_TOP/.ant
mkdir -m 755 -p $out/bindings/java
cp -r bindings/java/lib $out/bindings/java
mkdir -m 755 -p $out/case-uco/java
@ -58,11 +53,23 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHash = "0fq7v6zlgybg4v6k9wqjlk4gaqgjrpihbnr182vaqriihflav2s8";
outputHashAlgo = "sha256";
outputHash = "sha256-mc/KQrwn3xpPI0ngOLcpoQDaJJm/rM8XgaX//5PiRZk=";
};
src = sleuthsrc;
postUnpack = ''
export IVY_HOME="$NIX_BUILD_TOP/.ant"
export ANT_ARGS="-Doffline=true -Ddefault-jar-location=$IVY_HOME/lib"
# pre-positioning these jar files allows -Doffline=true to work
mkdir -p source/{bindings,case-uco}/java $IVY_HOME
cp -r ${finalAttrs.rdeps}/bindings/java/lib source/bindings/java
chmod -R 755 source/bindings/java
cp -r ${finalAttrs.rdeps}/case-uco/java/lib source/case-uco/java
chmod -R 755 source/case-uco/java
cp -r ${finalAttrs.rdeps}/lib $IVY_HOME
chmod -R 755 $IVY_HOME
'';
postPatch = ''
substituteInPlace tsk/img/ewf.cpp --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset
@ -72,15 +79,15 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
openjdk
perl
ant
rdeps
jdk
perl
stripJavaArchivesHook
];
buildInputs = [
libewf
afflib
libewf
openssl
zlib
];
@ -90,31 +97,16 @@ stdenv.mkDerivation rec {
rm -rf */.libs
'';
postUnpack = ''
export IVY_HOME="$NIX_BUILD_TOP/.ant"
export JAVA_HOME="${openjdk}"
export ant_args="-Doffline=true -Ddefault-jar-location=$IVY_HOME/lib"
# pre-positioning these jar files allows -Doffline=true to work
mkdir -p source/{bindings,case-uco}/java $IVY_HOME
cp -r ${rdeps}/bindings/java/lib source/bindings/java
chmod -R 755 source/bindings/java
cp -r ${rdeps}/case-uco/java/lib source/case-uco/java
chmod -R 755 source/case-uco/java
cp -r ${rdeps}/lib $IVY_HOME
chmod -R 755 $IVY_HOME
'';
meta = with lib; {
description = "A forensic/data recovery tool";
homepage = "https://www.sleuthkit.org/";
changelog = "https://github.com/sleuthkit/sleuthkit/releases/tag/sleuthkit-${version}";
changelog = "https://github.com/sleuthkit/sleuthkit/blob/${finalAttrs.src.rev}/NEWS.txt";
maintainers = with maintainers; [ raskin gfrascadorio ];
platforms = platforms.linux;
sourceProvenance = with sourceTypes; [
fromSource
binaryBytecode # dependencies
binaryBytecode # dependencies
];
license = licenses.ipl10;
};
}
})

View File

@ -1735,7 +1735,6 @@ with pkgs;
butler = callPackage ../by-name/bu/butler/package.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
buildGoModule = buildGo120Module;
};
carbon-now-cli = callPackage ../tools/typesetting/carbon-now-cli { };
@ -2556,9 +2555,7 @@ with pkgs;
lab = callPackage ../applications/version-management/lab { };
labctl = callPackage ../tools/networking/labctl {
buildGoModule = buildGo120Module;
};
labctl = callPackage ../tools/networking/labctl { };
legit = callPackage ../applications/version-management/legit { };
@ -8712,9 +8709,7 @@ with pkgs;
goreplay = callPackage ../tools/networking/goreplay { };
gost = callPackage ../tools/networking/gost {
buildGoModule = buildGo120Module; # go 1.21 build failure
};
gost = callPackage ../tools/networking/gost { };
gource = callPackage ../applications/version-management/gource { };
@ -13938,7 +13933,6 @@ with pkgs;
trezord = callPackage ../servers/trezord {
inherit (darwin.apple_sdk.frameworks) AppKit;
buildGoModule = buildGo120Module;
};
trezor-agent = with python3Packages; toPythonApplication trezor-agent;
@ -15116,9 +15110,7 @@ with pkgs;
zip = callPackage ../tools/archivers/zip { };
zincsearch = callPackage ../servers/search/zincsearch {
buildGoModule = buildGo120Module;
};
zincsearch = callPackage ../servers/search/zincsearch { };
zkfuse = callPackage ../tools/filesystems/zkfuse { };
@ -25524,17 +25516,6 @@ with pkgs;
buildGoModule = buildGo122Module;
buildGoPackage = buildGo122Package;
# requires a newer Apple SDK
go_1_20 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.20.nix {
inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;
};
buildGo120Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix {
go = buildPackages.go_1_20;
};
buildGo120Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix {
go = buildPackages.go_1_20;
};
# requires a newer Apple SDK
go_1_21 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.21.nix {
inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security;
@ -25971,7 +25952,6 @@ with pkgs;
engelsystem = callPackage ../servers/web-apps/engelsystem { };
envoy = callPackage ../servers/http/envoy {
go = go_1_20;
jdk = openjdk11_headless;
gn = gn1924;
};
@ -27972,9 +27952,7 @@ with pkgs;
goconst = callPackage ../development/tools/goconst { };
goconvey = callPackage ../development/tools/goconvey {
buildGoModule = buildGo120Module;
};
goconvey = callPackage ../development/tools/goconvey { };
go-callvis = callPackage ../development/tools/go-callvis { };
@ -28030,9 +28008,7 @@ with pkgs;
go-mod-graph-chart = callPackage ../development/tools/go-mod-graph-chart { };
gomacro = callPackage ../development/tools/gomacro {
buildGoModule = buildGo120Module;
};
gomacro = callPackage ../development/tools/gomacro { };
gomodifytags = callPackage ../development/tools/gomodifytags { };
@ -29355,9 +29331,9 @@ with pkgs;
open-sans = callPackage ../data/fonts/open-sans { };
openmoji-color = callPackage ../data/fonts/openmoji { variant = "color"; };
openmoji-color = callPackage ../data/fonts/openmoji { fontFormats = ["glyf_colr_0"]; };
openmoji-black = callPackage ../data/fonts/openmoji { variant = "black"; };
openmoji-black = callPackage ../data/fonts/openmoji { fontFormats = ["glyf"]; };
openzone-cursors = callPackage ../data/themes/openzone { };
@ -30986,9 +30962,7 @@ with pkgs;
gigalixir = callPackage ../tools/misc/gigalixir { };
go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon {
buildGoModule = buildGo120Module;
};
go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { };
go-motion = callPackage ../development/tools/go-motion { };
@ -33062,9 +33036,7 @@ with pkgs;
markscribe = callPackage ../tools/text/markscribe { };
magnetico = callPackage ../applications/networking/p2p/magnetico {
buildGoModule = buildGo120Module;
};
magnetico = callPackage ../applications/networking/p2p/magnetico { };
mastodon-bot = nodePackages.mastodon-bot;
@ -33409,11 +33381,7 @@ with pkgs;
normalize = callPackage ../applications/audio/normalize { };
norouter = callPackage ../tools/networking/norouter {
# doesn't build with go 1.21
# https://github.com/norouter/norouter/issues/165
buildGoModule = buildGo120Module;
};
norouter = callPackage ../tools/networking/norouter { };
nqptp = callPackage ../tools/networking/nqptp { };
@ -36500,9 +36468,7 @@ with pkgs;
dcrctl = callPackage ../applications/blockchains/dcrctl { };
dcrd = callPackage ../applications/blockchains/dcrd { };
dcrwallet = callPackage ../applications/blockchains/dcrwallet {
buildGoModule = buildGo120Module;
};
dcrwallet = callPackage ../applications/blockchains/dcrwallet { };
eclair = callPackage ../applications/blockchains/eclair { };
@ -40672,7 +40638,9 @@ with pkgs;
ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; };
vcluster = callPackage ../applications/networking/cluster/vcluster { };
vcluster = callPackage ../applications/networking/cluster/vcluster {
buildGoModule = buildGo122Module;
};
vnote = libsForQt5.callPackage ../applications/office/vnote { };

View File

@ -4450,6 +4450,8 @@ self: super: with self; {
frozenlist = callPackage ../development/python-modules/frozenlist { };
frozenlist2 = callPackage ../development/python-modules/frozenlist2 { };
fs = callPackage ../development/python-modules/fs { };
fs-s3fs = callPackage ../development/python-modules/fs-s3fs { };
@ -4999,6 +5001,8 @@ self: super: with self; {
graphene-django = callPackage ../development/python-modules/graphene-django { };
graphlib-backport = callPackage ../development/python-modules/graphlib-backport { };
graphqlclient= callPackage ../development/python-modules/graphqlclient { };
graphql-core = callPackage ../development/python-modules/graphql-core { };
@ -8758,6 +8762,8 @@ self: super: with self; {
python-nvd3 = callPackage ../development/python-modules/python-nvd3 { };
python-secp256k1-cardano = callPackage ../development/python-modules/python-secp256k1-cardano { };
python-tds = callPackage ../development/python-modules/python-tds { };
python-yate = callPackage ../development/python-modules/python-yate { };
@ -9943,6 +9949,8 @@ self: super: with self; {
plumbum = callPackage ../development/python-modules/plumbum { };
pluthon = callPackage ../development/python-modules/pluthon { };
plux = callPackage ../development/python-modules/plux { };
ply = callPackage ../development/python-modules/ply { };
@ -16141,6 +16149,8 @@ self: super: with self; {
update-dotdee = callPackage ../development/python-modules/update-dotdee { };
uplc = callPackage ../development/python-modules/uplc { };
upnpy = callPackage ../development/python-modules/upnpy { };
uproot = callPackage ../development/python-modules/uproot { };