mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
Merge remote-tracking branch 'origin/staging-next' into staging
This commit is contained in:
commit
4acb251aaa
74 changed files with 1252 additions and 1044 deletions
|
@ -12,7 +12,11 @@ in
|
|||
options.services.paretosecurity = {
|
||||
enable = lib.mkEnableOption "[ParetoSecurity](https://paretosecurity.com) [agent](https://github.com/ParetoSecurity/agent) and its root helper";
|
||||
package = lib.mkPackageOption pkgs "paretosecurity" { };
|
||||
trayIcon = lib.mkEnableOption "tray icon for ParetoSecurity";
|
||||
trayIcon = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
description = "Set to false to disable the tray icon and run as a CLI tool only.";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
|
|
@ -46,10 +46,7 @@
|
|||
{
|
||||
imports = [ ./common/user-account.nix ];
|
||||
|
||||
services.paretosecurity = {
|
||||
enable = true;
|
||||
trayIcon = true;
|
||||
};
|
||||
services.paretosecurity.enable = true;
|
||||
|
||||
services.xserver.enable = true;
|
||||
services.xserver.displayManager.lightdm.enable = true;
|
||||
|
@ -119,5 +116,16 @@
|
|||
xfce.wait_for_text("Pareto Security")
|
||||
xfce.succeed("xdotool click 1")
|
||||
xfce.wait_for_text("Run Checks")
|
||||
|
||||
# Test 5: paretosecurity:// URL handler is registered
|
||||
xfce.succeed("su - alice -c 'xdg-open paretosecurity://foo'")
|
||||
|
||||
# Test 6: Desktop entry
|
||||
xfce.succeed("xdotool mousemove 10 10")
|
||||
xfce.succeed("xdotool click 1") # hide the tray icon window
|
||||
xfce.succeed("xdotool click 1") # show the Applications menu
|
||||
xfce.succeed("xdotool mousemove 10 200")
|
||||
xfce.succeed("xdotool click 1")
|
||||
xfce.wait_for_text("Pareto Security")
|
||||
'';
|
||||
}
|
||||
|
|
|
@ -8,17 +8,18 @@
|
|||
qtbase,
|
||||
rocksdb_7_10,
|
||||
zeromq,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fulcrum";
|
||||
version = "1.11.1";
|
||||
version = "1.12.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cculianu";
|
||||
repo = "Fulcrum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+hBc7jW1MVLVjYXNOV7QvFJJpZ5RzW5/c9NdqOXrsj0=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/RlvbZ6/f0Jxj6oCeHjGWqlktvtNUNczOXi2/wYw2LQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -26,8 +27,6 @@ stdenv.mkDerivation rec {
|
|||
qmake
|
||||
];
|
||||
|
||||
dontWrapQtApps = true; # no GUI
|
||||
|
||||
buildInputs = [
|
||||
python3
|
||||
qtbase
|
||||
|
@ -35,11 +34,15 @@ stdenv.mkDerivation rec {
|
|||
zeromq
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
dontWrapQtApps = true; # no GUI
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Fast & nimble SPV server for Bitcoin Cash & Bitcoin BTC";
|
||||
homepage = "https://github.com/cculianu/Fulcrum";
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with lib.maintainers; [ prusnak ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -4355,6 +4355,19 @@ final: prev: {
|
|||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
ecolog-nvim = buildVimPlugin {
|
||||
pname = "ecolog.nvim";
|
||||
version = "2025-04-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "t3ntxcl3s";
|
||||
repo = "ecolog.nvim";
|
||||
rev = "cfd19e7a8841c538fdb706ee6ba3a22943d45ca6";
|
||||
sha256 = "12mlhmzqgv45v98gi5jvqkn9bkl6nfixlgvb76b6ci6rzdkyxg52";
|
||||
};
|
||||
meta.homepage = "https://github.com/t3ntxcl3s/ecolog.nvim/";
|
||||
meta.hydraPlatforms = [ ];
|
||||
};
|
||||
|
||||
edge = buildVimPlugin {
|
||||
pname = "edge";
|
||||
version = "2025-04-16";
|
||||
|
|
|
@ -333,6 +333,7 @@ https://github.com/Bekaboo/dropbar.nvim/,HEAD,
|
|||
https://github.com/earthly/earthly.vim/,HEAD,
|
||||
https://github.com/GustavEikaas/easy-dotnet.nvim/,HEAD,
|
||||
https://github.com/Shougo/echodoc.vim/,,
|
||||
https://github.com/t3ntxcl3s/ecolog.nvim/,HEAD,
|
||||
https://github.com/sainnhe/edge/,,
|
||||
https://github.com/geldata/edgedb-vim/,,
|
||||
https://github.com/folke/edgy.nvim/,HEAD,
|
||||
|
|
|
@ -34,13 +34,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vengi-tools";
|
||||
version = "0.0.35";
|
||||
version = "0.0.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vengi-voxel";
|
||||
repo = "vengi";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8rGnW+VtqNJYqUqQDp0yOVIQd7w+cq7PIpqqIQPhkbE=";
|
||||
hash = "sha256-6MJw8BaHvd9cZNCMIFwAtk8UzxP+RSfnuv9py8sUgnY=";
|
||||
};
|
||||
|
||||
prePatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
|
|
@ -85,8 +85,8 @@ rec {
|
|||
thunderbird = thunderbird-latest;
|
||||
|
||||
thunderbird-latest = common {
|
||||
version = "137.0.1";
|
||||
sha512 = "387f04aff9380c7261c574e7ef2e4972d63ebfb2768e25aa41a5ee2f3a755780a84099532cf4c1b5635db3412ab543e9b17b0a0476ec06c547b2dc678f19795f";
|
||||
version = "137.0.2";
|
||||
sha512 = "6cc631d14780f1bf9224208881c14834cef078688ffa006f50dfdd3a4e81c95255fb455f530a09a0f296dc494af104aefe2414ac53c6b8c9956ca1a9d7a7e053";
|
||||
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "thunderbirdPackages.thunderbird-latest";
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"version": "17.10.4",
|
||||
"repo_hash": "1ppfg904q1ikl21k21iyzknpd7l51zxpi144416myr5m1a6a3kza",
|
||||
"yarn_hash": "0fw84hf9qswajmjhds59fn6l6xmyha6vja13dvb5slfw9cmbq9pi",
|
||||
"version": "17.11.1",
|
||||
"repo_hash": "1sw1qw1fsxvdyzc48f03p89njklm3zn7fd090jjryr881fpcvgcd",
|
||||
"yarn_hash": "0z06jaxqbg2wnq7yhpkba0cpxp4w4iy2cxla8nhc6kgx49xk179v",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v17.10.4-ee",
|
||||
"rev": "v17.11.1-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "17.10.4",
|
||||
"GITLAB_PAGES_VERSION": "17.10.4",
|
||||
"GITALY_SERVER_VERSION": "17.11.1",
|
||||
"GITLAB_PAGES_VERSION": "17.11.1",
|
||||
"GITLAB_SHELL_VERSION": "14.41.0",
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "17.10.4"
|
||||
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.5.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "17.11.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -82,7 +82,7 @@ let
|
|||
cp Cargo.lock $out
|
||||
'';
|
||||
};
|
||||
hash = "sha256-VJR3F+6l8nYj1ZCHOWxnX82C68giXX45RkhIVpZvRLo=";
|
||||
hash = "sha256-Jr3lS3gQI/jojWIUxEBp7a950mcOvnbjlRIFXvfGays=";
|
||||
};
|
||||
|
||||
dontBuild = false;
|
||||
|
|
|
@ -10,7 +10,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "17.10.4";
|
||||
version = "17.11.1";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
|
@ -22,7 +22,7 @@ buildGoModule rec {
|
|||
|
||||
sourceRoot = "${src.name}/workhorse";
|
||||
|
||||
vendorHash = "sha256-rPTFHQ7b3l9wPURu50sur+PsxKYI4xiRs5uHNab9YUg=";
|
||||
vendorHash = "sha256-76JO/oayqhv36WM7zC/a85l8CK1orsMuMksBYbmDN1o=";
|
||||
buildInputs = [ git ];
|
||||
ldflags = [ "-X main.Version=${version}" ];
|
||||
doCheck = false;
|
||||
|
|
|
@ -45,7 +45,11 @@ gem 'bootsnap', '~> 1.18.3', require: false, feature_category: :shared
|
|||
|
||||
# Avoid the precompiled native gems because Omnibus needs to build this to ensure
|
||||
# LD_LIBRARY_PATH is correct: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730
|
||||
gem 'ffi', '~> 1.17', force_ruby_platform: true, feature_category: :shared
|
||||
if RUBY_PLATFORM.include?('darwin')
|
||||
gem 'ffi', '~> 1.17', feature_category: :shared
|
||||
else
|
||||
gem 'ffi', '~> 1.17', force_ruby_platform: true, feature_category: :shared
|
||||
end
|
||||
|
||||
gem 'openssl', '~> 3.0', feature_category: :shared
|
||||
|
||||
|
@ -95,7 +99,8 @@ gem 'doorkeeper', '~> 5.8', '>= 5.8.1', feature_category: :system_access
|
|||
gem 'doorkeeper-openid_connect', '~> 1.8.10', feature_category: :system_access
|
||||
gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access
|
||||
gem 'rexml', '~> 3.4.0', feature_category: :shared
|
||||
gem 'ruby-saml', '~> 1.18.0', path: 'vendor/gems/ruby-saml', feature_category: :system_access
|
||||
gem 'ruby-saml', '~> 1.18', feature_category: :system_access
|
||||
gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access
|
||||
gem 'omniauth', '~> 2.1.0', feature_category: :system_access
|
||||
gem 'omniauth-auth0', '~> 3.1', feature_category: :system_access
|
||||
gem 'omniauth-azure-activedirectory-v2', '~> 2.0', feature_category: :system_access
|
||||
|
@ -105,7 +110,6 @@ gem 'omniauth-github', '2.0.1', feature_category: :system_access
|
|||
gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab', feature_category: :system_access
|
||||
gem 'omniauth-google-oauth2', '~> 1.1', feature_category: :system_access
|
||||
gem 'omniauth-oauth2-generic', '~> 0.2.2', feature_category: :system_access
|
||||
gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access
|
||||
gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth', feature_category: :system_access
|
||||
# See vendor/gems/omniauth_crowd/README.md
|
||||
gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd', feature_category: :system_access
|
||||
|
@ -167,7 +171,6 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
|
|||
gem 'graphql', '2.4.11', path: 'vendor/gems/graphql', feature_category: :api
|
||||
gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api
|
||||
gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
|
||||
gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import)
|
||||
|
||||
# Cells
|
||||
gem 'gitlab-topology-service-client', '~> 0.1',
|
||||
|
@ -267,7 +270,7 @@ gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdow
|
|||
gem 'rouge', '~> 4.5.0', feature_category: :shared
|
||||
gem 'truncato', '~> 0.7.13', feature_category: :team_planning
|
||||
gem 'nokogiri', '~> 1.18', feature_category: :shared
|
||||
gem 'gitlab-glfm-markdown', '~> 0.0.27', feature_category: :markdown
|
||||
gem 'gitlab-glfm-markdown', '~> 0.0.29', feature_category: :markdown
|
||||
gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown
|
||||
gem 'unicode-emoji', '~> 4.0', feature_category: :markdown
|
||||
|
||||
|
@ -292,7 +295,7 @@ end
|
|||
gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared
|
||||
|
||||
# Background jobs
|
||||
gem 'sidekiq', path: 'vendor/gems/sidekiq-7.2.4', require: 'sidekiq', feature_category: :scalability
|
||||
gem 'sidekiq', '~> 7.3.9', feature_category: :scalability
|
||||
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
|
||||
gem 'gitlab-sidekiq-fetcher',
|
||||
path: 'vendor/gems/sidekiq-reliable-fetch',
|
||||
|
@ -378,7 +381,7 @@ gem 'gitlab_chronic_duration', '~> 0.12', feature_category: :shared
|
|||
|
||||
gem 'rack-proxy', '~> 0.7.7', feature_category: :shared
|
||||
|
||||
gem 'cssbundling-rails', '1.4.2', feature_category: :shared
|
||||
gem 'cssbundling-rails', '1.4.3', feature_category: :shared
|
||||
gem 'terser', '1.0.2', feature_category: :shared
|
||||
|
||||
gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client', feature_category: :database
|
||||
|
@ -398,7 +401,7 @@ gem 'sentry-sidekiq', '~> 5.22.0', feature_category: :observability
|
|||
|
||||
# PostgreSQL query parsing
|
||||
#
|
||||
gem 'pg_query', '~> 6.0.0', feature_category: :database
|
||||
gem 'pg_query', '~> 6.1.0', feature_category: :database
|
||||
|
||||
gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_category: :shared
|
||||
gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared
|
||||
|
@ -518,11 +521,11 @@ group :development, :test do
|
|||
# Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
|
||||
gem 'minitest', '~> 5.11.0', feature_category: :shared
|
||||
|
||||
gem 'spring', '~> 4.1.0', feature_category: :shared
|
||||
gem 'spring', '~> 4.3.0', feature_category: :shared
|
||||
gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared
|
||||
|
||||
gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false
|
||||
gem 'haml_lint', '~> 0.58', feature_category: :tooling
|
||||
gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false
|
||||
|
||||
# Benchmarking & profiling
|
||||
gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared
|
||||
|
@ -551,6 +554,8 @@ group :development, :test do
|
|||
gem 'vite_ruby', '~> 3.9.0', feature_category: :shared
|
||||
|
||||
gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling
|
||||
|
||||
gem 'yard', '~> 0.9', require: false, feature_category: :tooling
|
||||
end
|
||||
|
||||
group :development, :test, :danger do
|
||||
|
@ -724,7 +729,7 @@ gem 'cvss-suite', '~> 3.3.0', require: 'cvss_suite', feature_category: :software
|
|||
gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry
|
||||
|
||||
# Remote Development
|
||||
gem 'devfile', '~> 0.1.1', feature_category: :workspaces
|
||||
gem 'devfile', '~> 0.4.0', feature_category: :workspaces
|
||||
|
||||
# Apple plist parsing
|
||||
gem 'CFPropertyList', '~> 3.0.0', feature_category: :mobile_devops
|
||||
|
@ -755,4 +760,4 @@ gem 'paper_trail', '~> 15.0', feature_category: :shared
|
|||
|
||||
gem "i18n_data", "~> 0.13.1", feature_category: :system_access
|
||||
|
||||
gem "gitlab-cloud-connector", "~> 1.0.0", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
|
||||
gem "gitlab-cloud-connector", "~> 1.5", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
|
||||
|
|
|
@ -214,26 +214,10 @@ PATH
|
|||
nokogiri (>= 1.4.4)
|
||||
omniauth (~> 2.0)
|
||||
|
||||
PATH
|
||||
remote: vendor/gems/ruby-saml
|
||||
specs:
|
||||
ruby-saml (1.18.0)
|
||||
nokogiri (>= 1.13.10)
|
||||
rexml
|
||||
|
||||
PATH
|
||||
remote: vendor/gems/sidekiq-7.2.4
|
||||
specs:
|
||||
sidekiq (7.2.4)
|
||||
concurrent-ruby (< 2)
|
||||
connection_pool (>= 2.3.0)
|
||||
rack (>= 2.2.4)
|
||||
redis-client (>= 0.19.0)
|
||||
|
||||
PATH
|
||||
remote: vendor/gems/sidekiq-reliable-fetch
|
||||
specs:
|
||||
gitlab-sidekiq-fetcher (0.12.0)
|
||||
gitlab-sidekiq-fetcher (0.12.1)
|
||||
json (>= 2.5)
|
||||
sidekiq (~> 7.0)
|
||||
|
||||
|
@ -245,7 +229,7 @@ GEM
|
|||
nkf
|
||||
rexml
|
||||
RedCloth (4.3.4)
|
||||
acme-client (2.0.20)
|
||||
acme-client (2.0.21)
|
||||
base64 (~> 0.2.0)
|
||||
faraday (>= 1.0, < 3.0.0)
|
||||
faraday-retry (>= 1.0, < 3.0.0)
|
||||
|
@ -344,7 +328,7 @@ GEM
|
|||
asciidoctor-plantuml (0.0.16)
|
||||
asciidoctor (>= 2.0.17, < 3.0.0)
|
||||
ast (2.4.2)
|
||||
async (2.23.0)
|
||||
async (2.23.1)
|
||||
console (~> 1.29)
|
||||
fiber-annotation
|
||||
io-event (~> 1.9)
|
||||
|
@ -482,7 +466,7 @@ GEM
|
|||
git
|
||||
css_parser (1.14.0)
|
||||
addressable
|
||||
cssbundling-rails (1.4.2)
|
||||
cssbundling-rails (1.4.3)
|
||||
railties (>= 6.0.0)
|
||||
csv (3.3.0)
|
||||
cvss-suite (3.3.0)
|
||||
|
@ -535,7 +519,7 @@ GEM
|
|||
thor (>= 0.19, < 2)
|
||||
descendants_tracker (0.0.4)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
devfile (0.1.1)
|
||||
devfile (0.4.0)
|
||||
device_detector (1.0.0)
|
||||
devise (4.9.4)
|
||||
bcrypt (~> 3.0)
|
||||
|
@ -748,7 +732,7 @@ GEM
|
|||
terminal-table (>= 1.5.1)
|
||||
gitlab-chronic (0.10.6)
|
||||
numerizer (~> 0.2)
|
||||
gitlab-cloud-connector (1.0.0)
|
||||
gitlab-cloud-connector (1.6.0)
|
||||
activesupport (~> 7.0)
|
||||
jwt (~> 2.9.3)
|
||||
gitlab-dangerfiles (4.8.1)
|
||||
|
@ -767,7 +751,7 @@ GEM
|
|||
mime-types
|
||||
net-http-persistent (~> 4.0)
|
||||
nokogiri (~> 1, >= 1.10.8)
|
||||
gitlab-glfm-markdown (0.0.28)
|
||||
gitlab-glfm-markdown (0.0.29)
|
||||
rb_sys (~> 0.9.109)
|
||||
gitlab-kas-grpc (17.9.1)
|
||||
grpc (~> 1.0)
|
||||
|
@ -792,12 +776,14 @@ GEM
|
|||
activesupport (>= 5.2.0)
|
||||
rake (~> 13.0)
|
||||
snowplow-tracker (~> 0.8.0)
|
||||
gitlab-secret_detection (0.19.0)
|
||||
grpc (~> 1.63)
|
||||
gitlab-secret_detection (0.23.0)
|
||||
grpc (~> 1.63.0)
|
||||
grpc-tools (~> 1.63)
|
||||
grpc_reflection (~> 0.1)
|
||||
parallel (~> 1)
|
||||
re2 (~> 2.7)
|
||||
sentry-ruby (~> 5.22)
|
||||
stackprof (~> 0.2.27)
|
||||
toml-rb (~> 2.2)
|
||||
gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1)
|
||||
activesupport (>= 6, < 8)
|
||||
|
@ -952,13 +938,7 @@ GEM
|
|||
grape_logging (1.8.4)
|
||||
grape
|
||||
rack
|
||||
graphlient (0.8.0)
|
||||
faraday (~> 2.0)
|
||||
graphql-client
|
||||
graphlyte (1.0.0)
|
||||
graphql-client (0.23.0)
|
||||
activesupport (>= 3.0)
|
||||
graphql (>= 1.13.0)
|
||||
graphql-docs (5.0.0)
|
||||
commonmarker (~> 0.23, >= 0.23.6)
|
||||
escape_utils (~> 1.2)
|
||||
|
@ -1064,7 +1044,7 @@ GEM
|
|||
character_set (~> 1.4)
|
||||
regexp_parser (~> 2.5)
|
||||
regexp_property_values (~> 1.0)
|
||||
json (2.10.1)
|
||||
json (2.10.2)
|
||||
json-jwt (1.16.6)
|
||||
activesupport (>= 4.2)
|
||||
aes_key_wrap
|
||||
|
@ -1120,8 +1100,9 @@ GEM
|
|||
railties (>= 6.1)
|
||||
rexml
|
||||
libyajl2 (2.1.0)
|
||||
license_finder (7.1.0)
|
||||
license_finder (7.2.1)
|
||||
bundler
|
||||
csv (~> 3.2)
|
||||
rubyzip (>= 1, < 3)
|
||||
thor (~> 1.2)
|
||||
tomlrb (>= 1.3, < 2.1)
|
||||
|
@ -1226,7 +1207,7 @@ GEM
|
|||
nio4r (2.7.0)
|
||||
nkf (0.2.0)
|
||||
no_proxy_fix (0.1.2)
|
||||
nokogiri (1.18.3)
|
||||
nokogiri (1.18.7)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
notiffany (0.1.3)
|
||||
|
@ -1290,9 +1271,9 @@ GEM
|
|||
omniauth-oauth2-generic (0.2.8)
|
||||
omniauth-oauth2 (~> 1.0)
|
||||
rake
|
||||
omniauth-saml (2.2.2)
|
||||
omniauth-saml (2.2.3)
|
||||
omniauth (~> 2.1)
|
||||
ruby-saml (~> 1.17)
|
||||
ruby-saml (~> 1.18)
|
||||
omniauth-shibboleth-redux (2.0.0)
|
||||
omniauth (>= 2.0.0)
|
||||
omniauth_openid_connect (0.8.0)
|
||||
|
@ -1460,7 +1441,7 @@ GEM
|
|||
peek (1.1.0)
|
||||
railties (>= 4.0.0)
|
||||
pg (1.5.9)
|
||||
pg_query (6.0.0)
|
||||
pg_query (6.1.0)
|
||||
google-protobuf (>= 3.25.3)
|
||||
plist (3.7.0)
|
||||
png_quantizator (0.2.1)
|
||||
|
@ -1503,7 +1484,7 @@ GEM
|
|||
pyu-ruby-sasl (0.0.3.3)
|
||||
raabro (1.4.0)
|
||||
racc (1.8.1)
|
||||
rack (2.2.11)
|
||||
rack (2.2.13)
|
||||
rack-accept (0.4.5)
|
||||
rack (>= 0.4)
|
||||
rack-attack (6.7.0)
|
||||
|
@ -1707,7 +1688,7 @@ GEM
|
|||
ruby-fogbugz (0.3.0)
|
||||
crack (~> 0.4)
|
||||
multipart-post (~> 2.0)
|
||||
ruby-lsp (0.23.10)
|
||||
ruby-lsp (0.23.13)
|
||||
language_server-protocol (~> 3.17.0)
|
||||
prism (>= 1.2, < 2.0)
|
||||
rbs (>= 3, < 4)
|
||||
|
@ -1719,6 +1700,9 @@ GEM
|
|||
ruby-magic (0.6.0)
|
||||
mini_portile2 (~> 2.8)
|
||||
ruby-progressbar (1.11.0)
|
||||
ruby-saml (1.18.0)
|
||||
nokogiri (>= 1.13.10)
|
||||
rexml
|
||||
ruby-statistics (4.1.0)
|
||||
ruby2_keywords (0.0.5)
|
||||
rubyntlm (0.6.3)
|
||||
|
@ -1764,6 +1748,12 @@ GEM
|
|||
shellany (0.0.1)
|
||||
shoulda-matchers (6.4.0)
|
||||
activesupport (>= 5.2.0)
|
||||
sidekiq (7.3.9)
|
||||
base64
|
||||
connection_pool (>= 2.3.0)
|
||||
logger
|
||||
rack (>= 2.2.4)
|
||||
redis-client (>= 0.22.2)
|
||||
sidekiq-cron (1.12.0)
|
||||
fugit (~> 1.8)
|
||||
globalid (>= 1.0.1)
|
||||
|
@ -1812,7 +1802,7 @@ GEM
|
|||
sorbet-runtime (0.5.11647)
|
||||
spamcheck (1.3.3)
|
||||
grpc (~> 1.63)
|
||||
spring (4.1.0)
|
||||
spring (4.3.0)
|
||||
spring-commands-rspec (1.0.4)
|
||||
spring (>= 0.9.1)
|
||||
sprite-factory (1.7.1)
|
||||
|
@ -1916,11 +1906,12 @@ GEM
|
|||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
uber (0.1.0)
|
||||
undercover (0.6.3)
|
||||
undercover (0.6.4)
|
||||
base64
|
||||
bigdecimal
|
||||
imagen (>= 0.2.0)
|
||||
rainbow (>= 2.1, < 4.0)
|
||||
rugged (>= 0.27, < 1.8)
|
||||
rugged (>= 0.27, < 1.10)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.8.2)
|
||||
|
@ -2054,7 +2045,7 @@ DEPENDENCIES
|
|||
coverband (= 6.1.4)
|
||||
creole (~> 0.5.0)
|
||||
crystalball (~> 0.7.0)
|
||||
cssbundling-rails (= 1.4.2)
|
||||
cssbundling-rails (= 1.4.3)
|
||||
csv_builder!
|
||||
cvss-suite (~> 3.3.0)
|
||||
database_cleaner-active_record (~> 2.2.0)
|
||||
|
@ -2062,7 +2053,7 @@ DEPENDENCIES
|
|||
declarative_policy (~> 1.1.0)
|
||||
deprecation_toolkit (~> 1.5.1)
|
||||
derailed_benchmarks
|
||||
devfile (~> 0.1.1)
|
||||
devfile (~> 0.4.0)
|
||||
device_detector
|
||||
devise (~> 4.9.3)
|
||||
devise-pbkdf2-encryptable (~> 0.0.0)!
|
||||
|
@ -2108,12 +2099,12 @@ DEPENDENCIES
|
|||
gitlab-active-context!
|
||||
gitlab-backup-cli!
|
||||
gitlab-chronic (~> 0.10.5)
|
||||
gitlab-cloud-connector (~> 1.0.0)
|
||||
gitlab-cloud-connector (~> 1.5)
|
||||
gitlab-dangerfiles (~> 4.8.0)
|
||||
gitlab-duo-workflow-service-client (~> 0.1)!
|
||||
gitlab-experiment (~> 0.9.1)
|
||||
gitlab-fog-azure-rm (~> 2.2.0)
|
||||
gitlab-glfm-markdown (~> 0.0.27)
|
||||
gitlab-glfm-markdown (~> 0.0.29)
|
||||
gitlab-housekeeper!
|
||||
gitlab-http!
|
||||
gitlab-kas-grpc (~> 17.9.0.pre.rc2)
|
||||
|
@ -2160,7 +2151,6 @@ DEPENDENCIES
|
|||
grape-swagger (~> 2.1.2)
|
||||
grape-swagger-entity (~> 0.5.5)
|
||||
grape_logging (~> 1.8, >= 1.8.4)
|
||||
graphlient (~> 0.8.0)
|
||||
graphlyte (~> 1.0.0)
|
||||
graphql (= 2.4.11)!
|
||||
graphql-docs (~> 5.0.0)
|
||||
|
@ -2269,7 +2259,7 @@ DEPENDENCIES
|
|||
parslet (~> 1.8)
|
||||
peek (~> 1.1)
|
||||
pg (~> 1.5.6)
|
||||
pg_query (~> 6.0.0)
|
||||
pg_query (~> 6.1.0)
|
||||
png_quantizator (~> 0.2.1)
|
||||
premailer-rails (~> 1.12.0)
|
||||
prometheus-client-mmap (~> 1.2.9)
|
||||
|
@ -2312,7 +2302,7 @@ DEPENDENCIES
|
|||
ruby-lsp-rspec (~> 0.1.10)
|
||||
ruby-magic (~> 0.6)
|
||||
ruby-progressbar (~> 1.10)
|
||||
ruby-saml (~> 1.18.0)!
|
||||
ruby-saml (~> 1.18)
|
||||
rubyzip (~> 2.3.2)
|
||||
rugged (~> 1.6)
|
||||
sanitize (~> 6.0.2)
|
||||
|
@ -2324,7 +2314,7 @@ DEPENDENCIES
|
|||
sentry-ruby (~> 5.22.0)
|
||||
sentry-sidekiq (~> 5.22.0)
|
||||
shoulda-matchers (~> 6.4.0)
|
||||
sidekiq!
|
||||
sidekiq (~> 7.3.9)
|
||||
sidekiq-cron (~> 1.12.0)
|
||||
sigdump (~> 0.2.4)
|
||||
simple_po_parser (~> 1.1.6)
|
||||
|
@ -2335,7 +2325,7 @@ DEPENDENCIES
|
|||
snowplow-tracker (~> 0.8.0)
|
||||
solargraph (~> 0.47.2)
|
||||
spamcheck (~> 1.3.0)
|
||||
spring (~> 4.1.0)
|
||||
spring (~> 4.3.0)
|
||||
spring-commands-rspec (~> 1.0.4)
|
||||
sprite-factory (~> 1.7)
|
||||
sprockets (~> 3.7.0)
|
||||
|
@ -2372,6 +2362,7 @@ DEPENDENCIES
|
|||
webrick (~> 1.8.1)
|
||||
wikicloth (= 0.8.1)
|
||||
yajl-ruby (~> 1.4.3)
|
||||
yard (~> 0.9)
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.2
|
||||
2.6.6
|
||||
|
|
|
@ -9,10 +9,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1bixpb7sp6m7wp56icrs5094f0lvr2di1yspfwcmz6373d3ba2v5";
|
||||
sha256 = "0hbn563v0rc85md0fcx3z968dvq7n2ra64wbgyxg09ndjgwl9870";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.20";
|
||||
version = "2.0.21";
|
||||
};
|
||||
actioncable = {
|
||||
dependencies = [
|
||||
|
@ -456,10 +456,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0p29xccd3y96m7yb15yr96j362cz855ramn2x83g5z2642ag68w3";
|
||||
sha256 = "01jh5b1wh9gvgrkl2bgc93pimc0ncjbi5vsadgxxp9a8d4s9fb31";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.23.0";
|
||||
version = "2.23.1";
|
||||
};
|
||||
atlassian-jwt = {
|
||||
dependencies = [ "jwt" ];
|
||||
|
@ -1377,10 +1377,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1kscxk81incimp3y9dkaqbn8d1awzm2nn7dx24lq1nbs15l5fp18";
|
||||
sha256 = "0hbfji8lddlvsk9x70s5xvafl3w31v6mm5wjrn7rrb14gmdcvbjk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
};
|
||||
csv = {
|
||||
groups = [
|
||||
|
@ -1623,10 +1623,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0yf8ckwr0pkzbdhs4y57gv9a80hvasdjv815fn67yhs4zpphqs5f";
|
||||
sha256 = "1yca2rd1xb9h3his5kpnawjgki2rpgslchrn44imhig9v8l7fnw8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
version = "0.4.0";
|
||||
};
|
||||
device_detector = {
|
||||
groups = [ "default" ];
|
||||
|
@ -2868,10 +2868,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1bsis23gkm8p2q7p24l2si3iw3r329ygmklahakbh7lfd4yd3wpd";
|
||||
sha256 = "0karz59rpw7vz4ckxc37gjs7lgb6zsa1pvsr57wzqfbpppgx5swa";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
version = "1.6.0";
|
||||
};
|
||||
gitlab-dangerfiles = {
|
||||
dependencies = [
|
||||
|
@ -2942,10 +2942,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "188laljplhci8pr8crxi3b0sj9501zya74ipqyg33gkv0cf4h3ln";
|
||||
sha256 = "09mjdrgjyad1l2lcaiy62486hnajpv9mgyxcv6vrhga0dncqm6m1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.28";
|
||||
version = "0.0.29";
|
||||
};
|
||||
gitlab-housekeeper = {
|
||||
dependencies = [
|
||||
|
@ -3142,16 +3142,18 @@ src: {
|
|||
"grpc_reflection"
|
||||
"parallel"
|
||||
"re2"
|
||||
"sentry-ruby"
|
||||
"stackprof"
|
||||
"toml-rb"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "04sn44br9qcv5s4p2z0sjv402nlpiw0ial5gx0np9v1dcppqfpcr";
|
||||
sha256 = "1rv3r1wj5pnwjbkw3333y7kxj1hzzq0vnf6xdjj95n8m5b9krpck";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.19.0";
|
||||
version = "0.23.0";
|
||||
};
|
||||
gitlab-security_report_schemas = {
|
||||
dependencies = [
|
||||
|
@ -3178,7 +3180,7 @@ src: {
|
|||
path = "${src}/vendor/gems/sidekiq-reliable-fetch";
|
||||
type = "path";
|
||||
};
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
};
|
||||
gitlab-styles = {
|
||||
dependencies = [
|
||||
|
@ -3818,20 +3820,6 @@ src: {
|
|||
};
|
||||
version = "1.8.4";
|
||||
};
|
||||
graphlient = {
|
||||
dependencies = [
|
||||
"faraday"
|
||||
"graphql-client"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1cbwirpx8hclxyrxfbjz5c62l7i6nsqg6x72yplm8d083pd0ii4q";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.8.0";
|
||||
};
|
||||
graphlyte = {
|
||||
groups = [ "test" ];
|
||||
platforms = [ ];
|
||||
|
@ -3860,20 +3848,6 @@ src: {
|
|||
};
|
||||
version = "2.4.11";
|
||||
};
|
||||
graphql-client = {
|
||||
dependencies = [
|
||||
"activesupport"
|
||||
"graphql"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1hdb5fd1vd1zs7kc84ng7lj95081dqwrapyidg8alsv7a7jbhf7j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.23.0";
|
||||
};
|
||||
graphql-docs = {
|
||||
dependencies = [
|
||||
"commonmarker"
|
||||
|
@ -4466,10 +4440,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1p4l5ycdxfsr8b51gnvlvhq6s21vmx9z4x617003zbqv3bcqmj6x";
|
||||
sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
};
|
||||
json-jwt = {
|
||||
dependencies = [
|
||||
|
@ -4740,6 +4714,7 @@ src: {
|
|||
};
|
||||
license_finder = {
|
||||
dependencies = [
|
||||
"csv"
|
||||
"rubyzip"
|
||||
"thor"
|
||||
"tomlrb"
|
||||
|
@ -4754,10 +4729,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0v66fb85majc816qip42kbwcn41lr6rm5w6zim4a2kgp74v0n0kd";
|
||||
sha256 = "057ghx449d70bakmn3fjr4x6f4rq4cj61l9gnww0c5sbnqcsv7hp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.1.0";
|
||||
version = "7.2.1";
|
||||
};
|
||||
licensee = {
|
||||
dependencies = [
|
||||
|
@ -5513,10 +5488,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0npx535cs8qc33n0lpbbwl0p9fi3a5bczn6ayqhxvknh9yqw77vb";
|
||||
sha256 = "0cgv8vzp7kl20ip8qdzmrbr1vaaw4mjjy4mksg8k13z4xxfzyqvb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.18.3";
|
||||
version = "1.18.7";
|
||||
};
|
||||
notiffany = {
|
||||
dependencies = [
|
||||
|
@ -5799,10 +5774,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1czvs3nj1d8pmf39vgghpbp7g1hgzbxlv8d563agr16nq856bk44";
|
||||
sha256 = "1c2i8yry06qpqg4k8xps5aj0hfw7l7m5vdqf85sbpr04ngfdpq6l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
};
|
||||
omniauth-shibboleth-redux = {
|
||||
dependencies = [ "omniauth" ];
|
||||
|
@ -6588,10 +6563,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "012w1ypcbzy6w4dsxiziqn1vqddwzpza3zdvw9hivvhcj179mw7v";
|
||||
sha256 = "07j86a2mf90dhjlm6ns7p59ij91axg860k63hxc2rw89w8lm404b";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
};
|
||||
plist = {
|
||||
groups = [ "default" ];
|
||||
|
@ -6851,10 +6826,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "12mv97fz3jp6nl4bc36wiqwdiivv5lgqcpfnan91w20rzapljk22";
|
||||
sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.11";
|
||||
version = "2.2.13";
|
||||
};
|
||||
rack-accept = {
|
||||
dependencies = [ "rack" ];
|
||||
|
@ -7925,10 +7900,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0v2dag8wl2zpd51qml5w0icb4wp77z7gfjcfq696zimxyf7v1pvi";
|
||||
sha256 = "0j4zcp7nncrr6sn0m3scnqsxcf7j2v82pxcd7p3436m70ncmm1x1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.23.10";
|
||||
version = "0.23.13";
|
||||
};
|
||||
ruby-lsp-rails = {
|
||||
dependencies = [ "ruby-lsp" ];
|
||||
|
@ -7985,8 +7960,9 @@ src: {
|
|||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
path = "${src}/vendor/gems/ruby-saml";
|
||||
type = "path";
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "0vgsvdaglz1spx9gxrr6xh7qqhi4qd8jd06h2ihwxmazj9ajld6y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.18.0";
|
||||
};
|
||||
|
@ -8268,18 +8244,20 @@ src: {
|
|||
};
|
||||
sidekiq = {
|
||||
dependencies = [
|
||||
"concurrent-ruby"
|
||||
"base64"
|
||||
"connection_pool"
|
||||
"logger"
|
||||
"rack"
|
||||
"redis-client"
|
||||
];
|
||||
groups = [ "default" ];
|
||||
platforms = [ ];
|
||||
source = {
|
||||
path = "${src}/vendor/gems/sidekiq-7.2.4";
|
||||
type = "path";
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "19xm4s49hq0kpfbmvhnjskzmfjjxw5d5sm7350mh12gg3lp7220i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.2.4";
|
||||
version = "7.3.9";
|
||||
};
|
||||
sidekiq-cron = {
|
||||
dependencies = [
|
||||
|
@ -8545,10 +8523,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1jx3y1krmx7flrp8fldb354cap1xxlln4yl97ik8smfzn07hhzzi";
|
||||
sha256 = "08kizsvrb7a19aps7a8rpmndfq16jb8q2j45fn155s1qrsyg7aha";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.1.0";
|
||||
version = "4.3.0";
|
||||
};
|
||||
spring-commands-rspec = {
|
||||
dependencies = [ "spring" ];
|
||||
|
@ -9234,6 +9212,7 @@ src: {
|
|||
};
|
||||
undercover = {
|
||||
dependencies = [
|
||||
"base64"
|
||||
"bigdecimal"
|
||||
"imagen"
|
||||
"rainbow"
|
||||
|
@ -9247,10 +9226,10 @@ src: {
|
|||
platforms = [ ];
|
||||
source = {
|
||||
remotes = [ "https://rubygems.org" ];
|
||||
sha256 = "1yk5rgr82zl0k1vjpfs42lpw2lzk5hgc970zd03abl1ypi344k57";
|
||||
sha256 = "06pc56qly4c8ygwg9hyay1vmxq75clm62ljw0s9ljamm57qzqd1w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.3";
|
||||
version = "0.6.4";
|
||||
};
|
||||
unf = {
|
||||
dependencies = [ "unf_ext" ];
|
||||
|
|
|
@ -191,7 +191,7 @@ def update_rubyenv():
|
|||
# [comment]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435#note_1979750600
|
||||
# [upstream issue]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435
|
||||
subprocess.check_output(
|
||||
["sed", "-i", "s|gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq'|gem 'sidekiq', '~> 7.1.6'|g", "Gemfile"],
|
||||
["sed", "-i", "s|gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq'|gem 'sidekiq', '~> 7.3.9'|g", "Gemfile"],
|
||||
cwd=rubyenv_dir,
|
||||
)
|
||||
|
||||
|
@ -241,6 +241,9 @@ def update_rubyenv():
|
|||
)
|
||||
subprocess.check_output(["rm", "-rf", "vendor", "gems"], cwd=rubyenv_dir)
|
||||
|
||||
# Reformat gemset.nix
|
||||
subprocess.check_output(["nix-shell", "--run", "treefmt pkgs/applications/version-management/gitlab"], cwd=NIXPKGS_PATH)
|
||||
|
||||
|
||||
@cli.command("update-gitaly")
|
||||
def update_gitaly():
|
||||
|
@ -375,15 +378,12 @@ def commit_gitlab(old_version: str, new_version: str, new_rev: str) -> None:
|
|||
[
|
||||
"git",
|
||||
"add",
|
||||
"data.json",
|
||||
"rubyEnv",
|
||||
"gitaly",
|
||||
"gitlab-pages",
|
||||
"gitlab-shell",
|
||||
"gitlab-workhorse",
|
||||
"gitlab-elasticsearch-indexer",
|
||||
"pkgs/applications/version-management/gitlab",
|
||||
"pkgs/by-name/gi/gitaly",
|
||||
"pkgs/by-name/gi/gitlab-elasticsearch-indexer",
|
||||
"pkgs/by-name/gi/gitlab-pages",
|
||||
],
|
||||
cwd=GITLAB_DIR,
|
||||
cwd=NIXPKGS_PATH,
|
||||
)
|
||||
subprocess.run(
|
||||
[
|
||||
|
@ -392,13 +392,20 @@ def commit_gitlab(old_version: str, new_version: str, new_rev: str) -> None:
|
|||
"--message",
|
||||
f"""gitlab: {old_version} -> {new_version}\n\nhttps://gitlab.com/gitlab-org/gitlab/-/blob/{new_rev}/CHANGELOG.md""",
|
||||
],
|
||||
cwd=GITLAB_DIR,
|
||||
cwd=NIXPKGS_PATH,
|
||||
)
|
||||
|
||||
|
||||
def commit_container_registry(old_version: str, new_version: str) -> None:
|
||||
"""Commits the gitlab-container-registry changes for you"""
|
||||
subprocess.run(["git", "add", "gitlab-container-registry"], cwd=GITLAB_DIR)
|
||||
subprocess.run(
|
||||
[
|
||||
"git",
|
||||
"add",
|
||||
"pkgs/by-name/gi/gitlab-container-registry"
|
||||
],
|
||||
cwd=NIXPKGS_PATH,
|
||||
)
|
||||
subprocess.run(
|
||||
[
|
||||
"git",
|
||||
|
@ -406,7 +413,7 @@ def commit_container_registry(old_version: str, new_version: str) -> None:
|
|||
"--message",
|
||||
f"gitlab-container-registry: {old_version} -> {new_version}\n\nhttps://gitlab.com/gitlab-org/container-registry/-/blob/v{new_version}-gitlab/CHANGELOG.md",
|
||||
],
|
||||
cwd=GITLAB_DIR,
|
||||
cwd=NIXPKGS_PATH,
|
||||
)
|
||||
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
pkg-config,
|
||||
qt5,
|
||||
|
@ -27,6 +28,14 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
hash = "sha256-b2RqSw0Ksn9OLxQV9+3reBiqrty+Kx9OwV93jlvuPnY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "include-algorithm-header.patch";
|
||||
url = "https://github.com/AppImageCommunity/AppImageUpdate/commit/5e91de84aba775ba8d3a4771e4f7f06056f9b764.patch";
|
||||
hash = "sha256-RX2HFAlGsEjXona7cL3WdwwiiA0u9CnfvHMC6S0DeLY=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'VERSION 1-alpha' 'VERSION ${finalAttrs.version}' \
|
||||
|
|
|
@ -25,14 +25,14 @@ in
|
|||
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "awsebcli";
|
||||
version = "3.22";
|
||||
version = "3.23.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-elastic-beanstalk-cli";
|
||||
tag = version;
|
||||
hash = "sha256-I85VteUjPPWRixXC1mEiMmk46mYPzQJoaYcHV8ztMU4=";
|
||||
hash = "sha256-nZP3eepp3hUT2hCxz75vTP1N2akOZPQhyFRN6ecJvU4=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
@ -11,17 +11,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-semver-checks";
|
||||
version = "0.40.0";
|
||||
version = "0.41.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "obi1kenobi";
|
||||
repo = "cargo-semver-checks";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-bit8/o5MqlIL4vvCS9fGR2rNtD/Dn58aFqsmyhKueUI=";
|
||||
hash = "sha256-84tRzqJqvm+ermtWMCkOIUmNeH/RLf8IUTIsEVPbGQk=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-/8Juz8F5vJ/JLDYZUG9tyxkLSN7YPh5yAKJflpuSZ0w=";
|
||||
cargoHash = "sha256-8VtSQZHR8L6nijcN71ey9nW5nrAsPK6qyqJSWQDz8uw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cdecl";
|
||||
version = "18.4.1";
|
||||
version = "18.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paul-j-lucas";
|
||||
repo = "cdecl";
|
||||
tag = "cdecl-${finalAttrs.version}";
|
||||
hash = "sha256-GtNB55zFIpt6yYE3olC3yQr2RLsS9AMewzJKDcb67GM=";
|
||||
hash = "sha256-adM+EoumgZs207WpqMHG09RknC3gcaaemqPCZF3P6gU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "courier-unicode";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/courier/courier-unicode/${version}/courier-unicode-${version}.tar.bz2";
|
||||
sha256 = "sha256-uD7mRqR8Kp1pL7bvuThWRmjDLsF51PrAwH6s6KG4/JE=";
|
||||
sha256 = "sha256-tkXS8AqrvGgjIO3mlspQIBJm9xChvOxKxQQmlcmef2k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dnf5";
|
||||
version = "5.2.12.0";
|
||||
version = "5.2.13.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
owner = "rpm-software-management";
|
||||
repo = "dnf5";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-r5bZgcnY7O1U28tkSnSJur3/Z/llabGe7mlIMA8ZGls=";
|
||||
hash = "sha256-O5rEI6/ZtaEcjOaHCPT8kS6d3aqyEENHL7GNHg+FRgo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "fedifetcher";
|
||||
version = "7.1.15";
|
||||
version = "7.1.16";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nanos";
|
||||
repo = "FediFetcher";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WGJIp7YTgMA3nHlOjLHFF1XTwRuiOf1QJmlBgzgfkNY=";
|
||||
hash = "sha256-8eSzXstOOEx+yzwjcSgQfv8c0d+1gsVemzGG/U1TWEo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.70.0";
|
||||
version = "2.71.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FMv/W7Q9IZw0Pxj37Y/npLXHiF9s2tKqbNc9pmKrhcQ=";
|
||||
hash = "sha256-Wx1C5xrjssF09ok9YYXsewDi5Tdi3Gepfnf1FueEpkI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-q0JkYiOiAUDrdEzcrclnzU9WrxGTJxNn9nkihPvAqXo=";
|
||||
vendorHash = "sha256-69bGTUdVD/jebvmxYu0Mx7poSlbkXBAXUWLJ1CclXJU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-absorb";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tummychow";
|
||||
repo = "git-absorb";
|
||||
tag = version;
|
||||
hash = "sha256-fn4xeXlYl8xB/wjpt7By9tATzb5t58jcuwfqw0tNH7M=";
|
||||
hash = "sha256-O9bJMYhIyCtztswvL0JQ4ZtsAAI9TlHzWDeGdTHEmP4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
|||
];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-PC040PtMK0OUS4zlLoHPcSzgEw5H3kndnVuyME/jEz4=";
|
||||
cargoHash = "sha256-QBZItmKH9b2KwHR88MotyIT2krZl5QQFLvUmPmbxl4U=";
|
||||
|
||||
nativeCheckInputs = [
|
||||
gitMinimal
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gitaly-git";
|
||||
version = "2.47.2";
|
||||
version = "2.48.1.gl1";
|
||||
|
||||
# `src` attribute for nix-update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "git";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6KI8V6TDh8DYizvHFeaXBz5HlEPLNQzEZAEplVsvZUc=";
|
||||
hash = "sha256-j7yKImeRerdsYtSMrAU4y5vAJ2BT5wnJxURbDIwVot4=";
|
||||
};
|
||||
|
||||
# we actually use the gitaly build system
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "17.10.4";
|
||||
version = "17.11.1";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
|
@ -21,10 +21,10 @@ let
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NUTo5JVolc4WUinyCn4BKDqJPn3KWXOnBs6MRj7178o=";
|
||||
hash = "sha256-8PDCHAZrFs+4G4K0wAgE0AsOp4hlL+5uGb7qVJjuzqg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-umtSuLQiohSarzZDU7tHEYI6t8B7MlkaDu8//fnr1Ms=";
|
||||
vendorHash = "sha256-ExqgxukFKXq/Z//hGSoDevfpJiNbVHhind63os1/3Fk=";
|
||||
|
||||
ldflags = [
|
||||
"-X ${gitaly_package}/internal/version.version=${version}"
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-container-registry";
|
||||
version = "4.19.0";
|
||||
version = "4.20.0";
|
||||
rev = "v${version}-gitlab";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
|
@ -14,10 +14,10 @@ buildGoModule rec {
|
|||
owner = "gitlab-org";
|
||||
repo = "container-registry";
|
||||
inherit rev;
|
||||
hash = "sha256-WrijK/kQugCpiDbMw1+QTvG60SDsdJ5PDFGKGiLBsb8=";
|
||||
hash = "sha256-irMMOjORJY8yVSNBkh7HDYDJv05RDz19f0KAjnF8EWA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0fvjnEm4NdIKexjTO/GijWy8WwBrLt3jZCwjfOKI4jA=";
|
||||
vendorHash = "sha256-3j58QVLgwjUGX0QzruAbfRNyFmcAD5EApQ3+f212IDU=";
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
|
@ -35,13 +35,10 @@ buildGoModule rec {
|
|||
meta = with lib; {
|
||||
description = "GitLab Docker toolset to pack, ship, store, and deliver content";
|
||||
license = licenses.asl20;
|
||||
maintainers =
|
||||
with maintainers;
|
||||
[
|
||||
leona
|
||||
yayayayaka
|
||||
]
|
||||
++ teams.cyberus.members;
|
||||
teams = with teams; [
|
||||
gitlab
|
||||
cyberus
|
||||
];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -8,17 +8,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-elasticsearch-indexer";
|
||||
version = "5.4.0";
|
||||
version = "5.5.0";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-elasticsearch-indexer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jrUNOxqc/k4a/34nHEatGnBorTlh/EuHnEs/GfFRUcI=";
|
||||
hash = "sha256-b2kXp77pb9MXMRJsbDdNOXub8eZbZkHRwu/Ru0Voi60=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iL8QowfX0OpU9irUP4MJXhGVim7GU2fTMLgJSTAfh9w=";
|
||||
vendorHash = "sha256-9T8LbMROLcQYm9cT32Uc6Cuxwt9OYj3WzSYFgSQg1HQ=";
|
||||
|
||||
buildInputs = [ icu ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
@ -6,17 +6,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "17.10.4";
|
||||
version = "17.11.1";
|
||||
|
||||
# nixpkgs-update: no auto update
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kvmM8cWAAlDT+FJBVUiZD9h/qT6iAaz+gOncvyCsvtY=";
|
||||
hash = "sha256-rXIHRIFbgK7VLgZ7DjR+kmP6WnYCROSbxzx12KUjXLE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-o2DgP2YP2aejtuQ4NC90kysvwDy0XvSb4CW5oE2x2qQ=";
|
||||
vendorHash = "sha256-jCuLRXr7WHGxbXVg2JB1vp9WiNaLgsIJ6GJSS4QrlwY=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "goaccess";
|
||||
version = "1.9.3";
|
||||
version = "1.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "allinurl";
|
||||
repo = "goaccess";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZOngDAHA88YQvkx2pk5ZSpBzxqelvCIR4z5hiFmfGyc=";
|
||||
hash = "sha256-KevxuZuIrMybNlPZgVDLO0zQe4LfAKxfVBbHnyTUC/o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
@ -36,6 +36,12 @@ stdenv.mkDerivation rec {
|
|||
"--with-openssl"
|
||||
] ++ lib.optionals withGeolocation [ "--enable-geoip=mmdb" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString (
|
||||
lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DHOST_NAME_MAX=_POSIX_HOST_NAME_MAX"
|
||||
]
|
||||
);
|
||||
|
||||
meta = with lib; {
|
||||
description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems";
|
||||
homepage = "https://goaccess.io";
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "args";
|
||||
version = "6.4.6";
|
||||
version = "6.4.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Taywee";
|
||||
repo = "args";
|
||||
rev = version;
|
||||
sha256 = "sha256-2gH3h3QAl0+XVULt/fR2UUGKNIxTUmnRRdxPOFdpVy4=";
|
||||
sha256 = "sha256-IQzhbXl1CfEV164EjulKrOUdCTZNZAFgVyzxk4rTNlU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -7,15 +7,15 @@
|
|||
setJavaClassPath,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "metals";
|
||||
version = "1.5.2";
|
||||
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${pname}-deps-${version}";
|
||||
name = "metals-deps-${finalAttrs.version}";
|
||||
buildCommand = ''
|
||||
export COURSIER_CACHE=$(pwd)
|
||||
${coursier}/bin/cs fetch org.scalameta:metals_2.13:${version} \
|
||||
${coursier}/bin/cs fetch org.scalameta:metals_2.13:${finalAttrs.version} \
|
||||
-r bintray:scalacenter/releases \
|
||||
-r sonatype:snapshots > deps
|
||||
mkdir -p $out/share/java
|
||||
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
makeWrapper
|
||||
setJavaClassPath
|
||||
];
|
||||
buildInputs = [ deps ];
|
||||
buildInputs = [ finalAttrs.deps ];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out/bin
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/metals \
|
||||
--add-flags "${extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main"
|
||||
--add-flags "${finalAttrs.extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -54,4 +54,4 @@ stdenv.mkDerivation rec {
|
|||
tomahna
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -58,6 +58,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
preCheck = "export OMP_NUM_THREADS=2";
|
||||
|
||||
meta = {
|
||||
description = "MIT Photonic-Bands: computation of photonic band structures in periodic media";
|
||||
homepage = "https://mpb.readthedocs.io/en/latest/";
|
||||
|
|
|
@ -8,17 +8,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nvidia_oc";
|
||||
version = "0.1.19";
|
||||
version = "0.1.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dreaming-Codes";
|
||||
repo = "nvidia_oc";
|
||||
tag = version;
|
||||
hash = "sha256-OYQuCNHByt9y6XGIayCw8uvZHeITqRk8PV06+pT0dhA=";
|
||||
hash = "sha256-2BijC+LDZJKEheZVlqG+EP6+/GSRLNQfxPEUKCY8lfU=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-94uoOzbC1ocK1LWHArUYqfaBFzOUQNSLPKnMRXXjBQ0=";
|
||||
cargoHash = "sha256-Xt+0clazawNvc9iIX6PR76NlyuJnjCTMkI/k2JzJ6nw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoAddDriverRunpath
|
||||
|
|
|
@ -117,13 +117,13 @@ in
|
|||
goBuild (finalAttrs: {
|
||||
pname = "ollama";
|
||||
# don't forget to invalidate all hashes each update
|
||||
version = "0.6.5";
|
||||
version = "0.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ollama";
|
||||
repo = "ollama";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-l+JYQjl6A0fKONxtgCtc0ztT18rmArGKcO2o+p4H95M=";
|
||||
hash = "sha256-9ZkO+LrS9rOTgOW8chLO3tnbne/+BSxQY+zOsSoE5Zc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -9,11 +9,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "omniorb";
|
||||
version = "4.3.2";
|
||||
version = "4.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
|
||||
hash = "sha256-HHRTMNAZBK/Xoe0KWJa5puU6waS4ZKSFA7k8fuy/H6g=";
|
||||
hash = "sha256-rM0l4stwxOM+0iew2T6WaeOMRgGWN4h8dxOYhw7UXno=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
@ -31,13 +31,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openvas-scanner";
|
||||
version = "23.16.1";
|
||||
version = "23.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = "openvas-scanner";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/5vcK6ndqdur2CceAgEkMPQpWpghS3O8GuBe1s6ZPKg=";
|
||||
hash = "sha256-HMvtxblp7adr7EMBg1MShkAnEfsP7ENLPhPIBVYZU14=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -17,16 +17,16 @@ buildGoModule (finalAttrs: {
|
|||
webkitgtk_4_1
|
||||
];
|
||||
pname = "paretosecurity";
|
||||
version = "0.1.9";
|
||||
version = "0.2.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ParetoSecurity";
|
||||
repo = "agent";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-KJs4xC3EtGG4116UE+oIEwAMcuDWIm9gqgZY+Bv14ac=";
|
||||
hash = "sha256-skBxDPC+C8JU1CW6g3SA2C4IawaoPzVi8pdl5BCutUY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3plpvwLe32AsGuVzdM2fSmTPkKwRFmhi651NEIRdOxw=";
|
||||
vendorHash = "sha256-YnyACP/hJYxi4AWMwr0We4YUTbWwahKAIYN6RnHmzls=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [
|
||||
|
@ -51,6 +51,17 @@ buildGoModule (finalAttrs: {
|
|||
install -Dm444 ${finalAttrs.src}/apt/paretosecurity-trayicon.service $out/lib/systemd/user/paretosecurity-trayicon.service
|
||||
substituteInPlace $out/lib/systemd/user/paretosecurity-trayicon.service \
|
||||
--replace-fail "/usr/bin/paretosecurity" "$out/bin/paretosecurity"
|
||||
|
||||
# Install .desktop files
|
||||
install -Dm444 ${finalAttrs.src}/apt/ParetoSecurity.desktop $out/share/applications/ParetoSecurity.desktop
|
||||
substituteInPlace $out/share/applications/ParetoSecurity.desktop \
|
||||
--replace-fail "/usr/bin/paretosecurity" "$out/bin/paretosecurity"
|
||||
install -Dm444 ${finalAttrs.src}/apt/ParetoSecurityLink.desktop $out/share/applications/ParetoSecurityLink.desktop
|
||||
substituteInPlace $out/share/applications/ParetoSecurityLink.desktop \
|
||||
--replace-fail "/usr/bin/paretosecurity" "$out/bin/paretosecurity"
|
||||
|
||||
# Install icon
|
||||
install -Dm444 ${finalAttrs.src}/assets/icon.png $out/share/icons/hicolor/512x512/apps/ParetoSecurity.png
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
|
@ -74,10 +85,11 @@ buildGoModule (finalAttrs: {
|
|||
root helper that allows you to run the checker in userspace. Some checks
|
||||
require root permissions, and the checker asks the helper to run those.
|
||||
|
||||
Additionally, if you enable `services.paretosecurity.trayIcon`, you get a
|
||||
little Vilfredo Pareto living in your systray showing your the current
|
||||
status of checks. This will also enable a systemd timer to update the
|
||||
status of checks once per hour.
|
||||
Additionally, using the NixOS module gets you a little Vilfredo Pareto
|
||||
living in your systray showing your the current status of checks. The
|
||||
NixOS Module also installs a systemd timer to update the status of checks
|
||||
once per hour. If you want to use just the CLI mode, set
|
||||
`services.paretosecurity.trayIcon` to `false`.
|
||||
|
||||
Finally, you can run `paretosecurity link` to configure the agent
|
||||
to send the status of checks to https://dash.paretosecurity.com to make
|
||||
|
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rdma-core";
|
||||
version = "56.1";
|
||||
version = "57.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-rdma";
|
||||
repo = "rdma-core";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-sRQlynPZxlAe+G8ZMmq8TK3lHqucQxHzjBPIfFqVsZU=";
|
||||
hash = "sha256-vE0HKsNQNB+Nfxh7BNGadweZQC+e8HFbI89iJhSg40o=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "shopware-cli";
|
||||
version = "0.5.16";
|
||||
version = "0.5.18";
|
||||
src = fetchFromGitHub {
|
||||
repo = "shopware-cli";
|
||||
owner = "FriendsOfShopware";
|
||||
tag = version;
|
||||
hash = "sha256-E4+49YAHwojPX/QVjgtKHXCBiK65pmLidfNxe24SJYg=";
|
||||
hash = "sha256-0s+VoLw+isYzOQDxcFxEMxuOAKSej/q0tzpgzeHcshE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -27,7 +27,7 @@ buildGoModule rec {
|
|||
dart-sass
|
||||
];
|
||||
|
||||
vendorHash = "sha256-l71imlrBSg6PBdzREZL+2GYyBKEw/uqPwG8aiTUFpwk=";
|
||||
vendorHash = "sha256-g1Xtqt+LzBIHd57AGUbKuzWmT1pTG+eciuYDfdgEmkM=";
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd shopware-cli \
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "svt-av1-psy";
|
||||
version = "2.3.0-B-unstable-2025-02-02";
|
||||
version = "3.0.2-unstable-2025-04-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psy-ex";
|
||||
repo = "svt-av1-psy";
|
||||
rev = "ec65071b65ee70078229182ce6e1d0f6a4aa1a47";
|
||||
hash = "sha256-98u7J9tqrnc+MbryjWO2r9iuAy6QjJbbq0/o4xRLzhI=";
|
||||
rev = "3745419c40267d294202b52f48f069aff56cdb78";
|
||||
hash = "sha256-iAw2FiEsBGB4giWqzo1EJZok26WSlq7brq9kJubnkAQ=";
|
||||
};
|
||||
|
||||
cmakeBuildType = "Release";
|
||||
|
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tmuxp";
|
||||
version = "1.50.1";
|
||||
version = "1.55.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-v7k0S0dMmpmwZkCJhPKiE+sEtVkOL+tE4Io66EIEXP0=";
|
||||
hash = "sha256-reC609nY1kdmQInAphAfmSTZQQqitTD88EBv/4mU3h0=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update
|
||||
|
||||
nix-update --override-filename pkgs/by-name/ui/uiua/unstable.nix --version unstable uiua-unstable
|
||||
nix-update --override-filename pkgs/by-name/ui/uiua/unstable.nix --version-regex '^(\d*\.\d*\.\d*.*)$' uiua-unstable
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "virtnbdbackup";
|
||||
version = "2.26";
|
||||
version = "2.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abbbi";
|
||||
repo = "virtnbdbackup";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-wSfqWWXGjqnnmIY2sHW3XDIepie2QJGmFxfn7LXNREE=";
|
||||
hash = "sha256-oGvsqGraJs0UkmtRN8/2eSIKc0lDD/qxyTakrj3Sqno=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
|
|
@ -18,12 +18,12 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "winbox";
|
||||
version = "4.0beta18";
|
||||
version = "4.0beta19";
|
||||
|
||||
src = fetchurl {
|
||||
name = "WinBox_Linux-${finalAttrs.version}.zip";
|
||||
url = "https://download.mikrotik.com/routeros/winbox/${finalAttrs.version}/WinBox_Linux.zip";
|
||||
hash = "sha256-Eyvp1hCdYlyGQw+kQOZ4O2CdAMaI75GU4Uucp7RwY+0=";
|
||||
hash = "sha256-+hDhQT09mKaO65TK0AF6+o/FdmgdlNm1qUSkWZybj9s=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
@ -9,9 +9,11 @@
|
|||
wayland-scanner,
|
||||
wlr-protocols,
|
||||
libGL,
|
||||
libgbm,
|
||||
bash,
|
||||
installExampleScripts ? true,
|
||||
makeWrapper,
|
||||
installShellFiles,
|
||||
pipectl,
|
||||
slurp,
|
||||
rofi,
|
||||
|
@ -29,13 +31,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wl-mirror";
|
||||
version = "0.17.0";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ferdi265";
|
||||
repo = "wl-mirror";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-E8mbCMfmN3key1W3m8YbH1wKa56yESiXujACfKFS/+s=";
|
||||
hash = "sha256-kaWzcXXXHNCOHJvb2wpil+Jcqm/cF5JV3IhvDC67YeU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -46,9 +48,11 @@ stdenv.mkDerivation rec {
|
|||
wayland-scanner
|
||||
scdoc
|
||||
makeWrapper
|
||||
installShellFiles
|
||||
];
|
||||
buildInputs = [
|
||||
libGL
|
||||
libgbm
|
||||
wayland
|
||||
wayland-protocols
|
||||
wlr-protocols
|
||||
|
@ -65,11 +69,22 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
"-DINSTALL_EXAMPLE_SCRIPTS=${if installExampleScripts then "ON" else "OFF"}"
|
||||
"-DINSTALL_DOCUMENTATION=ON"
|
||||
"-DWITH_GBM=ON"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString installExampleScripts ''
|
||||
wrapProgram $out/bin/wl-present --prefix PATH ":" ${wl-present-binpath}
|
||||
'';
|
||||
postInstall =
|
||||
''
|
||||
installShellCompletion --cmd wl-mirror \
|
||||
--bash ../scripts/completions/bash-completions/_wl-mirror \
|
||||
--zsh ../scripts/completions/zsh-completions/_wl-mirror
|
||||
|
||||
installShellCompletion --cmd wl-present \
|
||||
--bash ../scripts/completions/bash-completions/_wl-present \
|
||||
--zsh ../scripts/completions/zsh-completions/_wl-present
|
||||
''
|
||||
+ lib.optionalString installExampleScripts ''
|
||||
wrapProgram $out/bin/wl-present --prefix PATH ":" ${wl-present-binpath}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Ferdi265/wl-mirror";
|
||||
|
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "zdns";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zmap";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ZwZCDiZ4rZ8ODaEd/81muMT+OvOe59hRcNi9iZKqdFs=";
|
||||
hash = "sha256-jnrewp0wXaRFVBY6Wo9JHGDnDxzQFOhh3JoLqxRicew=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-f5qboa7AIAG67Yla5sPr7r1HgW8n16SnbIOuGy7JjWs=";
|
||||
vendorHash = "sha256-Uosa4Am5IQ9653TDZCOA9AS97pyQ1H2wRhXyJBQ1Eys=";
|
||||
|
||||
preCheck = ''
|
||||
# Tests require network access
|
||||
|
|
|
@ -53,6 +53,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
(lib.cmakeBool "USE_SYSTEM_ARGS" true)
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
|
||||
meta = {
|
||||
description = "Rewrite of the advanced file download/sync tool zsync";
|
||||
homepage = "https://github.com/AppImageCommunity/zsync2";
|
||||
|
|
|
@ -12,14 +12,15 @@
|
|||
curlHTTP3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ngtcp2";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
repo = "ngtcp2";
|
||||
# must match version usage in meta.changelog
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-mfgWtyYhAJB8kvQVNCuSHx4Nz1Th5STMlorCB2xO7OQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
@ -48,11 +49,12 @@ stdenv.mkDerivation rec {
|
|||
inherit curlHTTP3;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/ngtcp2/ngtcp2";
|
||||
description = "ngtcp2 project is an effort to implement QUIC protocol which is now being discussed in IETF QUICWG for its standardization";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ izorkin ];
|
||||
changelog = "https://github.com/ngtcp2/ngtcp2/releases/tag/v${finalAttrs.version}";
|
||||
description = "Implementation of the QUIC protocol (RFC9000)";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ izorkin ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.150";
|
||||
version = "9.2.152";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = "ailment";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-R8AHs0tMpywD7GcPU/NI6G2eQEea75Ey/1vsZ2yLVLE=";
|
||||
hash = "sha256-nqMDsqmh0kzdUuSprDExSMpzzE8uwSs1cA/awflGB4o=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
42
pkgs/development/python-modules/ament-package/default.nix
Normal file
42
pkgs/development/python-modules/ament-package/default.nix
Normal file
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
importlib-metadata,
|
||||
importlib-resources,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ament-package";
|
||||
version = "0.17.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ament";
|
||||
repo = "ament_package";
|
||||
tag = version;
|
||||
hash = "sha256-+Jfj8mkvrpJnd3oPhOo2E5cvVO9ujez0mrpsj2taOOU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
importlib-metadata
|
||||
importlib-resources
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "ament_package" ];
|
||||
|
||||
# Tests currently broken
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "The parser for the manifest files in the ament buildsystem";
|
||||
homepage = "https://github.com/ament/ament_package";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ guelakais ];
|
||||
};
|
||||
}
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.150";
|
||||
version = "9.2.152";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
@ -47,7 +47,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = "angr";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-sjBLOVNqPeFbVLxvTnIpGeEpGfXx4GjomUSH9rN5rbc=";
|
||||
hash = "sha256-WeYLSN3DMZZOvzuLyRAkES5wjjmnJTQWhtJDCLMlbW0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "capstone" ];
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.150";
|
||||
version = "9.2.152";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = "archinfo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FCawauMXhUfPsMdpRDgbZ5mUBGDBAwp1mVWkJ+UTuxs=";
|
||||
hash = "sha256-SvtkEiBnqANcH2uHfVkYCNmXrJeOenbpQ+AfuOi7ZQ0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
@ -359,7 +359,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.37.38";
|
||||
version = "1.38.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -367,7 +367,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-14wt6I6fGmC+8Fz61bjtwFHxdivghlyDvr5xZEj1ZRA=";
|
||||
hash = "sha256-sEY+y4qWWGCW7eQHvCuUeILYt+o0igSNt2Ivbh4AuTE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.37.38";
|
||||
version = "1.38.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-ukdVtQZJZJ8xKbjympz8Rj1l1SlgXdOI8dpi+DbVYGc=";
|
||||
hash = "sha256-waWcO0CSVxDtNR8ojN6OkoM7DDngGC5qZSDbL7+7VPo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.150";
|
||||
version = "9.2.152";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = "claripy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RM0gyGOrMaZCMhX3dYi2Valsz7OHplTz+SX6GlDUL+A=";
|
||||
hash = "sha256-t2zqZ1yqa/CJDnOLcEXtrk3HR5QVol3FQZZAbC4gBHA=";
|
||||
};
|
||||
|
||||
# z3 does not provide a dist-info, so python-runtime-deps-check will fail
|
||||
|
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.150";
|
||||
version = "9.2.152";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = "binaries";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Gn6ipdxU5/POypRkQFyMNqIUGGyMLeUG2upR1GAB54w=";
|
||||
hash = "sha256-HN7k68IkfHt/qlzbGoXvvl2nHnVEmsXkpM9tKVZs0UI=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
|
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = "cle";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rBF3uvBMe+ef5Ldh+X2yL+fd/CpEJJXhkVHAY+SgOvk=";
|
||||
hash = "sha256-sYVzlmnsXHTJlIu5W1sFBNnER/lwf/MtfRmyA/XEJWg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
@ -2,39 +2,48 @@
|
|||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
filelock,
|
||||
packaging,
|
||||
tomli,
|
||||
typing-extensions,
|
||||
|
||||
distutils,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
ncurses,
|
||||
packaging,
|
||||
setuptools,
|
||||
filelock,
|
||||
patchelf,
|
||||
tomli,
|
||||
importlib-metadata,
|
||||
typing-extensions,
|
||||
dmgbuild,
|
||||
|
||||
# tests
|
||||
ensureNewerSourcesForZipFilesHook,
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
versionCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cx-freeze";
|
||||
version = "8.0.0";
|
||||
version = "8.2.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "cx_freeze";
|
||||
inherit version;
|
||||
hash = "sha256-gOH4e7FS7Q+X98ZDXgI31Eqt6Zl5knxGJ3cTIqJdVQ0=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "marcelotduarte";
|
||||
repo = "cx_Freeze";
|
||||
tag = version;
|
||||
hash = "sha256-xrSMW7z3XblwAuaC18Rju/XuBZvU+5+xAW+MO6u32EE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i /patchelf/d pyproject.toml
|
||||
# Build system requirements
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools>=70.1,<76" "setuptools"
|
||||
'';
|
||||
patches = [
|
||||
# ValueError: '/nix/store/33ajdw6s479bg0ydhk0zqrxi6p989gbl-python3.12-pytest-8.3.5/lib/python3.12/site-packages'
|
||||
# is not in the subpath of '/nix/store/fqm9bqqlmaqqr02qbalm1bazp810qfiw-python3-3.12.9'
|
||||
./fix-tests-relative-path.patch
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
|
@ -42,9 +51,12 @@ buildPythonPackage rec {
|
|||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
pythonRemoveDeps = [ "patchelf" ];
|
||||
|
||||
dependencies =
|
||||
[
|
||||
distutils
|
||||
filelock
|
||||
packaging
|
||||
setuptools
|
||||
]
|
||||
|
@ -52,11 +64,11 @@ buildPythonPackage rec {
|
|||
tomli
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.10") [
|
||||
importlib-metadata
|
||||
typing-extensions
|
||||
]
|
||||
++ lib.optional stdenv.hostPlatform.isLinux filelock
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin dmgbuild;
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
dmgbuild
|
||||
];
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix"
|
||||
|
@ -65,14 +77,81 @@ buildPythonPackage rec {
|
|||
(lib.makeBinPath [ patchelf ])
|
||||
];
|
||||
|
||||
# Fails to find Console even though it exists on python 3.x
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [
|
||||
"cx_Freeze"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
nativeCheckInputs = [
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
writableTmpDirAsHomeHook
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/cxfreeze";
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
preCheck = ''
|
||||
rm -rf cx_Freeze
|
||||
'';
|
||||
|
||||
disabledTests =
|
||||
[
|
||||
# Require internet access
|
||||
"test_bdist_appimage_target_name"
|
||||
"test_bdist_appimage_target_name_and_version"
|
||||
"test_bdist_appimage_target_name_and_version_none"
|
||||
|
||||
# Try to install a module: ValueError: ZIP does not support timestamps before 1980
|
||||
"test___main__"
|
||||
"test_bdist_appimage_simple"
|
||||
"test_bdist_appimage_skip_build"
|
||||
"test_bdist_deb_simple_pyproject"
|
||||
"test_bdist_rpm_simple_pyproject"
|
||||
"test_build"
|
||||
"test_build_constants"
|
||||
"test_build_exe_advanced"
|
||||
"test_build_exe_asmodule"
|
||||
"test_ctypes"
|
||||
"test_cxfreeze"
|
||||
"test_cxfreeze_debug_verbose"
|
||||
"test_cxfreeze_deprecated_behavior"
|
||||
"test_cxfreeze_deprecated_option"
|
||||
"test_cxfreeze_include_path"
|
||||
"test_cxfreeze_target_name_not_isidentifier"
|
||||
"test_excludes"
|
||||
"test_executable_namespace"
|
||||
"test_executable_rename"
|
||||
"test_executables"
|
||||
"test_freezer_zip_filename"
|
||||
"test_install"
|
||||
"test_install_pyproject"
|
||||
"test_multiprocessing"
|
||||
"test_not_found_icon"
|
||||
"test_parser"
|
||||
"test_sqlite"
|
||||
"test_ssl"
|
||||
"test_tz"
|
||||
"test_valid_icon"
|
||||
"test_zip_exclude_packages"
|
||||
"test_zip_include_packages"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# error: Path /nix/store/xzjghvsg4fhr2vv6h4scihsdrgk4i76w-python3-3.12.9/lib/libpython3.12.dylib
|
||||
# is not a path referenced from DarwinFile
|
||||
"test_bdist_dmg"
|
||||
"test_bdist_dmg_custom_layout"
|
||||
"test_bdist_mac"
|
||||
"test_plist_items"
|
||||
|
||||
# AssertionError: assert names != []
|
||||
"test_freezer_default_bin_includes"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Set of scripts and modules for freezing Python scripts into executables";
|
||||
homepage = "https://marcelotduarte.github.io/cx_Freeze/";
|
||||
homepage = "https://marcelotduarte.github.io/cx_Freeze";
|
||||
changelog = "https://github.com/marcelotduarte/cx_Freeze/releases/tag/${version}";
|
||||
license = licenses.psfl;
|
||||
license = lib.licenses.psfl;
|
||||
maintainers = [ ];
|
||||
mainProgram = "cxfreeze";
|
||||
};
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/tests/conftest.py b/tests/conftest.py
|
||||
index 04400a17..1facf55d 100644
|
||||
--- a/tests/conftest.py
|
||||
+++ b/tests/conftest.py
|
||||
@@ -46,9 +46,7 @@ class TempPackage:
|
||||
# environment
|
||||
self.system_path: Path = Path(os.getcwd())
|
||||
self.system_prefix: Path = Path(sys.prefix)
|
||||
- self.relative_site = Path(pytest.__file__).parent.parent.relative_to(
|
||||
- self.system_prefix
|
||||
- )
|
||||
+ self.relative_site = Path(pytest.__file__).resolve().parent.parent
|
||||
|
||||
# make a temporary directory and set it as current
|
||||
name = request.node.name
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
|
@ -39,14 +38,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "flax";
|
||||
version = "0.10.5";
|
||||
version = "0.10.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "flax";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8ZJbuPht9vQV52HN7eMqHBaNkzRP4K6K9CSw68vSTys=";
|
||||
hash = "sha256-HhepJp7y2YN05XcZhB/L08g+yOfTJPRzd2m4ALQJGvw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -97,16 +96,10 @@ buildPythonPackage rec {
|
|||
"examples/*"
|
||||
];
|
||||
|
||||
disabledTests =
|
||||
[
|
||||
# AssertionError: [Chex] Function 'add' is traced > 1 times!
|
||||
"PadShardUnpadTest"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
|
||||
"test_ref_changed"
|
||||
"test_structure_changed"
|
||||
];
|
||||
disabledTests = [
|
||||
# AssertionError: [Chex] Function 'add' is traced > 1 times!
|
||||
"PadShardUnpadTest"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = writeScript "update.sh" ''
|
||||
|
|
|
@ -32,17 +32,20 @@
|
|||
syrupy,
|
||||
postgresql,
|
||||
postgresqlTestHook,
|
||||
|
||||
# passthru
|
||||
nix-update-script,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph";
|
||||
version = "0.3.24";
|
||||
version = "0.3.31";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
tag = "${version}";
|
||||
hash = "sha256-NlTpBXBeADlIHQDlt0muJEuoKOgXiAtAo8GoU5CsvZo=";
|
||||
hash = "sha256-juguN0X9qsrjSvZNB2XyDzz92K0e0ARF7b2O8PlluIs=";
|
||||
};
|
||||
|
||||
postgresqlTestSetupPost = ''
|
||||
|
@ -125,9 +128,11 @@ buildPythonPackage rec {
|
|||
"tests/test_pregel_async.py"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit (langgraph-sdk) updateScript;
|
||||
skipBulkUpdate = true; # Broken, see https://github.com/NixOS/nixpkgs/issues/379898
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^(\\d+\\.\\d+\\.\\d+)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "libtmux";
|
||||
version = "0.40.1";
|
||||
version = "0.46.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmux-python";
|
||||
repo = "libtmux";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-rddjRBofI5M28wvlBwH2VwuIgmulThxbfxiJSOCNkPY=";
|
||||
hash = "sha256-x+zEfHFTAF0m6j/WFmelcBVOzh7oJE02BdB3bz/EcNM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -50,19 +50,22 @@ buildPythonPackage rec {
|
|||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# tests/test_pane.py:113: AssertionError
|
||||
"test_capture_pane_start"
|
||||
# assert (1740973920.500444 - 1740973919.015309) <= 1.1
|
||||
"test_retry_three_times"
|
||||
"test_function_times_out_no_raise"
|
||||
# assert False
|
||||
"test_retry_three_times_no_raise_assert"
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"tests/test_test.py"
|
||||
];
|
||||
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test/test_retry.py" ];
|
||||
|
||||
pythonImportsCheck = [ "libtmux" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Typed scripting library / ORM / API wrapper for tmux";
|
||||
homepage = "https://libtmux.git-pull.com/";
|
||||
changelog = "https://github.com/tmux-python/libtmux/raw/v${version}/CHANGES";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ otavio ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ otavio ];
|
||||
};
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oelint-parser";
|
||||
version = "7.0.0";
|
||||
version = "8.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "priv-kweihmann";
|
||||
repo = "oelint-parser";
|
||||
tag = version;
|
||||
hash = "sha256-NTMAgAN/YJu8vdk1AV4Ji962MIq4Wf5w+0yryz9cLh4=";
|
||||
hash = "sha256-UGRc3pTgWjxqJAjkzL2U3RLPhpM8+KzLowzY/pLdUR0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "regex" ];
|
||||
|
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.150";
|
||||
version = "9.2.152";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-im0ibSCj/sVnWMhitoPHhc60Cy7lyXbr11hRCL95Xts=";
|
||||
hash = "sha256-9OoJkScsHpC5AsVlTkjQ9O8Qizfnbn/ol6b3i/jB2Io=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
@ -30,6 +30,10 @@ buildPythonPackage rec {
|
|||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"ipython"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
cloudpickle
|
||||
ipykernel
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
aiohttp,
|
||||
asyncssh,
|
||||
atomicwrites,
|
||||
bcrypt,
|
||||
chardet,
|
||||
cloudpickle,
|
||||
cookiecutter,
|
||||
|
@ -27,6 +28,7 @@
|
|||
nbconvert,
|
||||
numpy,
|
||||
numpydoc,
|
||||
packaging,
|
||||
pickleshare,
|
||||
psutil,
|
||||
pygithub,
|
||||
|
@ -56,12 +58,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "spyder";
|
||||
version = "6.1.0a1";
|
||||
version = "6.1.0a2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Yjii1YUmdWdrrSLe3trAoATJXt2bfjc0JX5CBMVIEq8=";
|
||||
hash = "sha256-KbGfG9T3XkYXntIQx325mYb0Bh8c0idb+25awFlWD9s=";
|
||||
};
|
||||
|
||||
patches = [ ./dont-clear-pythonpath.patch ];
|
||||
|
@ -70,10 +72,15 @@ buildPythonPackage rec {
|
|||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"ipython"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
asyncssh
|
||||
atomicwrites
|
||||
bcrypt
|
||||
chardet
|
||||
cloudpickle
|
||||
cookiecutter
|
||||
|
@ -88,6 +95,7 @@ buildPythonPackage rec {
|
|||
nbconvert
|
||||
numpy
|
||||
numpydoc
|
||||
packaging
|
||||
pickleshare
|
||||
psutil
|
||||
pygithub
|
||||
|
@ -141,7 +149,7 @@ buildPythonPackage rec {
|
|||
'';
|
||||
homepage = "https://www.spyder-ide.org/";
|
||||
downloadPage = "https://github.com/spyder-ide/spyder/releases";
|
||||
changelog = "https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md";
|
||||
changelog = "https://github.com/spyder-ide/spyder/blob/v${version}/changelogs/Spyder-6.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
callPackage ../generic.nix rec {
|
||||
pname = "rat-king-adventure";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TrashboxBobylev";
|
||||
repo = "Rat-King-Adventure";
|
||||
rev = version;
|
||||
hash = "sha256-01WFQ2shxFbyr5bGfKn8e7hOEB2LpjNZu9dRRVk3Fzw=";
|
||||
hash = "sha256-fuCDzY6DWspLhajB/Z8mS2oEegFPpgRCwQWy8n3V7P0=";
|
||||
};
|
||||
|
||||
desktopName = "Rat King Adventure";
|
||||
|
|
|
@ -6,18 +6,19 @@
|
|||
kernelModuleMakeFlags,
|
||||
kmod,
|
||||
pahole,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tuxedo-drivers-${kernel.version}";
|
||||
version = "4.12.1";
|
||||
version = "4.12.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
group = "tuxedocomputers";
|
||||
owner = "development/packages";
|
||||
repo = "tuxedo-drivers";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ZsfPs8VvvgguyNLSVi6n5hs0OzNwiK3bkooQ267mKtA=";
|
||||
hash = "sha256-tVpuyZGpJJqv9Ilwjxvi9zN9MwwRI2CjjKFReCmXsEA=";
|
||||
};
|
||||
|
||||
buildInputs = [ pahole ];
|
||||
|
@ -29,6 +30,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"INSTALL_MOD_PATH=${placeholder "out"}"
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = {
|
||||
broken = stdenv.hostPlatform.isAarch64 || (lib.versionOlder kernel.version "5.5");
|
||||
description = "Keyboard and hardware I/O driver for TUXEDO Computers laptops";
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
fetchFromGitHub,
|
||||
lib,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
openssl,
|
||||
pkg-config,
|
||||
postgresql,
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
fetchFromGitHub,
|
||||
lib,
|
||||
libkrb5,
|
||||
nixosTests,
|
||||
openssl,
|
||||
postgresql,
|
||||
postgresqlBuildExtension,
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
fetchFromGitHub,
|
||||
lib,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
postgresql,
|
||||
}:
|
||||
|
||||
|
@ -27,7 +26,7 @@
|
|||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests = nixosTests.postgresql.timescaledb.passthru.override postgresql;
|
||||
tests = postgresql.pkgs.timescaledb.tests;
|
||||
};
|
||||
|
||||
# tests take really long
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
fetchzip,
|
||||
lib,
|
||||
mecab,
|
||||
nixosTests,
|
||||
postgresql,
|
||||
postgresqlTestExtension,
|
||||
stdenv,
|
||||
|
|
|
@ -11,17 +11,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "monolith";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Y2Z";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-048WUDMMaTjGsNY54m2eKY1MdyX9llojIzGvbcC+Buc=";
|
||||
hash = "sha256-7D/r9/uY1JcShKgfNUGVTn8P5kUAwUIa/xBbhpReeNw=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Q8gh6RuNC2+pc13VksI0tiX/uVjhxYwnR5GRyQYRWLg=";
|
||||
cargoHash = "sha256-rIwlNXe7me3Ehj1EIYiOYo12FQqovmZT0ui58gFRWWw=";
|
||||
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
|
||||
|
|
|
@ -630,6 +630,8 @@ self: super: with self; {
|
|||
|
||||
amcrest = callPackage ../development/python-modules/amcrest { };
|
||||
|
||||
ament-package = callPackage ../development/python-modules/ament-package { };
|
||||
|
||||
amply = callPackage ../development/python-modules/amply { };
|
||||
|
||||
amqp = callPackage ../development/python-modules/amqp { };
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue