Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gitlab: update prometheus-client-mmap gem to fix aarch64 #369636

Merged
merged 2 commits into from
Jan 4, 2025
Merged

gitlab: update prometheus-client-mmap gem to fix aarch64 #369636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34a0c14
gitlab: update prometheus-client-mmap gem to fix aarch64
xanderio Dec 31, 2024
d2b0b70
Revert "nixosTests.gitlab: do not block nixos-unstable on aarch64"
xanderio Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/release-combined.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ rec {

(onFullSupported "nixos.tests.firewall")
(onFullSupported "nixos.tests.fontconfig-default-fonts")
(onSystems [ "x86_64-linux" ] "nixos.tests.gitlab") # we lack energy to really debug aarch64 here
(onFullSupported "nixos.tests.gitlab")
(onFullSupported "nixos.tests.gnome")
(onFullSupported "nixos.tests.gnome-xorg")
(onSystems [ "x86_64-linux" ] "nixos.tests.hibernate")
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory

# Metrics
gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'prometheus-client-mmap', '1.1.2', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory

# Event-driven reactor for Ruby
# Required manually in config/initializers/require_async_gem
Expand Down
7 changes: 4 additions & 3 deletions pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1436,7 +1436,8 @@ GEM
coderay
parser
unparser
prometheus-client-mmap (1.1.1)
prometheus-client-mmap (1.1.2)
base64
rb_sys (~> 0.9.86)
pry (0.14.2)
coderay (~> 1.1)
Expand Down Expand Up @@ -2226,7 +2227,7 @@ DEPENDENCIES
pg_query (~> 5.1.0)
png_quantizator (~> 0.2.1)
premailer-rails (~> 1.12.0)
prometheus-client-mmap (~> 1.1, >= 1.1.1)
prometheus-client-mmap (= 1.1.2)
pry-byebug
pry-rails (~> 0.3.9)
pry-shell (~> 0.6.4)
Expand Down Expand Up @@ -2329,4 +2330,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.3)

BUNDLED WITH
2.5.11
2.5.22
6 changes: 3 additions & 3 deletions pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5063,15 +5063,15 @@ src:
version = "0.1.0";
};
prometheus-client-mmap = {
dependencies = ["rb_sys"];
dependencies = ["base64" "rb_sys"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vg47xx3wgg24snqc6ychb08mbcyrjmvxym9fg69cpa4xvj133fx";
sha256 = "1dwvpxqj652c8r61q88s336vzf2h2akcijk9hmjp9jzlnhil44n4";
type = "gem";
};
version = "1.1.1";
version = "1.1.2";
};
pry = {
dependencies = ["coderay" "method_source"];
Expand Down
6 changes: 6 additions & 0 deletions pkgs/applications/version-management/gitlab/update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,12 @@ def update_rubyenv():
cwd=rubyenv_dir,
)

# update to 1.1.2 to fix https://gitlab.com/gitlab-org/ruby/gems/prometheus-client-mmap/-/issues/68
subprocess.check_output(
["sed", "-i", "s:'prometheus-client-mmap', '~> 1.1', '>= 1.1.1':'prometheus-client-mmap', '1.1.2':g", "Gemfile"],
cwd=rubyenv_dir,
)

# Un-vendor sidekiq
#
# The sidekiq dependency was vendored to maintain compatibility with Redis 6.0 (as
Expand Down
9 changes: 6 additions & 3 deletions pkgs/development/ruby-modules/gem-config/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,9 +321,12 @@ in
cp -R ext/fast_mmaped_file_rs $out
'';
};
hash = if lib.versionAtLeast attrs.version "1.1.1"
then "sha256-RsN5XWX7Mj2ORccM0eczY+44WXsbXNTnJVcCMvnOATk="
else "sha256-XuQZPbFWqPHlrJvllkvLl1FjKeoAUbi8oKDrS2rY1KM=";
hash = if lib.versionAtLeast attrs.version "1.1.2"
then "sha256-pNzW2fQZDcuqu8apv3GU7lUC/H1cX5WRifBBQlbE8+s="
else
if lib.versionAtLeast attrs.version "1.1.1"
xanderio marked this conversation as resolved.
Show resolved Hide resolved
then "sha256-RsN5XWX7Mj2ORccM0eczY+44WXsbXNTnJVcCMvnOATk="
else "sha256-XuQZPbFWqPHlrJvllkvLl1FjKeoAUbi8oKDrS2rY1KM=";
};
nativeBuildInputs = [
cargo
Expand Down
Loading