From ee54d80c9bb7fdd15cb8f2684a44f0b2ec7095c6 Mon Sep 17 00:00:00 2001
From: znaniye <zn4niye@proton.me>
Date: Wed, 5 Jun 2024 10:11:43 -0300
Subject: [PATCH] ols: refactor

---
 .../ol/ols/package.nix}                       | 38 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 21 insertions(+), 19 deletions(-)
 rename pkgs/{development/tools/ols/default.nix => by-name/ol/ols/package.nix} (68%)

diff --git a/pkgs/development/tools/ols/default.nix b/pkgs/by-name/ol/ols/package.nix
similarity index 68%
rename from pkgs/development/tools/ols/default.nix
rename to pkgs/by-name/ol/ols/package.nix
index af950773c06d..86d9db36c06c 100644
--- a/pkgs/development/tools/ols/default.nix
+++ b/pkgs/by-name/ol/ols/package.nix
@@ -1,4 +1,11 @@
-{ stdenv, fetchFromGitHub, makeBinaryWrapper, unstableGitUpdater, odin, lib }:
+{
+  fetchFromGitHub,
+  lib,
+  makeBinaryWrapper,
+  odin,
+  stdenv,
+  unstableGitUpdater,
+}:
 
 stdenv.mkDerivation {
   pname = "ols";
@@ -11,22 +18,14 @@ stdenv.mkDerivation {
     hash = "sha256-zvojGIxMGawddWx5vnBQMTybz+jL9LXfaShbof7wwq0=";
   };
 
-  passthru.updateScript = unstableGitUpdater {
-    hardcodeZeroVersion = true;
-  };
-
-  nativeBuildInputs = [
-    makeBinaryWrapper
-  ];
-
-  buildInputs = [
-    odin
-  ];
-
   postPatch = ''
     patchShebangs build.sh
   '';
 
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  buildInputs = [ odin ];
+
   buildPhase = ''
     runHook preBuild
 
@@ -44,12 +43,17 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
+
+  meta = {
     inherit (odin.meta) platforms;
     description = "Language server for the Odin programming language";
-    mainProgram = "ols";
     homepage = "https://github.com/DanielGavin/ols";
-    license = licenses.mit;
-    maintainers = with maintainers; [ astavie znaniye ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      astavie
+      znaniye
+    ];
+    mainProgram = "ols";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 888cbbbb9b01..11497d10f1e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27651,8 +27651,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  ols = callPackage ../development/tools/ols { };
-
   openpam = callPackage ../development/libraries/openpam { };
 
   openbsm = callPackage ../development/libraries/openbsm { };