From d9d8928baa4a24077fd719286220d3b7c57e358a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 17 Mar 2024 11:15:04 +0000
Subject: [PATCH] more test fixes

---
 examples/phoenix/.test.sh              | 12 ------------
 examples/phoenix/README.md             | 12 ------------
 examples/phoenix/devenv.nix            | 13 -------------
 examples/supported-languages/.setup.sh |  2 ++
 examples/vala/devenv.nix               |  2 +-
 tests/glibcLocales/devenv.nix          |  2 +-
 6 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100755 examples/phoenix/.test.sh
 delete mode 100644 examples/phoenix/README.md
 delete mode 100644 examples/phoenix/devenv.nix
 create mode 100755 examples/supported-languages/.setup.sh

diff --git a/examples/phoenix/.test.sh b/examples/phoenix/.test.sh
deleted file mode 100755
index 95a374e03..000000000
--- a/examples/phoenix/.test.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-mix local.hex --force
-mix local.rebar --force
-echo Y | mix archive.install hex phx_new
-echo Y | mix phx.new hello
-sed -i.bak -e "s/username: \"postgres\",/socket_dir: System.get_env(\"PGDATA\"),/" \
-    ./hello/config/dev.exs && rm ./hello/config/dev.exs.bak
-    
-wait_for_port 4000
-curl -s http://localhost:4000/ | grep "Phoenix Framework"
diff --git a/examples/phoenix/README.md b/examples/phoenix/README.md
deleted file mode 100644
index 893474d7c..000000000
--- a/examples/phoenix/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Based on [the official tutorial](https://hexdocs.pm/phoenix/installation.html).
-
-```shell-session
-$ devenv shell
-$ mix local.hex --force
-$ mix local.rebar --force
-$ mix archive.install hex phx_new
-$ mix phx.new hello
-$ sed -i.bak -e "s/username: \"postgres\",/socket_dir: System.get_env(\"PGDATA\"),/" \
-    ./hello/config/dev.exs && rm ./hello/config/dev.exs.bak
-$ devenv up
-```
diff --git a/examples/phoenix/devenv.nix b/examples/phoenix/devenv.nix
deleted file mode 100644
index a5ce5f7b3..000000000
--- a/examples/phoenix/devenv.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ pkgs, lib, ... }:
-
-{
-  # this example is currently broken
-
-  packages = lib.optionals pkgs.stdenv.isLinux [ pkgs.inotify-tools ];
-
-  languages.elixir.enable = true;
-
-  services.postgres.enable = true;
-
-  processes.phoenix.exec = "mix ecto.create && mix phx.server";
-}
diff --git a/examples/supported-languages/.setup.sh b/examples/supported-languages/.setup.sh
new file mode 100755
index 000000000..6514f82aa
--- /dev/null
+++ b/examples/supported-languages/.setup.sh
@@ -0,0 +1,2 @@
+# arm is not supported yet
+echo "{ pkgs, lib, ... }: { languages.unison.enable = lib.mkForce (!(pkgs.stdenv.isLinux && pkgs.stdenv.isAarch64)); }" > devenv.local.nix
\ No newline at end of file
diff --git a/examples/vala/devenv.nix b/examples/vala/devenv.nix
index 4525b58f4..3d5ba50cb 100644
--- a/examples/vala/devenv.nix
+++ b/examples/vala/devenv.nix
@@ -3,7 +3,7 @@
 {
   packages = with pkgs; [
     # Check Vala code files for code-style errors
-    vala-lint
+    # vala-lint
   ];
 
   languages = {
diff --git a/tests/glibcLocales/devenv.nix b/tests/glibcLocales/devenv.nix
index 0a16d9baa..e3f5c8a2d 100644
--- a/tests/glibcLocales/devenv.nix
+++ b/tests/glibcLocales/devenv.nix
@@ -1,5 +1,5 @@
 {
   enterTest = ''
-    locale -a | grep "en_US.UTF-8"
+    locale -a | grep -E '(en_US.UTF-8|en_US.utf8)'
   '';
 }