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

This commit is contained in:
K900 2025-01-10 15:35:29 +03:00
commit bc9b250c6c
88 changed files with 1857 additions and 4548 deletions

View file

@ -145,7 +145,7 @@ def main() -> None:
tic = time.time() tic = time.time()
driver.run_tests() driver.run_tests()
toc = time.time() toc = time.time()
logger.info(f"test script finished in {(toc-tic):.2f}s") logger.info(f"test script finished in {(toc - tic):.2f}s")
def generate_driver_symbols() -> None: def generate_driver_symbols() -> None:

View file

@ -702,8 +702,7 @@ class Machine:
def get_tty_text(self, tty: str) -> str: def get_tty_text(self, tty: str) -> str:
status, output = self.execute( status, output = self.execute(
f"fold -w$(stty -F /dev/tty{tty} size | " f"fold -w$(stty -F /dev/tty{tty} size | awk '{{print $2}}') /dev/vcs{tty}"
f"awk '{{print $2}}') /dev/vcs{tty}"
) )
return output return output

View file

@ -14,16 +14,17 @@ in
{ {
options = { options = {
services.xserver.windowManager.stumpwm.enable = mkEnableOption "stumpwm"; services.xserver.windowManager.stumpwm.enable = mkEnableOption "stumpwm";
services.xserver.windowManager.stumpwm.package = mkPackageOption pkgs "stumpwm" { };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.xserver.windowManager.session = singleton { services.xserver.windowManager.session = singleton {
name = "stumpwm"; name = "stumpwm";
start = '' start = ''
${pkgs.sbclPackages.stumpwm}/bin/stumpwm & ${cfg.package}/bin/stumpwm &
waitPID=$! waitPID=$!
''; '';
}; };
environment.systemPackages = [ pkgs.sbclPackages.stumpwm ]; environment.systemPackages = [ cfg.package ];
}; };
} }

View file

