From 3c7cbaade8aa0959dc499af5c8a59be8fdbe3b08 Mon Sep 17 00:00:00 2001
From: Zitrone <nix@dev.quantenzitrone.eu>
Date: Wed, 12 Jun 2024 09:33:20 +0200
Subject: [PATCH] OSCAR: rename to oscar

---
 .../os/oscar/package.nix}                     | 21 ++++++++++++++-----
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 17 insertions(+), 7 deletions(-)
 rename pkgs/{applications/misc/OSCAR/default.nix => by-name/os/oscar/package.nix} (87%)

diff --git a/pkgs/applications/misc/OSCAR/default.nix b/pkgs/by-name/os/oscar/package.nix
similarity index 87%
rename from pkgs/applications/misc/OSCAR/default.nix
rename to pkgs/by-name/os/oscar/package.nix
index fab17cb0737d..1af7233bb20a 100644
--- a/pkgs/applications/misc/OSCAR/default.nix
+++ b/pkgs/by-name/os/oscar/package.nix
@@ -1,6 +1,12 @@
-{ lib, stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }:
-mkDerivation rec {
-  pname = "OSCAR";
+{
+  lib,
+  stdenv,
+  qt5,
+  fetchFromGitLab,
+  libGLU,
+}:
+qt5.mkDerivation rec {
+  pname = "oscar";
   version = "1.5.1";
 
   src = fetchFromGitLab {
@@ -10,8 +16,13 @@ mkDerivation rec {
     hash = "sha256-FBHbPtMZeIgcR1pQflfEWK2FS8bquctXaeY/yaZofHg=";
   };
 
-  buildInputs = [ qtbase qttools qtserialport libGLU ];
-  nativeBuildInputs = [ qmake ];
+  buildInputs = [
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtserialport
+    libGLU
+  ];
+  nativeBuildInputs = [ qt5.qmake ];
   postPatch = ''
     substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}"
   '';
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 33c0602e8a5e..37b3a63c8709 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1187,6 +1187,7 @@ mapAliases {
   onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
   openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24
   oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10
+  OSCAR = oscar; # Added 2024-06-12
   osxfuse = macfuse-stubs; # Added 2021-03-20
   ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24
   oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46d1f2e3a76f..a0811cee70d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -38046,8 +38046,6 @@ with pkgs;
 
   opkg-utils = callPackage ../tools/package-management/opkg-utils { };
 
-  OSCAR = qt5.callPackage ../applications/misc/OSCAR { };
-
   pgmanage = callPackage ../applications/misc/pgmanage { };
 
   pgadmin4 = callPackage ../tools/admin/pgadmin { };