various: migrate callPackage to by-name (#446807)

pkgs/by-name/fo/fortran-language-server/package.nix

@@ -1,19 +1,23 @@
 {
   lib,
   fetchPypi,
-  buildPythonApplication,
+  python3Packages,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "fortran-language-server";
   version = "1.12.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7Dkh7yPX4rULkzfJFxg47YxrCaxuHk+k3TOINHS9T5A=";
+    hash = "sha256-7Dkh7yPX4rULkzfJFxg47YxrCaxuHk+k3TOINHS9T5A=";
   };
 
+  build-system = [
+    python3Packages.setuptools
+  ];
+
   checkPhase = "$out/bin/fortls --help 1>/dev/null";
   pythonImportsCheck = [ "fortls" ];
 

pkgs/by-name/ki/kitti3/package.nix

@@ -1,13 +1,11 @@
 {
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  i3ipc,
   lib,
-  poetry-core,
   writeScript,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "kitti3";
   version = "0.5.1-unstable-2021-09-10";
   pyproject = true;
@@ -25,12 +23,12 @@ buildPythonApplication rec {
     ./kitti3-fix-build-system.patch
   ];
 
-  nativeBuildInputs = [
-    poetry-core
+  build-system = [
+    python3Packages.poetry-core
   ];
 
-  propagatedBuildInputs = [
-    i3ipc
+  dependencies = [
+    python3Packages.i3ipc
   ];
 
   passthru.updateScript = writeScript "update-kitti3" ''
@@ -38,7 +36,7 @@ buildPythonApplication rec {
     #!nix-shell -i bash -p git common-updater-scripts perl tomlq
     tmpdir="$(mktemp -d)"
     trap "rm -rf $tmpdir" EXIT
-    git clone --depth=1 "${src.gitRepoUrl}" "$tmpdir"
+    git clone --depth=1 "${finalAttrs.src.gitRepoUrl}" "$tmpdir"
     pushd "$tmpdir"
     newVersionNumber=$(perl -ne 'print if s/version = "([\d.]+)"/$1/' pyproject.toml)
     newRevision=$(git show -s --pretty='format:%H')
@@ -59,4 +57,4 @@ buildPythonApplication rec {
     license = lib.licenses.bsd3;
     maintainers = [ ];
   };
-}
+})

pkgs/by-name/lu/lutris-free/package.nix

@@ -0,0 +1,7 @@
+{
+  lutris,
+}:
+
+lutris.override {
+  steamSupport = false;
+}

pkgs/by-name/lu/lutris-unwrapped/package.nix

@@ -1,5 +1,5 @@
 {
-  buildPythonApplication,
+  python3Packages,
   lib,
   fetchFromGitHub,
 
@@ -20,25 +20,6 @@
   meson,
   ninja,
 
-  # check inputs
-  xvfb-run,
-  nose2,
-  flake8,
-
-  # python dependencies
-  certifi,
-  dbus-python,
-  distro,
-  evdev,
-  lxml,
-  pillow,
-  pygobject3,
-  pypresence,
-  pyyaml,
-  requests,
-  protobuf,
-  moddb,
-
   # commands that lutris needs
   xrandr,
   pciutils,
@@ -79,14 +60,14 @@ let
     util-linux
   ];
 in
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "lutris-unwrapped";
   version = "0.5.19";
 
   src = fetchFromGitHub {
     owner = "lutris";
     repo = "lutris";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-CAXKnx5+60MITRM8enkYgFl5ZKM6HCXhCYNyG7kHhuQ=";
   };
 
@@ -123,7 +104,7 @@ buildPythonApplication rec {
   ]);
 
   # See `install_requires` in https://github.com/lutris/lutris/blob/master/setup.py
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     certifi
     dbus-python
     distro

pkgs/by-name/mi/minijail-tools/package.nix

@@ -1,8 +1,8 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   pkgsBuildTarget,
-  python,
+  pkgsBuildHost,
   minijail,
 }:
 
