Unverified Commit 9c178804 authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

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

parents 13016a24 e9bd3931

pkgs/development/tools/language-servers/fortran-language-server/default.nix→pkgs/by-name/fo/fortran-language-server/package.nix

+8 −4
Original line number Diff line number Diff line 
{

  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/applications/window-managers/i3/kitti3.nix→pkgs/by-name/ki/kitti3/package.nix

+8 −10
Original line number Diff line number Diff line 
{

  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 → 100644
+7 −0
Original line number Diff line number Diff line 
{

  lutris,

}:



lutris.override {

  steamSupport = false;

}

pkgs/applications/misc/lutris/default.nix→pkgs/by-name/lu/lutris-unwrapped/package.nix

+4 −23
Original line number Diff line number Diff line 
{

  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