diff --git a/machines/compute01/ds-fr/package/default.nix b/machines/compute01/ds-fr/package/default.nix index 0f4d48c..c388bbc 100644 --- a/machines/compute01/ds-fr/package/default.nix +++ b/machines/compute01/ds-fr/package/default.nix @@ -4,13 +4,13 @@ let pname = "ds-fr"; - version = "2023-09-21-01"; + version = "2023-10-02-01"; src = fetchFromGitHub { owner = "demarches-simplifiees"; repo = "demarches-simplifiees.fr"; - rev = "2023-09-21-01"; - hash = "sha256-4HGnv3atCkftK4AbmlYSj2BwDfgZ0jRREYqd1WhJbv0="; + rev = version; + hash = "sha256-Gh8tUSX8YeSZKIm+e2IdA1NVxd8uSgM2SPhxMNfLROE="; }; rubyEnv = bundlerEnv { @@ -37,7 +37,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-c2al1GBgSaUOT3veq5u3Wpj3Y+SfoiFxt97vppSD67s="; + hash = "sha256-tLBkv0XWGHqgb+z896T6/xNfk9PEw/cNhuDTva6s340="; }; buildInputs = [ rubyEnv ]; diff --git a/machines/compute01/ds-fr/package/rubyEnv/Gemfile b/machines/compute01/ds-fr/package/rubyEnv/Gemfile index 4d53d15..f280c31 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/Gemfile +++ b/machines/compute01/ds-fr/package/rubyEnv/Gemfile @@ -13,7 +13,6 @@ gem 'administrate' gem 'administrate-field-enum' # Allow using Field::Enum in administrate gem 'after_party' gem 'anchored' -gem "aws-sdk-s3", require: false gem 'bcrypt' gem 'bootsnap', '>= 1.4.4', require: false # Reduces boot times through caching; required in config/boot.rb gem 'browser' @@ -117,6 +116,7 @@ group :test do end group :development do + gem 'benchmark-ips', require: false gem 'brakeman', require: false gem 'haml-lint' gem 'letter_opener_web' diff --git a/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock b/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock index c6eabbb..a8ba102 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock +++ b/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock @@ -103,22 +103,6 @@ GEM anchored (1.1.0) ast (2.4.2) attr_required (1.0.1) - aws-eventstream (1.2.0) - aws-partitions (1.826.0) - aws-sdk-core (3.183.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) - jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.71.0) - aws-sdk-core (~> 3, >= 3.177.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.135.0) - aws-sdk-core (~> 3, >= 3.181.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.0) - aws-eventstream (~> 1, >= 1.0.2) axe-core-api (4.2.1) capybara dumb_delegator @@ -137,6 +121,7 @@ GEM activesupport (>= 3.1) caxlsx (>= 2.0.2) bcrypt (3.1.18) + benchmark-ips (2.12.0) better_html (1.0.16) actionview (>= 4.0) activesupport (>= 4.0) @@ -255,7 +240,7 @@ GEM excon (0.102.0) factory_bot (6.1.0) activesupport (>= 5.0.0) - ffi (1.15.5) + ffi (1.16.2) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -364,7 +349,6 @@ GEM ruby-vips (>= 2.0.17, < 3) invisible_captcha (2.0.0) rails (>= 5.0) - jmespath (1.6.2) jquery-rails (4.5.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -675,7 +659,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - scss_lint (0.59.0) + scss_lint (0.60.0) sass (~> 3.5, >= 3.5.5) selectize-rails (0.12.6) selenium-devtools (0.114.0) @@ -828,9 +812,9 @@ DEPENDENCIES administrate-field-enum after_party anchored - aws-sdk-s3 axe-core-rspec bcrypt + benchmark-ips bootsnap (>= 1.4.4) brakeman browser @@ -951,5 +935,4 @@ DEPENDENCIES zxcvbn-ruby BUNDLED WITH - 2.4.19 - + 2.3.11 diff --git a/machines/compute01/ds-fr/package/rubyEnv/gemset.nix b/machines/compute01/ds-fr/package/rubyEnv/gemset.nix index a209970..45ac2d2 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/gemset.nix +++ b/machines/compute01/ds-fr/package/rubyEnv/gemset.nix @@ -268,70 +268,6 @@ }; version = "1.0.1"; }; - aws-eventstream = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; - type = "gem"; - }; - version = "1.2.0"; - }; - aws-partitions = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0363ia2fzm8p24kssll3wsfsh3xyf5791hm4q4ys1lkrcj5rc2hs"; - type = "gem"; - }; - version = "1.826.0"; - }; - aws-sdk-core = { - dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y7wgscqs0xdvalbwf8vkc6zlv82hb5a3qdkxd5f3bbvyngai7xb"; - type = "gem"; - }; - version = "3.183.0"; - }; - aws-sdk-kms = { - dependencies = ["aws-sdk-core" "aws-sigv4"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zr5w2cjd895abyn7y5gifhq37bxcinssvdx2l1qmlkllbdxbwq0"; - type = "gem"; - }; - version = "1.71.0"; - }; - aws-sdk-s3 = { - dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sqi6vy7xxw21503fis77clh26906zn08n0y67czn11dcjppsl40"; - type = "gem"; - }; - version = "1.135.0"; - }; - aws-sigv4 = { - dependencies = ["aws-eventstream"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na"; - type = "gem"; - }; - version = "1.6.0"; - }; axe-core-api = { dependencies = ["capybara" "dumb_delegator" "selenium-webdriver" "virtus" "watir"]; groups = ["default" "test"]; @@ -386,6 +322,16 @@ }; version = "3.1.18"; }; + benchmark-ips = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jyvyciwah3qxkcxjdaf0lx0fr0567kipc77wxq29d2xw1dlvp89"; + type = "gem"; + }; + version = "2.12.0"; + }; better_html = { dependencies = ["actionview" "activesupport" "ast" "erubi" "html_tokenizer" "parser" "smart_properties"]; groups = ["default"]; @@ -960,10 +906,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "0faxk6nsyh36anl8bmsk1b2cfaxsn9398bg9wcn2scqcpf1axwlf"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.2"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -1399,16 +1345,6 @@ }; version = "2.0.0"; }; - jmespath = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; - type = "gem"; - }; - version = "1.6.2"; - }; jquery-rails = { dependencies = ["rails-dom-testing" "railties" "thor"]; groups = ["default"]; @@ -2702,10 +2638,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s6dzk4n9pnmqciliggwpiny43vc3cx3n2d5gqa9aqng77ff7yv7"; + sha256 = "0nrpgwvpmyxzlw0c580kd4dhfqp5185ckdc32nw83kfxrphx1lma"; type = "gem"; }; - version = "0.59.0"; + version = "0.60.0"; }; selectize-rails = { groups = ["default"]; @@ -3335,4 +3271,3 @@ version = "1.2.0"; }; } -