@@ -10,7 +10,7 @@ let
   targetClang = pkgsBuildTarget.targetPackages.clangStdenv.cc;
 in
 
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   format = "setuptools";
   pname = "minijail-tools";
   inherit (minijail) version src;
@@ -28,7 +28,7 @@ buildPythonApplication {
     make libconstants.gen.c libsyscalls.gen.c
     ${targetClang}/bin/${targetClang.targetPrefix}cc -S -emit-llvm \
         libconstants.gen.c libsyscalls.gen.c
-    ${python.pythonOnBuildForHost.interpreter} tools/generate_constants_json.py \
+    ${pkgsBuildHost.python3.interpreter} tools/generate_constants_json.py \
         --output constants.json \
         libconstants.gen.ll libsyscalls.gen.ll
   '';

pkgs/by-name/mt/mtprotoproxy/package.nix

@@ -2,11 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  python,
-  pyaes,
-  pycrypto,
-  uvloop,
-  wrapPython,
+  python3Packages,
+  python3,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,8 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-tQ6e1Y25V4qAqBvhhKdirSCYzeALfH+PhNtcHTuBurs=";
   };
 
-  nativeBuildInputs = [ wrapPython ];
-  pythonPath = [
+  nativeBuildInputs = with python3Packages; [ wrapPython ];
+  pythonPath = with python3Packages; [
     pyaes
     pycrypto
     uvloop
@@ -36,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "Async MTProto proxy for Telegram";
     license = lib.licenses.mit;
     homepage = "https://github.com/alexbers/mtprotoproxy";
-    platforms = python.meta.platforms;
+    platforms = python3.meta.platforms;
     maintainers = [ ];
     mainProgram = "mtprotoproxy";
   };

pkgs/by-name/ni/nix-visualize/package.nix

@@ -2,15 +2,10 @@
   lib,
   fetchFromGitHub,
   nix,
-  python,
-  matplotlib,
-  networkx,
-  pandas,
-  pygraphviz,
-  setuptools,
+  python3Packages,
 }:
 
