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

Use added ruby support in devshell

Browse source
This commit is contained in:
Charlotte Van Petegem 2023-03-14 14:00:31 +01:00
parent 15c5fcaf15
commit 2e49db495a
No known key found for this signature in database
GPG key ID: 019E764B7184435A
5 changed files with 18 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flake.lock generated
View file

@ -153,11 +153,11 @@
]
},
"locked": {
"lastModified": 1678792404,
"lastModified": 1678798690,
"narHash": "sha256-ES6PnlxlQ8ROzHhMKUzuvwmTZvoift1LXyG+LN7TBNI=",
"owner": "chvp",
"repo": "devshell",
"rev": "a3869357ec18d35dc10083dd0fef42fddf4f7f17",
"rev": "5f31e3757888be373af78b724982bb4018406c98",
"type": "github"
},
"original": {

15
shells/dodona.nix
View file

@ -16,24 +16,18 @@ let
in
pkgs.devshell.mkShell {
name = "Dodona";
imports = [ "${inputs.devshell}/extra/language/c.nix" ];
imports = [ "${inputs.devshell}/extra/language/ruby.nix" ];
packages = with pkgs; [
(pkgs.lowPrio binutils)
chromedriver
ungoogled-chromium
findutils
gnumake
nodejs
nodePackages.typescript-language-server
ruby_3_1
rubyPackages_3_1.solargraph
yarn
];
env = [
{ name = "DATABASE_URL"; value = "mysql2://root:dodona@127.0.0.1:3306/dodona"; }
{ name = "TEST_DATABASE_URL"; value = "mysql2://root:dodona@127.0.0.1:3306/dodona_test"; }
{ name = "GEM_HOME"; eval = "$PRJ_DATA_DIR/bundle/$(ruby -e 'puts RUBY_VERSION')"; }
{ name = "PATH"; prefix = "$GEM_HOME/bin"; }
];
commands = [
{
@ -65,9 +59,8 @@ pkgs.devshell.mkShell {
server.services = all-services;
server-support.services = support-services;
};
language.c = {
compiler = pkgs.gcc;
includes = [ pkgs.libmysqlclient pkgs.zlib pkgs.libffi ];
libraries = [ pkgs.libmysqlclient pkgs.zlib pkgs.libffi ];
language.ruby = {
package = pkgs.ruby_3_1;
nativeDeps = [ pkgs.libmysqlclient pkgs.zlib pkgs.libffi ];
};
}

15
shells/gamification2.nix
View file

@ -1,10 +1,8 @@
{ pkgs, inputs }: pkgs.devshell.mkShell {
name = "Gamification 2";
imports = [ "${inputs.devshell}/extra/language/c.nix" ];
imports = [ "${inputs.devshell}/extra/language/ruby.nix" ];
env = [
{ name = "DATABASE_HOST"; eval = "$PGDATA"; }
{ name = "GEM_HOME"; eval = "$PRJ_DATA_DIR/bundle/$(ruby -e 'puts RUBY_VERSION')"; }
{ name = "PATH"; prefix = "$GEM_HOME/bin"; }
{ name = "PGDATA"; eval = "$PRJ_DATA_DIR/postgres"; }
];
commands = [
@ -48,22 +46,17 @@
}
];
packages = with pkgs; [
(pkgs.lowPrio binutils)
findutils
cmake
gnumake
nodejs
postgresql_14
ruby_3_1
yarn
];
serviceGroups.server.services = {
web.command = "rails s -p 3000";
postgres.command = "pg:start";
};
language.c = {
compiler = pkgs.gcc;
includes = [ pkgs.zlib pkgs.openssl ];
libraries = [ pkgs.zlib pkgs.openssl ];
language.ruby = {
package = pkgs.ruby_3_1;
nativeDeps = [ pkgs.sqlite pkgs.libmysqlclient pkgs.zlib ];
};
}

17
shells/tab.nix
View file

@ -1,6 +1,6 @@
{ pkgs, inputs }: pkgs.devshell.mkShell {
name = "Tab";
imports = [ "${inputs.devshell}/extra/language/c.nix" ];
imports = [ "${inputs.devshell}/extra/language/ruby.nix" ];
commands = [
{
name = "refresh-deps";
@ -13,26 +13,17 @@
'';
}
];
env = [
{ name = "GEM_HOME"; eval = "$PRJ_DATA_DIR/bundle/$(ruby -e 'puts RUBY_VERSION')"; }
{ name = "PATH"; prefix = "$GEM_HOME/bin"; }
];
serviceGroups.server.services = {
web.command = "rails s -p 3000";
js.command = "yarn build:dev --watch";
css.command = "yarn build:css --watch";
};
packages = with pkgs; [
(pkgs.lowPrio binutils)
findutils
gnumake
ruby_3_1
nodejs
yarn
];
language.c = {
compiler = pkgs.gcc;
includes = [ pkgs.sqlite pkgs.libmysqlclient pkgs.zlib ];
libraries = [ pkgs.sqlite pkgs.libmysqlclient pkgs.zlib ];
language.ruby = {
package = pkgs.ruby_3_1;
nativeDeps = [ pkgs.sqlite pkgs.libmysqlclient pkgs.zlib ];
};
}

18
shells/tap.nix
View file

@ -1,6 +1,6 @@
{ pkgs, inputs }: pkgs.devshell.mkShell {
name = "Tap";
imports = [ "${inputs.devshell}/extra/language/c.nix" ];
imports = [ "${inputs.devshell}/extra/language/ruby.nix" ];
commands = [
{
name = "refresh-deps";
@ -13,17 +13,8 @@
'';
}
];
env = [
{ name = "GEM_HOME"; eval = "$PRJ_DATA_DIR/bundle/$(ruby -e 'puts RUBY_VERSION')"; }
{ name = "PATH"; prefix = "$GEM_HOME/bin"; }
];
packages = with pkgs; [
(pkgs.lowPrio binutils)
imagemagick
file
findutils
gnumake
ruby_3_0
nodejs
yarn
];
@ -31,9 +22,8 @@
name = "server";
command = "rails s -p 3000";
};
language.c = {
compiler = pkgs.gcc;
includes = [ pkgs.sqlite pkgs.libmysqlclient pkgs.zlib ];
libraries = [ pkgs.sqlite pkgs.libmysqlclient pkgs.zlib ];
language.ruby = {
package = pkgs.ruby_3_0;
nativeDeps = [ pkgs.sqlite pkgs.libmysqlclient pkgs.zlib ];
};
}