diff --git a/machines/compute01/ds-fr/package/meta.nix b/machines/compute01/ds-fr/package/meta.nix index e7309bf..4560640 100644 --- a/machines/compute01/ds-fr/package/meta.nix +++ b/machines/compute01/ds-fr/package/meta.nix @@ -1,5 +1,5 @@ { - version = "2024-01-29-01"; - src-hash = "sha256-gF6AxMs10+EFWEgCVNkXg3i/t2qG5aB6Y50PBDSz+ok="; + version = "2024-01-31-01"; + src-hash = "sha256-TaoqHv6dGUldCat4Zd4HTsS29ASFXn2lJT5iCLh6a1Y="; deps-hash = "sha256-UR5K6DQMvmpWWTH8O9/zJ3Nd+Kkl7xofktFdmBB9z6M="; } diff --git a/machines/compute01/ds-fr/package/rubyEnv/Gemfile b/machines/compute01/ds-fr/package/rubyEnv/Gemfile index 96aa001..256c9f7 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/Gemfile +++ b/machines/compute01/ds-fr/package/rubyEnv/Gemfile @@ -25,7 +25,7 @@ gem 'deep_cloneable' # Enable deep clone of active record models gem 'delayed_cron_job' # Cron jobs gem 'delayed_job_active_record' gem 'delayed_job_web' -gem 'devise' # Gestion des comptes utilisateurs +gem 'devise', git: 'https://github.com/heartcombo/devise.git', ref: "edffc79bf05d7f1c58ba50ffeda645e2e4ae0cb1" # Gestion des comptes utilisateurs, drop ref on next release: 4.9.4 gem 'devise-i18n' gem 'devise-two-factor' gem 'discard' diff --git a/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock b/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock index cce7721..83f0752 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock +++ b/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock @@ -1,3 +1,15 @@ +GIT + remote: https://github.com/heartcombo/devise.git + revision: edffc79bf05d7f1c58ba50ffeda645e2e4ae0cb1 + ref: edffc79bf05d7f1c58ba50ffeda645e2e4ae0cb1 + specs: + devise (4.9.3) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0) + responders + warden (~> 1.2.3) + GEM remote: https://rubygems.org/ specs: @@ -189,12 +201,6 @@ GEM sinatra (>= 1.4.4) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.9.3) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0) - responders - warden (~> 1.2.3) devise-i18n (1.9.2) devise (>= 4.7.1) devise-two-factor (5.0.0) @@ -847,7 +853,7 @@ DEPENDENCIES delayed_cron_job delayed_job_active_record delayed_job_web - devise + devise! devise-i18n devise-two-factor discard diff --git a/machines/compute01/ds-fr/package/rubyEnv/gemset.nix b/machines/compute01/ds-fr/package/rubyEnv/gemset.nix index 4877168..4248dd7 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/gemset.nix +++ b/machines/compute01/ds-fr/package/rubyEnv/gemset.nix @@ -683,9 +683,11 @@ groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "121ljaaapil79dcsl5mkh5k613hv58z4z3g2lrnzb5qvqpb3h1j8"; - type = "gem"; + fetchSubmodules = false; + rev = "edffc79bf05d7f1c58ba50ffeda645e2e4ae0cb1"; + sha256 = "1vlcyp6qng7ws4gaw51rz6dhxwldryvfm6fsk33gf7drm7xvr5qf"; + type = "git"; + url = "https://github.com/heartcombo/devise.git"; }; version = "4.9.3"; };