@ -156,10 +156,10 @@ in
]; ];
}; };
astroui = super.astroui.overrideAttrs (oa: { astroui = super.astroui.overrideAttrs {
# Readme states that astrocore is an optional dependency # Readme states that astrocore is an optional dependency
nativeCheckInputs = oa.nativeCheckInputs ++ [ self.astrocore ]; checkInputs = [ self.astrocore ];
}); };
asyncrun-vim = super.asyncrun-vim.overrideAttrs { asyncrun-vim = super.asyncrun-vim.overrideAttrs {
nvimSkipModule = [ nvimSkipModule = [
@ -745,6 +745,14 @@ in
]; ];
}; };
conjure = super.conjure.overrideAttrs {
dependencies = [ self.plenary-nvim ];
nvimSkipModule = [
# Test mismatch of directory because of nix generated path
"conjure-spec.client.fennel.nfnl_spec"
];
};
context-vim = super.context-vim.overrideAttrs { context-vim = super.context-vim.overrideAttrs {
# Vim plugin with optional lua highlight module # Vim plugin with optional lua highlight module
nvimSkipModule = "context.highlight"; nvimSkipModule = "context.highlight";
@ -1062,9 +1070,9 @@ in
nvimRequireCheck = "fuzzy_nvim"; nvimRequireCheck = "fuzzy_nvim";
}; };
fugit2-nvim = super.fugit2-nvim.overrideAttrs (oa: { fugit2-nvim = super.fugit2-nvim.overrideAttrs {
# Requires web-devicons but mini.icons can mock them up # Requires web-devicons but mini.icons can mock them up
nativeCheckInputs = oa.nativeCheckInputs ++ [ checkInputs = [
self.nvim-web-devicons self.nvim-web-devicons
]; ];
dependencies = with self; [ dependencies = with self; [
@ -1078,7 +1086,7 @@ in
'M.library_path = "libgit2"' \ 'M.library_path = "libgit2"' \
'M.library_path = "${lib.getLib libgit2}/lib/libgit2${stdenv.hostPlatform.extensions.sharedLibrary}"' 'M.library_path = "${lib.getLib libgit2}/lib/libgit2${stdenv.hostPlatform.extensions.sharedLibrary}"'
''; '';
}); };
fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs { fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs {
# The plugin has a makefile which tries to run tests in a docker container. # The plugin has a makefile which tries to run tests in a docker container.
@ -1423,10 +1431,10 @@ in
dependencies = [ self.vim-floaterm ]; dependencies = [ self.vim-floaterm ];
}; };
lightline-bufferline = super.lightline-bufferline.overrideAttrs (oa: { lightline-bufferline = super.lightline-bufferline.overrideAttrs {
# Requires web-devicons but mini.icons can mock them up # Requires web-devicons but mini.icons can mock them up
nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-web-devicons ]; checkInputs = [ self.nvim-web-devicons ];
}); };
lir-nvim = super.lir-nvim.overrideAttrs { lir-nvim = super.lir-nvim.overrideAttrs {
dependencies = [ self.plenary-nvim ]; dependencies = [ self.plenary-nvim ];
@ -1832,9 +1840,20 @@ in
neotest neotest
nvim-nio nvim-nio
plenary-nvim plenary-nvim
nvim-treesitter-parsers.cpp
];
nvimSkipModule = [
# lua/plenary/path.lua:511: FileNotFoundError from mkdir because of stdpath parent path missing
"neotest-gtest.executables.global_registry"
"neotest-gtest.executables.init"
"neotest-gtest.executables.registry"
"neotest-gtest.executables.ui"
"neotest-gtest"
"neotest-gtest.neotest_adapter"
"neotest-gtest.report"
"neotest-gtest.storage"
"neotest-gtest.utils"
]; ];
# broken
# nvimRequireCheck = "neotest-gtest";
}; };
neotest-haskell = super.neotest-haskell.overrideAttrs { neotest-haskell = super.neotest-haskell.overrideAttrs {
@ -1865,6 +1884,7 @@ in
neotest-minitest = super.neotest-minitest.overrideAttrs { neotest-minitest = super.neotest-minitest.overrideAttrs {
dependencies = with self; [ dependencies = with self; [
neotest neotest
nvim-nio
plenary-nvim plenary-nvim
]; ];
}; };
@ -1918,6 +1938,7 @@ in
neotest-rspec = super.neotest-rspec.overrideAttrs { neotest-rspec = super.neotest-rspec.overrideAttrs {
dependencies = with self; [ dependencies = with self; [
neotest neotest
nvim-nio
plenary-nvim plenary-nvim
]; ];
}; };
@ -2171,6 +2192,10 @@ in
]; ];
}; };
nvim-java-test = super.nvim-java-test.overrideAttrs {
dependencies = [ self.nvim-java-core ];
};
nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs { nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs {
dependencies = [ self.plenary-nvim ]; dependencies = [ self.plenary-nvim ];
nvimRequireCheck = "lsp-file-operations"; nvimRequireCheck = "lsp-file-operations";
@ -2209,10 +2234,10 @@ in
]; ];
}; };
nvim-nonicons = super.nvim-nonicons.overrideAttrs (oa: { nvim-nonicons = super.nvim-nonicons.overrideAttrs {
# Requires web-devicons but mini.icons can mock them up # Requires web-devicons but mini.icons can mock them up
nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-web-devicons ]; checkInputs = [ self.nvim-web-devicons ];
}); };
nvim-nu = super.nvim-nu.overrideAttrs { nvim-nu = super.nvim-nu.overrideAttrs {
dependencies = with self; [ dependencies = with self; [
@ -2355,6 +2380,29 @@ in
nvimRequireCheck = "trevj"; nvimRequireCheck = "trevj";
}; };
nvim-test = super.nvim-test.overrideAttrs {
dependencies = with self; [
nvim-treesitter
nvim-treesitter-parsers.c_sharp
nvim-treesitter-parsers.go
nvim-treesitter-parsers.haskell
nvim-treesitter-parsers.javascript
nvim-treesitter-parsers.python
nvim-treesitter-parsers.ruby
nvim-treesitter-parsers.rust
nvim-treesitter-parsers.typescript
nvim-treesitter-parsers.zig
];
nvimSkipModule = [
# Optional toggleterm integration
"nvim-test.terms.toggleterm"
# Broken runners
"nvim-test.runners.zig"
"nvim-test.runners.hspec"
"nvim-test.runners.stack"
];
};
nvim-ufo = super.nvim-ufo.overrideAttrs { nvim-ufo = super.nvim-ufo.overrideAttrs {
dependencies = [ self.promise-async ]; dependencies = [ self.promise-async ];
nvimRequireCheck = "ufo"; nvimRequireCheck = "ufo";
@ -2575,6 +2623,8 @@ in
nvimSkipModule = [ nvimSkipModule = [
# rainbow-delimiters.types.lua # rainbow-delimiters.types.lua
"rainbow-delimiters.types" "rainbow-delimiters.types"
# Test that requires an unpackaged dependency
"rainbow-delimiters._test.highlight"
]; ];
}; };
@ -3152,6 +3202,14 @@ in
meta.maintainers = with lib.maintainers; [ enderger ]; meta.maintainers = with lib.maintainers; [ enderger ];
}; };
typescript-nvim = super.typescript-nvim.overrideAttrs {
dependencies = with self; [
nvim-lspconfig
];
# Optional null-ls integration
nvimSkipModule = [ "typescript.extensions.null-ls.code-actions.init" ];
};
typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs { typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs {
dependencies = with self; [ dependencies = with self; [
nvim-lspconfig nvim-lspconfig

View file

@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
name = "tinymist"; name = "tinymist";
publisher = "myriad-dreamin"; publisher = "myriad-dreamin";
inherit (tinymist) version; inherit (tinymist) version;
hash = "sha256-8QwUZfR0eTjXE6IgjpYx9TcWf8WrrVWA0VfTUX+WVCc="; hash = "sha256-86P0PsOyLtHfGE4HaTvH0nSVs3IialAmw+gyajfJrRE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -4,6 +4,8 @@
fetchFromGitHub, fetchFromGitHub,
fetchpatch, fetchpatch,
qtbase,
at-spi2-atk, at-spi2-atk,
at-spi2-core, at-spi2-core,
libepoxy, libepoxy,
@ -68,7 +70,7 @@ mkDerivation rec {
]; ];
cmakeFlags = [ cmakeFlags = [
"-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/$qtPluginPrefix" "-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
]; ];
meta = with lib; { meta = with lib; {

View file

@ -766,7 +766,7 @@
} }
}, },
"ungoogled-chromium": { "ungoogled-chromium": {
"version": "131.0.6778.204", "version": "131.0.6778.264",
"deps": { "deps": {
"depot_tools": { "depot_tools": {
"rev": "20b9bdcace7ed561d6a75728c85373503473cb6b", "rev": "20b9bdcace7ed561d6a75728c85373503473cb6b",
@ -777,16 +777,16 @@
"hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk=" "hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk="
}, },
"ungoogled-patches": { "ungoogled-patches": {
"rev": "131.0.6778.204-1", "rev": "131.0.6778.264-1",
"hash": "sha256-08XBobDtEuVG/tli7SXJ3Ca/aFM4kybuk043sVswPj8=" "hash": "sha256-u/2iKhrJRbvOtv5Yi/AfSpR7Xu4NjBTF5G03wsVGEKo="
}, },
"npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA=" "npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA="
}, },
"DEPS": { "DEPS": {
"src": { "src": {
"url": "https://chromium.googlesource.com/chromium/src.git", "url": "https://chromium.googlesource.com/chromium/src.git",
"rev": "52183f9e99a61056f9b78535f53d256f1516f2a0", "rev": "2d05e31515360f4da764174f7c448b33e36da871",
"hash": "sha256-D7+Ji8Y1vw1Sgt9njbZDGbgbzT8eAvx/95M8SsHyiN4=", "hash": "sha256-aAb+lMefY4+zADsVeyLIhNI4AQfGmzu+7Y8o3t2csmU=",
"recompress": true "recompress": true
}, },
"src/third_party/clang-format/script": { "src/third_party/clang-format/script": {
@ -1526,8 +1526,8 @@
}, },
"src/v8": { "src/v8": {
"url": "https://chromium.googlesource.com/v8/v8.git", "url": "https://chromium.googlesource.com/v8/v8.git",
"rev": "7f72bbed40ca85a6b68ca2f15feca342c9c256d0", "rev": "9c09e7876ff830e1f9a731aa930040d1028ff5a1",
"hash": "sha256-QJcC6T2IOCXhObwND0jPQTUl84lotcYRCIQe4GTtczc=" "hash": "sha256-OKa0W4s3VfaQ/MBHkrkZ8/LeRGqjGh9hTaqet7S4o58="
} }
} }
} }

View file

@ -9,7 +9,7 @@
( (
(buildMozillaMach rec { (buildMozillaMach rec {
pname = "floorp"; pname = "floorp";
packageVersion = "11.21.0"; packageVersion = "11.22.0";
applicationName = "Floorp"; applicationName = "Floorp";
binaryName = "floorp"; binaryName = "floorp";
branding = "browser/branding/official"; branding = "browser/branding/official";
@ -17,14 +17,14 @@
allowAddonSideload = true; allowAddonSideload = true;
# Must match the contents of `browser/config/version.txt` in the source tree # Must match the contents of `browser/config/version.txt` in the source tree
version = "128.5.0"; version = "128.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Floorp-Projects"; owner = "Floorp-Projects";
repo = "Floorp"; repo = "Floorp";
fetchSubmodules = true; fetchSubmodules = true;
rev = "v${packageVersion}"; rev = "v${packageVersion}";
hash = "sha256-gb190h7BAt0biE/RQayyzwSFCDEMe4F8YT6Re2mK9r4="; hash = "sha256-gPFWSCACWUk7QE85I6alT6hsjMengjiiSE4J9px0Z58=";
}; };
extraConfigureFlags = [ extraConfigureFlags = [

View file

@ -1,15 +1,15 @@
{ {
"version": "17.6.2", "version": "17.7.1",
"repo_hash": "0j08l2rhhlm5b6cim3bq5zk6lwimf467jhqarm01mxn53qj5rfna", "repo_hash": "0c800lczpfbc62scxmf0ll0y619qrdszwxdzsmyl4w14appp96mm",
"yarn_hash": "0g60lvngbvgvirjag5l539innmklh2x6a56vd38svrgx5jm6d3jc", "yarn_hash": "10iz5148yr1xaij78fx7j4dras35rsm4zgxw8m8fx5adg6xc86sg",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v17.6.2-ee", "rev": "v17.7.1-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "17.6.2", "GITALY_SERVER_VERSION": "17.7.1",
"GITLAB_PAGES_VERSION": "17.6.2", "GITLAB_PAGES_VERSION": "17.7.1",
"GITLAB_SHELL_VERSION": "14.39.0", "GITLAB_SHELL_VERSION": "14.39.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0",
"GITLAB_WORKHORSE_VERSION": "17.6.2" "GITLAB_WORKHORSE_VERSION": "17.7.1"
} }
} }

View file

@ -83,7 +83,7 @@ let
cp Cargo.lock $out cp Cargo.lock $out
''; '';
}; };
hash = "sha256-L/URWw7NoQhi7VV8ZiKLzthbF0wl4rIUqCQdH9wmAV0="; hash = "sha256-vFApyObuqsMBXhT2yyMpH7rzW0GaPgJUn9/hE/GpS9I=";
}; };
dontBuild = false; dontBuild = false;

View file

@ -5,7 +5,7 @@ in
buildGoModule rec { buildGoModule rec {
pname = "gitlab-workhorse"; pname = "gitlab-workhorse";
version = "17.6.2"; version = "17.7.1";
# nixpkgs-update: no auto update # nixpkgs-update: no auto update
src = fetchFromGitLab { src = fetchFromGitLab {

View file

@ -32,7 +32,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir
if next? if next?
gem 'rails', '~> 7.1.4', feature_category: :shared gem 'rails', '~> 7.1.4', feature_category: :shared
else else
gem 'rails', '~> 7.0.8.4', feature_category: :shared gem 'rails', '~> 7.0.8.6', feature_category: :shared
end end
gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory
@ -89,8 +89,8 @@ gem 'coverband', '6.1.4', require: false, feature_category: :shared
gem 'devise', '~> 4.9.3', feature_category: :system_access gem 'devise', '~> 4.9.3', feature_category: :system_access
gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' # rubocop:todo Gemfile/MissingFeatureCategory gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'bcrypt', '~> 3.1', '>= 3.1.14' # rubocop:todo Gemfile/MissingFeatureCategory gem 'bcrypt', '~> 3.1', '>= 3.1.14' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'doorkeeper', '~> 5.6', '>= 5.6.6' # rubocop:todo Gemfile/MissingFeatureCategory gem 'doorkeeper', '~> 5.8', '>= 5.8.1', feature_category: :system_access
gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'doorkeeper-openid_connect', '~> 1.8.10', feature_category: :system_access
gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access
gem 'rexml', '~> 3.3.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rexml', '~> 3.3.2' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'ruby-saml', '~> 1.17.0', feature_category: :system_access gem 'ruby-saml', '~> 1.17.0', feature_category: :system_access
@ -130,10 +130,10 @@ gem 'rqrcode', '~> 2.2', feature_category: :system_access
gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' # rubocop:todo Gemfile/MissingFeatureCategory gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' # rubocop:todo Gemfile/MissingFeatureCategory
# GitLab Pages # GitLab Pages
gem 'validates_hostname', '~> 1.0.13' # rubocop:todo Gemfile/MissingFeatureCategory gem 'validates_hostname', '~> 1.0.13', feature_category: :pages
gem 'rubyzip', '~> 2.3.2', require: 'zip' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rubyzip', '~> 2.3.2', require: 'zip', feature_category: :pages
# GitLab Pages letsencrypt support # GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0.18' # rubocop:todo Gemfile/MissingFeatureCategory gem 'acme-client', '~> 2.0.19', feature_category: :pages
# Browser detection # Browser detection
gem 'browser', '~> 5.3.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'browser', '~> 5.3.1' # rubocop:todo Gemfile/MissingFeatureCategory
@ -203,7 +203,7 @@ gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory
# We may want to update this dependency if this is ever addressed upstream, e.g. via # We may want to update this dependency if this is ever addressed upstream, e.g. via
# https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93 # https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93
gem 'fog-aliyun', '~> 0.4' # rubocop:todo Gemfile/MissingFeatureCategory gem 'fog-aliyun', '~> 0.4' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-fog-azure-rm', '~> 2.1.0', require: 'fog/azurerm', feature_category: :shared gem 'gitlab-fog-azure-rm', '~> 2.2.0', require: 'fog/azurerm', feature_category: :shared
# for Google storage # for Google storage
@ -234,9 +234,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search
gem 'elasticsearch-api', '7.17.11', feature_category: :global_search gem 'elasticsearch-api', '7.17.11', feature_category: :global_search
gem 'aws-sdk-core', '~> 3.211.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-core', '~> 3.213.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-s3', '~> 1.169.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-s3', '~> 1.172.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search
gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search
# Used with Elasticsearch to support http keep-alive connections # Used with Elasticsearch to support http keep-alive connections
@ -276,7 +276,7 @@ gem 'rack', '~> 2.2.9' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory
group :puma do group :puma do
gem 'puma', '= 6.4.3', require: false, feature_category: :shared gem 'puma', '= 6.5.0', require: false, feature_category: :shared
gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
end end
@ -292,7 +292,7 @@ gem 'gitlab-sidekiq-fetcher',
feature_category: :scalability feature_category: :scalability
# Cron Parser # Cron Parser
gem 'fugit', '~> 1.8.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'fugit', '~> 1.11.1', feature_category: :continuous_integration
# HTTP requests # HTTP requests
gem 'httparty', '~> 0.21.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'httparty', '~> 0.21.0' # rubocop:todo Gemfile/MissingFeatureCategory
@ -325,7 +325,7 @@ gem 'redis-clustering', '~> 5.3.0', feature_category: :redis
gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory
# Redis session store # Redis session store
gem 'redis-actionpack', '~> 5.4.0', feature_category: :redis gem 'redis-actionpack', '~> 5.5.0', feature_category: :redis
# Discord integration # Discord integration
gem 'discordrb-webhooks', '~> 3.5', require: false, feature_category: :integrations gem 'discordrb-webhooks', '~> 3.5', require: false, feature_category: :integrations
@ -380,7 +380,7 @@ gem 'addressable', '~> 2.8' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gon', '~> 6.4.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'gon', '~> 6.4.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'request_store', '~> 1.5.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'request_store', '~> 1.5.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'base32', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'base32', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-license', '~> 2.5', feature_category: :shared gem 'gitlab-license', '~> 2.6', feature_category: :shared
# Protect against bruteforcing # Protect against bruteforcing
gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory
@ -392,13 +392,13 @@ gem 'sentry-sidekiq', '~> 5.21.0', feature_category: :observability
# PostgreSQL query parsing # PostgreSQL query parsing
# #
gem 'pg_query', '~> 5.1.0', feature_category: :database gem 'pg_query', '~> 6.0.0', feature_category: :database
gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' # rubocop:todo Gemfile/MissingFeatureCategory 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 'gitlab-http', path: 'gems/gitlab-http' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications
gem 'gitlab-labkit', '~> 0.36.0', feature_category: :shared gem 'gitlab-labkit', '~> 0.37.0', feature_category: :shared
gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory
# I18n # I18n
@ -480,7 +480,7 @@ group :development do
gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'ruby-lsp', "~> 0.19.0", require: false, feature_category: :tooling gem 'ruby-lsp', "~> 0.21.0", require: false, feature_category: :tooling
gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling
@ -509,7 +509,7 @@ group :development, :test do
gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-styles', '~> 13.0.1', feature_category: :tooling gem 'gitlab-styles', '~> 13.0.2', feature_category: :tooling
gem 'haml_lint', '~> 0.58', feature_category: :tooling gem 'haml_lint', '~> 0.58', feature_category: :tooling
gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
@ -592,7 +592,7 @@ group :test do
# Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab_quality-test_tooling', '~> 2.1.0', require: false, feature_category: :tooling gem 'gitlab_quality-test_tooling', '~> 2.4.0', require: false, feature_category: :tooling
end end
gem 'octokit', '~> 9.0', feature_category: :importers gem 'octokit', '~> 9.0', feature_category: :importers
@ -632,7 +632,7 @@ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitaly', '~> 17.5.0.pre.rc1', feature_category: :gitaly gem 'gitaly', '~> 17.5.0.pre.rc1', feature_category: :gitaly
# KAS GRPC protocol definitions # KAS GRPC protocol definitions
gem 'gitlab-kas-grpc', '~> 17.5.0', feature_category: :deployment_management gem 'gitlab-kas-grpc', '~> 17.6.1', feature_category: :deployment_management
# Lock the version before issues below are resolved: # Lock the version before issues below are resolved:
# https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939
@ -685,7 +685,7 @@ gem 'lockbox', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'valid_email', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'valid_email', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory
# JSON # JSON
gem 'jsonb_accessor', '~> 1.3.10' # rubocop:todo Gemfile/MissingFeatureCategory gem 'jsonb_accessor', '~> 1.4' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'json', '~> 2.7.2', feature_category: :shared gem 'json', '~> 2.7.2', feature_category: :shared
gem 'json_schemer', '~> 2.3.0', feature_category: :shared gem 'json_schemer', '~> 2.3.0', feature_category: :shared
gem 'oj', '~> 3.13.21' # rubocop:todo Gemfile/MissingFeatureCategory gem 'oj', '~> 3.13.21' # rubocop:todo Gemfile/MissingFeatureCategory
@ -741,3 +741,5 @@ gem 'openbao_client', path: 'gems/openbao_client' # rubocop:todo Gemfile/Missing
gem 'paper_trail', '~> 15.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'paper_trail', '~> 15.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem "i18n_data", "~> 0.13.1", feature_category: :system_access gem "i18n_data", "~> 0.13.1", feature_category: :system_access
gem "gitlab-cloud-connector", "~> 0.2.5", require: 'cloud_connector', feature_category: :cloud_connector

View file

@ -97,7 +97,9 @@ PATH
PATH PATH
remote: gems/gitlab-secret_detection remote: gems/gitlab-secret_detection
specs: specs:
gitlab-secret_detection (0.1.0) gitlab-secret_detection (0.1.1)
grpc (= 1.63.0)
grpc-tools (= 1.63.0)
parallel (~> 1.22) parallel (~> 1.22)
re2 (~> 2.4) re2 (~> 2.4)
toml-rb (~> 2.2) toml-rb (~> 2.2)
@ -227,73 +229,74 @@ GEM
CFPropertyList (3.0.5) CFPropertyList (3.0.5)
rexml rexml
RedCloth (4.3.4) RedCloth (4.3.4)
acme-client (2.0.18) acme-client (2.0.19)
base64 (~> 0.2.0)
faraday (>= 1.0, < 3.0.0) faraday (>= 1.0, < 3.0.0)
faraday-retry (>= 1.0, < 3.0.0) faraday-retry (>= 1.0, < 3.0.0)
actioncable (7.0.8.4) actioncable (7.0.8.6)
actionpack (= 7.0.8.4) actionpack (= 7.0.8.6)
activesupport (= 7.0.8.4) activesupport (= 7.0.8.6)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (7.0.8.4) actionmailbox (7.0.8.6)
actionpack (= 7.0.8.4) actionpack (= 7.0.8.6)
activejob (= 7.0.8.4) activejob (= 7.0.8.6)
activerecord (= 7.0.8.4) activerecord (= 7.0.8.6)
activestorage (= 7.0.8.4) activestorage (= 7.0.8.6)
activesupport (= 7.0.8.4) activesupport (= 7.0.8.6)
mail (>= 2.7.1) mail (>= 2.7.1)
net-imap net-imap
net-pop net-pop
net-smtp net-smtp
actionmailer (7.0.8.4) actionmailer (7.0.8.6)
actionpack (= 7.0.8.4) actionpack (= 7.0.8.6)
actionview (= 7.0.8.4) actionview (= 7.0.8.6)
activejob (= 7.0.8.4) activejob (= 7.0.8.6)
activesupport (= 7.0.8.4) activesupport (= 7.0.8.6)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
net-imap net-imap
net-pop net-pop
net-smtp net-smtp
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (7.0.8.4) actionpack (7.0.8.6)
actionview (= 7.0.8.4) actionview (= 7.0.8.6)
activesupport (= 7.0.8.4) activesupport (= 7.0.8.6)
rack (~> 2.0, >= 2.2.4) rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.8.4) actiontext (7.0.8.6)
actionpack (= 7.0.8.4) actionpack (= 7.0.8.6)
activerecord (= 7.0.8.4) activerecord (= 7.0.8.6)
activestorage (= 7.0.8.4) activestorage (= 7.0.8.6)
activesupport (= 7.0.8.4) activesupport (= 7.0.8.6)
globalid (>= 0.6.0) globalid (>= 0.6.0)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (7.0.8.4) actionview (7.0.8.6)
activesupport (= 7.0.8.4) activesupport (= 7.0.8.6)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.8.4) activejob (7.0.8.6)
activesupport (= 7.0.8.4) activesupport (= 7.0.8.6)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (7.0.8.4) activemodel (7.0.8.6)
activesupport (= 7.0.8.4) activesupport (= 7.0.8.6)
activerecord (7.0.8.4) activerecord (7.0.8.6)
activemodel (= 7.0.8.4) activemodel (= 7.0.8.6)
activesupport (= 7.0.8.4) activesupport (= 7.0.8.6)
activerecord-explain-analyze (0.1.0) activerecord-explain-analyze (0.1.0)
activerecord (>= 4) activerecord (>= 4)
pg pg
activestorage (7.0.8.4) activestorage (7.0.8.6)
actionpack (= 7.0.8.4) actionpack (= 7.0.8.6)
activejob (= 7.0.8.4) activejob (= 7.0.8.6)
activerecord (= 7.0.8.4) activerecord (= 7.0.8.6)
activesupport (= 7.0.8.4) activesupport (= 7.0.8.6)
marcel (~> 1.0) marcel (~> 1.0)
mini_mime (>= 1.1.0) mini_mime (>= 1.1.0)
activesupport (7.0.8.4) activesupport (7.0.8.6)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
@ -339,7 +342,7 @@ GEM
aws-sdk-cloudformation (1.41.0) aws-sdk-cloudformation (1.41.0)
aws-sdk-core (~> 3, >= 3.99.0) aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-core (3.211.0) aws-sdk-core (3.213.0)
aws-eventstream (~> 1, >= 1.3.0) aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0) aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9) aws-sigv4 (~> 1.9)
@ -347,7 +350,7 @@ GEM
aws-sdk-kms (1.76.0) aws-sdk-kms (1.76.0)
aws-sdk-core (~> 3, >= 3.188.0) aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.169.0) aws-sdk-s3 (1.172.0)
aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-core (~> 3, >= 3.210.0)
aws-sdk-kms (~> 1) aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5) aws-sigv4 (~> 1.5)
@ -437,7 +440,7 @@ GEM
coercible (1.0.0) coercible (1.0.0)
descendants_tracker (~> 0.0.1) descendants_tracker (~> 0.0.1)
colored2 (3.1.2) colored2 (3.1.2)
commonmarker (0.23.10) commonmarker (0.23.11)
concurrent-ruby (1.2.3) concurrent-ruby (1.2.3)
connection_pool (2.4.1) connection_pool (2.4.1)
console (1.25.2) console (1.25.2)
@ -464,6 +467,7 @@ GEM
addressable addressable
cssbundling-rails (1.4.1) cssbundling-rails (1.4.1)
railties (>= 6.0.0) railties (>= 6.0.0)
csv (3.3.0)
cvss-suite (3.0.1) cvss-suite (3.0.1)
danger (9.4.2) danger (9.4.2)
claide (~> 1.0) claide (~> 1.0)
@ -532,12 +536,12 @@ GEM
docile (1.4.0) docile (1.4.0)
domain_name (0.5.20190701) domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
doorkeeper (5.7.1) doorkeeper (5.8.1)
railties (>= 5) railties (>= 5)
doorkeeper-device_authorization_grant (1.0.3) doorkeeper-device_authorization_grant (1.0.3)
doorkeeper (~> 5.5) doorkeeper (~> 5.5)
doorkeeper-openid_connect (1.8.9) doorkeeper-openid_connect (1.8.10)
doorkeeper (>= 5.5, < 5.8) doorkeeper (>= 5.5, < 5.9)
jwt (>= 2.5) jwt (>= 2.5)
dotenv (2.7.6) dotenv (2.7.6)
dry-cli (1.0.0) dry-cli (1.0.0)
@ -599,7 +603,7 @@ GEM
factory_bot_rails (6.4.4) factory_bot_rails (6.4.4)
factory_bot (~> 6.5) factory_bot (~> 6.5)
railties (>= 5.0.0) railties (>= 5.0.0)
faraday (2.12.1) faraday (2.12.2)
faraday-net_http (>= 2.0, < 3.5) faraday-net_http (>= 2.0, < 3.5)
json json
logger logger
@ -684,8 +688,8 @@ GEM
nokogiri (>= 1.5.11, < 2.0.0) nokogiri (>= 1.5.11, < 2.0.0)
formatador (0.2.5) formatador (0.2.5)
forwardable (1.3.3) forwardable (1.3.3)
fugit (1.8.1) fugit (1.11.1)
et-orbi (~> 1, >= 1.2.7) et-orbi (~> 1, >= 1.2.11)
raabro (~> 1.4) raabro (~> 1.4)
fuubar (2.2.0) fuubar (2.2.0)
rspec-core (~> 3.0) rspec-core (~> 3.0)
@ -723,6 +727,9 @@ GEM
terminal-table (>= 1.5.1) terminal-table (>= 1.5.1)
gitlab-chronic (0.10.5) gitlab-chronic (0.10.5)
numerizer (~> 0.2) numerizer (~> 0.2)
gitlab-cloud-connector (0.2.6)
activesupport (~> 7.0)
jwt (~> 2.9.3)
gitlab-dangerfiles (4.8.0) gitlab-dangerfiles (4.8.0)
danger (>= 9.3.0) danger (>= 9.3.0)
danger-gitlab (>= 8.0.0) danger-gitlab (>= 8.0.0)
@ -730,7 +737,7 @@ GEM
gitlab-experiment (0.9.1) gitlab-experiment (0.9.1)
activesupport (>= 3.0) activesupport (>= 3.0)
request_store (>= 1.0) request_store (>= 1.0)
gitlab-fog-azure-rm (2.1.0) gitlab-fog-azure-rm (2.2.0)
faraday (~> 2.0) faraday (~> 2.0)
faraday-follow_redirects (~> 0.3.0) faraday-follow_redirects (~> 0.3.0)
faraday-net_http_persistent (~> 2.0) faraday-net_http_persistent (~> 2.0)
@ -739,19 +746,19 @@ GEM
mime-types mime-types
net-http-persistent (~> 4.0) net-http-persistent (~> 4.0)
nokogiri (~> 1, >= 1.10.8) nokogiri (~> 1, >= 1.10.8)
gitlab-glfm-markdown (0.0.21) gitlab-glfm-markdown (0.0.23)
rb_sys (= 0.9.94) rb_sys (= 0.9.94)
gitlab-kas-grpc (17.5.1) gitlab-kas-grpc (17.6.2)
grpc (~> 1.0) grpc (~> 1.0)
gitlab-labkit (0.36.1) gitlab-labkit (0.37.0)
actionpack (>= 5.0.0, < 8.0.0) actionpack (>= 5.0.0, < 8.1.0)
activesupport (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.1.0)
grpc (>= 1.62) grpc (>= 1.62)
jaeger-client (~> 1.1.0) jaeger-client (~> 1.1.0)
opentracing (~> 0.4) opentracing (~> 0.4)
pg_query (>= 4.2.3, < 6.0) pg_query (>= 5.1.0, < 7.0)
redis (> 3.0.0, < 6.0.0) redis (> 3.0.0, < 6.0.0)
gitlab-license (2.5.0) gitlab-license (2.6.0)
gitlab-mail_room (0.0.25) gitlab-mail_room (0.0.25)
jwt (>= 2.0) jwt (>= 2.0)
net-imap (>= 0.2.1) net-imap (>= 0.2.1)
@ -767,8 +774,8 @@ GEM
gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1) gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1)
activesupport (>= 6, < 8) activesupport (>= 6, < 8)
json_schemer (~> 2.3.0) json_schemer (~> 2.3.0)
gitlab-styles (13.0.1) gitlab-styles (13.0.2)
rubocop (~> 1.67.0) rubocop (~> 1.68.0)
rubocop-capybara (~> 2.21.0) rubocop-capybara (~> 2.21.0)
rubocop-factory_bot (~> 2.26.1) rubocop-factory_bot (~> 2.26.1)
rubocop-graphql (~> 1.5.4) rubocop-graphql (~> 1.5.4)
@ -783,7 +790,7 @@ GEM
omniauth (>= 1.3, < 3) omniauth (>= 1.3, < 3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1) pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5) rubyntlm (~> 0.5)
gitlab_quality-test_tooling (2.1.0) gitlab_quality-test_tooling (2.4.0)
activesupport (>= 7.0, < 7.2) activesupport (>= 7.0, < 7.2)
amatch (~> 0.4.1) amatch (~> 0.4.1)
fog-google (~> 1.24, >= 1.24.1) fog-google (~> 1.24, >= 1.24.1)
@ -921,7 +928,7 @@ GEM
faraday (~> 2.0) faraday (~> 2.0)
graphql-client graphql-client
graphlyte (1.0.0) graphlyte (1.0.0)
graphql (2.4.1) graphql (2.4.8)
base64 base64
fiber-storage fiber-storage
graphql-client (0.23.0) graphql-client (0.23.0)
@ -942,6 +949,7 @@ GEM
google-protobuf (~> 3.18) google-protobuf (~> 3.18)
googleapis-common-protos (~> 1.4) googleapis-common-protos (~> 1.4)
grpc (~> 1.41) grpc (~> 1.41)
grpc-tools (1.63.0)
gssapi (1.3.1) gssapi (1.3.1)
ffi (>= 1.0.1) ffi (>= 1.0.1)
guard (2.16.2) guard (2.16.2)
@ -1007,7 +1015,8 @@ GEM
ice_nine (0.11.2) ice_nine (0.11.2)
imagen (0.1.8) imagen (0.1.8)
parser (>= 2.5, != 2.5.1.1) parser (>= 2.5, != 2.5.1.1)
influxdb-client (3.1.0) influxdb-client (3.2.0)
csv
invisible_captcha (2.1.0) invisible_captcha (2.1.0)
rails (>= 5.2) rails (>= 5.2)
io-event (1.6.5) io-event (1.6.5)
@ -1040,9 +1049,9 @@ GEM
hana (~> 1.3) hana (~> 1.3)
regexp_parser (~> 2.0) regexp_parser (~> 2.0)
simpleidn (~> 0.2) simpleidn (~> 0.2)
jsonb_accessor (1.3.10) jsonb_accessor (1.4)
activerecord (>= 5.0) activerecord (>= 6.1)
activesupport (>= 5.0) activesupport (>= 6.1)
pg (>= 0.18.1) pg (>= 0.18.1)
jsonpath (1.1.2) jsonpath (1.1.2)
multi_json multi_json
@ -1153,7 +1162,7 @@ GEM
mixlib-log (3.0.9) mixlib-log (3.0.9)
mixlib-shellout (3.2.7) mixlib-shellout (3.2.7)
chef-utils chef-utils
mize (0.6.0) mize (0.6.1)
msgpack (1.5.4) msgpack (1.5.4)
multi_json (1.14.1) multi_json (1.14.1)
multi_xml (0.6.0) multi_xml (0.6.0)
@ -1188,7 +1197,7 @@ GEM
netrc (0.11.0) netrc (0.11.0)
nio4r (2.7.0) nio4r (2.7.0)
no_proxy_fix (0.1.2) no_proxy_fix (0.1.2)
nokogiri (1.16.7) nokogiri (1.16.8)
mini_portile2 (~> 2.8.2) mini_portile2 (~> 2.8.2)
racc (~> 1.4) racc (~> 1.4)
notiffany (0.1.3) notiffany (0.1.3)
@ -1291,7 +1300,7 @@ GEM
opentelemetry-api (~> 1.0) opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-active_support (~> 0.1) opentelemetry-instrumentation-active_support (~> 0.1)
opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-action_pack (0.9.0) opentelemetry-instrumentation-action_pack (0.10.0)
opentelemetry-api (~> 1.0) opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-rack (~> 0.21) opentelemetry-instrumentation-rack (~> 0.21)
@ -1302,7 +1311,7 @@ GEM
opentelemetry-instrumentation-active_job (0.7.8) opentelemetry-instrumentation-active_job (0.7.8)
opentelemetry-api (~> 1.0) opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-active_record (0.8.0) opentelemetry-instrumentation-active_record (0.8.1)
opentelemetry-api (~> 1.0) opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-active_support (0.6.0) opentelemetry-instrumentation-active_support (0.6.0)
@ -1349,10 +1358,10 @@ GEM
opentelemetry-instrumentation-rack (0.25.0) opentelemetry-instrumentation-rack (0.25.0)
opentelemetry-api (~> 1.0) opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-rails (0.32.0) opentelemetry-instrumentation-rails (0.33.0)
opentelemetry-api (~> 1.0) opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-action_mailer (~> 0.2.0) opentelemetry-instrumentation-action_mailer (~> 0.2.0)
opentelemetry-instrumentation-action_pack (~> 0.9.0) opentelemetry-instrumentation-action_pack (~> 0.10.0)
opentelemetry-instrumentation-action_view (~> 0.7.0) opentelemetry-instrumentation-action_view (~> 0.7.0)
opentelemetry-instrumentation-active_job (~> 0.7.0) opentelemetry-instrumentation-active_job (~> 0.7.0)
opentelemetry-instrumentation-active_record (~> 0.8.0) opentelemetry-instrumentation-active_record (~> 0.8.0)
@ -1415,9 +1424,9 @@ GEM
tty-color (~> 0.5) tty-color (~> 0.5)
peek (1.1.0) peek (1.1.0)
railties (>= 4.0.0) railties (>= 4.0.0)
pg (1.5.6) pg (1.5.9)
pg_query (5.1.0) pg_query (6.0.0)
google-protobuf (>= 3.22.3) google-protobuf (>= 3.25.3)
plist (3.7.0) plist (3.7.0)
png_quantizator (0.2.1) png_quantizator (0.2.1)
premailer (1.23.0) premailer (1.23.0)
@ -1431,7 +1440,7 @@ GEM
prime (0.1.2) prime (0.1.2)
forwardable forwardable
singleton singleton
prism (1.1.0) prism (1.2.0)
proc_to_ast (0.1.0) proc_to_ast (0.1.0)
coderay coderay
parser parser
@ -1452,7 +1461,7 @@ GEM
tty-markdown tty-markdown
tty-prompt tty-prompt
public_suffix (6.0.1) public_suffix (6.0.1)
puma (6.4.3) puma (6.5.0)
nio4r (~> 2.0) nio4r (~> 2.0)
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
raabro (1.4.0) raabro (1.4.0)
@ -1480,20 +1489,20 @@ GEM
rack-test (2.1.0) rack-test (2.1.0)
rack (>= 1.3) rack (>= 1.3)
rack-timeout (0.7.0) rack-timeout (0.7.0)
rails (7.0.8.4) rails (7.0.8.6)
actioncable (= 7.0.8.4) actioncable (= 7.0.8.6)
actionmailbox (= 7.0.8.4) actionmailbox (= 7.0.8.6)
actionmailer (= 7.0.8.4) actionmailer (= 7.0.8.6)
actionpack (= 7.0.8.4) actionpack (= 7.0.8.6)
actiontext (= 7.0.8.4) actiontext (= 7.0.8.6)
actionview (= 7.0.8.4) actionview (= 7.0.8.6)
activejob (= 7.0.8.4) activejob (= 7.0.8.6)
activemodel (= 7.0.8.4) activemodel (= 7.0.8.6)
activerecord (= 7.0.8.4) activerecord (= 7.0.8.6)
activestorage (= 7.0.8.4) activestorage (= 7.0.8.6)
activesupport (= 7.0.8.4) activesupport (= 7.0.8.6)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 7.0.8.4) railties (= 7.0.8.6)
rails-controller-testing (1.0.5) rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1) actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1)
@ -1501,15 +1510,15 @@ GEM
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0) rails-html-sanitizer (1.6.1)
loofah (~> 2.21) loofah (~> 2.21)
nokogiri (~> 1.14) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
rails-i18n (7.0.10) rails-i18n (7.0.10)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8) railties (>= 6.0.0, < 8)
railties (7.0.8.4) railties (7.0.8.6)
actionpack (= 7.0.8.4) actionpack (= 7.0.8.6)
activesupport (= 7.0.8.4) activesupport (= 7.0.8.6)
method_source method_source
rake (>= 12.2) rake (>= 12.2)
thor (~> 1.0) thor (~> 1.0)
@ -1520,7 +1529,7 @@ GEM
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
rb_sys (0.9.94) rb_sys (0.9.94)
rbs (3.5.1) rbs (3.6.1)
logger logger
rbtrace (0.5.1) rbtrace (0.5.1)
ffi (>= 1.0.6) ffi (>= 1.0.6)
@ -1535,8 +1544,8 @@ GEM
redcarpet (3.6.0) redcarpet (3.6.0)
redis (5.3.0) redis (5.3.0)
redis-client (>= 0.22.0) redis-client (>= 0.22.0)
redis-actionpack (5.4.0) redis-actionpack (5.5.0)
actionpack (>= 5, < 8) actionpack (>= 5)
redis-rack (>= 2.1.0, < 4) redis-rack (>= 2.1.0, < 4)
redis-store (>= 1.1.0, < 2) redis-store (>= 1.1.0, < 2)
redis-client (0.22.2) redis-client (0.22.2)
@ -1625,7 +1634,7 @@ GEM
activerecord activerecord
get_process_mem get_process_mem
rails rails
rubocop (1.67.0) rubocop (1.68.0)
json (~> 2.3) json (~> 2.3)
language_server-protocol (>= 3.17.0) language_server-protocol (>= 3.17.0)
parallel (~> 1.10) parallel (~> 1.10)
@ -1659,15 +1668,15 @@ GEM
ruby-fogbugz (0.3.0) ruby-fogbugz (0.3.0)
crack (~> 0.4) crack (~> 0.4)
multipart-post (~> 2.0) multipart-post (~> 2.0)
ruby-lsp (0.19.1) ruby-lsp (0.21.3)
language_server-protocol (~> 3.17.0) language_server-protocol (~> 3.17.0)
prism (>= 1.1, < 2.0) prism (>= 1.2, < 2.0)
rbs (>= 3, < 4) rbs (>= 3, < 4)
sorbet-runtime (>= 0.5.10782) sorbet-runtime (>= 0.5.10782)
ruby-lsp-rails (0.3.17) ruby-lsp-rails (0.3.26)
ruby-lsp (>= 0.19.0, < 0.20.0) ruby-lsp (>= 0.21.2, < 0.22.0)
ruby-lsp-rspec (0.1.15) ruby-lsp-rspec (0.1.18)
ruby-lsp (~> 0.19.0) ruby-lsp (~> 0.21.0)
ruby-magic (0.6.0) ruby-magic (0.6.0)
mini_portile2 (~> 2.8) mini_portile2 (~> 2.8)
ruby-openai (3.7.0) ruby-openai (3.7.0)
@ -1698,7 +1707,7 @@ GEM
seed-fu (2.3.7) seed-fu (2.3.7)
activerecord (>= 3.1) activerecord (>= 3.1)
activesupport (>= 3.1) activesupport (>= 3.1)
selenium-webdriver (4.25.0) selenium-webdriver (4.27.0)
base64 (~> 0.2) base64 (~> 0.2)
logger (~> 1.4) logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5) rexml (~> 3.2, >= 3.2.5)
@ -1766,7 +1775,7 @@ GEM
thor (~> 1.0) thor (~> 1.0)
tilt (~> 2.0) tilt (~> 2.0)
yard (~> 0.9, >= 0.9.24) yard (~> 0.9, >= 0.9.24)
sorbet-runtime (0.5.11266) sorbet-runtime (0.5.11647)
spamcheck (1.3.0) spamcheck (1.3.0)
grpc (~> 1.0) grpc (~> 1.0)
spring (4.1.0) spring (4.1.0)
@ -1818,7 +1827,7 @@ GEM
unicode-display_width (>= 1.1.1, < 3) unicode-display_width (>= 1.1.1, < 3)
terser (1.0.2) terser (1.0.2)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
test-prof (1.4.0) test-prof (1.4.2)
test_file_finder (0.3.1) test_file_finder (0.3.1)
faraday (>= 1.0, < 3.0, != 2.0.0) faraday (>= 1.0, < 3.0, != 2.0.0)
text (1.3.1) text (1.3.1)
@ -1881,9 +1890,7 @@ GEM
unf_ext unf_ext
unf_ext (0.0.8.2) unf_ext (0.0.8.2)
unicode-display_width (2.4.2) unicode-display_width (2.4.2)
unicode-emoji (4.0.0) unicode-emoji (4.0.4)
unicode-version (~> 1.0)
unicode-version (1.4.0)
unicode_utils (1.4.0) unicode_utils (1.4.0)
uniform_notifier (1.16.0) uniform_notifier (1.16.0)
unleash (3.2.2) unleash (3.2.2)
@ -1939,7 +1946,7 @@ GEM
addressable (>= 2.8.0) addressable (>= 2.8.0)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0) hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1) webrick (1.8.2)
websocket (1.2.10) websocket (1.2.10)
websocket-driver (0.7.6) websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
@ -1965,7 +1972,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
CFPropertyList (~> 3.0.0) CFPropertyList (~> 3.0.0)
RedCloth (~> 4.3.3) RedCloth (~> 4.3.3)
acme-client (~> 2.0.18) acme-client (~> 2.0.19)
activerecord-explain-analyze (~> 0.1) activerecord-explain-analyze (~> 0.1)
activerecord-gitlab! activerecord-gitlab!
addressable (~> 2.8) addressable (~> 2.8)
@ -1982,8 +1989,8 @@ DEPENDENCIES
attr_encrypted (~> 3.2.4)! attr_encrypted (~> 3.2.4)!
awesome_print awesome_print
aws-sdk-cloudformation (~> 1) aws-sdk-cloudformation (~> 1)
aws-sdk-core (~> 3.211.0) aws-sdk-core (~> 3.213.0)
aws-sdk-s3 (~> 1.169.0) aws-sdk-s3 (~> 1.172.0)
axe-core-rspec (~> 4.9.0) axe-core-rspec (~> 4.9.0)
babosa (~> 2.0) babosa (~> 2.0)
base32 (~> 0.3.0) base32 (~> 0.3.0)
@ -2027,9 +2034,9 @@ DEPENDENCIES
diff_match_patch (~> 0.1.0)! diff_match_patch (~> 0.1.0)!
diffy (~> 3.4) diffy (~> 3.4)
discordrb-webhooks (~> 3.5) discordrb-webhooks (~> 3.5)
doorkeeper (~> 5.6, >= 5.6.6) doorkeeper (~> 5.8, >= 5.8.1)
doorkeeper-device_authorization_grant (~> 1.0.0) doorkeeper-device_authorization_grant (~> 1.0.0)
doorkeeper-openid_connect (~> 1.8, >= 1.8.7) doorkeeper-openid_connect (~> 1.8.10)
duo_api (~> 1.3) duo_api (~> 1.3)
ed25519 (~> 1.3.0) ed25519 (~> 1.3.0)
elasticsearch-api (= 7.17.11) elasticsearch-api (= 7.17.11)
@ -2055,7 +2062,7 @@ DEPENDENCIES
fog-core (= 2.1.0) fog-core (= 2.1.0)
fog-google (~> 1.24.1) fog-google (~> 1.24.1)
fog-local (~> 0.8) fog-local (~> 0.8)
fugit (~> 1.8.1) fugit (~> 1.11.1)
fuubar (~> 2.2.0) fuubar (~> 2.2.0)
gdk-toogle (~> 0.9, >= 0.9.5) gdk-toogle (~> 0.9, >= 0.9.5)
gettext (~> 3.4, >= 3.4.9) gettext (~> 3.4, >= 3.4.9)
@ -2063,16 +2070,17 @@ DEPENDENCIES
gitaly (~> 17.5.0.pre.rc1) gitaly (~> 17.5.0.pre.rc1)
gitlab-backup-cli! gitlab-backup-cli!
gitlab-chronic (~> 0.10.5) gitlab-chronic (~> 0.10.5)
gitlab-cloud-connector (~> 0.2.5)
gitlab-dangerfiles (~> 4.8.0) gitlab-dangerfiles (~> 4.8.0)
gitlab-duo-workflow-service-client (~> 0.1)! gitlab-duo-workflow-service-client (~> 0.1)!
gitlab-experiment (~> 0.9.1) gitlab-experiment (~> 0.9.1)
gitlab-fog-azure-rm (~> 2.1.0) gitlab-fog-azure-rm (~> 2.2.0)
gitlab-glfm-markdown (~> 0.0.21) gitlab-glfm-markdown (~> 0.0.21)
gitlab-housekeeper! gitlab-housekeeper!
gitlab-http! gitlab-http!
gitlab-kas-grpc (~> 17.5.0) gitlab-kas-grpc (~> 17.6.1)
gitlab-labkit (~> 0.36.0) gitlab-labkit (~> 0.37.0)
gitlab-license (~> 2.5) gitlab-license (~> 2.6)
gitlab-mail_room (~> 0.0.24) gitlab-mail_room (~> 0.0.24)
gitlab-markup (~> 1.9.0) gitlab-markup (~> 1.9.0)
gitlab-net-dns (~> 0.9.2) gitlab-net-dns (~> 0.9.2)
@ -2084,12 +2092,12 @@ DEPENDENCIES
gitlab-secret_detection! gitlab-secret_detection!
gitlab-security_report_schemas (= 0.1.2.min15.0.0.max15.2.1) gitlab-security_report_schemas (= 0.1.2.min15.0.0.max15.2.1)
gitlab-sidekiq-fetcher! gitlab-sidekiq-fetcher!
gitlab-styles (~> 13.0.1) gitlab-styles (~> 13.0.2)
gitlab-topology-service-client (~> 0.1)! gitlab-topology-service-client (~> 0.1)!
gitlab-utils! gitlab-utils!
gitlab_chronic_duration (~> 0.12) gitlab_chronic_duration (~> 0.12)
gitlab_omniauth-ldap (~> 2.2.0) gitlab_omniauth-ldap (~> 2.2.0)
gitlab_quality-test_tooling (~> 2.1.0) gitlab_quality-test_tooling (~> 2.4.0)
gon (~> 6.4.0) gon (~> 6.4.0)
google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-androidpublisher_v3 (~> 0.34.0)
google-apis-cloudbilling_v1 (~> 0.21.0) google-apis-cloudbilling_v1 (~> 0.21.0)
@ -2139,7 +2147,7 @@ DEPENDENCIES
js_regex (~> 3.8) js_regex (~> 3.8)
json (~> 2.7.2) json (~> 2.7.2)
json_schemer (~> 2.3.0) json_schemer (~> 2.3.0)
jsonb_accessor (~> 1.3.10) jsonb_accessor (~> 1.4)
jwt (~> 2.9.3) jwt (~> 2.9.3)
kaminari (~> 1.2.2) kaminari (~> 1.2.2)
knapsack (~> 4.0.0) knapsack (~> 4.0.0)
@ -2224,21 +2232,21 @@ DEPENDENCIES
parslet (~> 1.8) parslet (~> 1.8)
peek (~> 1.1) peek (~> 1.1)
pg (~> 1.5.6) pg (~> 1.5.6)
pg_query (~> 5.1.0) pg_query (~> 6.0.0)
png_quantizator (~> 0.2.1) png_quantizator (~> 0.2.1)
premailer-rails (~> 1.12.0) premailer-rails (~> 1.12.0)
prometheus-client-mmap (= 1.1.2) prometheus-client-mmap (= 1.1.2)
pry-byebug pry-byebug
pry-rails (~> 0.3.9) pry-rails (~> 0.3.9)
pry-shell (~> 0.6.4) pry-shell (~> 0.6.4)
puma (= 6.4.3) puma (= 6.5.0)
rack (~> 2.2.9) rack (~> 2.2.9)
rack-attack (~> 6.7.0) rack-attack (~> 6.7.0)
rack-cors (~> 2.0.1) rack-cors (~> 2.0.1)
rack-oauth2 (~> 2.2.1) rack-oauth2 (~> 2.2.1)
rack-proxy (~> 0.7.7) rack-proxy (~> 0.7.7)
rack-timeout (~> 0.7.0) rack-timeout (~> 0.7.0)
rails (~> 7.0.8.4) rails (~> 7.0.8.6)
rails-controller-testing rails-controller-testing
rails-i18n (~> 7.0, >= 7.0.9) rails-i18n (~> 7.0, >= 7.0.9)
rainbow (~> 3.0) rainbow (~> 3.0)
@ -2246,7 +2254,7 @@ DEPENDENCIES
re2 (= 2.7.0) re2 (= 2.7.0)
recaptcha (~> 5.12) recaptcha (~> 5.12)
redis (~> 5.3.0) redis (~> 5.3.0)
redis-actionpack (~> 5.4.0) redis-actionpack (~> 5.5.0)
redis-clustering (~> 5.3.0) redis-clustering (~> 5.3.0)
redis-namespace (~> 1.11.0) redis-namespace (~> 1.11.0)
request_store (~> 1.5.1) request_store (~> 1.5.1)
@ -2263,7 +2271,7 @@ DEPENDENCIES
rspec_profiling (~> 0.0.9) rspec_profiling (~> 0.0.9)
rubocop rubocop
ruby-fogbugz (~> 0.3.0) ruby-fogbugz (~> 0.3.0)
ruby-lsp (~> 0.19.0) ruby-lsp (~> 0.21.0)
ruby-lsp-rails (~> 0.3.6) ruby-lsp-rails (~> 0.3.6)
ruby-lsp-rspec (~> 0.1.10) ruby-lsp-rspec (~> 0.1.10)
ruby-magic (~> 0.6) ruby-magic (~> 0.6)

