ecoppens/infrastructure
1
0
Fork 0
forked from DGNum/infrastructure
Code Pull requests Activity

chore(ds-fr): Update

Browse source
This commit is contained in:
Tom Hubrecht 2024-02-10 20:36:16 +01:00
parent 743e76ebb2
commit db6d3cef1b
5 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
machines/compute01/ds-fr/package/default.nix
View file

@ -15,6 +15,11 @@
}:
let
inherit (lib) getExe;
# Head of the DGNum repo
dgn-id = "640e75577059ded6f2eac4daf10941f573cb83c2";
pname = "ds-fr";
meta = import ./meta.nix;
@ -70,9 +75,9 @@ let
./patches/build.patch
];
postPatch = builtins.concatStringsSep "\n" (
builtins.map (p: "${git}/bin/git apply -p1 < ${p}") dgn-patches
);
postPatch = ''
${getExe git} apply -p1 < ${builtins.fetchurl "https://git.dgnum.eu/DGNum/demarches-normaliennes/commit/${dgn-id}.patch"}
'';
OTP_SECRET_KEY = "precompile_placeholder";
SECRET_KEY_BASE = "precompile_placeholder";
@ -98,8 +103,6 @@ let
cp -r public/* $out/public
'';
};
dgn-patches = import ./dgnum.nix { };
in
stdenv.mkDerivation {
name = "demarches-simplifiees.fr-${version}";
@ -116,9 +119,9 @@ stdenv.mkDerivation {
./patches/secrets-fc.patch
];
postPatch = builtins.concatStringsSep "\n" (
builtins.map (p: "${git}/bin/git apply -p1 < ${p}") dgn-patches
);
postPatch = ''
${getExe git} apply -p1 < ${builtins.fetchurl "https://git.dgnum.eu/DGNum/demarches-normaliennes/commit/${dgn-id}.patch"}
'';
buildPhase = ''
rm -rf public

5
machines/compute01/ds-fr/package/dgnum.nix
View file

@ -1,5 +0,0 @@
_:
builtins.map
(id: builtins.fetchurl "https://git.dgnum.eu/DGNum/demarches-normaliennes/commit/${id}.patch")
[ "0b9b32483a700ad3060b3d4ef723d5f40c290c62" ]

4
machines/compute01/ds-fr/package/meta.nix
View file

@ -1,5 +1,5 @@
{
version = "2024-02-06-01";
src-hash = "sha256-fihC4tZX/29faSNvRJHzenXvIXn/BqoI5oF1y5yqxw0=";
version = "2024-02-09-01";
src-hash = "sha256-LPofN+zAViTo6/amX8gf74rjvaWr29/c0rQFiXUawb0=";
deps-hash = "sha256-GBaz19bxRKS9kc/S9jzisFHm7VayO//46342qgKv2DQ=";
}

18
machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock
View file

@ -97,12 +97,12 @@ GEM
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
administrate (0.18.0)
actionpack (>= 5.0)
actionview (>= 5.0)
activerecord (>= 5.0)
jquery-rails (>= 4.0)
kaminari (>= 1.0)
administrate (0.20.1)
actionpack (>= 6.0, < 8.0)
actionview (>= 6.0, < 8.0)
activerecord (>= 6.0, < 8.0)
jquery-rails (~> 4.6.0)
kaminari (~> 1.2.2)
sassc-rails (~> 2.1)
selectize-rails (~> 0.6)
administrate-field-enum (0.0.9)
@ -357,7 +357,7 @@ GEM
reline (>= 0.3.8)
job-iteration (1.4.1)
activejob (>= 5.2)
jquery-rails (4.5.1)
jquery-rails (4.6.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
@ -724,7 +724,7 @@ GEM
spring (4.1.1)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (4.2.0)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.4.2)
@ -745,7 +745,7 @@ GEM
unicode-display_width (>= 1.1.1, < 3)
thor (1.3.0)
thread_safe (0.3.6)
tilt (2.0.11)
tilt (2.3.0)
timecop (0.9.4)
timeout (0.4.1)
ttfunk (1.7.0)

16
machines/compute01/ds-fr/package/rubyEnv/gemset.nix
View file

@ -304,10 +304,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "00hlp3i6imkmvppby8bzpf24n486h5xiqnlglvxsfg95l5nk1jwq";
sha256 = "1mb7gdzpbsp8w0mrg9gvs2713rjfxdrj2zg6wiplhvj47h0738jb";
type = "gem";
};
version = "0.18.0";
version = "0.20.1";
};
administrate-field-enum = {
dependencies = [ "administrate" ];
@ -1736,10 +1736,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0rxfy6mk1yh8yjkk7gd1908f85dkc60xnfplwz7mi09f6j3f812p";
sha256 = "1qm74n8g68a417ngb6kkw98x9ikjahdsmf1nv120nd3lfbs6nkiw";
type = "gem";
};
version = "4.5.1";
version = "4.6.0";
};
json = {
groups = [
@ -3665,10 +3665,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0k0236g4h3ax7v6vp9k0l2fa0w6f1wqp7dn060zm4isw4n3k89sw";
sha256 = "15rzfzd9dca4v0mr0bbhsbwhygl0k9l24iqqlx0fijig5zfi66wm";
type = "gem";
};
version = "4.2.0";
version = "4.2.1";
};
sprockets-rails = {
dependencies = [
@ -3807,10 +3807,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v";
sha256 = "0p3l7v619hwfi781l3r7ypyv1l8hivp09r18kmkn6g11c4yr1pc2";
type = "gem";
};
version = "2.0.11";
version = "2.3.0";
};
timecop = {
groups = [ "test" ];