From 2a7015603d1cbd927f58da23cb2ea92a3143eda0 Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Wed, 11 Feb 2026 01:24:23 +1000
Subject: [PATCH 1/4] uasm: fix building with gcc > 13

gcc13Stdenv isn't cached pkgsStatic, which is particularly annoying.
Add the relevant flags to get it compiling with regular stdenv.
---
 pkgs/by-name/ua/uasm/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ua/uasm/package.nix b/pkgs/by-name/ua/uasm/package.nix
index a4e3051775fc..db7fa7d52860 100644
--- a/pkgs/by-name/ua/uasm/package.nix
+++ b/pkgs/by-name/ua/uasm/package.nix
@@ -1,14 +1,11 @@
 {
   lib,
-  gcc13Stdenv,
+  stdenv,
   fetchFromGitHub,
   testers,
   uasm,
 }:
 
-let
-  stdenv = gcc13Stdenv;
-in
 stdenv.mkDerivation rec {
   pname = "uasm";
   version = "2.57";
@@ -23,13 +20,16 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   makefile =
-    if gcc13Stdenv.hostPlatform.isDarwin then
+    if stdenv.hostPlatform.isDarwin then
       "Makefile-OSX-Clang-64.mak"
     else
       "Makefile-Linux-GCC-64.mak";
 
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
 
+  # Needed for compiling with GCC > 13
+  env.CFLAGS = "-std=c99 -Wno-incompatible-pointer-types -Wno-implicit-function-declaration -Wno-int-conversion";
+
   installPhase = ''
     runHook preInstall
 

From 3ff5f64e7af19fd2431a5d0c08bed675aa27f614 Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Wed, 11 Feb 2026 01:27:32 +1000
Subject: [PATCH 2/4] uasm: switch to finalAttrs

---
 pkgs/by-name/ua/uasm/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ua/uasm/package.nix b/pkgs/by-name/ua/uasm/package.nix
index db7fa7d52860..0aaa745457ff 100644
--- a/pkgs/by-name/ua/uasm/package.nix
+++ b/pkgs/by-name/ua/uasm/package.nix
@@ -6,14 +6,14 @@
   uasm,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation(finalAttrs: {
   pname = "uasm";
   version = "2.57";
 
   src = fetchFromGitHub {
     owner = "Terraspace";
     repo = "uasm";
-    tag = "v${version}r";
+    tag = "v${finalAttrs.version}r";
     hash = "sha256-HaiK2ogE71zwgfhWL7fesMrNZYnh8TV/kE3ZIS0l85w=";
   };
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     runHook preInstall
 
     install -Dt "$out/bin" -m0755 GccUnixR/uasm
-    install -Dt "$out/share/doc/${pname}" -m0644 {Readme,History}.txt Doc/*
+    install -Dt "$out/share/doc/uasm" -m0644 {Readme,History}.txt Doc/*
 
     runHook postInstall
   '';
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   passthru.tests.version = testers.testVersion {
     package = uasm;
     command = "uasm -h";
-    version = "v${version}";
+    version = "v${finalAttrs.version}";
   };
 
   meta = {
@@ -54,4 +54,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.watcom;
     broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})

From bd41e8db92882c29ba457498f9d9ada6670f67cf Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Wed, 11 Feb 2026 01:28:56 +1000
Subject: [PATCH 3/4] uasm: add myself as maintainer

---
 pkgs/by-name/ua/uasm/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ua/uasm/package.nix b/pkgs/by-name/ua/uasm/package.nix
index 0aaa745457ff..0968d2b4c4c8 100644
--- a/pkgs/by-name/ua/uasm/package.nix
+++ b/pkgs/by-name/ua/uasm/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation(finalAttrs: {
     description = "Free MASM-compatible assembler based on JWasm";
     mainProgram = "uasm";
     platforms = lib.platforms.unix;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.zane ];
     license = lib.licenses.watcom;
     broken = stdenv.hostPlatform.isDarwin;
   };

From 6983c2ea73d9af76818273de7ea7cf1b4d087bfe Mon Sep 17 00:00:00 2001
From: Zane van Iperen <zane@zanevaniperen.com>
Date: Wed, 11 Feb 2026 01:40:26 +1000
Subject: [PATCH 4/4] uasm: formatting

---
 pkgs/by-name/ua/uasm/package.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ua/uasm/package.nix b/pkgs/by-name/ua/uasm/package.nix
index 0968d2b4c4c8..dc05c0b564d8 100644
--- a/pkgs/by-name/ua/uasm/package.nix
+++ b/pkgs/by-name/ua/uasm/package.nix
@@ -6,7 +6,7 @@
   uasm,
 }:
 
-stdenv.mkDerivation(finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "uasm";
   version = "2.57";
 
@@ -20,10 +20,7 @@ stdenv.mkDerivation(finalAttrs: {
   enableParallelBuilding = true;
 
   makefile =
-    if stdenv.hostPlatform.isDarwin then
-      "Makefile-OSX-Clang-64.mak"
-    else
-      "Makefile-Linux-GCC-64.mak";
+    if stdenv.hostPlatform.isDarwin then "Makefile-OSX-Clang-64.mak" else "Makefile-Linux-GCC-64.mak";
 
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];