View file

@ -1,15 +1,15 @@
src: src:
{ {
acme-client = { acme-client = {
dependencies = ["faraday" "faraday-retry"]; dependencies = ["base64" "faraday" "faraday-retry"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xgj5r8b7q242f3p9rr17v0q10dd9nx53gmscpmidz3gj90v7siz"; sha256 = "1y246a1wimhjbzsmgjnai1jwmp151afkygamrw1rac6y9jq7lr19";
type = "gem"; type = "gem";
}; };
version = "2.0.18"; version = "2.0.19";
}; };
actioncable = { actioncable = {
dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"];
@ -17,10 +17,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1c46q4ykf8cqcpzad7zhkrxjhvf92sil0185zvxwzhj95p1zp5vr"; sha256 = "0ms0196bp8gzlghfj32q2qdzszb7hsgg96v3isrv5ysd87w0z2zl";
type = "gem"; type = "gem";
}; };
version = "7.0.8.4"; version = "7.0.8.6";
}; };
actionmailbox = { actionmailbox = {
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"];
@ -28,10 +28,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0x100vq4rf2c5ndz8ai00hb5gsb9ax2xqc89dsfzzhxbpa9gs9ik"; sha256 = "0mw8casnlqgj3vwqv7qk3d4q3bjszlpmbs9ldpc9gz1qdvafx7cg";
type = "gem"; type = "gem";
}; };
version = "7.0.8.4"; version = "7.0.8.6";
}; };
actionmailer = { actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"];
@ -39,10 +39,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1hds7b6n7vsa64fmma7wl7x9mxscr89myfb13vxni5fcns1agwzr"; sha256 = "07gpm15k5c0y84q99zipnhcdgq93bwralyjpj252prvqwfjmiw73";
type = "gem"; type = "gem";
}; };
version = "7.0.8.4"; version = "7.0.8.6";
}; };
actionpack = { actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@ -50,10 +50,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "18k05a55i0xgyv60lx0m1psnyncn935j76ivbp9hssqpij00jj1f"; sha256 = "19ywl4jp77b51c01hsyzwia093fnj73pw1ipgyj4pk3h2b9faj5n";
type = "gem"; type = "gem";
}; };
version = "7.0.8.4"; version = "7.0.8.6";
}; };
actiontext = { actiontext = {
dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"];
@ -61,10 +61,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1g54g1kjyrwv9g592gxfz7z6ksmj916l1cgkxk54zhywxf6gpn0y"; sha256 = "1j8b29764nbiqz6d7ra42j2i6wf070lbms1fhpq3cl9azbgijb16";
type = "gem"; type = "gem";
}; };
version = "7.0.8.4"; version = "7.0.8.6";
}; };
actionview = { actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -72,10 +72,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "03rfynhj40270dqhkm4cyaphzb37b4fdiaqh9grvcfq760vx7ha5"; sha256 = "0girx71db1aq5b70ln3qq03z9d7xjdyp297v1a8rdal7k89y859c";
type = "gem"; type = "gem";
}; };
version = "7.0.8.4"; version = "7.0.8.6";
}; };
activejob = { activejob = {
dependencies = ["activesupport" "globalid"]; dependencies = ["activesupport" "globalid"];
@ -83,10 +83,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1b54didwsg5p8wn30qjwspzh97w7g07hrsdzr7wdrdly4zii7sr1"; sha256 = "0gbc0wx9xal5bj0pbz8ygkr75wj4cm5i69hpwknf023psgixaybw";
type = "gem"; type = "gem";
}; };
version = "7.0.8.4"; version = "7.0.8.6";
}; };
activemodel = { activemodel = {
dependencies = ["activesupport"]; dependencies = ["activesupport"];
@ -94,10 +94,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1mi5cppdmkzgr2z135ibs0bq71qndbnip0vfflz1n4j4hqnhjkpg"; sha256 = "1f6szahjsb4pr2xvlvk4kghk9291xh9c14s8cqwy6wwpm1vcglim";
type = "gem"; type = "gem";
}; };
version = "7.0.8.4"; version = "7.0.8.6";
}; };
activerecord = { activerecord = {
dependencies = ["activemodel" "activesupport"]; dependencies = ["activemodel" "activesupport"];
@ -105,10 +105,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1pkv0jvvjc3grr0rvxni9b3j3hb22jaj0h70g476h9w54p0aljcb"; sha256 = "14qs1jc9hwnsm4dzvnai8b36bcq1d7rcqgjxy0dc6wza670lqapf";
type = "gem"; type = "gem";
}; };
version = "7.0.8.4"; version = "7.0.8.6";
}; };
activerecord-explain-analyze = { activerecord-explain-analyze = {
dependencies = ["activerecord" "pg"]; dependencies = ["activerecord" "pg"];
@ -137,10 +137,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1qdqx20dqkg7iwzb8q5148x5sl9mr2063hxzy4i7i94af2d2vz6b"; sha256 = "1nnvqnmc7mdhw2w55j4vnx4zmmdmmwmaf6ax2mbj9j5a48fw19vf";
type = "gem"; type = "gem";
}; };
version = "7.0.8.4"; version = "7.0.8.6";
}; };
activesupport = { activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
@ -148,10 +148,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "15z11983ws5svibg6rky9k2mgd4d4chnvddyxfpgn81b81q70139"; sha256 = "0gj20cysajda05z3r7pl1g9y84nzsqak5dvk9nrz13jpy6297dj1";
type = "gem"; type = "gem";
}; };
version = "7.0.8.4"; version = "7.0.8.6";
}; };
addressable = { addressable = {
dependencies = ["public_suffix"]; dependencies = ["public_suffix"];
@ -400,10 +400,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "16mvscjhxdyhlvk2rpbxdzqmyikcf64xavb35grk4dkh0pg390rk"; sha256 = "06fvh863v0g7h14642yxy0plfnp4jg1g7pdazmv1gmkj3nz8b9kc";
type = "gem"; type = "gem";
}; };
version = "3.211.0"; version = "3.213.0";
}; };
aws-sdk-kms = { aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"]; dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -422,10 +422,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1jnf9k9d91ki3yvy12q4kph5wvd8l3ziwwh0qsmar5xhyb7zbwrz"; sha256 = "0hwj46w4ilynw5rilpydbykk7hp2hfg2rmwlnr0b4wy5f3aq7b52";
type = "gem"; type = "gem";
}; };
version = "1.169.0"; version = "1.172.0";
}; };
aws-sigv4 = { aws-sigv4 = {
dependencies = ["aws-eventstream"]; dependencies = ["aws-eventstream"];
@ -918,10 +918,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1lb5slzbqrca49h0gaifg82xky5r7i9xgm4560pin1xl5fp15lzx"; sha256 = "1gyjwd7in1nlf8zai2fxazxi8cy6xjzswdcjway520blb39ka7cx";
type = "gem"; type = "gem";
}; };
version = "0.23.10"; version = "0.23.11";
}; };
concurrent-ruby = { concurrent-ruby = {
groups = ["default" "development" "monorepo" "test"]; groups = ["default" "development" "monorepo" "test"];
@ -1062,6 +1062,16 @@ src:
}; };
version = "1.4.1"; version = "1.4.1";
}; };
csv = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zfn40dvgjk1xv1z8l11hr9jfg3jncwsc9yhzsz4l4rivkpivg8b";
type = "gem";
};
version = "3.3.0";
};
csv_builder = { csv_builder = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -1358,10 +1368,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0a6nbc12nfz355am2vwm1ql2p8zck7mr941glghmnl32djaga24b"; sha256 = "0v6jjb1259y8dq97ibchc20jqjgk3z7zn12ggv5wzn2mcz1z6m3d";
type = "gem"; type = "gem";
}; };
version = "5.7.1"; version = "5.8.1";
}; };
doorkeeper-device_authorization_grant = { doorkeeper-device_authorization_grant = {
dependencies = ["doorkeeper"]; dependencies = ["doorkeeper"];
@ -1380,10 +1390,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1bpw7flhhkfffbfpxrpc46hw1jrvmyafn8npqzhlds8ks68sj2ap"; sha256 = "0hip8n52fbrnv0pagx4ndap51j9wyrz5m0pw9v59mgicnnlzm3mj";
type = "gem"; type = "gem";
}; };
version = "1.8.9"; version = "1.8.10";
}; };
dotenv = { dotenv = {
groups = ["default"]; groups = ["default"];
@ -1716,10 +1726,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0vxaw0mg8avqivdj0lzj19nxf652ri208grsdf0361flyn5i5wi3"; sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm";
type = "gem"; type = "gem";
}; };
version = "2.12.1"; version = "2.12.2";
}; };
faraday-follow_redirects = { faraday-follow_redirects = {
dependencies = ["faraday"]; dependencies = ["faraday"];
@ -2048,10 +2058,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1cm2lrvhrpqq19hbdsxf4lq2nkb2qdldbdxh3gvi15l62dlb5zqq"; sha256 = "0s4qhq3mjl0gak5wl20w9d5jhq069mk1393dkj76s8i2pvkqb578";
type = "gem"; type = "gem";
}; };
version = "1.8.1"; version = "1.11.1";
}; };
fuubar = { fuubar = {
dependencies = ["rspec-core" "ruby-progressbar"]; dependencies = ["rspec-core" "ruby-progressbar"];
@ -2193,6 +2203,17 @@ src:
}; };
version = "0.10.5"; version = "0.10.5";
}; };
gitlab-cloud-connector = {
dependencies = ["activesupport" "jwt"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c042q0fcqmavs9ncnhiyzwf06xwv7i1jj43lydq07s68jm49sbf";
type = "gem";
};
version = "0.2.6";
};
gitlab-dangerfiles = { gitlab-dangerfiles = {
dependencies = ["danger" "danger-gitlab" "rake"]; dependencies = ["danger" "danger-gitlab" "rake"];
groups = ["danger" "development" "test"]; groups = ["danger" "development" "test"];
@ -2231,10 +2252,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1p8bmbkfc0dkq663vxm9nx7kaajnqa5in1mcz0c8z31a86gcvgpm"; sha256 = "1acbwzi4dkixfmb2rggzf4pg65cyxhbggrs4642p8y7mf0hpraii";
type = "gem"; type = "gem";
}; };
version = "2.1.0"; version = "2.2.0";
}; };
gitlab-glfm-markdown = { gitlab-glfm-markdown = {
dependencies = ["rb_sys"]; dependencies = ["rb_sys"];
@ -2242,10 +2263,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0h1vsqblhy9bqw01nsyylmhz0b50n17r7p69c2s757ahpk0hm5nb"; sha256 = "097zykj89jqbp9gl62132bwv8qcxp3vr8w8bvdm35slsqc4jk8c9";
type = "gem"; type = "gem";
}; };
version = "0.0.21"; version = "0.0.23";
}; };
gitlab-housekeeper = { gitlab-housekeeper = {
dependencies = ["activesupport" "awesome_print" "httparty" "rubocop"]; dependencies = ["activesupport" "awesome_print" "httparty" "rubocop"];
@ -2273,10 +2294,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "19qwlv3kjszypx8in77llqanlsgdcb16wsgzzfkph79hm7x9nqw8"; sha256 = "11v8jy5dv5vknrgzpasbdncy6jxpxsnrbbz9kpaxpky2k9n7s1fg";
type = "gem"; type = "gem";
}; };
version = "17.5.1"; version = "17.6.2";
}; };
gitlab-labkit = { gitlab-labkit = {
dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"];
@ -2284,20 +2305,20 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0063h3aksh4jp5s7mrir5r2dr94643x736cgxvf1zz75nx0nkyq4"; sha256 = "0w7szxnvh9hvxcragnqvn37c6jpm4gf7aadzxslajj91vdh0mpfj";
type = "gem"; type = "gem";
}; };
version = "0.36.1"; version = "0.37.0";
}; };
gitlab-license = { gitlab-license = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0k9zaybfzp7q8w07ghf44q3yngxyrr68l623r9v7il9aki36q5jc"; sha256 = "05nhswkfhxkr5y87gkq17h23a1kkr78c2n7pgg3hwr1m73kql7rc";
type = "gem"; type = "gem";
}; };
version = "2.5.0"; version = "2.6.0";
}; };
gitlab-mail_room = { gitlab-mail_room = {
dependencies = ["jwt" "net-imap" "oauth2" "redis" "redis-namespace"]; dependencies = ["jwt" "net-imap" "oauth2" "redis" "redis-namespace"];
@ -2382,14 +2403,14 @@ src:
version = "0.3.1"; version = "0.3.1";
}; };
gitlab-secret_detection = { gitlab-secret_detection = {
dependencies = ["parallel" "re2" "toml-rb"]; dependencies = ["grpc" "grpc-tools" "parallel" "re2" "toml-rb"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
path = "${src}/gems/gitlab-secret_detection"; path = "${src}/gems/gitlab-secret_detection";
type = "path"; type = "path";
}; };
version = "0.1.0"; version = "0.1.1";
}; };
gitlab-security_report_schemas = { gitlab-security_report_schemas = {
dependencies = ["activesupport" "json_schemer"]; dependencies = ["activesupport" "json_schemer"];
@ -2418,10 +2439,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1gb89c035f32hj8iam4hxlyx6c7f1apq66hzzrvan5djjzz4065z"; sha256 = "0qf8rsw6yv4dzaq8kgbrh7wlfr89j5hf5yb1m1aknxj38qrvjqp6";
type = "gem"; type = "gem";
}; };
version = "13.0.1"; version = "13.0.2";
}; };
gitlab-topology-service-client = { gitlab-topology-service-client = {
dependencies = ["grpc"]; dependencies = ["grpc"];
@ -2471,10 +2492,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0z74fj5gklxpq8bc622f6psaaz8fpkg08q4lf28kj9krcx3b0jw3"; sha256 = "181nzcn5ny8wc4vs737j9fwsmm25yps4kvwwkhdky985id914k1f";
type = "gem"; type = "gem";
}; };
version = "2.1.0"; version = "2.4.0";
}; };
globalid = { globalid = {
dependencies = ["activesupport"]; dependencies = ["activesupport"];
@ -2930,10 +2951,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0sc2s5yprba7i6x8iskd39fsp93r04xa08wbz1m5bygvj0lb7zpf"; sha256 = "1dbg7xp1jgcfnmpvv8xcpzxandjkhqpsfybiwipz0sj7br685zzn";
type = "gem"; type = "gem";
}; };
version = "2.4.1"; version = "2.4.8";
}; };
graphql-client = { graphql-client = {
dependencies = ["activesupport" "graphql"]; dependencies = ["activesupport" "graphql"];
@ -2979,6 +3000,16 @@ src:
}; };
version = "1.5.0"; version = "1.5.0";
}; };
grpc-tools = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h7abfifclwhfipxx6iwc7cr4h3hq69wd992dj2bzg4dds6yhg8k";
type = "gem";
};
version = "1.63.0";
};
gssapi = { gssapi = {
dependencies = ["ffi"]; dependencies = ["ffi"];
groups = ["kerberos"]; groups = ["kerberos"];
@ -3276,14 +3307,15 @@ src:
version = "0.1.8"; version = "0.1.8";
}; };
influxdb-client = { influxdb-client = {
dependencies = ["csv"];
groups = ["development" "test"]; groups = ["development" "test"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1j01r3rhai3h0bgq7npi49xz6ahm5sj6zag8b0l3amdxp82wb7ay"; sha256 = "1wp1p29hg5xb1izrl5xr6azp8x0l9kx9nvdg66glrxj20p48w7nw";
type = "gem"; type = "gem";
}; };
version = "3.1.0"; version = "3.2.0";
}; };
invisible_captcha = { invisible_captcha = {
dependencies = ["rails"]; dependencies = ["rails"];
@ -3427,10 +3459,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1q2q9i2kf4p6vw8fbzvsd037wl837gpsiiikjazf6fdfayi803v7"; sha256 = "1avnyx2ympzbmkqbc9dfy87npzcfia8sys2dc9m6prs3p1y0h3h1";
type = "gem"; type = "gem";
}; };
version = "1.3.10"; version = "1.4";
}; };
jsonpath = { jsonpath = {
dependencies = ["multi_json"]; dependencies = ["multi_json"];
@ -3935,10 +3967,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0qr3vf0qc216kyyv2vnp8p9pv73di6zd6v9sx51qw5awrd90y6iz"; sha256 = "105pjjmncf7q724swbygrbsgmh74ni4s2xaclbyjcm7zg64maca0";
type = "gem"; type = "gem";
}; };
version = "0.6.0"; version = "0.6.1";
}; };
msgpack = { msgpack = {
groups = ["default"]; groups = ["default"];
@ -4186,10 +4218,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; sha256 = "18ajyy4d16q4ahnrfmj6d6z9ak21mnbn4wblx2vddck3lvwlpkny";
type = "gem"; type = "gem";
}; };
version = "1.16.7"; version = "1.16.8";
}; };
notiffany = { notiffany = {
dependencies = ["nenv" "shellany"]; dependencies = ["nenv" "shellany"];
@ -4550,10 +4582,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "16nbkayp8jb2zkqj2rmqd4d1mz4wdf0zg6jx8b0vzkf9mxr89py5"; sha256 = "00mbrqmpk7p3wy377izsspshzdb849b9dv22z8f2hajcpr2im0id";
type = "gem"; type = "gem";
}; };
version = "0.9.0"; version = "0.10.0";
}; };
opentelemetry-instrumentation-action_view = { opentelemetry-instrumentation-action_view = {
dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"];
@ -4583,10 +4615,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1j61jv60hdvjs18rj7i3lbkd5zqkfm8fdx15c0ixdxc15q88778r"; sha256 = "14aar8w2szn5fi7j3lg35qlq1r12ka6lvcrcn700agv5nm3han5y";
type = "gem"; type = "gem";
}; };
version = "0.8.0"; version = "0.8.1";
}; };
opentelemetry-instrumentation-active_support = { opentelemetry-instrumentation-active_support = {
dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"];
@ -4748,10 +4780,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "13nj66l0jhs4pz4krlncyach5zb1bbb82bfipkvc33b0dmicll88"; sha256 = "0v9021ixcfs9shwf2c130gd0xxpwz8p1d5r7bci15mmrzq7wj37h";
type = "gem"; type = "gem";
}; };
version = "0.32.0"; version = "0.33.0";
}; };
opentelemetry-instrumentation-rake = { opentelemetry-instrumentation-rake = {
dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"];
@ -4972,10 +5004,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "071b55bhsz7mivlnp2kv0a11msnl7xg5awvk8mlflpl270javhsb"; sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn";
type = "gem"; type = "gem";
}; };
version = "1.5.6"; version = "1.5.9";
}; };
pg_query = { pg_query = {
dependencies = ["google-protobuf"]; dependencies = ["google-protobuf"];
@ -4983,10 +5015,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0p8ljf694qvrf5875ljg6kp7gvmndy8490kasjzcq22ghryg9xxp"; sha256 = "012w1ypcbzy6w4dsxiziqn1vqddwzpza3zdvw9hivvhcj179mw7v";
type = "gem"; type = "gem";
}; };
version = "5.1.0"; version = "6.0.0";
}; };
plist = { plist = {
groups = ["default"]; groups = ["default"];
@ -5046,10 +5078,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0ywvpskabdm0ckg6b3cf1jczg1jkjnb1mr0g73cy5l09xdlx5w25"; sha256 = "0bvdq2jsn1jj8vgp9xrmi6ljw0hqlv4i97v5aa0fcii34g9rrzr4";
type = "gem"; type = "gem";
}; };
version = "1.1.0"; version = "1.2.0";
}; };
proc_to_ast = { proc_to_ast = {
dependencies = ["coderay" "parser" "unparser"]; dependencies = ["coderay" "parser" "unparser"];
@ -5133,10 +5165,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; sha256 = "1wl9q4fl8gvhwdpfxghx6jdqi4508287pcgiwi96sdbzmdfbglcl";
type = "gem"; type = "gem";
}; };
version = "6.4.3"; version = "6.5.0";
}; };
pyu-ruby-sasl = { pyu-ruby-sasl = {
groups = ["default"]; groups = ["default"];
@ -5282,10 +5314,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1sv5jzd3varqzcqm8zxllwiqzgbgcymszw12ci3f9zbzlliq8hby"; sha256 = "1s42lyl19h74xlqkb6ffl67h688q0slp1lhnd05g09a46z7wapri";
type = "gem"; type = "gem";
}; };
version = "7.0.8.4"; version = "7.0.8.6";
}; };
rails-controller-testing = { rails-controller-testing = {
dependencies = ["actionpack" "actionview" "activesupport"]; dependencies = ["actionpack" "actionview" "activesupport"];
@ -5315,10 +5347,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1pm4z853nyz1bhhqr7fzl44alnx4bjachcr6rh6qjj375sfz3sc6"; sha256 = "1w6bqm8d3afc66ff6npnsc2d8ky552n6qzwwwc1bh0wz6c8gplp3";
type = "gem"; type = "gem";
}; };
version = "1.6.0"; version = "1.6.1";
}; };
rails-i18n = { rails-i18n = {
dependencies = ["i18n" "railties"]; dependencies = ["i18n" "railties"];
@ -5337,10 +5369,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "02z7lqx0y60bzpkd4v67i9sbdh7djs0mm89h343kidx0gmq0kbh0"; sha256 = "1fcn0ix814074gqicc0k1178f7ahmysiv3pfq8g00phdwj0p3w0g";
type = "gem"; type = "gem";
}; };
version = "7.0.8.4"; version = "7.0.8.6";
}; };
rainbow = { rainbow = {
groups = ["coverage" "default" "development" "test"]; groups = ["coverage" "default" "development" "test"];
@ -5399,10 +5431,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1bnb361ca6gizncs8qybfrm1m9pin2siw548pizfd5l711mrzn4f"; sha256 = "1h1jal1sv47saxyk33nnjk2ywrsf35aar18p7mc48s2m33876wpd";
type = "gem"; type = "gem";
}; };
version = "3.5.1"; version = "3.6.1";
}; };
rbtrace = { rbtrace = {
dependencies = ["ffi" "msgpack" "optimist"]; dependencies = ["ffi" "msgpack" "optimist"];
@ -5494,10 +5526,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0h1mx8shrzpcj27k9kw77f4cq7i217vxfd1ksqb4g485md4zc37i"; sha256 = "049kd6480j16d3xmnsayqmmrircffympzf8pbjrn5v0lijvp01fw";
type = "gem"; type = "gem";
}; };
version = "5.4.0"; version = "5.5.0";
}; };
redis-client = { redis-client = {
dependencies = ["connection_pool"]; dependencies = ["connection_pool"];
@ -5859,10 +5891,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "131pbjl7bv9g9qli84j91kgqmcqzdm2flq7r9abskl3ndqiagk4c"; sha256 = "0ay1lrz3ffrznjfr65c6xvkinb6m4l7h68cd9qbrf7nq0j2m1pq7";
type = "gem"; type = "gem";
}; };
version = "1.67.0"; version = "1.68.0";
}; };
rubocop-ast = { rubocop-ast = {
dependencies = ["parser"]; dependencies = ["parser"];
@ -5969,10 +6001,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1vcc2jib05p8lf09mczxyd2rw89gybbk8lkc08ckzq53lqvzj4yh"; sha256 = "1hayvpcmgjylxpgxs05jdzyahar4cxpgwhg2b6gg1qhcfhky7i2i";
type = "gem"; type = "gem";
}; };
version = "0.19.1"; version = "0.21.3";
}; };
ruby-lsp-rails = { ruby-lsp-rails = {
dependencies = ["ruby-lsp"]; dependencies = ["ruby-lsp"];
@ -5980,10 +6012,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1l8z5m81519ki6p33s8xxy3vbcvp71did91pzvhr129a7cqhxs14"; sha256 = "0lb39frvjwm25iw0q7bzbv6hyh2p2p634fsnplkxz9vqgb0r53pm";
type = "gem"; type = "gem";
}; };
version = "0.3.17"; version = "0.3.26";
}; };
ruby-lsp-rspec = { ruby-lsp-rspec = {
dependencies = ["ruby-lsp"]; dependencies = ["ruby-lsp"];
@ -5991,10 +6023,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "17dxzzywxy8x78nxm24czdc9jf75ghgqijj396q1mx0nknmd9vni"; sha256 = "0qf43lkvf6v0c5z173sqbxw9vk1vwjfwaq9ynj658kzba8pqjvjf";
type = "gem"; type = "gem";
}; };
version = "0.1.15"; version = "0.1.18";
}; };
ruby-magic = { ruby-magic = {
dependencies = ["mini_portile2"]; dependencies = ["mini_portile2"];
@ -6180,10 +6212,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1md0sixm8dq8a7riv50x4q1z273q47b5jvcbv5hxympxn3ran4by"; sha256 = "1q5nbszbxz566yzyiv0a4lvfk56q89k0lk4mqp6wyddrc2nz88c8";
type = "gem"; type = "gem";
}; };
version = "4.25.0"; version = "4.27.0";
}; };
semver_dialects = { semver_dialects = {
dependencies = ["deb_version" "pastel" "thor" "tty-command"]; dependencies = ["deb_version" "pastel" "thor" "tty-command"];
@ -6432,10 +6464,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1fsq1k58isarg6ycg2ix9sw9a6391y12ss48m3hcryqi902w7cny"; sha256 = "1dpxyhph8rp0bwiacqjsvsm67gm6v7bw16na20rk59g6y8953dk4";
type = "gem"; type = "gem";
}; };
version = "0.5.11266"; version = "0.5.11647";
}; };
spamcheck = { spamcheck = {
dependencies = ["grpc"]; dependencies = ["grpc"];
@ -6717,10 +6749,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0x0gj68an9nkb8pvlzxs7m5n3ip3fizlw9s4kgkyj5kjqgpw6swn"; sha256 = "1mydvmcm4m5501322wyl3pwmc6i5ijvwh4kb242l085j88hiqp4n";
type = "gem"; type = "gem";
}; };
version = "1.4.0"; version = "1.4.2";
}; };
test_file_finder = { test_file_finder = {
dependencies = ["faraday"]; dependencies = ["faraday"];
@ -7027,25 +7059,14 @@ src:
version = "2.4.2"; version = "2.4.2";
}; };
unicode-emoji = { unicode-emoji = {
dependencies = ["unicode-version"];
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1zis8a993f4hxmcmmacm7rwzd06hpzfs7aa4zqqik39gg8pxz74l"; sha256 = "0ajk6rngypm3chvl6r0vwv36q1931fjqaqhjjya81rakygvlwb1c";
type = "gem"; type = "gem";
}; };
version = "4.0.0"; version = "4.0.4";
};
unicode-version = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qvmcyv9gh5i0x4pzd30jn1j9vn6h67zaiymmklz4b8498srlh2n";
type = "gem";
};
version = "1.4.0";
}; };
unicode_utils = { unicode_utils = {
groups = ["default"]; groups = ["default"];
@ -7265,10 +7286,10 @@ src:
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3";
type = "gem"; type = "gem";
}; };
version = "1.8.1"; version = "1.8.2";
}; };
websocket = { websocket = {
groups = ["default" "test"]; groups = ["default" "test"];

View file

@ -0,0 +1,41 @@
{
stdenv,
lib,
fetchFromGitHub,
autoreconfHook,
sbcl,
texinfo,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "stumpwm";
version = "24.11";
src = fetchFromGitHub {
owner = "stumpwm";
repo = "stumpwm";
rev = "${finalAttrs.version}";
hash = "sha256-Ba2HcAmNcZvnqU0jpLTxsBe8L+4aHbO/oM4Bp/IYEC0=";
};
nativeBuildInputs = [
autoreconfHook
sbcl
texinfo
];
doCheck = true;
postConfigure = ''
export ASDF_OUTPUT_TRANSLATIONS=$(pwd):$(pwd)
'';
meta = {
description = "Tiling, keyboard driven window manager";
homepage = "https://stumpwm.github.io/";
license = lib.licenses.gpl2Plus;
mainProgram = "stumpwm";
maintainers = lib.teams.lisp.members;
platforms = lib.platforms.unix;
};
})

View file

@ -48,6 +48,11 @@ python3Packages.buildPythonPackage rec {
pytestFlagsArray = [ "tests/static" ]; pytestFlagsArray = [ "tests/static" ];
disabledTests = [
# disable copyright year check of files
"current_year"
];
meta = { meta = {
description = "Automatically build (and test) feature-rich configurations for BGP route servers"; description = "Automatically build (and test) feature-rich configurations for BGP route servers";
mainProgram = "arouteserver"; mainProgram = "arouteserver";

View file

@ -7,12 +7,12 @@
let let
pname = "cables"; pname = "cables";
version = "0.4.4"; version = "0.5.0";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage"; url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage";
sha256 = "sha256-+PMENdKs/bcmszlrk0hQILZzKCV8uQbCgR0bbKMk7ic="; sha256 = "sha256-rwnCIIPQ7a+SDehtl72Q3K3igJmVcOyhKUb9lpW7Zvo=";
}; };
appimageContents = appimageTools.extract { appimageContents = appimageTools.extract {

File diff suppressed because it is too large Load diff

View file

@ -28,25 +28,20 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "firefoxpwa"; pname = "firefoxpwa";
version = "2.13.1"; version = "2.13.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "filips123"; owner = "filips123";
repo = "PWAsForFirefox"; repo = "PWAsForFirefox";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-eZNbM2T7Owu11b7NHqHExm3MYF+LfMGOYKOhZRxjZ28="; hash = "sha256-0VHuS507uQXaRRYjaJ9uPh1bhPrxA6PQa/x5o4IE78U=";
}; };
sourceRoot = "${src.name}/native"; sourceRoot = "${src.name}/native";
buildFeatures = [ "immutable-runtime" ]; buildFeatures = [ "immutable-runtime" ];
cargoLock = { useFetchCargoVendor = true;
lockFile = ./Cargo.lock; cargoHash = "sha256-UxUXXF13YyS+ViEsjjfuNinq7n4W28J+fZsy/WeV6Dc=";
outputHashes = {
"mime-0.4.0-a.0" = "sha256-LjM7LH6rL3moCKxVsA+RUL9lfnvY31IrqHa9pDIAZNE=";
"web_app_manifest-0.0.0" = "sha256-G+kRN8AEmAY1TxykhLmgoX8TG8y2lrv7SCRJlNy0QzA=";
};
};
preConfigure = '' preConfigure = ''
sed -i 's;version = "0.0.0";version = "${version}";' Cargo.toml sed -i 's;version = "0.0.0";version = "${version}";' Cargo.toml
@ -158,7 +153,6 @@ rustPlatform.buildRustPackage rec {
license = lib.licenses.mpl20; license = lib.licenses.mpl20;
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
adamcstephens
camillemndn camillemndn
pasqui23 pasqui23
]; ];

View file

@ -0,0 +1,195 @@
# generated by zon2nix (https://github.com/Cloudef/zig2nix)
{
lib,
linkFarm,
fetchurl,
fetchgit,
runCommandLocal,
zig,
name ? "zig-packages",
}:
with builtins;
with lib;
let
unpackZigArtifact =
{ name, artifact }:
runCommandLocal name
{
nativeBuildInputs = [ zig ];
}
''
hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
mv "$TMPDIR/p/$hash" "$out"
chmod 755 "$out"
'';
fetchZig =
{
name,
url,
hash,
}:
let
artifact = fetchurl { inherit url hash; };
in
unpackZigArtifact { inherit name artifact; };
fetchGitZig =
{
name,
url,
hash,
}:
let
parts = splitString "#" url;
url_base = elemAt parts 0;
url_without_query = elemAt (splitString "?" url_base) 0;
rev_base = elemAt parts 1;
rev = if match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}";
in
fetchgit {
inherit name rev hash;
url = url_without_query;
deepClone = false;
};
fetchZigArtifact =
{
name,
url,
hash,
}:
let
parts = splitString "://" url;
proto = elemAt parts 0;
path = elemAt parts 1;
fetcher = {
"git+http" = fetchGitZig {
inherit name hash;
url = "http://${path}";
};
"git+https" = fetchGitZig {
inherit name hash;
url = "https://${path}";
};
http = fetchZig {
inherit name hash;
url = "http://${path}";
};
https = fetchZig {
inherit name hash;
url = "https://${path}";
};
};
in
fetcher.${proto};
in
linkFarm name [
{
name = "1220930a42f8da3fb7f723e3ad3f6dcc6db76327dd8d26274566423192d53e91b2bb";
path = fetchZigArtifact {
name = "flags";
url = "https://github.com/n0s4/flags/archive/b3905aa990719ff567f1c5a2f89e6dd3292d8533.tar.gz";
hash = "sha256-2lN2goQgjU5Hf18tvDV/csS83A20nA9Iu2/fKXtpZok=";
};
}
{
name = "1220a2c8f8db1b5265458ac967ea1f7cc0a8ddcd1d774df3b73d86c4f529aadbfb94";
path = fetchZigArtifact {
name = "tracy";
url = "https://github.com/neurocyte/zig-tracy/archive/58999b786089e5319dd0707f6afbfca04c6340e7.tar.gz";
hash = "sha256-4q1UD2hRtp9mUPL5wIKzk8AhnAoVkl9xpaUN5sp4mWA=";
};
}
{
name = "12202aac930cebaf2b57f443cacc2483478580a72f1316b4f0a720ddd91246fce69d";
path = fetchZigArtifact {
name = "tracy_src";
url = "https://github.com/wolfpld/tracy/archive/refs/tags/v0.10.tar.gz";
hash = "sha256-p2AX2Sjz8nJ1QPuVDt07c2yql7Etu05e3OZlQsvqZgA=";
};
}
{
name = "1220220dbc7fe91c1c54438193ca765cebbcb7d58f35cdcaee404a9d2245a42a4362";
path = fetchZigArtifact {
name = "dizzy";
url = "https://github.com/neurocyte/dizzy/archive/455d18369cbb2a0458ba70be919cd378338d695e.tar.gz";
hash = "sha256-PKCqS8/sEieEA3ZONEsBHq+am02JRHG9waYzn2GnYgI=";
};
}
{
name = "1220f6fdc977fff899aaf624afc8cf01e29a0e100dbb52860902a3bc256f4ddd687b";
path = fetchZigArtifact {
name = "thespian";
url = "https://github.com/neurocyte/thespian/archive/9df7beb192dd0db647e55fe44272b77ca687f6cd.tar.gz";
hash = "sha256-b8PPqmiURT9bOaa2ubz/v0J2WEyRmtL6iL4nBDkvgeQ=";
};
}
{
name = "1220c85e0d9438ec518849c84e3ea66633a0e191e49c4ae4bbb3bc46626cd8dfad75";
path = fetchZigArtifact {
name = "asio";
url = "https://github.com/neurocyte/asio/archive/b9c9c23ef2e6f11b6123535ec33e5a23ed0c59da.tar.gz";
hash = "sha256-tD9lxE6RRAptBE9suZA4ANpT5x/B3e4YINay9Se78XY=";
};
}
{
name = "1220b2109e0aadf85e4ac5e1cd084e321fe50f1e59cea690c022a7a8f7eb6021eadb";
path = fetchZigArtifact {
name = "themes";
url = "https://github.com/neurocyte/flow-themes/releases/download/master-0c2a187c604c63031225847a966b6ca279b2be91/flow-themes.tar.gz";
hash = "sha256-8zumZneeSPVrpw2wAQwKoEOXCLYqkKQFVXQ8oum08Hw=";
};
}
{
name = "122019f077d09686b1ec47928ca2b4bf264422f3a27afc5b49dafb0129a4ceca0d01";
path = fetchZigArtifact {
name = "fuzzig";
url = "https://github.com/fjebaker/fuzzig/archive/0fd156d5097365151e85a85eef9d8cf0eebe7b00.tar.gz";
hash = "sha256-XVOKqHX2X8HvRDJgnqVEPN/A0hFvCk8Fgsss0CKInYQ=";
};
}
{
name = "12202ee9842d28927674e552f1ea41e2c41e59f6b4b5d290de9b6fd626fd332ac627";
path = fetchZigArtifact {
name = "vaxis";
url = "https://github.com/neurocyte/libvaxis/archive/ffe35b4342bd2913efd46c35c0ccd15544ac87e6.tar.gz";
hash = "sha256-AQpYS1WnHLzcUMhD8BaCd+Dh+nqY5umL6KCBTuVlSQw=";
};
}
{
name = "1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5";
path = fetchZigArtifact {
name = "zigimg";
url = "git+https://github.com/zigimg/zigimg#3a667bdb3d7f0955a5a51c8468eac83210c1439e";
hash = "sha256-oLf3YH3yeg4ikVO/GahMCDRMTU31AHkfSnF4rt7xTKo=";
};
}
{
name = "122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40";
path = fetchZigArtifact {
name = "zg";
url = "https://github.com/neurocyte/zg/archive/refs/tags/v0.13.2.tar.gz";
hash = "sha256-Hd8HlYEkkA/2BLW+4d/0Ibw7r7U533us3n2QR+XG/PQ=";
};
}
{
name = "1220755ea2a5aa6bb3713437aaafefd44812169fe43f1da755c3ee6101b85940f441";
path = fetchZigArtifact {
name = "zeit";
url = "https://github.com/rockorager/zeit/archive/9cca8ec620a54c3b07cd249f25e5bcb3153d03d7.tar.gz";
hash = "sha256-4bxyQKbVUtYzZixUq2d+iiSPGkcwg+dG4WLaDYYQzn8=";
};
}
{
name = "12204c99c6093230023380068f386f7eb32ab83df9a8eb8b586ffe5aa44afa34ff0e";
path = fetchZigArtifact {
name = "tree-sitter";
url = "https://github.com/neurocyte/tree-sitter/releases/download/master-aea6072c6178d5cd0c97fff33e130f632f355bc2/source.tar.gz";
hash = "sha256-eqJc3lx+tnbiqcD8R0u4+sH7wKOr4McYiZNUfPTNbRc=";
};
}
]