-python.pkgs.buildPythonApplication {
+python3Packages.buildPythonApplication {
   version = "1.0.5-unstable-2024-01-17";
   pname = "nix-visualize";
   pyproject = true;
@@ -27,9 +22,9 @@ python.pkgs.buildPythonApplication {
       --prefix PATH : ${lib.makeBinPath [ nix ]}
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = with python3Packages; [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     matplotlib
     networkx
     pandas

pkgs/by-name/nx/nxdomain/package.nix

@@ -1,24 +1,24 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchPypi,
-  dnspython,
-  pytestCheckHook,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "nxdomain";
   version = "1.0.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "0va7nkbdjgzrf7fnbxkh1140pbc62wyj86rdrrh5wmg3phiziqkb";
   };
 
-  propagatedBuildInputs = [ dnspython ];
+  build-system = with python3Packages; [ setuptools ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  dependencies = with python3Packages; [ dnspython ];
+
+  nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
 
   postCheck = ''
     echo example.org > simple.list

pkgs/by-name/rs/rshell/package.nix

@@ -1,12 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchPypi,
-  pyserial,
-  pyudev,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "rshell";
   version = "0.0.36";
   format = "setuptools";
@@ -16,7 +14,7 @@ buildPythonApplication rec {
     hash = "sha256-SmbYNSB0eVUOWdDdPoMAPQTE7KeKTkklD4h+0t1LC/U=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     pyserial
     pyudev
   ];

pkgs/by-name/sc/scfbuild/package.nix

@@ -1,15 +1,11 @@
 {
   lib,
-  buildPythonApplication,
   fetchFromGitHub,
-  python,
-  pyyaml,
-  fonttools,
-  fontforge,
-  setuptools,
+  python3Packages,
+  python3,
 }:
 
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "scfbuild";
   version = "2.0.0";
 
@@ -22,7 +18,7 @@ buildPythonApplication {
     sha256 = "0wkyzkhshlax9rvdmn441gv87n9abfr0qqmgs8bkg9kbcjb4bhad";
   };
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     pyyaml
     fonttools
     fontforge
@@ -32,8 +28,8 @@ buildPythonApplication {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/${python.sitePackages}
-    cp -r scfbuild $out/${python.sitePackages}
+    mkdir -p $out/${python3.sitePackages}
+    cp -r scfbuild $out/${python3.sitePackages}
     cp -r bin $out
 
     runHook postInstall

pkgs/by-name/sp/spf-engine/package.nix

@@ -1,15 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchurl,
-  flit-core,
-  pyspf,
-  dnspython,
-  authres,
-  pymilter,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "spf-engine";
   version = "3.1.0";
   pyproject = true;
@@ -19,9 +14,11 @@ buildPythonApplication rec {
     hash = "sha256-HUuMxYFCqItLFgMSnrkwfmJWqgFGyI1RWgmljb+jkWk=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  nativeBuildInputs = [
+    python3Packages.flit-core
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     pyspf
     dnspython
     authres

pkgs/by-name/st/steamback/package.nix

@@ -1,19 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchPypi,
-  setuptools,
-  setuptools-scm,
-  wheel,
-  pillow,
-  psutil,
-  async-tkinter-loop,
-  timeago,
-  platformdirs,
-  sv-ttk,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "steamback";
   version = "0.3.6";
   format = "pyproject";
@@ -23,28 +14,25 @@ buildPythonApplication rec {
     hash = "sha256-hvMPSxIfwwQqo80JCpYhcbVY4kXs5jWtjjafVSMrw6o=";
   };
 
-  build-system = [
+  build-system = with python3Packages; [
+    setuptools
     setuptools-scm
     wheel
   ];
 
-  buildInputs = [
-    setuptools
-    pillow
-  ];
-
-  dependencies = [
+  dependencies = with python3Packages; [
     psutil
     async-tkinter-loop
     timeago
     platformdirs
     sv-ttk
+    pillow
   ];
 
   pythonRelaxDeps = [
     "async-tkinter-loop"
     "platformdirs"
-    "Pillow"
+    "pillow"
     "psutil"
   ];
 

pkgs/by-name/sy/syncplay-nogui/package.nix

@@ -0,0 +1,7 @@
+{
+  syncplay,
+}:
+
+syncplay.override {
+  enableGUI = false;
+}

pkgs/by-name/sy/syncplay/package.nix

@@ -2,17 +2,12 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  buildPythonApplication,
-  pem,
-  pyside6,
-  twisted,
-  certifi,
+  python3Packages,
   qt6,
-  appnope,
   enableGUI ? true,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "syncplay";
   version = "1.7.4";
 
@@ -32,14 +27,16 @@ buildPythonApplication rec {
   buildInputs = lib.optionals enableGUI [
     (if stdenv.hostPlatform.isLinux then qt6.qtwayland else qt6.qtbase)
   ];
-  propagatedBuildInputs = [
-    certifi
-    pem
-    twisted
-  ]
-  ++ twisted.optional-dependencies.tls
-  ++ lib.optional enableGUI pyside6
-  ++ lib.optional (stdenv.hostPlatform.isDarwin && enableGUI) appnope;
+  dependencies =
+    with python3Packages;
+    [
+      certifi
+      pem
+      twisted
+    ]
+    ++ twisted.optional-dependencies.tls
+    ++ lib.optional enableGUI pyside6
+    ++ lib.optional (stdenv.hostPlatform.isDarwin && enableGUI) appnope;
   nativeBuildInputs = lib.optionals enableGUI [ qt6.wrapQtAppsHook ];
 
   makeFlags = [

pkgs/top-level/all-packages.nix

@@ -3224,8 +3224,6 @@ with pkgs;
 
   minijail = callPackage ../tools/system/minijail { };
 
-  minijail-tools = python3.pkgs.callPackage ../tools/system/minijail/tools.nix { };
-
   mir-qualia = callPackage ../tools/text/mir-qualia {
     pythonPackages = python3Packages;
   };
@@ -3370,8 +3368,6 @@ with pkgs;
 
   nwdiag = with python3Packages; toPythonApplication nwdiag;
 
-  nxdomain = python3.pkgs.callPackage ../tools/networking/nxdomain { };
-
   ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim { };
 
   ola = callPackage ../applications/misc/ola {
@@ -3715,8 +3711,6 @@ with pkgs;
     };
   };
 
-  scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { };
-
   segger-jlink-headless = callPackage ../by-name/se/segger-jlink/package.nix { headless = true; };
 
   semgrep = python3.pkgs.toPythonApplication python3.pkgs.semgrep;
@@ -5804,10 +5798,6 @@ with pkgs;
 
   ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS
 
-  fortran-language-server =
-    python3.pkgs.callPackage ../development/tools/language-servers/fortran-language-server
-      { };
-
   inherit (callPackages ../development/tools/language-servers/nixd { }) nixf nixt nixd;
 
   antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
@@ -8189,8 +8179,6 @@ with pkgs;
     };
   };
 
-  rshell = python3.pkgs.callPackage ../development/embedded/rshell { };
-
   SDL = SDL_compat;
   SDL2 = sdl2-compat;
 
@@ -9023,8 +9011,6 @@ with pkgs;
 
   mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
 
-  mtprotoproxy = python3.pkgs.callPackage ../servers/mtprotoproxy { };
-
   moodle = callPackage ../servers/web-apps/moodle { };
 
   moodle-utils = callPackage ../servers/web-apps/moodle/moodle-utils.nix { };
@@ -9353,8 +9339,6 @@ with pkgs;
 
   public-inbox = perlPackages.callPackage ../servers/mail/public-inbox { };
 
-  spf-engine = python3.pkgs.callPackage ../servers/mail/spf-engine { };
-
   pypiserver = with python3Packages; toPythonApplication pypiserver;
 
   qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { };
@@ -10925,8 +10909,6 @@ with pkgs;
 
   i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { };
 
-  kitti3 = python3.pkgs.callPackage ../applications/window-managers/i3/kitti3.nix { };
-
   waybox = callPackage ../by-name/wa/waybox/package.nix {
     wlroots = wlroots_0_17;
   };
@@ -11212,14 +11194,6 @@ with pkgs;
 
   luddite = with python3Packages; toPythonApplication luddite;
 
-  lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris {
-    inherit (pkgs) meson;
-  };
-  lutris = callPackage ../applications/misc/lutris/fhsenv.nix { };
-  lutris-free = lutris.override {
-    steamSupport = false;
-  };
-
   lxi-tools = callPackage ../tools/networking/lxi-tools { };
   lxi-tools-gui = callPackage ../tools/networking/lxi-tools { withGui = true; };
 
@@ -11857,10 +11831,6 @@ with pkgs;
     waylandSupport = true;
   };
 
-  syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { };
-
-  syncplay-nogui = syncplay.override { enableGUI = false; };
-
   inherit
     (callPackages ../applications/networking/syncthing {
       inherit (darwin) autoSignDarwinBinariesHook;
@@ -12759,8 +12729,6 @@ with pkgs;
   steam-run = steam.run;
   steam-run-free = steam.run-free;
 
-  steamback = python3.pkgs.callPackage ../tools/games/steamback { };
-
   protonup-ng = with python3Packages; toPythonApplication protonup-ng;
 
   stuntrally = callPackage ../games/stuntrally { boost = boost183; };
@@ -13684,8 +13652,6 @@ with pkgs;
     else
       haskell.lib.compose.justStaticExecutables haskellPackages.nix-serve-ng;
 
-  nix-visualize = python3.pkgs.callPackage ../tools/package-management/nix-visualize { };
-
   nixpkgs-manual = callPackage ../../doc/doc-support/package.nix { };
 
   nixos-artwork = recurseIntoAttrs (callPackage ../data/misc/nixos-artwork { });