From 94d91e996b2db90ce02e4dda70effda28fe47be0 Mon Sep 17 00:00:00 2001
From: toastal <toastal@posteo.net>
Date: Wed, 20 Mar 2024 17:22:05 +0700
Subject: displaycal: mv → by-name/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/graphics/displaycal/default.nix | 75 -----------------------
 pkgs/by-name/di/displaycal/package.nix            | 75 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix                   |  2 -
 3 files changed, 75 insertions(+), 77 deletions(-)
 delete mode 100644 pkgs/applications/graphics/displaycal/default.nix
 create mode 100644 pkgs/by-name/di/displaycal/package.nix

(limited to 'pkgs')

diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix
deleted file mode 100644
index a48355fbb8250..0000000000000
--- a/pkgs/applications/graphics/displaycal/default.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ lib
-, python3
-, fetchPypi
-, wrapGAppsHook
-, gtk3
-, librsvg
-, xorg
-, argyllcms
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "displaycal";
-  version = "3.9.12";
-  format = "setuptools";
-
-  src = fetchPypi {
-    pname = "DisplayCAL";
-    inherit version;
-    hash = "sha256-0NZ+fr3ilnyWE6+Xa8xqpccNe7WVvvQfQEYvdQ8rf/Q=";
-  };
-
-  nativeBuildInputs = [
-    wrapGAppsHook
-    gtk3
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    build
-    certifi
-    wxpython
-    dbus-python
-    distro
-    numpy
-    pillow
-    pychromecast
-    send2trash
-    zeroconf
-  ];
-
-  buildInputs = [
-    gtk3
-    librsvg
-  ] ++ (with xorg; [
-    libX11
-    libXxf86vm
-    libXext
-    libXinerama
-    libXrandr
-  ]);
-
-  # Workaround for eoyilmaz/displaycal-py3#261
-  setupPyGlobalFlags = [ "appdata" ];
-
-  doCheck = false; # Tests try to access an X11 session and dbus in weird locations.
-
-  pythonImportsCheck = [ "DisplayCAL" ];
-
-  dontWrapGApps = true;
-
-  preFixup = ''
-    makeWrapperArgs+=(
-      ''${gappsWrapperArgs[@]}
-      --prefix PATH : ${lib.makeBinPath [ argyllcms ]}
-      --prefix PYTHONPATH : $PYTHONPATH
-    )
-  '';
-
-  meta = with lib; {
-    description = "Display calibration and characterization powered by Argyll CMS (Migrated to Python 3)";
-    homepage = "https://github.com/eoyilmaz/displaycal-py3";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ toastal ];
-  };
-}
diff --git a/pkgs/by-name/di/displaycal/package.nix b/pkgs/by-name/di/displaycal/package.nix
new file mode 100644
index 0000000000000..a48355fbb8250
--- /dev/null
+++ b/pkgs/by-name/di/displaycal/package.nix
@@ -0,0 +1,75 @@
+{ lib
+, python3
+, fetchPypi
+, wrapGAppsHook
+, gtk3
+, librsvg
+, xorg
+, argyllcms
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "displaycal";
+  version = "3.9.12";
+  format = "setuptools";
+
+  src = fetchPypi {
+    pname = "DisplayCAL";
+    inherit version;
+    hash = "sha256-0NZ+fr3ilnyWE6+Xa8xqpccNe7WVvvQfQEYvdQ8rf/Q=";
+  };
+
+  nativeBuildInputs = [
+    wrapGAppsHook
+    gtk3
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    build
+    certifi
+    wxpython
+    dbus-python
+    distro
+    numpy
+    pillow
+    pychromecast
+    send2trash
+    zeroconf
+  ];
+
+  buildInputs = [
+    gtk3
+    librsvg
+  ] ++ (with xorg; [
+    libX11
+    libXxf86vm
+    libXext
+    libXinerama
+    libXrandr
+  ]);
+
+  # Workaround for eoyilmaz/displaycal-py3#261
+  setupPyGlobalFlags = [ "appdata" ];
+
+  doCheck = false; # Tests try to access an X11 session and dbus in weird locations.
+
+  pythonImportsCheck = [ "DisplayCAL" ];
+
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=(
+      ''${gappsWrapperArgs[@]}
+      --prefix PATH : ${lib.makeBinPath [ argyllcms ]}
+      --prefix PYTHONPATH : $PYTHONPATH
+    )
+  '';
+
+  meta = with lib; {
+    description = "Display calibration and characterization powered by Argyll CMS (Migrated to Python 3)";
+    homepage = "https://github.com/eoyilmaz/displaycal-py3";
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ toastal ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9bca9f2acfa6..bb629ec2bff3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27358,8 +27358,6 @@ with pkgs;
 
   disk_indicator = callPackage ../os-specific/linux/disk-indicator { };
 
-  displaycal = callPackage ../applications/graphics/displaycal { };
-
   displaylink = callPackage ../os-specific/linux/displaylink {
     inherit (linuxPackages) evdi;
   };
-- 
cgit 1.4.1