View file

@ -0,0 +1,37 @@
{
lib,
fetchFromGitHub,
stdenv,
zig_0_13,
callPackage,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "flow";
version = "0.2.1";
src = fetchFromGitHub {
owner = "neurocyte";
repo = "flow";
tag = "v${finalAttrs.version}";
hash = "sha256-dXWqxV66BwtjOvmreq4+u5+xBI+1v1PAep8RQBK3rlA=";
};
postPatch = ''
ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
nativeBuildInputs = [
zig_0_13.hook
];
env.VERSION = finalAttrs.version;
meta = {
description = "Programmer's text editor";
homepage = "https://github.com/neurocyte/flow";
changelog = "https://github.com/neurocyte/flow/releases/tag/v${finalAttrs.version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ genga898 ];
mainProgram = "flow";
};
})

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "gemmi"; pname = "gemmi";
version = "0.6.7"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "project-gemmi"; owner = "project-gemmi";
repo = "gemmi"; repo = "gemmi";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-Y7gQSh9C7smoXuGWgpJI3hPIg06Jns+1dBpmMxuCrKE="; hash = "sha256-XOu//yY5CnnzjvGu7IIC5GvecYsnZQV3Y2wvGVTwWzU=";
}; };
nativeBuildInputs = nativeBuildInputs =
@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals enablePython ( ++ lib.optionals enablePython (
with python3Packages; with python3Packages;
[ [
pybind11 nanobind
python python
pythonImportsCheckHook pythonImportsCheckHook
] ]
@ -44,7 +44,15 @@ stdenv.mkDerivation (finalAttrs: {
doInstallCheck = enablePython; doInstallCheck = enablePython;
nativeInstallCheckInputs = [ python3Packages.pytestCheckHook ]; nativeInstallCheckInputs = with python3Packages; [
# biopython
numpy
pytestCheckHook
];
preInstallCheck = ''
export PATH=$out/bin:$PATH
'';
pytestFlagsArray = [ "../tests" ]; pytestFlagsArray = [ "../tests" ];

View file

@ -10,14 +10,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gitaly-git"; pname = "gitaly-git";
version = "2.46.2"; version = "2.47.0";
# `src` attribute for nix-update # `src` attribute for nix-update
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "git"; repo = "git";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-LQqb3lmYIqtwIHR5KHg/Cm568CxQqeGOBAQeXphqSXo="; hash = "sha256-KG8YYGVWkfazVm8lOGs+Tg79wDl5O33JLkKrYBSIZYk=";
}; };
# we actually use the gitaly build system # we actually use the gitaly build system

View file

@ -7,7 +7,7 @@
}: }:
let let
version = "17.6.2"; version = "17.7.1";
package_version = "v${lib.versions.major version}"; package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -21,10 +21,10 @@ let
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitaly"; repo = "gitaly";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-i+Yk5hFhtIxf12crSJRbkHNbfPy9ZbxSNFEPwFOovhE="; hash = "sha256-XklkFdp2tIZewIxi9XY1HQ1toL590tvY1DQ/VNF/QQo=";
}; };
vendorHash = "sha256-AxuAEiYV3jwWxcuTLc1i4/6sG957YIA+Fmky5Dkdzu8="; vendorHash = "sha256-STZvZqqCbW/n3uZohYmz/2lJNkiUUcVjs0msL/lDDaE=";
ldflags = [ ldflags = [
"-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.version=${version}"

View file

@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "github-backup"; pname = "github-backup";
version = "0.47.0"; version = "0.48.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "josegonzalez"; owner = "josegonzalez";
repo = "python-github-backup"; repo = "python-github-backup";
tag = version; tag = version;
hash = "sha256-BnsPVSyQuoNH56M2ZwOyWGXjWI9sGS1S8vQzCQEqNcY="; hash = "sha256-vJD+dzKHYgiDme+wXklbxkbOPKwbilOWfJknsS37+vw=";
}; };
build-system = with python3Packages; [ build-system = with python3Packages; [

View file

@ -6,17 +6,17 @@
buildGoModule rec { buildGoModule rec {
pname = "gitlab-pages"; pname = "gitlab-pages";
version = "17.6.2"; version = "17.7.1";
# nixpkgs-update: no auto update # nixpkgs-update: no auto update
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-pages"; repo = "gitlab-pages";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-iO6kMggGajB7ARXsJynEVbgd7iPBBp0x6J1lKuOxgH4="; hash = "sha256-DbrasgqowycZNJ2VWwpMBw9SQCxfV47aDVMJrUOQ/Es=";
}; };
vendorHash = "sha256-2feUOWcGj7eQ43rfM6IF55BawYVP4UY5sKA29Y9ozPk="; vendorHash = "sha256-pJj0BaplDwlNiD+Aqkh1dvu8NfxMhuunK1fnM7TQmuw=";
subPackages = [ "." ]; subPackages = [ "." ];
meta = with lib; { meta = with lib; {

View file

@ -2,9 +2,9 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
gitUpdater,
installShellFiles, installShellFiles,
rustPlatform, rustPlatform,
Security,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -13,17 +13,15 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mike-engel"; owner = "mike-engel";
repo = pname; repo = "jwt-cli";
rev = version; tag = version;
sha256 = "sha256-2pYCNLopvIHcKiN4qewQCdkGWHYQ6vQVCaApxGsRG9E="; hash = "sha256-2pYCNLopvIHcKiN4qewQCdkGWHYQ6vQVCaApxGsRG9E=";
}; };
cargoHash = "sha256-M/9b+iPufq0S7P2PdPYIDS1to5WAtJbS3O/+NfO3sbY="; cargoHash = "sha256-M/9b+iPufq0S7P2PdPYIDS1to5WAtJbS3O/+NfO3sbY=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd jwt \ installShellCompletion --cmd jwt \
--bash <($out/bin/jwt completion bash) \ --bash <($out/bin/jwt completion bash) \
@ -32,17 +30,21 @@ rustPlatform.buildRustPackage rec {
''; '';
doInstallCheck = true; doInstallCheck = true;
installCheckPhase = '' installCheckPhase = ''
$out/bin/jwt --version > /dev/null $out/bin/jwt --version > /dev/null
$out/bin/jwt decode eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c \ $out/bin/jwt decode eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c \
| grep -q 'John Doe' | grep -q 'John Doe'
''; '';
meta = with lib; { passthru.updateScript = gitUpdater { };
meta = {
description = "Super fast CLI tool to decode and encode JWTs"; description = "Super fast CLI tool to decode and encode JWTs";
homepage = "https://github.com/mike-engel/jwt-cli"; homepage = "https://github.com/mike-engel/jwt-cli";
license = with licenses; [ mit ]; changelog = "https://github.com/mike-engel/jwt-cli/releases/tag/${version}";
maintainers = with maintainers; [ rycee ]; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ rycee ];
mainProgram = "jwt"; mainProgram = "jwt";
}; };
} }

