From a664cd4d494195d8303c154e5b590b085f0aecba Mon Sep 17 00:00:00 2001 From: Omar Brikaa Date: Sun, 5 Jun 2022 12:24:56 +0200 Subject: [PATCH] Rename runtime priorities to mainstream runtimes --- api/src/bin/pistond.js | 10 +++++----- flake.nix | 7 +------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/api/src/bin/pistond.js b/api/src/bin/pistond.js index 1478c0c..c07e08d 100755 --- a/api/src/bin/pistond.js +++ b/api/src/bin/pistond.js @@ -45,18 +45,18 @@ expressWs(app); .toString(); const runtime_names_unordered = JSON.parse(runtimes_data); - const priorities_data = cp + const mainstream_runtimes_data = cp .execSync( - `nix eval --json ${config.flake_path}#pistonRuntimePriorities` + `nix eval --json ${config.flake_path}#pistonMainstreamRuntimes` ) .toString(); - const priorities = JSON.parse(priorities_data).filter(runtime => + const mainstream_runtimes = JSON.parse(mainstream_runtimes_data).filter(runtime => runtime_names_unordered.includes(runtime) ); const runtime_names = [ - ...priorities, + ...mainstream_runtimes, ...runtime_names_unordered.filter( - runtime => !priorities.includes(runtime) + runtime => !mainstream_runtimes.includes(runtime) ), ]; diff --git a/flake.nix b/flake.nix index 8fd37d9..2b9c50d 100644 --- a/flake.nix +++ b/flake.nix @@ -65,17 +65,12 @@ "bash-only" = runtimeList ["bash"]; "none" = { }; }; - pistonRuntimePriorities = [ + pistonMainstreamRuntimes = [ "mono-csharp" - "dotnet-sdk-csharp" "python3" - "python2" "node-javascript" "node-typescript" - "deno-javascript" - "deno-typescript" "mono-basic" - "dotnet-sdk-visual-basic" ]; legacyPackages."${system}" = rec {