From 69c42fccc0f388effc7f7e3483b51ea4e6302f93 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 28 Dec 2024 12:21:53 +0000 Subject: [PATCH 1/3] uasm: switch to gcc13Stdenv --- pkgs/by-name/ua/uasm/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ua/uasm/package.nix b/pkgs/by-name/ua/uasm/package.nix index 3dc47e5ccbc0..2477abf981cc 100644 --- a/pkgs/by-name/ua/uasm/package.nix +++ b/pkgs/by-name/ua/uasm/package.nix @@ -1,13 +1,13 @@ { lib, - stdenv, + gcc13Stdenv, fetchFromGitHub, fetchpatch, testers, uasm, }: -stdenv.mkDerivation rec { +gcc13Stdenv.mkDerivation rec { pname = "uasm"; version = "2.56.2"; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makefile = if stdenv.hostPlatform.isDarwin then "ClangOSX64.mak" else "gccLinux64.mak"; + makefile = if gcc13Stdenv.hostPlatform.isDarwin then "ClangOSX64.mak" else "gccLinux64.mak"; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + makeFlags = [ "CC=${gcc13Stdenv.cc.targetPrefix}cc" ]; installPhase = '' runHook preInstall From 64543f6931c72d967bff3de3596d76992fc35e3f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 28 Dec 2024 12:29:30 +0000 Subject: [PATCH 2/3] uasm: 2.56.2 -> 2.57 --- pkgs/by-name/ua/uasm/package.nix | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ua/uasm/package.nix b/pkgs/by-name/ua/uasm/package.nix index 2477abf981cc..70fff1e01afb 100644 --- a/pkgs/by-name/ua/uasm/package.nix +++ b/pkgs/by-name/ua/uasm/package.nix @@ -2,36 +2,28 @@ lib, gcc13Stdenv, fetchFromGitHub, - fetchpatch, testers, uasm, }: gcc13Stdenv.mkDerivation rec { pname = "uasm"; - version = "2.56.2"; + version = "2.57"; src = fetchFromGitHub { owner = "Terraspace"; - repo = pname; - # Specifying only the tag results in the following error during download: - # the given path has multiple possibilities: #, # - # Probably because upstream has both a tag and a branch with the same name - rev = "refs/tags/v${version}"; - hash = "sha256-QiRBscY6zefeLDDVhS/+j9yIJ+5QhgkDQh1CLl/CslM="; + repo = "uasm"; + tag = "v${version}r"; + hash = "sha256-HaiK2ogE71zwgfhWL7fesMrNZYnh8TV/kE3ZIS0l85w="; }; - patches = [ - (fetchpatch { - name = "fix-v2_55-compilation-on-macos.patch"; - url = "https://github.com/Terraspace/UASM/commit/b50c430cc3083c7f32e288a9f64fe1cafb03091d.patch"; - sha256 = "sha256-FGFB282LSEKtGD1cIRH+Qi5bye5Gx4xb0Ty4J03xjCU"; - }) - ]; - enableParallelBuilding = true; - makefile = if gcc13Stdenv.hostPlatform.isDarwin then "ClangOSX64.mak" else "gccLinux64.mak"; + makefile = + if gcc13Stdenv.hostPlatform.isDarwin then + "Makefile-OSX-Clang-64.mak" + else + "Makefile-Linux-GCC-64.mak"; makeFlags = [ "CC=${gcc13Stdenv.cc.targetPrefix}cc" ]; From 39b7652cf1b08cd012e7735d48c0cae95525f898 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 28 Dec 2024 17:16:32 +0000 Subject: [PATCH 3/3] uasm: mark as broken in darwin --- pkgs/by-name/ua/uasm/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ua/uasm/package.nix b/pkgs/by-name/ua/uasm/package.nix index 70fff1e01afb..24450ee9ccd2 100644 --- a/pkgs/by-name/ua/uasm/package.nix +++ b/pkgs/by-name/ua/uasm/package.nix @@ -6,7 +6,10 @@ uasm, }: -gcc13Stdenv.mkDerivation rec { +let + stdenv = gcc13Stdenv; +in +stdenv.mkDerivation rec { pname = "uasm"; version = "2.57"; @@ -25,7 +28,7 @@ gcc13Stdenv.mkDerivation rec { else "Makefile-Linux-GCC-64.mak"; - makeFlags = [ "CC=${gcc13Stdenv.cc.targetPrefix}cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' runHook preInstall @@ -49,5 +52,6 @@ gcc13Stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ thiagokokada ]; license = licenses.watcom; + broken = stdenv.isDarwin; }; }