From 073a816fd654990f3752a982bfc0476ea57b03f9 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Mon, 29 Jan 2024 21:47:27 +0100 Subject: [PATCH] chore(ds-fr): Update --- machines/compute01/ds-fr/package/dgnum.nix | 2 +- machines/compute01/ds-fr/package/meta.nix | 4 ++-- machines/compute01/ds-fr/package/rubyEnv/Gemfile | 1 + machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock | 5 +++++ machines/compute01/ds-fr/package/rubyEnv/gemset.nix | 11 +++++++++++ 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/machines/compute01/ds-fr/package/dgnum.nix b/machines/compute01/ds-fr/package/dgnum.nix index 687ccfa..a3e6208 100644 --- a/machines/compute01/ds-fr/package/dgnum.nix +++ b/machines/compute01/ds-fr/package/dgnum.nix @@ -3,4 +3,4 @@ _: builtins.map (id: builtins.fetchurl "https://git.dgnum.eu/DGNum/demarches-normaliennes/commit/${id}.patch") -[ "0e8fc7cd890b9a8bdc9cc5b3e40fe11a717b69af" ] +[ "0b9b32483a700ad3060b3d4ef723d5f40c290c62" ] diff --git a/machines/compute01/ds-fr/package/meta.nix b/machines/compute01/ds-fr/package/meta.nix index cb9385a..e7309bf 100644 --- a/machines/compute01/ds-fr/package/meta.nix +++ b/machines/compute01/ds-fr/package/meta.nix @@ -1,5 +1,5 @@ { - version = "2024-01-22-01"; - src-hash = "sha256-wvrWSUnnHA3KXyqD4oORMemSwExH9M579gHtsxx0PKo="; + version = "2024-01-29-01"; + src-hash = "sha256-gF6AxMs10+EFWEgCVNkXg3i/t2qG5aB6Y50PBDSz+ok="; 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 563fb53..96aa001 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/Gemfile +++ b/machines/compute01/ds-fr/package/rubyEnv/Gemfile @@ -54,6 +54,7 @@ gem 'invisible_captcha' gem 'json_schemer' gem 'jwt' gem 'kaminari' +gem 'kredis' gem 'listen' # Required by ActiveSupport::EventedFileUpdateChecker gem 'lograge' gem 'logstash-event' diff --git a/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock b/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock index 2364295..cce7721 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock +++ b/machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock @@ -379,6 +379,10 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) + kredis (1.7.0) + activemodel (>= 6.0.0) + activesupport (>= 6.0.0) + redis (>= 4.2, < 6) launchy (2.5.0) addressable (~> 2.7) letter_opener (1.7.0) @@ -876,6 +880,7 @@ DEPENDENCIES json_schemer jwt kaminari + kredis launchy letter_opener_web listen diff --git a/machines/compute01/ds-fr/package/rubyEnv/gemset.nix b/machines/compute01/ds-fr/package/rubyEnv/gemset.nix index 4713cfb..4877168 100644 --- a/machines/compute01/ds-fr/package/rubyEnv/gemset.nix +++ b/machines/compute01/ds-fr/package/rubyEnv/gemset.nix @@ -1473,6 +1473,17 @@ }; version = "1.2.2"; }; + kredis = { + dependencies = ["activemodel" "activesupport" "redis"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "148dnrpqb058ddvbxhk0vh5brlpjb28zh0ml4cn1apq69rwxwqbh"; + type = "gem"; + }; + version = "1.7.0"; + }; launchy = { dependencies = ["addressable"]; groups = ["default" "development" "test"];