diff --git a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix
new file mode 100644
index 000000000000..a12eee62fecd
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, trivialBuild
+, fetchFromGitHub
+}:
+
+trivialBuild {
+  pname = "bqn-mode";
+  version = "0.0.0+unstable=-2021-09-15";
+
+  src = fetchFromGitHub {
+    owner = "mlochbaum";
+    repo = "BQN";
+    rev = "fb6ec1d8b083cd2b335828ae22e978b1b13986fa";
+    hash = "sha256-57ryT5gb7hToAJOiGjjgU87rmlswjPK9tV1iQzJ4C0Y=";
+  };
+
+  postUnpack = ''
+    sourceRoot="$sourceRoot/editors/emacs"
+  '';
+
+  meta = with lib; {
+    homepage = "https://mlochbaum.github.io/BQN/editors/index.html";
+    description = "Emacs mode for BQN";
+    license = licenses.gpl3Only;
+    maintainers = [ maintainers.sternenseemann ];
+  };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 7e5fda8e61be..d763b99c1dd9 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -152,30 +152,8 @@
 
   agda-input = callPackage ./agda-input{ };
 
-  # may be part of MELPA in the future, see
-  # https://github.com/mlochbaum/BQN/issues/10#issuecomment-912982874
-  bqn-mode = self.trivialBuild {
-    pname = "bqn-mode";
-    version = "unstable-2021-09-04";
+  bqn-mode = callPackage ./bqn-mode { };
 
-    src = pkgs.fetchFromGitHub {
-      owner = "mlochbaum";
-      repo = "BQN";
-      rev = "e623a2fcafdf5fd6c8d31570175284805c4f34d9";
-      sha256 = "1a2lpxy3bak4724r0ns4la5d0j6484ngi73kcwp82vgbbpk7lcrp";
-    };
-
-    postUnpack = ''
-      sourceRoot="$sourceRoot/editors/emacs"
-    '';
-
-    meta = {
-      description = "Emacs mode for BQN";
-      license = lib.licenses.gpl3Only;
-      maintainers = [ lib.maintainers.sternenseemann ];
-      homepage = "https://mlochbaum.github.io/BQN/editors/index.html";
-    };
-  };
   llvm-mode = trivialBuild {
     pname = "llvm-mode";
     inherit (pkgs.llvmPackages.llvm) src version;