From 3cdf5be0dcdc7c829de77c6e7dd519e3d72f591f Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 24 Feb 2024 13:42:14 +0100
Subject: gpt4all: rename `gpt4all-chat` in `gpt4all`

---
 pkgs/by-name/gp/gpt4all-chat/package.nix | 72 -------------------------------
 pkgs/by-name/gp/gpt4all/package.nix      | 73 ++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 72 deletions(-)
 delete mode 100644 pkgs/by-name/gp/gpt4all-chat/package.nix
 create mode 100644 pkgs/by-name/gp/gpt4all/package.nix

(limited to 'pkgs/by-name/gp')

diff --git a/pkgs/by-name/gp/gpt4all-chat/package.nix b/pkgs/by-name/gp/gpt4all-chat/package.nix
deleted file mode 100644
index 8337ad938391d..0000000000000
--- a/pkgs/by-name/gp/gpt4all-chat/package.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, qt6
-, fmt
-, shaderc
-, vulkan-headers
-, wayland
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "gpt4all-chat";
-  version = "2.7.1";
-
-  src = fetchFromGitHub {
-    fetchSubmodules = true;
-    hash = "sha256-PXOnhSU8YaV0fcLAptSVjsUP2Za23GFUxyOkL0T6z0o=";
-    owner = "nomic-ai";
-    repo = "gpt4all";
-    rev = "v${finalAttrs.version}";
-  };
-
-  sourceRoot = "${finalAttrs.src.name}/gpt4all-chat";
-
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace 'set(CMAKE_INSTALL_PREFIX ''${CMAKE_BINARY_DIR}/install)' ""
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    qt6.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    fmt
-    qt6.qtwayland
-    qt6.qtquicktimeline
-    qt6.qtsvg
-    qt6.qthttpserver
-    qt6.qtwebengine
-    qt6.qt5compat
-    shaderc
-    vulkan-headers
-    wayland
-  ];
-
-  cmakeFlags = [
-    "-DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF"
-    "-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON"
-    "-DKOMPUTE_OPT_USE_BUILT_IN_FMT=OFF"
-  ];
-
-  postInstall = ''
-    rm -rf $out/include
-    rm -rf $out/lib/*.a
-    mv $out/bin/chat $out/bin/${finalAttrs.meta.mainProgram}
-    install -m 444 -D $src/gpt4all-chat/flatpak-manifest/io.gpt4all.gpt4all.desktop $out/share/applications/io.gpt4all.gpt4all.desktop
-    install -m 444 -D $src/gpt4all-chat/icons/logo.svg $out/share/icons/hicolor/scalable/apps/io.gpt4all.gpt4all.svg
-    substituteInPlace $out/share/applications/io.gpt4all.gpt4all.desktop \
-      --replace 'Exec=chat' 'Exec=${finalAttrs.meta.mainProgram}'
-  '';
-
-  meta = {
-    description = "A free-to-use, locally running, privacy-aware chatbot. No GPU or internet required";
-    homepage = "https://github.com/nomic-ai/gpt4all-chat";
-    license = lib.licenses.mit;
-    mainProgram = "gpt4all-chat";
-    maintainers = with lib.maintainers; [ drupol polygon ];
-  };
-})
diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix
new file mode 100644
index 0000000000000..e6119fc9212ee
--- /dev/null
+++ b/pkgs/by-name/gp/gpt4all/package.nix
@@ -0,0 +1,73 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, qt6
+, fmt
+, shaderc
+, vulkan-headers
+, wayland
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gpt4all";
+  version = "2.7.1";
+
+  src = fetchFromGitHub {
+    fetchSubmodules = true;
+    hash = "sha256-PXOnhSU8YaV0fcLAptSVjsUP2Za23GFUxyOkL0T6z0o=";
+    owner = "nomic-ai";
+    repo = "gpt4all";
+    rev = "v${finalAttrs.version}";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/gpt4all-chat";
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace 'set(CMAKE_INSTALL_PREFIX ''${CMAKE_BINARY_DIR}/install)' ""
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    fmt
+    qt6.qtwayland
+    qt6.qtquicktimeline
+    qt6.qtsvg
+    qt6.qthttpserver
+    qt6.qtwebengine
+    qt6.qt5compat
+    shaderc
+    vulkan-headers
+    wayland
+  ];
+
+  cmakeFlags = [
+    "-DKOMPUTE_OPT_USE_BUILT_IN_VULKAN_HEADER=OFF"
+    "-DKOMPUTE_OPT_DISABLE_VULKAN_VERSION_CHECK=ON"
+    "-DKOMPUTE_OPT_USE_BUILT_IN_FMT=OFF"
+  ];
+
+  postInstall = ''
+    rm -rf $out/include
+    rm -rf $out/lib/*.a
+    mv $out/bin/chat $out/bin/${finalAttrs.meta.mainProgram}
+    install -m 444 -D $src/gpt4all-chat/flatpak-manifest/io.gpt4all.gpt4all.desktop $out/share/applications/io.gpt4all.gpt4all.desktop
+    install -m 444 -D $src/gpt4all-chat/icons/logo.svg $out/share/icons/hicolor/scalable/apps/io.gpt4all.gpt4all.svg
+    substituteInPlace $out/share/applications/io.gpt4all.gpt4all.desktop \
+      --replace 'Exec=chat' 'Exec=${finalAttrs.meta.mainProgram}'
+  '';
+
+  meta = {
+    changelog = "https://github.com/nomic-ai/gpt4all/releases/tag/v${finalAttrs.version}";
+    description = "A free-to-use, locally running, privacy-aware chatbot. No GPU or internet required";
+    homepage = "https://github.com/nomic-ai/gpt4all";
+    license = lib.licenses.mit;
+    mainProgram = "gpt4all";
+    maintainers = with lib.maintainers; [ drupol polygon ];
+  };
+})
-- 
cgit 1.4.1