From 10988d8adeea21aaa8485fb5eac83caec6c673cf Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 4 May 2024 16:54:42 +0800
Subject: [PATCH] apostrophe: move to pkgs/by-name

---
 .../default.nix => by-name/ap/apostrophe/package.nix}         | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/editors/apostrophe/default.nix => by-name/ap/apostrophe/package.nix} (93%)

diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/by-name/ap/apostrophe/package.nix
similarity index 93%
rename from pkgs/applications/editors/apostrophe/default.nix
rename to pkgs/by-name/ap/apostrophe/package.nix
index 768402f4e5a7..b3915a9651fb 100644
--- a/pkgs/applications/editors/apostrophe/default.nix
+++ b/pkgs/by-name/ap/apostrophe/package.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchFromGitLab, meson, ninja
 , wrapGAppsHook3, pkg-config, desktop-file-utils
-, appstream-glib, pythonPackages, glib, gobject-introspection
+, appstream-glib, python3Packages, glib, gobject-introspection
 , gtk3, webkitgtk, glib-networking, gnome, gspell, texliveMedium
 , shared-mime-info, libhandy, fira, sassc
 }:
 
 let
-  pythonEnv = pythonPackages.python.withPackages(p: with p; [
+  pythonEnv = python3Packages.python.withPackages(p: with p; [
     regex setuptools levenshtein pyenchant
     pygobject3 pycairo pypandoc chardet
   ]);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 012ca8aaf600..daba8bc585ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29738,10 +29738,6 @@ with pkgs;
 
   appgate-sdp = callPackage ../applications/networking/appgate-sdp { };
 
-  apostrophe = callPackage ../applications/editors/apostrophe {
-    pythonPackages = python3Packages;
-  };
-
   ardour = callPackage ../applications/audio/ardour { };
   ardour_7 = callPackage ../applications/audio/ardour/7.nix { };