View file

@ -9,18 +9,18 @@
buildGoModule rec { buildGoModule rec {
pname = "kubescape"; pname = "kubescape";
version = "3.0.22"; version = "3.0.23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubescape"; owner = "kubescape";
repo = "kubescape"; repo = "kubescape";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-m1tfYuRDPxm8Q1e4RIzqfkv9vOjGUPvI0FADvYXep/c="; hash = "sha256-LC5m+r38mm5c8dmlo4+E5eWlfF0xJIglTcGpvY3EDOg=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
proxyVendor = true; proxyVendor = true;
vendorHash = "sha256-+DmElfOZcSnGaxEj4Ca1ysIb1M7N0kxtJx8+TXFOREY="; vendorHash = "sha256-J8+GyOgzR2MkJSskM7lzloyKw/JywCT38WFnosg6ACM=";
subPackages = [ "." ]; subPackages = [ "." ];

View file

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "ldeep"; pname = "ldeep";
version = "1.0.78"; version = "1.0.79";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "franc-pentest"; owner = "franc-pentest";
repo = "ldeep"; repo = "ldeep";
tag = version; tag = version;
hash = "sha256-ExAZrlrsx6ijTeUSiPNL06wY4gWUuCNajpyXqpq785I="; hash = "sha256-tq5M1YOTiXHdv8dTw2acnBzz0lZu6TtZFEi9rC1Sx14=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [

View file

@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "libretro-core-info"; pname = "libretro-core-info";
version = "1.19.0"; version = "1.20.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libretro"; owner = "libretro";
repo = "libretro-core-info"; repo = "libretro-core-info";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-dMMX9i2xPKay6BKC52fYxElcGSllHkSZyOXX/t3l6Io="; hash = "sha256-T/La/Y9txRX8SHAyOi45KcQA8zb3puXdfTKlPSm42+U=";
}; };
makeFlags = [ makeFlags = [

View file

@ -1,12 +0,0 @@
diff --git a/src/stb_image.h b/src/stb_image.h
index f12c30b..526281c 100644
--- a/src/stb_image.h
+++ b/src/stb_image.h
@@ -1534,6 +1534,7 @@ static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int r
int i,j;
unsigned char *good;
+ if (data == NULL) return data;
if (req_comp == img_n) return data;
STBI_ASSERT(req_comp >= 1 && req_comp <= 4);

View file

@ -10,20 +10,15 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libsixel"; pname = "libsixel";
version = "1.10.3"; version = "1.10.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libsixel"; owner = "libsixel";
repo = "libsixel"; repo = "libsixel";
rev = "v${version}"; rev = "v${version}";
sha256 = "1nny4295ipy4ajcxmmh04c796hcds0y7z7rv3qd17mj70y8j0r2d"; hash = "sha256-obzBZAknN3N7+Bvtd0+JHuXcemVb7wRv+Pt4VjS6Bck=";
}; };
patches = [
# https://github.com/NixOS/nixpkgs/issues/160670
./fix-CVE-2021-45340.patch
];
buildInputs = [ buildInputs = [
gdk-pixbuf gdk-pixbuf
gd gd

View file

@ -0,0 +1,53 @@
{
lib,
stdenvNoCC,
fetchurl,
makeBinaryWrapper,
php,
testers,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "magento-cloud";
version = "1.46.1";
src = fetchurl {
url = "https://accounts.magento.cloud/sites/default/files/magento-cloud-v${finalAttrs.version}.phar";
hash = "sha256-QrrD5pz6Juov1u3QYcuLr6aEKe/4DX5wFKs+hp6KjJ8=";
};
dontUnpack = true;
dontBuild = true;
dontConfigure = true;
nativeBuildInputs = [ makeBinaryWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
install -D ${finalAttrs.src} $out/libexec/magento-cloud/magento-cloud.phar
makeWrapper ${lib.getExe php} $out/bin/magento-cloud \
--add-flags "$out/libexec/magento-cloud/magento-cloud.phar"
runHook postInstall
'';
passthru = {
updateScript = ./update.sh;
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "HOME=$TMPDIR magento-cloud --version";
};
};
meta = {
homepage = "https://experienceleague.adobe.com/en/docs/commerce-cloud-service/user-guide/dev-tools/cloud-cli/cloud-cli-overview";
description = "Adobe Commerce Cloud CLI";
longDescription = ''
Adobe Commerce Cloud CLI enables developers and system administrators the ability to manage Cloud projects and environments, perform routines and run automation tasks locally.
'';
mainProgram = "magento-cloud";
maintainers = with lib.maintainers; [ piotrkwiecinski ];
license = lib.licenses.unfree;
};
})

View file

@ -0,0 +1,6 @@
#!/usr/bin/env nix-shell
#!nix-shell --pure -i bash -p bash curl jq nix-update cacert git
set -euo pipefail
new_version="$(curl https://accounts.magento.cloud/cli/manifest.json | jq --raw-output .[0].version)"
nix-update magento-cloud --version "$new_version"

View file

@ -22,13 +22,13 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "mangojuice"; pname = "mangojuice";
version = "0.7.9"; version = "0.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "radiolamp"; owner = "radiolamp";
repo = "mangojuice"; repo = "mangojuice";
tag = finalAttrs.version; tag = finalAttrs.version;
hash = "sha256-L+wxRmpCAfrvLE9IHAT9g+F/clXlQAkLpbnMJwC8RxY="; hash = "sha256-LSwn6PIAGX1FIofnmoM2eqnhZBa3gkhlOBUJtdR9gWE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -40,13 +40,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openscap"; pname = "openscap";
version = "1.4.0"; version = "1.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OpenSCAP"; owner = "OpenSCAP";
repo = "openscap"; repo = "openscap";
rev = version; rev = version;
hash = "sha256-LYDXASy1yZA+GfUKaXUKyZgdRqGERvMeyVIHJFfCfII="; hash = "sha256-omPGm3VSLmwEIzInIORLfJf7wreRyxbDOXTRl05mAz0=";
}; };
strictDeps = true; strictDeps = true;

View file

@ -1,52 +1,220 @@
{ {
stdenv,
lib, lib,
binutils,
fetchFromGitHub, fetchFromGitHub,
bambu-studio, cmake,
pkg-config,
wrapGAppsHook3,
boost,
cereal,
cgal,
curl,
dbus,
eigen,
expat,
ffmpeg,
gcc-unwrapped,
glew,
glfw,
glib,
glib-networking,
gmp,
gst_all_1,
gtest,
gtk3,
hicolor-icon-theme,
ilmbase,
libpng,
mesa,
mpfr,
nlopt,
opencascade-occt_7_6,
openvdb,
opencv,
pcre,
systemd,
tbb_2021_11,
webkitgtk_4_0,
wxGTK31,
xorg,
withSystemd ? stdenv.hostPlatform.isLinux,
}: }:
bambu-studio.overrideAttrs ( let
finalAttrs: previousAttrs: { wxGTK' =
version = "2.2.0"; (wxGTK31.override {
pname = "orca-slicer"; withCurl = true;
withPrivateFonts = true;
withWebKit = true;
}).overrideAttrs
(old: {
configureFlags = old.configureFlags ++ [
# Disable noisy debug dialogs
"--enable-debug=no"
];
});
in
stdenv.mkDerivation rec {
pname = "orca-slicer";
version = "v2.2.0-unstable-2025-01-06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SoftFever"; owner = "SoftFever";
repo = "OrcaSlicer"; repo = "OrcaSlicer";
rev = "v${finalAttrs.version}"; rev = "99a0facfb3a5c9b4e661e536825c08393053cb53";
hash = "sha256-h+cHWhrp894KEbb3ic2N4fNTn13WlOSYoMsaof0RvRI="; hash = "sha256-XWM04Vx65q+Vc+s3YLucS63IhGVw8ODhL2m+47nZKs8=";
}; };
patches = [ nativeBuildInputs = [
# Fix for webkitgtk linking cmake
./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch pkg-config
./patches/dont-link-opencv-world-orca.patch wrapGAppsHook3
wxGTK'
];
buildInputs =
[
binutils
(boost.override {
enableShared = true;
enableStatic = false;
extraFeatures = [
"log"
"thread"
"filesystem"
];
})
boost.dev
cereal
cgal
curl
dbus
eigen
expat
ffmpeg
gcc-unwrapped
glew
glfw
glib
glib-networking
gmp
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-good
gtk3
hicolor-icon-theme
ilmbase
libpng
mesa
mesa.osmesa
mesa.drivers
mpfr
nlopt
opencascade-occt_7_6
openvdb
pcre
tbb_2021_11
webkitgtk_4_0
wxGTK'
xorg.libX11
opencv
]
++ lib.optionals withSystemd [ systemd ]
++ checkInputs;
patches = [
# Fix for webkitgtk linking
./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
./patches/dont-link-opencv-world-orca.patch
./patches/fix-boost.patch
];
doCheck = true;
checkInputs = [ gtest ];
separateDebugInfo = true;
NLOPT = nlopt;
NIX_CFLAGS_COMPILE = toString [
"-Wno-ignored-attributes"
"-I${opencv.out}/include/opencv4"
"-Wno-error=template-id-cdtor"
"-Wno-error=incompatible-pointer-types"
"-Wno-template-id-cdtor"
"-Wno-uninitialized"
"-Wno-unused-result"
"-Wno-deprecated-declarations"
"-Wno-use-after-free"
"-Wno-format-overflow"
"-Wno-stringop-overflow"
"-DBOOST_ALLOW_DEPRECATED_HEADERS"
"-DBOOST_MATH_DISABLE_STD_FPCLASSIFY"
"-DBOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS"
"-DBOOST_MATH_DISABLE_FLOAT128"
"-DBOOST_MATH_NO_QUAD_SUPPORT"
"-DBOOST_MATH_MAX_FLOAT128_DIGITS=0"
"-DBOOST_CSTDFLOAT_NO_LIBQUADMATH_SUPPORT"
"-DBOOST_MATH_DISABLE_FLOAT128_BUILTIN_FPCLASSIFY"
];
NIX_LDFLAGS = toString [
(lib.optionalString withSystemd "-ludev")
"-L${mesa.osmesa}/lib"
"-L${mesa.drivers}/lib"
"-L${boost}/lib"
"-lboost_log"
"-lboost_log_setup"
];
prePatch = ''
sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake
'';
cmakeFlags = [
"-DSLIC3R_STATIC=0"
"-DSLIC3R_FHS=1"
"-DSLIC3R_GTK=3"
"-DBBL_RELEASE_TO_PUBLIC=1"
"-DBBL_INTERNAL_TESTING=0"
"-DDEP_WX_GTK3=ON"
"-DSLIC3R_BUILD_TESTS=0"
"-DCMAKE_CXX_FLAGS=-DBOOST_LOG_DYN_LINK"
"-DBOOST_LOG_DYN_LINK=1"
"-DBOOST_ALL_DYN_LINK=1"
"-DBOOST_LOG_NO_LIB=OFF"
"-DCMAKE_CXX_FLAGS=-DGL_SILENCE_DEPRECATION"
"-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-as-needed"
"-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${mesa.drivers}/lib -Wl,-rpath,${mesa.osmesa}/lib"
];
preFixup = ''
gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : "$out/lib:${
lib.makeLibraryPath [
mesa.drivers
mesa.osmesa
glew
]
}"
--prefix LIBGL_DRIVERS_PATH : "${mesa.drivers}/lib/dri"
--set WEBKIT_DISABLE_COMPOSITING_MODE 1
)
'';
meta = {
description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)";
homepage = "https://github.com/SoftFever/OrcaSlicer";
changelog = "https://github.com/SoftFever/OrcaSlicer/releases/tag/v${version}";
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [
zhaofengli
ovlach
pinpox
liberodark
]; ];
mainProgram = "orca-slicer";
preFixup = '' platforms = lib.platforms.linux;
gappsWrapperArgs+=( };
# Fixes blackscreen dialogs }
--set WEBKIT_DISABLE_COMPOSITING_MODE 1
)
'';
cmakeFlags = lib.remove "-DFLATPAK=1" previousAttrs.cmakeFlags or [ ];
# needed to prevent collisions between the LICENSE.txt files of
# bambu-studio and orca-slicer.
postInstall = ''
mv $out/LICENSE.txt $out/share/OrcaSlicer/LICENSE.txt
'';
meta = with lib; {
description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)";
homepage = "https://github.com/SoftFever/OrcaSlicer";
license = licenses.agpl3Only;
maintainers = with maintainers; [
zhaofengli
ovlach
pinpox
];
mainProgram = "orca-slicer";
platforms = platforms.linux;
};
}
)

View file

@ -0,0 +1,60 @@
diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp
index 25b282c7b..81ee858c2 100644
--- a/src/libslic3r/PrintBase.cpp
+++ b/src/libslic3r/PrintBase.cpp
@@ -79,7 +79,7 @@ std::string PrintBase::output_filename(const std::string &format, const std::str
cfg.opt_string("input_filename_base") + default_ext :
this->placeholder_parser().process(format, 0, &cfg);
if (filename.extension().empty())
- filename = boost::filesystem::change_extension(filename, default_ext);
+ filename.replace_extension(default_ext);
return filename.string();
} catch (std::runtime_error &err) {
throw Slic3r::PlaceholderParserError(L("Failed processing of the filename_format template.") + "\n" + err.what());
diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
index 50368b854..cad5cf545 100644
--- a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
+++ b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp
@@ -337,7 +337,7 @@ wxDataViewItemArray AuxiliaryModel::ImportFile(AuxiliaryModelNode* sel, wxArrayS
dir_path += "\\" + src_bfs_path.filename().generic_wstring();
boost::system::error_code ec;
- if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_option::overwrite_if_exists, ec))
+ if (!fs::copy_file(src_bfs_path, fs::path(dir_path.ToStdWstring()), fs::copy_options::overwrite_existing, ec))
continue;
// Update model data
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index f3782be14..e12f0c321 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -10265,7 +10265,7 @@ bool Plater::preview_zip_archive(const boost::filesystem::path& archive_path)
std::replace(name.begin(), name.end(), '\\', '/');
// rename if file exists
std::string filename = path.filename().string();
- std::string extension = boost::filesystem::extension(path);
+ std::string extension = path.extension().string();
std::string just_filename = filename.substr(0, filename.size() - extension.size());
std::string final_filename = just_filename;
diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp
index a26e13448..83ec4695c 100644
--- a/src/slic3r/GUI/RemovableDriveManager.cpp
+++ b/src/slic3r/GUI/RemovableDriveManager.cpp
@@ -22,7 +22,6 @@
#include <pwd.h>
#include <boost/filesystem.hpp>
#include <boost/system/error_code.hpp>
-#include <boost/filesystem/convenience.hpp>
#include <boost/process.hpp>
#endif
@@ -202,7 +201,7 @@ namespace search_for_drives_internal
stat(path.c_str(), &buf);
uid_t uid = buf.st_uid;
if (getuid() == uid)
- out.emplace_back(DriveData{ boost::filesystem::basename(boost::filesystem::path(path)), path });
+ out.emplace_back(DriveData{ boost::filesystem::path(path).stem().string(), path });
}
}
}

View file

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "pkgsite"; pname = "pkgsite";
version = "0-unstable-2024-12-26"; version = "0-unstable-2025-01-08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "golang"; owner = "golang";
repo = "pkgsite"; repo = "pkgsite";
rev = "8bad909da0cbaf239510644c5a91d1be27376d9f"; rev = "840de57bb85975c3c0bcb24ba00fee86ef8c0748";
hash = "sha256-EsShGqT2Pk8VdxNRplliPb5+VoD05/sQzGNTsk0VZEI="; hash = "sha256-TNnZG9Q3RmB5TfHDqPCHfChsdkZ6FOErbzo47cRXhTw=";
}; };
vendorHash = "sha256-Ijcj1Nq4WjXcUqmoDkpO9I4rl/4/TMXFMQVAlEK11R8="; vendorHash = "sha256-Z+Ji3RO2zn5vn9DXOAxyeI4OZXGOfyVdfdIsNyJHZpE=";
subPackages = [ "cmd/pkgsite" ]; subPackages = [ "cmd/pkgsite" ];

View file

