From c670990e329f5014c3e04facd0ba3d541844649f Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Sat, 31 May 2025 18:43:18 +0200
Subject: [PATCH 1/2] armips: migrate to by-name

---
 .../armips/default.nix => by-name/ar/armips/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{development/compilers/armips/default.nix => by-name/ar/armips/package.nix} (100%)

diff --git a/pkgs/development/compilers/armips/default.nix b/pkgs/by-name/ar/armips/package.nix
similarity index 100%
rename from pkgs/development/compilers/armips/default.nix
rename to pkgs/by-name/ar/armips/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b4db4c33be0..23561a2170e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4936,7 +4936,7 @@ with pkgs;
     jdk = jdk8;
   };
 
-  armips = callPackage ../development/compilers/armips {
+  armips = callPackage ../by-name/ar/armips/package.nix {
     stdenv = gcc10Stdenv;
   };
 

From d0c39b61cdb9c651750070f9d643f66d322d24af Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Sat, 31 May 2025 18:46:14 +0200
Subject: [PATCH 2/2] armips: build with Clang instead of GCC 10, run tests

---
 pkgs/by-name/ar/armips/package.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/armips/package.nix b/pkgs/by-name/ar/armips/package.nix
index c8386845b35a..047ee07e522d 100644
--- a/pkgs/by-name/ar/armips/package.nix
+++ b/pkgs/by-name/ar/armips/package.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-L+Uxww/WtvDJn1xZqoqA6Pkzq/98sy1qTxZbv6eEjbA=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail c++11 c++17
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   installPhase = ''
@@ -27,6 +32,14 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  doCheck = true;
+
+  checkPhase = ''
+    runHook preCheck
+    ./armipstests ..
+    runHook postCheck
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/Kingcom/armips";
     description = "Assembler for various ARM and MIPS platforms";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23561a2170e6..af69f7dc74dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4937,7 +4937,7 @@ with pkgs;
   };
 
   armips = callPackage ../by-name/ar/armips/package.nix {
-    stdenv = gcc10Stdenv;
+    stdenv = clangStdenv;
   };
 
   ballerina = callPackage ../development/compilers/ballerina {