From 5be6e19f01fca57899c7049f13a1ca56adcc1a17 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 14 Jun 2024 13:21:33 -0300
Subject: [PATCH 1/3] jwasm: migrate to by-name

---
 .../jwasm/default.nix => by-name/jw/jwasm/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/compilers/jwasm/default.nix => by-name/jw/jwasm/package.nix} (100%)

diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/by-name/jw/jwasm/package.nix
similarity index 100%
rename from pkgs/development/compilers/jwasm/default.nix
rename to pkgs/by-name/jw/jwasm/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f06962f5fad6..abaf97e4dec7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16167,8 +16167,6 @@ with pkgs;
   julia-stable-bin = julia_110-bin;
   julia-bin = julia-stable-bin;
 
-  jwasm =  callPackage ../development/compilers/jwasm { };
-
   kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { };
 
   kingstvis = callPackage ../applications/science/electronics/kingstvis { };

From 7f5127eb52044f64b1cecde8c75cbc69ceca9852 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 14 Jun 2024 13:23:10 -0300
Subject: [PATCH 2/3] jwasm: get rid of nested with at meta

---
 pkgs/by-name/jw/jwasm/package.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/jw/jwasm/package.nix b/pkgs/by-name/jw/jwasm/package.nix
index a8ffc3164a66..d3b79d391734 100644
--- a/pkgs/by-name/jw/jwasm/package.nix
+++ b/pkgs/by-name/jw/jwasm/package.nix
@@ -1,6 +1,7 @@
-{ lib
-, stdenv
-, fetchFromGitHub
+{
+  lib,
+  fetchFromGitHub,
+  stdenv,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -31,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: {
                     -t $doc/share/doc/jwasm/
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Baron-von-Riedesel/JWasm/";
     description = "MASM-compatible x86 assembler";
-    changelog = "https://github.com/Baron-von-Riedesel/JWasm/releases/tag/v${finalAttrs.version}";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = platforms.unix;
+    changelog = "https://github.com/Baron-von-Riedesel/JWasm/releases/tag/${finalAttrs.src.rev}";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.unix;
     broken = stdenv.isDarwin;
   };
 })

From a3ba1e408b58ad923fcd244958167e86dfa72ac4 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 14 Jun 2024 13:25:37 -0300
Subject: [PATCH 3/3] jwasm: 2.17 -> 2.18

---
 pkgs/by-name/jw/jwasm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/jw/jwasm/package.nix b/pkgs/by-name/jw/jwasm/package.nix
index d3b79d391734..8a1390aac9f5 100644
--- a/pkgs/by-name/jw/jwasm/package.nix
+++ b/pkgs/by-name/jw/jwasm/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jwasm";
-  version = "2.17";
+  version = "2.18";
 
   src = fetchFromGitHub {
     owner = "Baron-von-Riedesel";
     repo  = "JWasm";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-22eNtHXF+RQT4UbXIVjn1JP/s6igp5O1oQT7sVl7c1U=";
+    hash = "sha256-xbiyGBTzIkAfUy45JdAl77gbvArzVUQNPOxa+H2uGFo=";
   };
 
   outputs = [ "out" "doc" ];