@ -88,9 +88,9 @@ dependencies = [
[[package]] [[package]]
name = "anyhow" name = "anyhow"
version = "1.0.94" version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
[[package]] [[package]]
name = "arrayvec" name = "arrayvec"
@ -133,7 +133,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"serde", "serde",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -323,13 +323,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
[[package]] [[package]]
name = "async-trait" name = "async-trait"
version = "0.1.83" version = "0.1.84"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -346,7 +346,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -360,6 +360,9 @@ name = "backend"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"ast", "ast",
"miette",
"printer",
"thiserror",
"url", "url",
] ]
@ -465,9 +468,9 @@ dependencies = [
[[package]] [[package]]
name = "bstr" name = "bstr"
version = "1.11.0" version = "1.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
dependencies = [ dependencies = [
"memchr", "memchr",
"regex-automata", "regex-automata",
@ -494,9 +497,9 @@ checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.2.3" version = "1.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d" checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
dependencies = [ dependencies = [
"shlex", "shlex",
] ]
@ -537,9 +540,9 @@ dependencies = [
[[package]] [[package]]
name = "clap_complete" name = "clap_complete"
version = "4.5.38" version = "4.5.40"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9647a559c112175f17cf724dc72d3645680a883c58481332779192b0d8e7a01" checksum = "ac2e663e3e3bed2d32d065a8404024dad306e699a04263ec59919529f803aee9"
dependencies = [ dependencies = [
"clap", "clap",
] ]
@ -553,7 +556,7 @@ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -565,9 +568,8 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
[[package]] [[package]]
name = "codespan" name = "codespan"
version = "0.11.1" version = "0.11.1"
source = "git+https://github.com/polarity-lang/codespan.git?rev=542320ab177fd38fff3a398a97b3f0352e065149#542320ab177fd38fff3a398a97b3f0352e065149" source = "git+https://github.com/polarity-lang/codespan.git?rev=91e4f64801cee923661097eb35e05a782996d8ea#91e4f64801cee923661097eb35e05a782996d8ea"
dependencies = [ dependencies = [
"lsp-types 0.91.1",
"url", "url",
] ]
@ -632,18 +634,18 @@ dependencies = [
[[package]] [[package]]
name = "crossbeam-channel" name = "crossbeam-channel"
version = "0.5.13" version = "0.5.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
dependencies = [ dependencies = [
"crossbeam-utils", "crossbeam-utils",
] ]
[[package]] [[package]]
name = "crossbeam-deque" name = "crossbeam-deque"
version = "0.8.5" version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
dependencies = [ dependencies = [
"crossbeam-epoch", "crossbeam-epoch",
"crossbeam-utils", "crossbeam-utils",
@ -660,9 +662,9 @@ dependencies = [
[[package]] [[package]]
name = "crossbeam-utils" name = "crossbeam-utils"
version = "0.8.20" version = "0.8.21"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
[[package]] [[package]]
name = "crunchy" name = "crunchy"
@ -746,7 +748,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -779,6 +781,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"ast", "ast",
"async-trait", "async-trait",
"backend",
"codespan", "codespan",
"elaborator", "elaborator",
"log", "log",
@ -835,9 +838,9 @@ dependencies = [
[[package]] [[package]]
name = "env_filter" name = "env_filter"
version = "0.1.2" version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
dependencies = [ dependencies = [
"log", "log",
"regex", "regex",
@ -845,9 +848,9 @@ dependencies = [
[[package]] [[package]]
name = "env_logger" name = "env_logger"
version = "0.11.5" version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
@ -928,9 +931,9 @@ dependencies = [
[[package]] [[package]]
name = "fastrand" name = "fastrand"
version = "2.2.0" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
[[package]] [[package]]
name = "fixedbitset" name = "fixedbitset"
@ -1056,7 +1059,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -1248,9 +1251,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]] [[package]]
name = "hyper" name = "hyper"
version = "1.5.1" version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures-channel", "futures-channel",
@ -1268,9 +1271,9 @@ dependencies = [
[[package]] [[package]]
name = "hyper-rustls" name = "hyper-rustls"
version = "0.27.3" version = "0.27.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"http", "http",
@ -1433,7 +1436,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -1627,9 +1630,9 @@ checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.167" version = "0.2.169"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
[[package]] [[package]]
name = "libm" name = "libm"
@ -1680,18 +1683,18 @@ dependencies = [
[[package]] [[package]]
name = "logos" name = "logos"
version = "0.14.2" version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c6b6e02facda28ca5fb8dbe4b152496ba3b1bd5a4b40bb2b1b2d8ad74e0f39b" checksum = "7251356ef8cb7aec833ddf598c6cb24d17b689d20b993f9d11a3d764e34e6458"
dependencies = [ dependencies = [
"logos-derive", "logos-derive",
] ]
[[package]] [[package]]
name = "logos-codegen" name = "logos-codegen"
version = "0.14.3" version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f3303189202bb8a052bcd93d66b6c03e6fe70d9c7c47c0ea5e974955e54c876" checksum = "59f80069600c0d66734f5ff52cc42f2dabd6b29d205f333d61fd7832e9e9963f"
dependencies = [ dependencies = [
"beef", "beef",
"fnv", "fnv",
@ -1699,15 +1702,14 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"regex-syntax 0.8.5", "regex-syntax 0.8.5",
"rustc_version", "syn 2.0.94",
"syn 2.0.90",
] ]
[[package]] [[package]]
name = "logos-derive" name = "logos-derive"
version = "0.14.3" version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "774a1c225576486e4fdf40b74646f672c542ca3608160d348749693ae9d456e6" checksum = "24fb722b06a9dc12adb0963ed585f19fc61dc5413e6a9be9422ef92c091e731d"
dependencies = [ dependencies = [
"logos-codegen", "logos-codegen",
] ]
@ -1769,19 +1771,6 @@ dependencies = [
"url", "url",
] ]
[[package]]
name = "lsp-types"
version = "0.91.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2368312c59425dd133cb9a327afee65be0a633a8ce471d248e2202a48f8f68ae"
dependencies = [
"bitflags 1.3.2",
"serde",
"serde_json",
"serde_repr",
"url",
]
[[package]] [[package]]
name = "lsp-types" name = "lsp-types"
version = "0.97.0" version = "0.97.0"
@ -1854,7 +1843,7 @@ checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -1889,9 +1878,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.8.0" version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
dependencies = [ dependencies = [
"adler2", "adler2",
] ]
@ -1995,9 +1984,9 @@ dependencies = [
[[package]] [[package]]
name = "object" name = "object"
version = "0.36.5" version = "0.36.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@ -2047,7 +2036,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -2250,9 +2239,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
[[package]] [[package]]
name = "predicates" name = "predicates"
version = "3.1.2" version = "3.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573"
dependencies = [ dependencies = [
"anstyle", "anstyle",
"difflib", "difflib",
@ -2261,15 +2250,15 @@ dependencies = [
[[package]] [[package]]
name = "predicates-core" name = "predicates-core"
version = "1.0.8" version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa"
[[package]] [[package]]
name = "predicates-tree" name = "predicates-tree"
version = "1.0.11" version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c"
dependencies = [ dependencies = [
"predicates-core", "predicates-core",
"termtree", "termtree",
@ -2317,9 +2306,9 @@ dependencies = [
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.37" version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
] ]
@ -2376,9 +2365,9 @@ dependencies = [
[[package]] [[package]]
name = "redox_syscall" name = "redox_syscall"
version = "0.5.7" version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
] ]
@ -2437,9 +2426,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]] [[package]]
name = "reqwest" name = "reqwest"
version = "0.12.9" version = "0.12.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"bytes", "bytes",
@ -2466,10 +2455,11 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
"sync_wrapper 1.0.2", "sync_wrapper",
"system-configuration", "system-configuration",
"tokio", "tokio",
"tokio-native-tls", "tokio-native-tls",
"tower",
"tower-service", "tower-service",
"url", "url",
"wasm-bindgen", "wasm-bindgen",
@ -2528,33 +2518,24 @@ version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
[[package]]
name = "rustc_version"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
dependencies = [
"semver",
]
[[package]] [[package]]
name = "rustix" name = "rustix"
version = "0.38.41" version = "0.38.42"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"errno", "errno",
"libc", "libc",
"linux-raw-sys", "linux-raw-sys",
"windows-sys 0.52.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
name = "rustls" name = "rustls"
version = "0.23.19" version = "0.23.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"rustls-pki-types", "rustls-pki-types",
@ -2574,9 +2555,9 @@ dependencies = [
[[package]] [[package]]
name = "rustls-pki-types" name = "rustls-pki-types"
version = "1.10.0" version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
[[package]] [[package]]
name = "rustls-webpki" name = "rustls-webpki"
@ -2591,9 +2572,9 @@ dependencies = [
[[package]] [[package]]
name = "rustversion" name = "rustversion"
version = "1.0.18" version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
[[package]] [[package]]
name = "ryu" name = "ryu"
@ -2640,45 +2621,39 @@ dependencies = [
[[package]] [[package]]
name = "security-framework-sys" name = "security-framework-sys"
version = "2.12.1" version = "2.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5"
dependencies = [ dependencies = [
"core-foundation-sys", "core-foundation-sys",
"libc", "libc",
] ]
[[package]]
name = "semver"
version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.215" version = "1.0.217"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.215" version = "1.0.217"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.133" version = "1.0.134"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
dependencies = [ dependencies = [
"itoa", "itoa",
"memchr", "memchr",
@ -2694,7 +2669,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -2823,21 +2798,15 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.90" version = "2.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"unicode-ident", "unicode-ident",
] ]
[[package]]
name = "sync_wrapper"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
[[package]] [[package]]
name = "sync_wrapper" name = "sync_wrapper"
version = "1.0.2" version = "1.0.2"
@ -2855,7 +2824,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -2970,12 +2939,13 @@ dependencies = [
[[package]] [[package]]
name = "tempfile" name = "tempfile"
version = "3.14.0" version = "3.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"fastrand", "fastrand",
"getrandom",
"once_cell", "once_cell",
"rustix", "rustix",
"windows-sys 0.59.0", "windows-sys 0.59.0",
@ -3023,9 +2993,9 @@ dependencies = [
[[package]] [[package]]
name = "termtree" name = "termtree"
version = "0.4.1" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
[[package]] [[package]]
name = "test-runner" name = "test-runner"
@ -3077,7 +3047,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -3189,14 +3159,15 @@ dependencies = [
[[package]] [[package]]
name = "tower" name = "tower"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"futures-util", "futures-util",
"pin-project-lite", "pin-project-lite",
"sync_wrapper 0.1.2", "sync_wrapper",
"tokio",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
] ]
@ -3219,7 +3190,7 @@ dependencies = [
"dashmap", "dashmap",
"futures", "futures",
"httparse", "httparse",
"lsp-types 0.97.0", "lsp-types",
"memchr", "memchr",
"serde", "serde",
"serde_json", "serde_json",
@ -3235,7 +3206,7 @@ source = "git+https://github.com/tower-lsp/tower-lsp?rev=19f5a87810ff4b643d2bc39
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -3263,7 +3234,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -3301,9 +3272,9 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
[[package]] [[package]]
name = "unicase" name = "unicase"
version = "2.8.0" version = "2.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
[[package]] [[package]]
name = "unicode-ident" name = "unicode-ident"
@ -3350,7 +3321,6 @@ dependencies = [
"form_urlencoded", "form_urlencoded",
"idna", "idna",
"percent-encoding", "percent-encoding",
"serde",
] ]
[[package]] [[package]]
@ -3460,7 +3430,7 @@ dependencies = [
"log", "log",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -3496,7 +3466,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -3711,7 +3681,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
"synstructure", "synstructure",
] ]
@ -3733,7 +3703,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]
[[package]] [[package]]
@ -3753,7 +3723,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
"synstructure", "synstructure",
] ]
@ -3782,5 +3752,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.90", "syn 2.0.94",
] ]

View file

@ -7,19 +7,19 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "polarity"; pname = "polarity";
version = "latest-unstable-2024-12-20"; version = "latest-unstable-2025-01-08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "polarity-lang"; owner = "polarity-lang";
repo = "polarity"; repo = "polarity";
rev = "e679bff1d40b2d145fdc5206c74e59321a70efd2"; rev = "bbc91efbc25f77f505d244e96cc566f63f6dc858";
hash = "sha256-KiwK9rBYfOtsEiUF+e62L/j1Yc4KloRLXbXZ+5axiEM="; hash = "sha256-3wKMFX4ubp8bLNhdLoMkZlsP2vfu0wcNpEZrs95xwAY=";
}; };
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"codespan-0.11.1" = "sha256-Wq99v77bqSGIOK/iyv+x/EG1563XSeaTDW5K2X3kSXU="; "codespan-0.11.1" = "sha256-0cUndjWQ44X5zXVfg7YX/asBByWq/hFV1n9tHPBTcfY=";
"tower-lsp-0.20.0" = "sha256-f3S2CyFFX6yylaxMoXhB1/bfizVsLfNldLM+dXl5Y8k="; "tower-lsp-0.20.0" = "sha256-f3S2CyFFX6yylaxMoXhB1/bfizVsLfNldLM+dXl5Y8k=";
}; };
}; };

View file

@ -12,14 +12,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "ruff-lsp"; pname = "ruff-lsp";
version = "0.0.59"; version = "0.0.60";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "astral-sh"; owner = "astral-sh";
repo = "ruff-lsp"; repo = "ruff-lsp";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-fMw93EmwO0wbIcGMr7csXkMRzgyQJNQzgLDZQqNB8Zc="; hash = "sha256-Qo2pzDjdlhIpKfldPbL9VsO1AaSc1bW5t1i1Nqu7alA=";
}; };
build-system = with python3Packages; [ hatchling ]; build-system = with python3Packages; [ hatchling ];

View file

@ -17,17 +17,17 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ruff"; pname = "ruff";
version = "0.8.6"; version = "0.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "astral-sh"; owner = "astral-sh";
repo = "ruff"; repo = "ruff";
tag = version; tag = version;
hash = "sha256-9YvHmNiKdf5hKqy9tToFSQZM2DNLoIiChcfjQay8wbU="; hash = "sha256-OAhjatPzwvLT3HyXYPzaL5pAC5CH75CyMmFo0c4726I=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-aTzTCDCMhG4cKD9wFNHv6A3VBUifnKgI8a6kelc3bAM="; cargoHash = "sha256-vroKiwouk2E2WYB/B+8zszXqer5pENDYrxcrCQ17mF0=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -1,25 +1,48 @@
{ lib, stdenv, fetchFromGitHub, zlib }: {
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
zlib,
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "simg2img"; pname = "simg2img";
version = "1.1.4"; version = "1.1.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "anestisb"; owner = "anestisb";
repo = "android-simg2img"; repo = "android-simg2img";
rev = version; rev = version;
sha256 = "1xm9kaqs2w8c7a4psv78gv66gild88mpgjn5lj087d7jh1jxy7bf"; hash = "sha256-sNHdSbms35YnENASFEG+VMLJGkV/JAlQUVMquDrePDc=";
}; };
# fix GCC 14 error
# https://github.com/anestisb/android-simg2img/pull/41
postPatch = ''
substituteInPlace backed_block.cpp \
--replace-fail 'calloc(sizeof(struct backed_block_list), 1));' 'calloc(1, sizeof(struct backed_block_list)));'
substituteInPlace sparse.cpp \
--replace-fail 'calloc(sizeof(struct sparse_file), 1));' 'calloc(1, sizeof(struct sparse_file)));'
substituteInPlace simg2simg.cpp \
--replace-fail 'calloc(sizeof(struct sparse_file*), files);' 'calloc(files, sizeof(struct sparse_file*));'
'';
buildInputs = [ zlib ]; buildInputs = [ zlib ];
makeFlags = [ "PREFIX=$(out)" "DEP_CXX:=$(CXX)" ]; makeFlags = [
"PREFIX=$(out)"
"DEP_CXX:=$(CXX)"
];
meta = with lib; { meta = with lib; {
description = "Tool to convert Android sparse images to raw images"; description = "Tool to convert Android sparse images to raw images";
homepage = "https://github.com/anestisb/android-simg2img"; homepage = "https://github.com/anestisb/android-simg2img";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ dezgeg arkivm ]; maintainers = with maintainers; [
dezgeg
arkivm
];
}; };
} }

View file

@ -10,7 +10,7 @@
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tideways-daemon"; pname = "tideways-daemon";
version = "1.9.28"; version = "1.9.30";
src = src =
finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
sources = { sources = {
"x86_64-linux" = fetchurl { "x86_64-linux" = fetchurl {
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz"; url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
hash = "sha256-Te2FGyUjFEZ6hex2n6W+tsOYuehOAmWyzwDzCj3YqVo="; hash = "sha256-pXWGoDnNQPlDQMriUbjD8+Tiv7jGeBf+5NGPMOAfuIo=";
}; };
"aarch64-linux" = fetchurl { "aarch64-linux" = fetchurl {
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz"; url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
hash = "sha256-tDVo/FkXSamwlQa1Zq5EFmawrdPmCGdSPT6zYWFzCU0="; hash = "sha256-x9QDaGz7nHEbe3o9awqyBu+0/ArM1QIr9jQ4kcSSnHA=";
}; };
"aarch64-darwin" = fetchurl { "aarch64-darwin" = fetchurl {
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz"; url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
hash = "sha256-TwbGXr35KYLb+K83Q29mxG0QJGgQxRlkSNLCVbijQyE="; hash = "sha256-c5ntOhaJaRjipNd0B9ybzPD7EFkdQgEOSaS3JWGfBpA=";
}; };
}; };
updateScript = "${ updateScript = "${

View file

@ -18,17 +18,17 @@ rustPlatform.buildRustPackage rec {
pname = "tinymist"; pname = "tinymist";
# Please update the corresponding vscode extension when updating # Please update the corresponding vscode extension when updating
# this derivation. # this derivation.
version = "0.12.16"; version = "0.12.18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Myriad-Dreamin"; owner = "Myriad-Dreamin";
repo = "tinymist"; repo = "tinymist";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-DwekAk1LkpK/48yzKc6Ry5GZ3oR/uH7+xpvT0LlSF00="; hash = "sha256-/QalLr4kerOe+KooKY+Vq6FaGJyzGvaUHhUSu+LTphA=";
}; };
useFetchCargoVendor = true; useFetchCargoVendor = true;
cargoHash = "sha256-LlZD/amKO/4dOo6xB5kz51igTDrkHbVQDquRpkMujVU="; cargoHash = "sha256-D4UWFg22lnkqozsWAQydNSnOpDlw5AUhGCHHfuyihfU=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles

View file

@ -0,0 +1,129 @@
{
lib,
fetchpatch,
python3,
fetchFromGitHub,
gitUpdater,
makeWrapper,
e2fsprogs,
jefferson,
lz4,
lziprecover,
lzop,
p7zip,
sasquatch,
sasquatch-v4be,
simg2img,
ubi_reader,
unar,
zstd,
versionCheckHook,
}:
let
# These dependencies are only added to PATH
runtimeDeps = [
e2fsprogs
jefferson
lziprecover
lzop
p7zip
sasquatch
sasquatch-v4be
ubi_reader
simg2img
unar
zstd
lz4
];
in
python3.pkgs.buildPythonApplication rec {
pname = "unblob";
version = "25.1.8";
pyproject = true;
disabled = python3.pkgs.pythonOlder "3.9";
src = fetchFromGitHub {
owner = "onekey-sec";
repo = "unblob";
tag = version;
hash = "sha256-PGpJPAo9q52gQ3EGusYtDA2e0MG5kFClqCYPB2DvuMs=";
forceFetchGit = true;
fetchLFS = true;
};
strictDeps = true;
build-system = with python3.pkgs; [ poetry-core ];
dependencies = with python3.pkgs; [
arpy
attrs
click
cryptography
dissect-cstruct
lark
lief.py
python3.pkgs.lz4 # shadowed by pkgs.lz4
plotext
pluggy
pyfatfs
pyperscan
python-magic
rarfile
rich
structlog
treelib
unblob-native
];
nativeBuildInputs = [
makeWrapper
];
# These are runtime-only CLI dependencies, which are used through
# their CLI interface
pythonRemoveDeps = [
"jefferson"
"ubi-reader"
];
pythonImportsCheck = [ "unblob" ];
makeWrapperArgs = [
"--prefix PATH : ${lib.makeBinPath runtimeDeps}"
];
nativeCheckInputs =
with python3.pkgs;
[
pytestCheckHook
pytest-cov
versionCheckHook
]
++ runtimeDeps;
versionCheckProgramArg = "--version";
pytestFlagsArray = [
"--no-cov"
# `disabledTests` swallows the parameters between square brackets
# https://github.com/tytso/e2fsprogs/issues/152
"-k 'not test_all_handlers[filesystem.extfs]'"
];
passthru = {
updateScript = gitUpdater { };
# helpful to easily add these to a nix-shell environment
inherit runtimeDeps;
};
meta = {
description = "Extract files from any kind of container formats";
homepage = "https://unblob.org";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
mainProgram = "unblob";
maintainers = with lib.maintainers; [ vlaci ];
};
}

View file

@ -4,9 +4,10 @@
fetchFromGitHub, fetchFromGitHub,
rustPlatform, rustPlatform,
cargo, cargo,
sphinx, python3Packages,
Security, versionCheckHook,
libiconv, nix-update-script,
prefix ? "uutils-", prefix ? "uutils-",
buildMulticallBinary ? true, buildMulticallBinary ? true,
}: }:
@ -30,17 +31,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
sphinx python3Packages.sphinx
];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
Security
libiconv
]; ];
makeFlags = makeFlags =
[ [
"CARGO=${cargo}/bin/cargo" "CARGO=${lib.getExe cargo}"
"PREFIX=${placeholder "out"}" "PREFIX=${placeholder "out"}"
"PROFILE=release" "PROFILE=release"
"INSTALLDIR_MAN=${placeholder "out"}/share/man/man1" "INSTALLDIR_MAN=${placeholder "out"}/share/man/man1"
@ -51,6 +47,21 @@ stdenv.mkDerivation rec {
# too many impure/platform-dependent tests # too many impure/platform-dependent tests
doCheck = false; doCheck = false;
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgram =
let
prefix' = lib.optionalString (prefix != null) prefix;
in
"${placeholder "out"}/bin/${prefix'}ls";
versionCheckProgramArg = [ "--version" ];
doInstallCheck = true;
passthru = {
updateScript = nix-update-script { };
};
meta = { meta = {
description = "Cross-platform Rust rewrite of the GNU coreutils"; description = "Cross-platform Rust rewrite of the GNU coreutils";
longDescription = '' longDescription = ''

View file

@ -13,13 +13,13 @@
buildGoModule rec { buildGoModule rec {
pname = "walker"; pname = "walker";
version = "0.11.16"; version = "0.11.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "abenz1267"; owner = "abenz1267";
repo = "walker"; repo = "walker";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-9cZ+cJcBiZA0HU8YU7+DmOPmbeFtuiqmyBEosVxCADQ="; hash = "sha256-dt6dGl/1KGmnG8g9iv+EL7xYXVVy48tizg9aGunh1QU=";
}; };
vendorHash = "sha256-urAtl2aSuNw7UVnuacSACUE8PCwAsrRQbuMb7xItjao="; vendorHash = "sha256-urAtl2aSuNw7UVnuacSACUE8PCwAsrRQbuMb7xItjao=";

View file

@ -190,45 +190,12 @@ let
lispLibs = super.mathkit.lispLibs ++ [ super.sb-cga ]; lispLibs = super.mathkit.lispLibs ++ [ super.sb-cga ];
}; };
stumpwm = super.stumpwm.overrideLispAttrs (o: rec { stumpwm = super.stumpwm.overrideAttrs {
version = "22.11"; inherit (pkgs.stumpwm) src version;
src = pkgs.fetchFromGitHub { meta = {
owner = "stumpwm"; inherit (pkgs.stumpwm.meta) description license homepage;
repo = "stumpwm";
rev = version;
hash = "sha256-zXj17ucgyFhv7P0qEr4cYSVRPGrL1KEIofXWN2trr/M=";
}; };
buildScript = pkgs.writeText "build-stumpwm.lisp" '' };
(load "${super.stumpwm.asdfFasl}/asdf.${super.stumpwm.faslExt}")
(asdf:load-system 'stumpwm)
;; Prevents package conflict error
(when (uiop:version<= "3.1.5" (asdf:asdf-version))
(uiop:symbol-call '#:asdf '#:register-immutable-system :stumpwm)
(dolist (system-name (uiop:symbol-call '#:asdf
'#:system-depends-on
(asdf:find-system :stumpwm)))
(uiop:symbol-call '#:asdf '#:register-immutable-system system-name)))
;; Prevents "cannot create /homeless-shelter" error
(asdf:disable-output-translations)
(sb-ext:save-lisp-and-die
"stumpwm"
:executable t
:purify t
#+sb-core-compression :compression
#+sb-core-compression t
:toplevel #'stumpwm:stumpwm)
'';
installPhase = ''
mkdir -p $out/bin
cp -v stumpwm $out/bin
'';
});
stumpwm-unwrapped = super.stumpwm;
clfswm = super.clfswm.overrideAttrs (o: rec { clfswm = super.clfswm.overrideAttrs (o: rec {
buildScript = pkgs.writeText "build-clfswm.lisp" '' buildScript = pkgs.writeText "build-clfswm.lisp" ''
@ -471,6 +438,7 @@ let
} // optionalAttrs pkgs.config.allowAliases { } // optionalAttrs pkgs.config.allowAliases {
cl-glib_dot_gio = throw "cl-glib_dot_gio was replaced by cl-gio"; cl-glib_dot_gio = throw "cl-glib_dot_gio was replaced by cl-gio";
cl-gtk4_dot_webkit2 = throw "cl-gtk4_dot_webkit2 was replaced by cl-gtk4_dot_webkit"; cl-gtk4_dot_webkit2 = throw "cl-gtk4_dot_webkit2 was replaced by cl-gtk4_dot_webkit";
stumpwm-unwrapped = throw "stumpwm-unwrapped is now just stumpwm";
}); });
in packages in packages

View file

@ -11,61 +11,62 @@
colorama, colorama,
fetchFromGitHub, fetchFromGitHub,
iconv, iconv,
minikerberos,
pillow, pillow,
pyperclip, pyperclip,
pythonOlder, pythonOlder,
rustPlatform, rustPlatform,
rustc, rustc,
setuptools,
setuptools-rust, setuptools-rust,
tqdm, tqdm,
unicrypto, unicrypto,
winsspi,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aardwolf"; pname = "aardwolf";
version = "0.2.8"; version = "0.2.11";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "skelsec"; owner = "skelsec";
repo = "aardwolf"; repo = "aardwolf";
tag = version; rev = "0586591e948977ca5945252c893ba8f766ff8d28";
hash = "sha256-4kJsW0uwWfcgVruEdDw3QhbzfPDuLjmK+YvcLrgF4SI="; hash = "sha256-daDxkQ7N0+yS2JOLfXJq4jv+5VQNnwtqIMy2p8j+Sag=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
sourceRoot = "${src.name}/aardwolf/utils/rlers"; sourceRoot = "${src.name}/aardwolf/utils/rlers";
name = "${pname}-${version}"; name = "${pname}-${version}";
hash = "sha256-i7fmdWOseRQGdvdBnlGi+lgWvhC2WFI2FwXU9JywYsc="; hash = "sha256-dGWPgyg8Ibyz3KcrMUI7xL7gTJ7iZ4sN0zOxFxcIrhM=";
}; };
cargoRoot = "aardwolf/utils/rlers"; cargoRoot = "aardwolf/utils/rlers";
build-system = [
setuptools
setuptools-rust
];
nativeBuildInputs = [ nativeBuildInputs = [
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
setuptools-rust
cargo cargo
rustc rustc
]; ];
propagatedBuildInputs = [ dependencies = [
arc4 arc4
asn1crypto asn1crypto
asn1tools asn1tools
asyauth asyauth
asysocks asysocks
colorama colorama
minikerberos
pillow pillow
pyperclip pyperclip
tqdm tqdm
unicrypto unicrypto
winsspi
] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ iconv ]; ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ iconv ];
# Module doesn't have tests # Module doesn't have tests

View file

@ -3,41 +3,48 @@
buildPythonPackage, buildPythonPackage,
fetchPypi, fetchPypi,
fonttools, fonttools,
fs,
pyclipper, pyclipper,
defcon, defcon,
fontpens, fontpens,
setuptools,
setuptools-scm, setuptools-scm,
pytest, pytestCheckHook,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "booleanoperations"; pname = "booleanoperations";
version = "0.9.0"; version = "0.9.0";
pyproject = true;
src = fetchPypi { src = fetchPypi {
pname = "booleanOperations"; pname = "booleanOperations";
inherit version; inherit version;
sha256 = "1f41lb19m8azchl1aqz6j5ycbspb8jsf1cnn42hlydxd68f85ylc"; hash = "sha256-jPqCHDKtN0+hINay4LRE6+rFfJHmYxUoZF+hmsKigbg=";
extension = "zip"; extension = "zip";
}; };
nativeBuildInputs = [ setuptools-scm ]; build-system = [
setuptools
propagatedBuildInputs = [ setuptools-scm
fonttools
fs
pyclipper
defcon
fontpens
]; ];
nativeCheckInputs = [ pytest ]; dependencies = [
fonttools
pyclipper
];
meta = with lib; { pythonImportsCheck = [ "booleanOperations" ];
nativeCheckInputs = [
defcon
fontpens
pytestCheckHook
];
meta = {
description = "Boolean operations on paths"; description = "Boolean operations on paths";
homepage = "https://github.com/typemytype/booleanOperations"; homepage = "https://github.com/typemytype/booleanOperations";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.sternenseemann ]; maintainers = [ lib.maintainers.sternenseemann ];
}; };
} }

View file

@ -1,76 +0,0 @@
{
lib,
buildPythonPackage,
config,
cudaSupport ? config.cudaSupport,
cupy,
fetchFromGitHub,
filelock,
mock,
protobuf,
pytestCheckHook,
pythonOlder,
six,
setuptools,
numpy,
typing-extensions,
}:
buildPythonPackage rec {
pname = "chainer";
version = "7.8.1.post1";
build-system = [ setuptools ];
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "chainer";
repo = "chainer";
tag = "v${version}";
hash = "sha256-epwnExmyCWmwaOz+mJnAl1peEeHLBdQGC62BlLfSTQQ=";
};
postPatch = ''
substituteInPlace chainer/_environment_check.py \
--replace-fail "import numpy.distutils.system_info" "import numpy" \
--replace-fail "numpy.distutils.system_info" "numpy.__config__.get_info"
'';
dependencies = [
filelock
protobuf
six
typing-extensions
numpy
] ++ lib.optionals cudaSupport [ cupy ];
nativeCheckInputs = [
mock
pytestCheckHook
];
pytestFlagsArray = [ "tests/chainer_tests/utils_tests" ];
preCheck = ''
# cf. https://github.com/chainer/chainer/issues/8621
export CHAINER_WARN_VERSION_MISMATCH=0
# ignore pytest warnings not listed
rm setup.cfg
'';
disabledTests = [
"gpu"
"cupy"
"ideep"
];
pythonImportsCheck = [ "chainer" ];
meta = {
description = "Flexible framework of neural networks for deep learning";
homepage = "https://chainer.org/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ hyphon81 ];
};
}

View file

@ -1,24 +1,33 @@
{ {
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchPypi, fetchFromGitLab,
setuptools,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "cjkwrap"; pname = "cjkwrap";
version = "2.2"; version = "2.2";
src = fetchPypi { pyproject = true;
pname = "CJKwrap";
inherit version; src = fetchFromGitLab {
sha256 = "1b603sg6c2gv9vmlxwr6r1qvhadqk3qp6vifmijris504zjx5ix2"; owner = "fgallaire";
repo = "cjkwrap";
rev = "v${version}";
hash = "sha256-0wTx3rnlUfQEE2/Z8Y7iwlsHk+CIy6ut+QIpC5yg4aM=";
}; };
build-system = [ setuptools ];
pythonImportsCheck = [ "cjkwrap" ]; pythonImportsCheck = [ "cjkwrap" ];
meta = with lib; { # no tests
doCheck = false;
meta = {
description = "Library for wrapping and filling CJK text"; description = "Library for wrapping and filling CJK text";
homepage = "https://f.gallai.re/cjkwrap"; homepage = "https://f.gallai.re/cjkwrap";
license = licenses.lgpl3Plus; license = lib.licenses.lgpl3Plus;
maintainers = [ maintainers.kaction ]; maintainers = [ lib.maintainers.kaction ];
}; };
} }

View file

@ -19,7 +19,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "color-operations"; pname = "color-operations";
version = "0.1.4"; version = "0.1.6";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "vincentsarago"; owner = "vincentsarago";
repo = "color-operations"; repo = "color-operations";
tag = version; tag = version;
hash = "sha256-qqOTmVYD3VfjeVJtYvDQw+cxjcTsmqTYQNL1qMX+fL4="; hash = "sha256-hHfcScKYemvPg2V5wn1Wsctjg6vgzljk5sAw+I+kS6w=";
}; };
build-system = [ build-system = [

View file

@ -20,7 +20,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-pubsub"; pname = "google-cloud-pubsub";
version = "2.27.1"; version = "2.27.2";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "google_cloud_pubsub"; pname = "google_cloud_pubsub";
inherit version; inherit version;
hash = "sha256-cRnbxa9LkV7N+hKJkZ95GkMpJ+qqe7++t0Dm1wIMGB4="; hash = "sha256-2SwVbH3dDlElAI+XeJgZjXsa52YCYFZJcnG+xJCWR/4=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View file

@ -1,35 +1,50 @@
{ {
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchPypi, fetchFromGitHub,
pythonOlder, setuptools,
python-json-logger, python-json-logger,
jsonschema, jsonschema,
ruamel-yaml, ruamel-yaml,
traitlets, traitlets,
pytestCheckHook,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "jupyter_telemetry"; pname = "jupyter-telemetry";
version = "0.1.0"; version = "0.1.0";
disabled = pythonOlder "3.5"; pyproject = true;
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "jupyter";
sha256 = "052khyn6h97jxl3k5i2m81xvga5v6vwh5qixzrax4w6zwcx62p24"; repo = "telemetry";
tag = "v${version}";
hash = "sha256-WxTlTs6gE9pa0hbl29Zvwikobz1/2JQ3agYO7WxyZ2E=";
}; };
propagatedBuildInputs = [ build-system = [ setuptools ];
dependencies = [
python-json-logger python-json-logger
jsonschema jsonschema
ruamel-yaml ruamel-yaml
traitlets traitlets
]; ];
meta = with lib; { pythonImportsCheck = [ "jupyter_telemetry" ];
nativeCheckInputs = [ pytestCheckHook ];
disabledTests = [
# AssertionError
"test_record_event"
"test_unique_logger_instances"
];
meta = {
description = "Telemetry for Jupyter Applications and extensions"; description = "Telemetry for Jupyter Applications and extensions";
homepage = "https://jupyter-telemetry.readthedocs.io/"; homepage = "https://jupyter-telemetry.readthedocs.io/";
license = licenses.bsd3; license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ chiroptical ]; maintainers = with lib.maintainers; [ chiroptical ];
}; };
} }

