From 35644e53d7a0b486ea69bc84b98ad20853e64a0a Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Tue, 9 Jul 2024 10:13:07 -0300
Subject: [PATCH 1/2] qnial: migrate to by-name

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

diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/by-name/qn/qnial/package.nix
similarity index 100%
rename from pkgs/development/interpreters/qnial/default.nix
rename to pkgs/by-name/qn/qnial/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e1c0e799088..268f9453682a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12044,8 +12044,6 @@ with pkgs;
 
   qlog = qt6Packages.callPackage ../applications/radio/qlog { };
 
-  qnial = callPackage ../development/interpreters/qnial { };
-
   quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { };
 
   q-text-as-data = callPackage ../tools/misc/q-text-as-data { };

From 7bbda31fc0575ab51801f14e82a32b353aec40b3 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 15 Jul 2024 14:49:03 -0300
Subject: [PATCH 2/2] qnial: 6.3 -> 6.3_1

- use backup from bitbucket/museoa
- finalAttrs design pattern
- remove unused input makeWrapper
- strictDeps
- change maintainer
---
 pkgs/by-name/qn/qnial/package.nix | 49 +++++++++++++++++++------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/qn/qnial/package.nix b/pkgs/by-name/qn/qnial/package.nix
index a23f1665e5cc..0ba34b8a6572 100644
--- a/pkgs/by-name/qn/qnial/package.nix
+++ b/pkgs/by-name/qn/qnial/package.nix
@@ -1,20 +1,38 @@
-{ lib, stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses, libxcrypt }:
+{
+  lib,
+  fetchFromBitbucket,
+  libxcrypt,
+  ncurses,
+  pkg-config,
+  stdenv,
+  unzip,
+}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qnial";
-  version = "6.3";
+  version = "6.3_1";
 
-  src = fetchFromGitHub {
-    sha256 = "0426hb8w0wpkisvmf3danj656j6g7rc6v91gqbgzkcj485qjaliw";
-    rev = "cfe8720a4577d6413034faa2878295431bfe39f8";
+  src = fetchFromBitbucket {
+    owner = "museoa";
     repo = "qnial";
-    owner = "vrthra";
+    rev = finalAttrs.version;
+    hash = "sha256-QhjEq6YKO6OKy7+dlHeTWQvCvrF8zS7o8QfPD8WDXy0=";
   };
 
-  nativeBuildInputs = [ makeWrapper unzip pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    unzip
+  ];
+
+  buildInputs = [
+     ncurses
+     libxcrypt
+  ];
+
+  strictDeps = true;
 
   preConfigure = ''
-    cd build;
+    cd build
   '';
 
   installPhase = ''
@@ -24,17 +42,12 @@ stdenv.mkDerivation {
     cp -r niallib $out/lib/
   '';
 
-  buildInputs = [
-     ncurses
-     libxcrypt
-  ];
-
   meta = {
     description = "Array language from Nial Systems";
-    mainProgram = "nial";
-    homepage = "https://github.com/vrthra/qnial";
+    homepage = "https://bitbucket.com/museoa/qnial";
     license = lib.licenses.artistic1;
-    maintainers = [ ];
+    mainProgram = "nial";
+    maintainers = [ lib.maintainers.AndersonTorres ];
     platforms = lib.platforms.linux;
   };
-}
+})