chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
Charlotte Van Petegem 2021-05-29 13:01:00 +02:00
parent cd8484cc4c
commit 51b7651181
No known key found for this signature in database
GPG key ID: 019E764B7184435A
5 changed files with 2092 additions and 1971 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -54,11 +54,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1622184933, "lastModified": 1622233358,
"narHash": "sha256-xSnIDR4HYljTPmgwZ942/JZTwQNidm/+uZjif4PpBmk=", "narHash": "sha256-qBb+eaX5oj2ZeCXSeSfKRqM9/JUzKBQtBd+TVtzZhlE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "490aeb3cfa932d9a7314f7c068ad034df89d5b05", "rev": "6ec090d8681d1bef5c835abd64ab74a68170a0e8",
"type": "github" "type": "github"
}, },
"original": { "original": {

11
modules/accentor.nix
View file

@ -7,7 +7,7 @@ let
owner = "accentor"; owner = "accentor";
repo = "web"; repo = "web";
rev = "develop"; rev = "develop";
sha256 = "06z4qm6sgqpvg3cgb20vgac83zkfm1q120i5xbra6p2srhd0h922"; sha256 = "0gqbzhbpv1h3c76nmbd4c0i2hd28hxvhs0xxllqbav4nnpdvrmq6";
}; };
yarnNix = ./accentor/yarn.nix; yarnNix = ./accentor/yarn.nix;
buildPhase = '' buildPhase = ''
@ -24,7 +24,7 @@ let
owner = "accentor"; owner = "accentor";
repo = "api"; repo = "api";
rev = "develop"; rev = "develop";
sha256 = "13lkvrn3nw00jwyf4jzp9j9f09sgva2fbnh9i028hr3lcd7yw6my"; sha256 = "1pm8zmf1q6gxjl6swqi103gpac27nc3v2q6xwyq2jkf8ql71jarj";
}; };
gems = pkgs.bundlerEnv { gems = pkgs.bundlerEnv {
name = "accentor-api-env"; name = "accentor-api-env";
@ -37,6 +37,7 @@ let
env = { env = {
DATABASE_URL = "postgresql://%2Frun%2Fpostgresql/accentor"; DATABASE_URL = "postgresql://%2Frun%2Fpostgresql/accentor";
FFMPEG_LOG_LOCATION = "/var/log/accentor/ffmpeg.log"; FFMPEG_LOG_LOCATION = "/var/log/accentor/ffmpeg.log";
FFMPEG_VERSION_LOCATION = "${config.chvp.dataPrefix}/var/lib/accentor/ffmpeg.version";
RAILS_STORAGE_PATH = "${config.chvp.dataPrefix}/var/lib/accentor/storage"; RAILS_STORAGE_PATH = "${config.chvp.dataPrefix}/var/lib/accentor/storage";
RAILS_TRANSCODE_CACHE = "/var/tmp/accentor/transcode_cache"; RAILS_TRANSCODE_CACHE = "/var/tmp/accentor/transcode_cache";
BOOTSNAP_CACHE_DIR = "/var/tmp/accentor/bootsnap"; BOOTSNAP_CACHE_DIR = "/var/tmp/accentor/bootsnap";
@ -59,6 +60,7 @@ in
export DATABASE_URL="postgresql://%2Frun%2Fpostgresql/accentor" export DATABASE_URL="postgresql://%2Frun%2Fpostgresql/accentor"
export FFMPEG_LOG_LOCATION="/var/log/accentor/ffmpeg.log" export FFMPEG_LOG_LOCATION="/var/log/accentor/ffmpeg.log"
export RAILS_STORAGE_PATH="${config.chvp.dataPrefix}/var/lib/accentor/storage" export RAILS_STORAGE_PATH="${config.chvp.dataPrefix}/var/lib/accentor/storage"
export FFMPEG_VERSION_LOCATION="${config.chvp.dataPrefix}/var/lib/accentor/ffmpeg.version"
export RAILS_TRANSCODE_CACHE="/var/tmp/accentor/transcode_cache" export RAILS_TRANSCODE_CACHE="/var/tmp/accentor/transcode_cache"
export BOOTSNAP_CACHE_DIR="/var/tmp/accentor/bootsnap" export BOOTSNAP_CACHE_DIR="/var/tmp/accentor/bootsnap"
export PIDFILE="/run/accentor/server.pid" export PIDFILE="/run/accentor/server.pid"
@ -110,7 +112,10 @@ in
Group = "accentor"; Group = "accentor";
Restart = "on-failure"; Restart = "on-failure";
WorkingDirectory = api; WorkingDirectory = api;
ExecStartPre = "${gems}/bin/bundle exec rails db:migrate"; ExecStartPre = [
"${gems}/bin/bundle exec rails db:migrate"
"${gems}/bin/bundle exec rails ffmpeg:check_version"
];
ExecStart = "${gems}/bin/bundle exec puma -C ${api}/config/puma.rb"; ExecStart = "${gems}/bin/bundle exec puma -C ${api}/config/puma.rb";
}; };
}; };

9
modules/accentor/gemset.nix
View file

@ -187,11 +187,14 @@
groups = [ "development" "test" ]; groups = [ "development" "test" ];
platforms = [{ platforms = [{
engine = "maglev"; engine = "maglev";
} { }
{
engine = "mingw"; engine = "mingw";
} { }
{
engine = "mingw"; engine = "mingw";
} { }
{
engine = "ruby"; engine = "ruby";
}]; }];
source = { source = {

1352
modules/accentor/yarn.nix
View file

File diff suppressed because it is too large Load diff

1
shells/accentor-api.nix
View file

@ -4,6 +4,7 @@ in
pkgs.mkShell { pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
ffmpeg ffmpeg
imagemagick
postgresql postgresql
ruby_2_7 ruby_2_7
taglib taglib