View file

@ -5,31 +5,28 @@
google-auth, google-auth,
keyring, keyring,
pluggy, pluggy,
pythonOlder,
requests, requests,
setuptools,
setuptools-scm, setuptools-scm,
toml,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "keyrings.google-artifactregistry-auth"; pname = "keyrings-google-artifactregistry-auth";
version = "1.1.2"; version = "1.1.2";
disabled = pythonOlder "3.6";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; pname = "keyrings.google-artifactregistry-auth";
inherit version;
hash = "sha256-vWq7cnQNLf60pcA8OxBcb326FpyqKd7jlZaU8fAsd94="; hash = "sha256-vWq7cnQNLf60pcA8OxBcb326FpyqKd7jlZaU8fAsd94=";
}; };
buildInputs = [ build-system = [
setuptools
setuptools-scm setuptools-scm
toml
]; ];
propagatedBuildInputs = [ dependencies = [
google-auth google-auth
keyring keyring
pluggy pluggy
@ -41,11 +38,11 @@ buildPythonPackage rec {
# upstream has no tests # upstream has no tests
doCheck = false; doCheck = false;
meta = with lib; { meta = {
changelog = "https://github.com/GoogleCloudPlatform/artifact-registry-python-tools/blob/main/HISTORY.md"; changelog = "https://github.com/GoogleCloudPlatform/artifact-registry-python-tools/blob/main/HISTORY.md";
description = "Python package which allows you to configure keyring to interact with Python repositories stored in Artifact Registry"; description = "Python package which allows you to configure keyring to interact with Python repositories stored in Artifact Registry";
homepage = "https://pypi.org/project/keyrings.google-artifactregistry-auth"; homepage = "https://github.com/GoogleCloudPlatform/artifact-registry-python-tools";
license = licenses.asl20; license = lib.licenses.asl20;
maintainers = with maintainers; [ lovesegfault ]; maintainers = with lib.maintainers; [ lovesegfault ];
}; };
} }

View file

@ -2,30 +2,33 @@
buildPythonPackage, buildPythonPackage,
colorama, colorama,
fetchPypi, fetchPypi,
isPy27,
lib, lib,
setuptools,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "log_symbols"; pname = "log-symbols";
version = "0.0.14"; version = "0.0.14";
disabled = isPy27; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; pname = "log_symbols";
sha256 = "0mh5d0igw33libfmbsr1ri1p1y644p36nwaa2w6kzrd8w5pvq2yg"; inherit version;
hash = "sha256-zwu8b+Go5T8NF0pxa8YlxPhwQ8wh61XdinQM/iJoBVY=";
}; };
propagatedBuildInputs = [ colorama ]; build-system = [ setuptools ];
dependencies = [ colorama ];
# Tests are not included in the PyPI distribution and the git repo does not have tagged releases # Tests are not included in the PyPI distribution and the git repo does not have tagged releases
doCheck = false; doCheck = false;
pythonImportsCheck = [ "log_symbols" ]; pythonImportsCheck = [ "log_symbols" ];
meta = with lib; { meta = {
description = "Colored Symbols for Various Log Levels"; description = "Colored Symbols for Various Log Levels";
homepage = "https://github.com/manrajgrover/py-log-symbols"; homepage = "https://github.com/manrajgrover/py-log-symbols";
license = licenses.mit; license = lib.licenses.mit;
maintainers = with maintainers; [ urbas ]; maintainers = with lib.maintainers; [ urbas ];
}; };
} }

View file

@ -1,30 +0,0 @@
{
lib,
buildPythonPackage,
fetchPypi,
matrix-client,
}:
buildPythonPackage rec {
pname = "matrix_api_async";
version = "0.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "0xdx8fci0lar3x09dwqgka6ssz9d3g7gsfx4yyr13sdwza7zsqc3";
};
propagatedBuildInputs = [ matrix-client ];
# no tests
doCheck = false;
pythonImportsCheck = [ "matrix_api_async" ];
meta = with lib; {
description = "Asyncio wrapper of matrix_client.api";
license = licenses.mit;
homepage = "https://github.com/Cadair/matrix_api_async";
maintainers = with maintainers; [ globin ];
};
}

View file

@ -5,21 +5,26 @@
pytestCheckHook, pytestCheckHook,
requests, requests,
responses, responses,
setuptools,
urllib3, urllib3,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "matrix-client"; pname = "matrix-client";
version = "0.4.0"; version = "0.4.0";
format = "setuptools"; pyproject = true;
src = fetchPypi { src = fetchPypi {
pname = "matrix_client"; pname = "matrix_client";
inherit version; inherit version;
sha256 = "0mii7ib3bah5ppqs7i8sjv5l0zbl57011908m4l0jbyby90ayy06"; hash = "sha256-BnivQPLLLwkoqQikEMApdH1Ay5YaxaPxvQWqNVY8MVY=";
}; };
propagatedBuildInputs = [ build-system = [ setuptools ];
pythonRelaxDeps = [ "urllib3" ];
dependencies = [
requests requests
urllib3 urllib3
]; ];
@ -36,10 +41,10 @@ buildPythonPackage rec {
pythonImportsCheck = [ "matrix_client" ]; pythonImportsCheck = [ "matrix_client" ];
meta = with lib; { meta = {
description = "Python Matrix Client-Server SDK"; description = "Python Matrix Client-Server SDK";
homepage = "https://github.com/matrix-org/matrix-python-sdk"; homepage = "https://github.com/matrix-org/matrix-python-sdk";
license = licenses.asl20; license = lib.licenses.asl20;
maintainers = with maintainers; [ olejorgenb ]; maintainers = with lib.maintainers; [ olejorgenb ];
}; };
} }

View file

@ -2,13 +2,15 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
setuptools,
markdown, markdown,
python, pytestCheckHook,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "mdx_truly_sane_lists"; pname = "mdx-truly-sane-lists";
version = "1.3"; version = "1.3";
pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "radude"; owner = "radude";
@ -17,23 +19,23 @@ buildPythonPackage rec {
hash = "sha256-hPnqF1UA4peW8hzeFiMlsBPfodC1qJXETGoq2yUm7d4="; hash = "sha256-hPnqF1UA4peW8hzeFiMlsBPfodC1qJXETGoq2yUm7d4=";
}; };
propagatedBuildInputs = [ markdown ]; build-system = [ setuptools ];
dependencies = [ markdown ];
pythonImportsCheck = [ "mdx_truly_sane_lists" ]; pythonImportsCheck = [ "mdx_truly_sane_lists" ];
checkPhase = '' nativeCheckInputs = [ pytestCheckHook ];
runHook preCheck
${python.interpreter} mdx_truly_sane_lists/tests.py
runHook postCheck
'';
meta = with lib; { pytestFlagsArray = [ "mdx_truly_sane_lists/tests.py" ];
meta = {
description = "Extension for Python-Markdown that makes lists truly sane"; description = "Extension for Python-Markdown that makes lists truly sane";
longDescription = '' longDescription = ''
Features custom indents for nested lists and fix for messy linebreaks and Features custom indents for nested lists and fix for messy linebreaks and
paragraphs between lists. paragraphs between lists.
''; '';
license = licenses.mit; license = lib.licenses.mit;
maintainers = with maintainers; [ kaction ]; maintainers = with lib.maintainers; [ kaction ];
}; };
} }

View file

@ -238,8 +238,8 @@ rec {
"sha256-4EYaL7nEbjypOOtEJwJvqLvXfS1D0zGzGSWY85XVzRQ="; "sha256-4EYaL7nEbjypOOtEJwJvqLvXfS1D0zGzGSWY85XVzRQ=";
mypy-boto3-cloudhsmv2 = mypy-boto3-cloudhsmv2 =
buildMypyBoto3Package "cloudhsmv2" "1.35.93" buildMypyBoto3Package "cloudhsmv2" "1.35.94"
"sha256-zJpDczYBHPPgdJlFOjzS1RnHLDO3CuPid92S1CwjaxY="; "sha256-dmHU4UGGd5qo7hYvOU+SmLswjMLSNFvONudTRYm25fc=";
mypy-boto3-cloudsearch = mypy-boto3-cloudsearch =
buildMypyBoto3Package "cloudsearch" "1.35.93" buildMypyBoto3Package "cloudsearch" "1.35.93"
@ -266,8 +266,8 @@ rec {
"sha256-00fCatU8SbuxQuw+VAbG1kOJ43asrbGbq8moJw1JzrY="; "sha256-00fCatU8SbuxQuw+VAbG1kOJ43asrbGbq8moJw1JzrY=";
mypy-boto3-codebuild = mypy-boto3-codebuild =
buildMypyBoto3Package "codebuild" "1.35.93" buildMypyBoto3Package "codebuild" "1.35.96"
"sha256-h2/TOx5T7U2iBfOZ6aDyykzEd0A/eiT/5/6fKS4wR1Q="; "sha256-SOJAFGd5Yz4TJ49VfjixfchWC0s1xdogZ/2qd5SvDVQ=";
mypy-boto3-codecatalyst = mypy-boto3-codecatalyst =
buildMypyBoto3Package "codecatalyst" "1.35.93" buildMypyBoto3Package "codecatalyst" "1.35.93"
@ -330,8 +330,8 @@ rec {
"sha256-zBPL1DFdMYELOa3YMMlsUL+j6aDTNcYtAMlTlvkLnF0="; "sha256-zBPL1DFdMYELOa3YMMlsUL+j6aDTNcYtAMlTlvkLnF0=";
mypy-boto3-compute-optimizer = mypy-boto3-compute-optimizer =
buildMypyBoto3Package "compute-optimizer" "1.35.93" buildMypyBoto3Package "compute-optimizer" "1.35.96"
"sha256-hln7MWYK6yPqN77pwGz+013kHyjXgL4xFMycUzJgMMo="; "sha256-l6q47Z3FTNzy5/SUH+SZly1JmEz3F96zfj6J9dJXm4U=";
mypy-boto3-config = mypy-boto3-config =
buildMypyBoto3Package "config" "1.35.93" buildMypyBoto3Package "config" "1.35.93"
@ -434,8 +434,8 @@ rec {
"sha256-EZfK4RgPD0RWYqSbOu3IJX7oXN9QG8G46MFwFV09gyk="; "sha256-EZfK4RgPD0RWYqSbOu3IJX7oXN9QG8G46MFwFV09gyk=";
mypy-boto3-dynamodb = mypy-boto3-dynamodb =
buildMypyBoto3Package "dynamodb" "1.35.93" buildMypyBoto3Package "dynamodb" "1.35.94"
"sha256-yrTXfvYfk7w6lRnLMlUmizQ75iOHrSLgg1pjPLmxaY0="; "sha256-kSi8nfpXTx9v45keyMM7NGJtJqdnuWGXOpX3YQ2OmME=";
mypy-boto3-dynamodbstreams = mypy-boto3-dynamodbstreams =
buildMypyBoto3Package "dynamodbstreams" "1.35.93" buildMypyBoto3Package "dynamodbstreams" "1.35.93"
@ -542,8 +542,8 @@ rec {
"sha256-jBVQYYUjnU8wbXW3XFSFCb/gnDOqkTgiAx8NCHN82tM="; "sha256-jBVQYYUjnU8wbXW3XFSFCb/gnDOqkTgiAx8NCHN82tM=";
mypy-boto3-fms = mypy-boto3-fms =
buildMypyBoto3Package "fms" "1.35.93" buildMypyBoto3Package "fms" "1.35.96"
"sha256-V6LNqtede9jv8nsF8FYfTAAC0S9qapucnbG521nPyYM="; "sha256-IFNzmyaKRvoQ+afX1Oy9ZPXiIQqzR3M3NpbCArEhXkI=";
mypy-boto3-forecast = mypy-boto3-forecast =
buildMypyBoto3Package "forecast" "1.35.93" buildMypyBoto3Package "forecast" "1.35.93"
@ -614,8 +614,8 @@ rec {
"sha256-qSuSaVpjEzdjr9vwH74IibWAiiiQRkXqn+wKWWTU+u0="; "sha256-qSuSaVpjEzdjr9vwH74IibWAiiiQRkXqn+wKWWTU+u0=";
mypy-boto3-imagebuilder = mypy-boto3-imagebuilder =
buildMypyBoto3Package "imagebuilder" "1.35.93" buildMypyBoto3Package "imagebuilder" "1.35.94"
"sha256-Viw56d3d1j/V7zijdxziCh/0E8vy1oZwE7+AhP7Vwx4="; "sha256-Cj3//KC7Au8xn0NHjLH5yGjbpHFQL80EXhuMSHTlIAc=";
mypy-boto3-importexport = mypy-boto3-importexport =
buildMypyBoto3Package "importexport" "1.35.93" buildMypyBoto3Package "importexport" "1.35.93"
@ -1086,8 +1086,8 @@ rec {
"sha256-VECkUIkz/tUtKaiRTpi+gcNYpkI9DugZDFZ13ZjL558="; "sha256-VECkUIkz/tUtKaiRTpi+gcNYpkI9DugZDFZ13ZjL558=";
mypy-boto3-rds = mypy-boto3-rds =
buildMypyBoto3Package "rds" "1.35.93" buildMypyBoto3Package "rds" "1.35.95"
"sha256-S+8+by+OVPbcXL0ZC3rf0XEhEp051oItzpVwEQREdcA="; "sha256-rRukdIPIrpdv4S9+EIndBDp2b4uoWP9cRIV9q1RwL9M=";
mypy-boto3-rds-data = mypy-boto3-rds-data =
buildMypyBoto3Package "rds-data" "1.35.93" buildMypyBoto3Package "rds-data" "1.35.93"
@ -1134,8 +1134,8 @@ rec {
"sha256-Bv1Z2cVGXepn2/VjnoLHozMZvfdfniR+pTzv9FAoXV8="; "sha256-Bv1Z2cVGXepn2/VjnoLHozMZvfdfniR+pTzv9FAoXV8=";
mypy-boto3-route53 = mypy-boto3-route53 =
buildMypyBoto3Package "route53" "1.35.93" buildMypyBoto3Package "route53" "1.35.95"
"sha256-eMp0hg8GwRU3XL+0zmUHGrhq35g89h1AyZ5A8C4g/QE="; "sha256-0Aocwq1wvF7NmODu0NV15IoPEscjb441s0NRTVyi5Hs=";
mypy-boto3-route53-recovery-cluster = mypy-boto3-route53-recovery-cluster =
buildMypyBoto3Package "route53-recovery-cluster" "1.35.93" buildMypyBoto3Package "route53-recovery-cluster" "1.35.93"
@ -1174,8 +1174,8 @@ rec {
"sha256-nuCuzwEQnTMuI8Wd1an+vT3fsUAgpHqIRyoXV66L4Xs="; "sha256-nuCuzwEQnTMuI8Wd1an+vT3fsUAgpHqIRyoXV66L4Xs=";
mypy-boto3-sagemaker = mypy-boto3-sagemaker =
buildMypyBoto3Package "sagemaker" "1.35.93" buildMypyBoto3Package "sagemaker" "1.35.95"
"sha256-87BRRU94aOljH1uYC8aXAyfBX62GL/Wb6L6AkQFOlYc="; "sha256-hJfmA6R/to1JQW/VIi71LoJ6gIhXboZFMtxxZnVtX9A=";
mypy-boto3-sagemaker-a2i-runtime = mypy-boto3-sagemaker-a2i-runtime =
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.93" buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.93"

View file

@ -23,16 +23,16 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "photutils"; pname = "photutils";
version = "2.0.2"; version = "2.1.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.10"; disabled = pythonOlder "3.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "astropy"; owner = "astropy";
repo = "photutils"; repo = "photutils";
tag = version; tag = version;
hash = "sha256-gXtC6O8rXBBa8VMuqxshnJieAahv3bCY2C1BXNmJxb4="; hash = "sha256-p1MQgIYmiTekKV6oNKql/dnp5CAahXzecrTl25tz1g0=";
}; };
build-system = [ build-system = [

View file

@ -0,0 +1,54 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
gitUpdater,
setuptools,
setuptools-scm,
fs,
pytestCheckHook,
pytest-mock,
}:
buildPythonPackage rec {
pname = "pyfatfs";
version = "1.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "nathanhi";
repo = "pyfatfs";
tag = "v${version}";
hash = "sha256-26b4EV3WERUqJ10VkYov3PDFhSBcfxCF79P8Eg5xpoM=";
};
build-system = [
setuptools
setuptools-scm
];
dependencies = [ fs ];
postPatch = ''
substituteInPlace ./pyproject.toml \
--replace-fail 'setuptools ~= 67.8' setuptools \
--replace-fail '"setuptools_scm[toml] ~= 7.1"' ""
'';
nativeCheckInputs = [
pytestCheckHook
pytest-mock
];
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
meta = {
description = "Python based FAT12/FAT16/FAT32 implementation with VFAT support";
homepage = "https://github.com/nathanhi/pyfatfs";
license = lib.licenses.mit;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ vlaci ];
};
}

View file

@ -2,31 +2,34 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchPypi, fetchPypi,
setuptools,
pygments, pygments,
isPy3k,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pygments_better_html"; pname = "pygments-better-html";
version = "0.1.5"; version = "0.1.5";
disabled = !isPy3k; pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; pname = "pygments_better_html";
inherit version;
hash = "sha256-SLAe5ubIGEchUNoHCct6CWisBja3WNEfpE48v9CTzPQ="; hash = "sha256-SLAe5ubIGEchUNoHCct6CWisBja3WNEfpE48v9CTzPQ=";
}; };
propagatedBuildInputs = [ pygments ]; build-system = [ setuptools ];
dependencies = [ pygments ];
# has no tests # has no tests
doCheck = false; doCheck = false;
pythonImportsCheck = [ "pygments_better_html" ]; pythonImportsCheck = [ "pygments_better_html" ];
meta = with lib; { meta = {
homepage = "https://github.com/Kwpolska/pygments_better_html"; homepage = "https://github.com/Kwpolska/pygments_better_html";
description = "Improved line numbering for Pygments HTML formatter"; description = "Improved line numbering for Pygments HTML formatter";
license = licenses.bsd3; license = lib.licenses.bsd3;
maintainers = with maintainers; [ hexa ]; maintainers = with lib.maintainers; [ hexa ];
}; };
} }

View file

@ -2,6 +2,7 @@
lib, lib,
stdenv, stdenv,
aiohttp, aiohttp,
aioresponses,
async-timeout, async-timeout,
buildPythonPackage, buildPythonPackage,
click, click,
@ -20,7 +21,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-roborock"; pname = "python-roborock";
version = "2.8.5"; version = "2.9.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.10"; disabled = pythonOlder "3.10";
@ -29,7 +30,7 @@ buildPythonPackage rec {
owner = "humbertogontijo"; owner = "humbertogontijo";
repo = "python-roborock"; repo = "python-roborock";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-3wUf2J7TncxUdqN3SgAdHwMLbkNXj9Pwf7Zk3OmAThY="; hash = "sha256-xPbq31mp1XM1WtmrknF9ZXyolxXu+iCMCqJccxC+Qd0=";
}; };
postPatch = '' postPatch = ''
@ -53,6 +54,7 @@ buildPythonPackage rec {
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pycryptodomex ]; ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ pycryptodomex ];
nativeCheckInputs = [ nativeCheckInputs = [
aioresponses
pytest-asyncio pytest-asyncio
pytestCheckHook pytestCheckHook
]; ];

