From 003996f6d9ed3189b50e9e6839a446e3785f8cb1 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 5 Sep 2025 00:41:55 +0200
Subject: [PATCH 1/3] x11basic: move to pkgs/by-name

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

diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/by-name/x1/x11basic/package.nix
similarity index 100%
rename from pkgs/development/compilers/x11basic/default.nix
rename to pkgs/by-name/x1/x11basic/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d8e66412c57..06da23e322bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13515,7 +13515,7 @@ with pkgs;
 
   wsjtx = qt5.callPackage ../applications/radio/wsjtx { };
 
-  x11basic = callPackage ../development/compilers/x11basic {
+  x11basic = callPackage ../by-name/x1/x11basic/package.nix {
     autoconf = buildPackages.autoconf269;
   };
 

From 8b50aa2f63dcc628fcc3881b6b50f8459995488a Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 5 Sep 2025 00:43:24 +0200
Subject: [PATCH 2/3] x11basic: modernize

---
 pkgs/by-name/x1/x11basic/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/x1/x11basic/package.nix b/pkgs/by-name/x1/x11basic/package.nix
index e90eb300ffdc..391d384df6bf 100644
--- a/pkgs/by-name/x1/x11basic/package.nix
+++ b/pkgs/by-name/x1/x11basic/package.nix
@@ -10,14 +10,14 @@
   SDL2,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "X11basic";
   version = "1.27";
 
   src = fetchFromGitHub {
     owner = "kollokollo";
-    repo = pname;
-    rev = version;
+    repo = "X11basic";
+    rev = finalAttrs.version;
     sha256 = "1hpxzdqnjl1fiwgs2vrjg4kxm29c7pqwk3g1m4p5pm4x33a3d1q2";
   };
 
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     autoconf
     automake
   ];
+
   buildInputs = [
     readline
     libX11
@@ -50,12 +51,11 @@ stdenv.mkDerivation rec {
     cp -r ../examples $out/share/.
   '';
 
-  meta = with lib; {
-    homepage = "https://x11-basic.sourceforge.net/";
+  meta = {
+    homepage = "https://x11-basic.codeberg.page";
     description = "Basic interpreter and compiler with graphics capabilities";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ edwtjo ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ edwtjo ];
+    platforms = lib.platforms.unix;
   };
-
-}
+})

From 0fe345900d38933a6fef44322ecf6d24d26261b0 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 5 Sep 2025 00:44:26 +0200
Subject: [PATCH 3/3] x11basic: 1.27 -> 1.28-65

---
 pkgs/by-name/x1/x11basic/package.nix | 35 +++++++++++++++++-----------
 pkgs/top-level/all-packages.nix      |  4 ----
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/x1/x11basic/package.nix b/pkgs/by-name/x1/x11basic/package.nix
index 391d384df6bf..a0756b46a437 100644
--- a/pkgs/by-name/x1/x11basic/package.nix
+++ b/pkgs/by-name/x1/x11basic/package.nix
@@ -1,9 +1,9 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
-  automake,
-  autoconf,
+  fetchFromGitea,
+  autoreconfHook,
+  fig2dev,
   readline,
   libX11,
   bluez,
@@ -11,19 +11,28 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "X11basic";
-  version = "1.27";
+  pname = "x11basic";
+  version = "1.28-65";
 
-  src = fetchFromGitHub {
-    owner = "kollokollo";
-    repo = "X11basic";
-    rev = finalAttrs.version;
-    sha256 = "1hpxzdqnjl1fiwgs2vrjg4kxm29c7pqwk3g1m4p5pm4x33a3d1q2";
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "kollo";
+    repo = "X11Basic";
+    tag = finalAttrs.version;
+    hash = "sha256-07sRUFKJ4CYMtQhRu18PElvNQN2DyKkRJUt7oIhenkA=";
   };
 
+  sourceRoot = "${finalAttrs.src.name}/src";
+
+  postPatch = ''
+    chmod -R u+w examples/compiler
+    substituteInPlace configure.in \
+      --replace-fail "main(foo)" "int main(int foo)"
+  '';
+
   nativeBuildInputs = [
-    autoconf
-    automake
+    autoreconfHook
+    fig2dev
   ];
 
   buildInputs = [
@@ -33,8 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
     bluez
   ];
 
-  preConfigure = "cd src;autoconf";
-
   configureFlags = [
     "--with-bluetooth"
     "--with-usb"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06da23e322bb..d9aec56564d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13515,10 +13515,6 @@ with pkgs;
 
   wsjtx = qt5.callPackage ../applications/radio/wsjtx { };
 
-  x11basic = callPackage ../by-name/x1/x11basic/package.nix {
-    autoconf = buildPackages.autoconf269;
-  };
-
   x2goclient = callPackage ../applications/networking/remote/x2goclient { };
 
   x2gokdriveclient = libsForQt5.callPackage ../applications/networking/remote/x2gokdriveclient { };