View file

@ -19,7 +19,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "rapidfuzz"; pname = "rapidfuzz";
version = "3.10.1"; version = "3.11.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "maxbachmann"; owner = "maxbachmann";
repo = "RapidFuzz"; repo = "RapidFuzz";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-0L8nkjgWdP/w//M69ZRxYk9If3CIEcnAl9mkJKJ4o1g="; hash = "sha256-wsY0JCY8unLIMs01SLgQMOu9RQ0qTdPAZ71e6TigTVQ=";
}; };
postPatch = '' postPatch = ''

View file

@ -13,7 +13,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "rns"; pname = "rns";
version = "0.8.8"; version = "0.8.9";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "markqvist"; owner = "markqvist";
repo = "Reticulum"; repo = "Reticulum";
tag = version; tag = version;
hash = "sha256-Vsh5C0IlOz8/Jw0ya1bOGsNiBQTXJwTWUBcDFs5Zp+0="; hash = "sha256-yUn7tDAu4DJZFJAMdsSnEjlvCHxp1y7OO8xR86lus54=";
}; };
patches = [ patches = [

View file

@ -0,0 +1,35 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
}:
buildPythonPackage rec {
pname = "scikits-odes-core";
version = "3.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "bmcage";
repo = "odes";
tag = "v${version}";
hash = "sha256-wOdqRzj45piT9P+qA0xXBCnOZ9Xh+Waej2t51mDcilc=";
};
sourceRoot = "${src.name}/packages/scikits-odes-core";
build-system = [ setuptools ];
pythonImportsCheck = [ "scikits_odes_core" ];
# no tests
doCheck = false;
meta = {
description = "Core support module for scikits-odes";
homepage = "https://github.com/bmcage/odes/blob/master/packages/scikits-odes-core";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ idontgetoutmuch ];
};
}

View file

@ -0,0 +1,37 @@
{
buildPythonPackage,
gfortran,
meson-python,
numpy,
scikits-odes-core,
}:
buildPythonPackage rec {
inherit (scikits-odes-core) version src;
pname = "scikits-odes-daepack";
pyproject = true;
sourceRoot = "${src.name}/packages/scikits-odes-daepack";
build-system = [
meson-python
numpy
];
nativeBuildInputs = [ gfortran ];
dependencies = [
numpy
scikits-odes-core
];
pythonImportsCheck = [ "scikits_odes_daepack" ];
# no tests
doCheck = false;
meta = scikits-odes-core.meta // {
description = "Wrapper around daepack";
homepage = "https://github.com/bmcage/odes/blob/master/packages/scikits-odes-daepack";
};
}

View file

@ -0,0 +1,41 @@
{
buildPythonPackage,
sundials,
cython,
numpy,
pkgconfig,
setuptools,
scikits-odes-core,
pytestCheckHook,
}:
buildPythonPackage rec {
inherit (scikits-odes-core) version src;
pname = "scikits-odes-sundials";
pyproject = true;
sourceRoot = "${src.name}/packages/scikits-odes-sundials";
build-system = [
cython
numpy
pkgconfig
setuptools
];
buildInputs = [ sundials ];
dependencies = [
numpy
scikits-odes-core
];
pythonImportsCheck = [ "scikits_odes_sundials" ];
nativeCheckInputs = [ pytestCheckHook ];
meta = scikits-odes-core.meta // {
description = "Sundials wrapper module for scikits-odes";
homepage = "https://github.com/bmcage/odes/blob/master/packages/scikits-odes-sundials";
};
}

View file

@ -1,59 +1,42 @@
{ {
lib, lib,
stdenv,
buildPythonPackage, buildPythonPackage,
fetchPypi, setuptools,
pythonAtLeast,
cython,
enum34,
gfortran,
isPy27,
isPy3k,
numpy,
pytest,
python,
scipy, scipy,
sundials, scikits-odes-core,
scikits-odes-daepack,
scikits-odes-sundials,
pytestCheckHook,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
inherit (scikits-odes-core) version src;
pname = "scikits.odes"; pname = "scikits.odes";
version = "2.7.0"; pyproject = true;
# https://github.com/bmcage/odes/issues/130 sourceRoot = "${src.name}/packages/scikits-odes";
disabled = isPy27 || pythonAtLeast "3.12";
src = fetchPypi { build-system = [ setuptools ];
inherit pname version;
hash = "sha256-px4Z4UhYk3VK6MBQZoIy/MaU8XuDYC51++v3v5+XXh4=";
};
nativeBuildInputs = [ dependencies = [
gfortran scipy
cython scikits-odes-core
scikits-odes-daepack
scikits-odes-sundials
]; ];
propagatedBuildInputs = [ pythonImportsCheck = [ "scikits_odes" ];
numpy
sundials
scipy
] ++ lib.optionals (!isPy3k) [ enum34 ];
nativeCheckInputs = [ pytest ]; nativeCheckInputs = [ pytestCheckHook ];
checkPhase = '' disabledTests = lib.optionals stdenv.hostPlatform.isAarch64 [
cd $out/${python.sitePackages}/scikits/odes/tests # skip on aarch64, see https://github.com/bmcage/odes/issues/101
pytest "test_lsodi"
''; ];
meta = with lib; { meta = scikits-odes-core.meta // {
description = "Scikit offering extra ode/dae solvers, as an extension to what is available in scipy"; description = "Scikit offering extra ode/dae solvers, as an extension to what is available in scipy";
homepage = "https://github.com/bmcage/odes"; homepage = "https://github.com/bmcage/odes/blob/master/packages/scikits-odes";
license = licenses.bsd3;
maintainers = with maintainers; [ idontgetoutmuch ];
platforms = [
"aarch64-linux"
"x86_64-linux"
"x86_64-darwin"
];
}; };
} }

View file

@ -2,24 +2,35 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchPypi, fetchPypi,
setuptools,
setuptools-scm, setuptools-scm,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "scrap_engine"; pname = "scrap-engine";
version = "1.4.1"; version = "1.4.1";
pyproject = true;
src = fetchPypi { src = fetchPypi {
inherit pname version; pname = "scrap_engine";
inherit version;
hash = "sha256-qxzbVYFcSKcL2HtMlH9epO/sCx9HckWAt/NyVD8QJBQ="; hash = "sha256-qxzbVYFcSKcL2HtMlH9epO/sCx9HckWAt/NyVD8QJBQ=";
}; };
nativeBuildInputs = [ setuptools-scm ]; build-system = [
setuptools
setuptools-scm
];
meta = with lib; { pythonImportsCheck = [ "scrap_engine" ];
maintainers = with maintainers; [ fgaz ];
# raise scrap_engine.CoordinateError
doCheck = false;
meta = {
maintainers = with lib.maintainers; [ fgaz ];
description = "2D ascii game engine for the terminal"; description = "2D ascii game engine for the terminal";
homepage = "https://github.com/lxgr-linux/scrap_engine"; homepage = "https://github.com/lxgr-linux/scrap_engine";
license = licenses.gpl3Only; license = lib.licenses.gpl3Only;
}; };
} }

View file

@ -21,7 +21,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "twilio"; pname = "twilio";
version = "9.4.1"; version = "9.4.2";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "twilio"; owner = "twilio";
repo = "twilio-python"; repo = "twilio-python";
tag = version; tag = version;
hash = "sha256-sZhKFnCmARocnOqM1NE6eGU/6UtfJSQTK+bv5HHHU1U="; hash = "sha256-U3N/0HrZlv3/AtMtf5hvkBB3nzol83XDGLAa7hdCB2w=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

View file

@ -0,0 +1,46 @@
{
lib,
stdenvNoCC,
buildPythonPackage,
fetchFromGitHub,
nix-update-script,
rustPlatform,
libiconv,
}:
buildPythonPackage rec {
pname = "unblob-native";
version = "0.1.5";
pyproject = true;
src = fetchFromGitHub {
owner = "onekey-sec";
repo = "unblob-native";
tag = "v${version}";
hash = "sha256-jpaBxKuQNfU0I3kCs67mM5dzGURSSHvqymhk43P7xXk=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-K2QTf4OlP4AH2JJiJ6r8PRkInSOQdIBQcSvY5tWr4mw=";
};
nativeBuildInputs = with rustPlatform; [
maturinBuildHook
cargoSetupHook
];
buildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ libiconv ];
pythonImportsCheck = [ "unblob_native" ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Performance sensitive parts of Unblob";
homepage = "https://unblob.org";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ vlaci ];
};
}

View file

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "checkov"; pname = "checkov";
version = "3.2.351"; version = "3.2.352";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bridgecrewio"; owner = "bridgecrewio";
repo = "checkov"; repo = "checkov";
tag = version; tag = version;
hash = "sha256-GrzCdMw77yAZPRu7eIRJAlZKclpZe/lVMLUP4zNjkts="; hash = "sha256-by1oMAhhN+VbWzv2+OfQRBGQXkUn4EST4OWqyoOhdEQ=";
}; };
patches = [ ./flake8-compat-5.x.patch ]; patches = [ ./flake8-compat-5.x.patch ];

View file

@ -4,12 +4,12 @@
assert lib.versionAtLeast ocaml.version "4.08.0"; assert lib.versionAtLeast ocaml.version "4.08.0";
stdenv.mkDerivation { stdenv.mkDerivation (finalAttrs: {
pname = "opam"; pname = "opam";
version = "2.3.0"; version = "2.3.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/ocaml/opam/releases/download/2.3.0/opam-full-2.3.0.tar.gz"; url = "https://github.com/ocaml/opam/releases/download/${finalAttrs.version}/opam-full-${finalAttrs.version}.tar.gz";
hash = "sha256-UGunaGXcMVtn35qonnq9XBqJen8KkteyaUl0/cUys0Y="; hash = "sha256-UGunaGXcMVtn35qonnq9XBqJen8KkteyaUl0/cUys0Y=";
}; };
@ -23,36 +23,30 @@ stdenv.mkDerivation {
patches = [ ./opam-shebangs.patch ]; patches = [ ./opam-shebangs.patch ];
preConfigure = '' preConfigure = ''
patchShebangs src/state/shellscripts # Fix opam sandboxing on nixos. Remove after opam >= 2.4.0 is released
substituteInPlace src/state/shellscripts/bwrap.sh \
--replace-fail 'for dir in /*; do' 'for dir in /{*,run/current-system/sw}; do'
''; '';
configureFlags = [ "--with-vendored-deps" "--with-mccs" ]; configureFlags = [ "--with-vendored-deps" "--with-mccs" ];
# Dirty, but apparently ocp-build requires a TERM
makeFlags = ["TERM=screen"];
outputs = [ "out" "installer" ]; outputs = [ "out" "installer" ];
setOutputFlags = false; setOutputFlags = false;
# change argv0 to "opam" as a workaround for
# https://github.com/ocaml/opam/issues/2142
postInstall = '' postInstall = ''
mv $out/bin/opam $out/bin/.opam-wrapped wrapProgram $out/bin/opam \
makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --suffix PATH : ${lib.makeBinPath ([ curl getconf unzip ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bubblewrap ])}
--argv0 "opam" \
--suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.hostPlatform.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
--set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/
$out/bin/opam-installer --prefix=$installer opam-installer.install $out/bin/opam-installer --prefix=$installer opam-installer.install
''; '';
doCheck = false; doCheck = false;
meta = with lib; { meta = {
description = "Package manager for OCaml"; description = "Package manager for OCaml";
homepage = "https://opam.ocaml.org/"; homepage = "https://opam.ocaml.org/";
changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES"; changelog = "https://github.com/ocaml/opam/raw/${finalAttrs.version}/CHANGES";
maintainers = [ ]; maintainers = [ ];
license = licenses.lgpl21Only; license = lib.licenses.lgpl21Only;
platforms = platforms.all; platforms = lib.platforms.all;
}; };
} })

View file

@ -54,6 +54,7 @@
tree-sitter-jsonnet = lib.importJSON ./tree-sitter-jsonnet.json; tree-sitter-jsonnet = lib.importJSON ./tree-sitter-jsonnet.json;
tree-sitter-julia = lib.importJSON ./tree-sitter-julia.json; tree-sitter-julia = lib.importJSON ./tree-sitter-julia.json;
tree-sitter-just = lib.importJSON ./tree-sitter-just.json; tree-sitter-just = lib.importJSON ./tree-sitter-just.json;
tree-sitter-kdl = lib.importJSON ./tree-sitter-kdl.json;
tree-sitter-koka = lib.importJSON ./tree-sitter-koka.json; tree-sitter-koka = lib.importJSON ./tree-sitter-koka.json;
tree-sitter-kotlin = lib.importJSON ./tree-sitter-kotlin.json; tree-sitter-kotlin = lib.importJSON ./tree-sitter-kotlin.json;
tree-sitter-latex = lib.importJSON ./tree-sitter-latex.json; tree-sitter-latex = lib.importJSON ./tree-sitter-latex.json;

View file

@ -0,0 +1,12 @@
{
"url": "https://github.com/tree-sitter-grammars/tree-sitter-kdl",
"rev": "3ca569b9f9af43593c24f9e7a21f02f43a13bb88",
"date": "2023-05-13T01:55:45-04:00",
"path": "/nix/store/gmz9dnqxagdk59hqz7n9cyg43n7v0x93-tree-sitter-kdl",
"sha256": "1015x24ffrvzb0m0wbqdzmaqavpnjw0gvcagxi9b6vj3n1ynm0ps",
"hash": "sha256-+oJqfbBDbrNS7E+x/QCX9m6FVf0NLw4qWH9n54joJYA=",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false
}

View file

@ -466,6 +466,10 @@ let
orga = "tree-sitter-grammars"; orga = "tree-sitter-grammars";
repo = "tree-sitter-hyprlang"; repo = "tree-sitter-hyprlang";
}; };
"tree-sitter-kdl" = {
orga = "tree-sitter-grammars";
repo = "tree-sitter-kdl";
};
}; };
allGrammars = allGrammars =

View file

@ -7,11 +7,11 @@
}: }:
mkKdeDerivation rec { mkKdeDerivation rec {
pname = "pulseaudio-qt"; pname = "pulseaudio-qt";
version = "1.6.1"; version = "1.7.0";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/pulseaudio-qt/pulseaudio-qt-${version}.tar.xz"; url = "mirror://kde/stable/pulseaudio-qt/pulseaudio-qt-${version}.tar.xz";
hash = "sha256-8hvzDy/z5nDSBG+WYGncI/XmU/9Wus24kgwTdCZMvB4="; hash = "sha256-ahjbdt0rzD332ak3nAJSlYFyZLqh8u2Mqqx9pE4E6TE=";
}; };
extraNativeBuildInputs = [ pkg-config ]; extraNativeBuildInputs = [ pkg-config ];

View file

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "nginx_exporter"; pname = "nginx_exporter";
version = "1.4.0"; version = "1.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nginxinc"; owner = "nginxinc";
repo = "nginx-prometheus-exporter"; repo = "nginx-prometheus-exporter";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-aA6wQjTVkyEx+f1xBdrvN05NGqnJkgLVwrNLSh5+Ll0="; sha256 = "sha256-yujMufcL4uJHxbEd8mwqxPmPlopVm6szkDxz+GZITio=";
}; };
vendorHash = "sha256-ua3Cm1VXRs3M58vJ/fEt7SH+ZYegt0WjOGRV/iU8qZk="; vendorHash = "sha256-csBnUeuzkqgk5+62w0GZS2gX5jscPhN1z85KBVCMA0I=";
ldflags = ldflags =
let let

View file

@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "ggshield"; pname = "ggshield";
version = "1.34.0"; version = "1.35.0";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GitGuardian"; owner = "GitGuardian";
repo = "ggshield"; repo = "ggshield";
tag = "v${version}"; tag = "v${version}";
hash = "sha256-RNQD862m1p8ooFbV8k7yDW9GzP5vPQ8hgerMpvDdXAs="; hash = "sha256-ystZS5TYmu6Y86lGTAEXzQlV2/eowQJ+UQqLPtvwdpE=";
}; };
pythonRelaxDeps = true; pythonRelaxDeps = true;
@ -43,6 +43,7 @@ python3.pkgs.buildPythonApplication rec {
++ (with python3.pkgs; [ ++ (with python3.pkgs; [
jsonschema jsonschema
pyfakefs pyfakefs
pytest-factoryboy
pytest-mock pytest-mock
pytest-voluptuous pytest-voluptuous
pytestCheckHook pytestCheckHook
@ -59,6 +60,7 @@ python3.pkgs.buildPythonApplication rec {
"tests/unit/cmd/iac" "tests/unit/cmd/iac"
"tests/unit/cmd/sca/" "tests/unit/cmd/sca/"
"tests/unit/cmd/scan/" "tests/unit/cmd/scan/"
"tests/test_factories.py"
]; ];
disabledTests = [ disabledTests = [

View file

@ -2393,10 +2393,6 @@ with pkgs;
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
}; };
jwt-cli = callPackage ../tools/security/jwt-cli {
inherit (darwin.apple_sdk.frameworks) Security;
};
kaldi = callPackage ../tools/audio/kaldi { kaldi = callPackage ../tools/audio/kaldi {
inherit (darwin.apple_sdk.frameworks) Accelerate; inherit (darwin.apple_sdk.frameworks) Accelerate;
}; };
@ -3172,11 +3168,6 @@ with pkgs;
uusi = haskell.lib.compose.justStaticExecutables haskellPackages.uusi; uusi = haskell.lib.compose.justStaticExecutables haskellPackages.uusi;
uutils-coreutils = callPackage ../tools/misc/uutils-coreutils {
inherit (python3Packages) sphinx;
inherit (darwin.apple_sdk.frameworks) Security;
};
uutils-coreutils-noprefix = uutils-coreutils.override { prefix = null; }; uutils-coreutils-noprefix = uutils-coreutils.override { prefix = null; };
vorta = qt6Packages.callPackage ../applications/backup/vorta { }; vorta = qt6Packages.callPackage ../applications/backup/vorta { };
@ -15288,8 +15279,14 @@ with pkgs;
# Stumpwm is broken on SBCL 2.4.11, see # Stumpwm is broken on SBCL 2.4.11, see
# https://github.com/NixOS/nixpkgs/pull/360320 # https://github.com/NixOS/nixpkgs/pull/360320
stumpwm = sbcl_2_4_10.pkgs.stumpwm; stumpwm = callPackage ../applications/window-managers/stumpwm {
stumpwm-unwrapped = sbcl_2_4_10.pkgs.stumpwm-unwrapped; stdenv = stdenvNoCC;
sbcl = sbcl_2_4_10.withPackages (ps: with ps; [
alexandria cl-ppcre clx fiasco
]);
};
stumpwm-unwrapped = sbcl_2_4_10.pkgs.stumpwm;
sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { }); sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { });

View file

@ -110,6 +110,7 @@ mapAliases ({
case = throw "case has been removed, since it is an unused leaf package with a dependency on the nose test framework"; # added 2024-07-08 case = throw "case has been removed, since it is an unused leaf package with a dependency on the nose test framework"; # added 2024-07-08
cchardet = faust-cchardet; # added 2023-03-02 cchardet = faust-cchardet; # added 2023-03-02
cepa = throw "cepa has been removed, as onionshare switched back to stem"; # added 2024-05-07 cepa = throw "cepa has been removed, as onionshare switched back to stem"; # added 2024-05-07
chainer = throw "chainer has been removed, as it is abandoned and broken"; # added 2024-12-31
chiabip158 = throw "chiabip158 has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 chiabip158 = throw "chiabip158 has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
chiapos = throw "chiapos has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 chiapos = throw "chiapos has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26 chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
@ -360,6 +361,7 @@ mapAliases ({
mapbox = throw "mapbox has been removed because the upstream repository was archived in 2022"; # Added 2024-10-04 mapbox = throw "mapbox has been removed because the upstream repository was archived in 2022"; # Added 2024-10-04
marshmallow-enum = throw "marshmallow-enum has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10 marshmallow-enum = throw "marshmallow-enum has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10
markerlib = throw "markerlib has been removed because it's abandoned since 2013"; # added 2023-05-19 markerlib = throw "markerlib has been removed because it's abandoned since 2013"; # added 2023-05-19
matrix-api-async = throw "matrix-api-async has been removed as it is an old wrapper and no longer in use"; # added 2025-01-01
memory_profiler = memory-profiler; # added 2023-10-09 memory_profiler = memory-profiler; # added 2023-10-09
mir_eval = mir-eval; # added 2024-01-07 mir_eval = mir-eval; # added 2024-01-07
mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12

View file

@ -2234,10 +2234,6 @@ self: super: with self; {
chai = callPackage ../development/python-modules/chai { }; chai = callPackage ../development/python-modules/chai { };
chainer = callPackage ../development/python-modules/chainer {
inherit (pkgs.config) cudaSupport;
};
chainmap = callPackage ../development/python-modules/chainmap { }; chainmap = callPackage ../development/python-modules/chainmap { };
chainstream = callPackage ../development/python-modules/chainstream { }; chainstream = callPackage ../development/python-modules/chainstream { };
@ -7961,8 +7957,6 @@ self: super: with self; {
matplotx = callPackage ../development/python-modules/matplotx { }; matplotx = callPackage ../development/python-modules/matplotx { };
matrix-api-async = callPackage ../development/python-modules/matrix-api-async { };
matrix-client = callPackage ../development/python-modules/matrix-client { }; matrix-client = callPackage ../development/python-modules/matrix-client { };
matrix-common = callPackage ../development/python-modules/matrix-common { }; matrix-common = callPackage ../development/python-modules/matrix-common { };
@ -11714,6 +11708,8 @@ self: super: with self; {
pyfantom = callPackage ../development/python-modules/pyfantom { }; pyfantom = callPackage ../development/python-modules/pyfantom { };
pyfatfs = callPackage ../development/python-modules/pyfatfs { };
pyfcm = callPackage ../development/python-modules/pyfcm { }; pyfcm = callPackage ../development/python-modules/pyfcm { };
pyfido = callPackage ../development/python-modules/pyfido { }; pyfido = callPackage ../development/python-modules/pyfido { };
@ -14490,6 +14486,12 @@ self: super: with self; {
scikits-odes = callPackage ../development/python-modules/scikits-odes { }; scikits-odes = callPackage ../development/python-modules/scikits-odes { };
scikits-odes-core = callPackage ../development/python-modules/scikits-odes-core { };
scikits-odes-daepack = callPackage ../development/python-modules/scikits-odes-daepack { };
scikits-odes-sundials = callPackage ../development/python-modules/scikits-odes-sundials { };
scikit-tda = callPackage ../development/python-modules/scikit-tda { }; scikit-tda = callPackage ../development/python-modules/scikit-tda { };
scipy = callPackage ../development/python-modules/scipy { }; scipy = callPackage ../development/python-modules/scipy { };
@ -17498,6 +17500,8 @@ self: super: with self; {
unasync = callPackage ../development/python-modules/unasync { }; unasync = callPackage ../development/python-modules/unasync { };
unblob-native = callPackage ../development/python-modules/unblob-native { };
uncertainties = callPackage ../development/python-modules/uncertainties { }; uncertainties = callPackage ../development/python-modules/uncertainties { };
uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; uncompyle6 = callPackage ../development/python-modules/uncompyle6 { };

View file

@ -121,7 +121,6 @@ let
boxx = linux; boxx = linux;
bpycv = linux; bpycv = linux;
catboost = linux; catboost = linux;
chainer = linux;
cupy = linux; cupy = linux;
faiss = linux; faiss = linux;
faster-whisper = linux; faster-whisper = linux;