Unverified Commit 902abd48 authored by Bruno BELANYI's avatar Bruno BELANYI Committed by GitHub
Browse files

treewide: migrate my 'pkgs/by-name' python packages to finalAttrs (#481613)

parents 98cc984c d890b78d

pkgs/by-name/cg/cgt-calc/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  withTeXLive ? true,

  texliveSmall,

}:

python3Packages.buildPythonApplication rec {

python3Packages.buildPythonApplication (finalAttrs: {

  pname = "cgt-calc";

  version = "1.13.0";

  pyproject = true;
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { 
  src = fetchFromGitHub {

    owner = "KapJI";

    repo = "capital-gains-calculator";

    rev = "v${version}";

    rev = "v${finalAttrs.version}";

    hash = "sha256-y/Y05wG89nccXyxfjqazyPJhd8dOkfwRJre+Rzx97Hw=";

  };
@@ -45,4 +45,4 @@ python3Packages.buildPythonApplication rec { 
    maintainers = with lib.maintainers; [ ambroisie ];

    platforms = lib.platforms.unix;

  };

}
 
})

pkgs/by-name/cv/cvehound/package.nix

+21 −14
Original line number Diff line number Diff line
@@ -5,8 +5,13 @@ 
  gnugrep,

  python3,

}:



python3.pkgs.buildPythonApplication rec {

let

  runtimeDeps = [

    coccinelle

    gnugrep

  ];

in

python3.pkgs.buildPythonApplication (finalAttrs: {

  pname = "cvehound";

  version = "1.2.1";

  pyproject = true;
@@ -14,19 +19,10 @@ python3.pkgs.buildPythonApplication rec { 
  src = fetchFromGitHub {

    owner = "evdenis";

    repo = "cvehound";

    tag = version;

    tag = finalAttrs.version;

    hash = "sha256-UvjmlAm/8B4KfE9grvvgn37Rui+ZRfs2oTLqYYgqcUQ=";

  };



  makeWrapperArgs = [

    "--prefix PATH : ${

      lib.makeBinPath [

        coccinelle

        gnugrep

      ]

    }"

  ];



  build-system = with python3.pkgs; [

    setuptools

  ];
@@ -45,10 +41,21 @@ python3.pkgs.buildPythonApplication rec { 
  # Tries to clone the kernel sources

  doCheck = false;



  makeWrapperArgs = [

    "--prefix"

    "PATH"

    ":"

    (lib.makeBinPath finalAttrs.passthru.runtimeDeps)

  ];



  passthru = {

    inherit runtimeDeps;

  };



  meta = {

    description = "Tool to check linux kernel source dump for known CVEs";

    homepage = "https://github.com/evdenis/cvehound";

    changelog = "https://github.com/evdenis/cvehound/blob/${src.rev}/ChangeLog";

    changelog = "https://github.com/evdenis/cvehound/blob/${finalAttrs.src.rev}/ChangeLog";

    # See https://github.com/evdenis/cvehound/issues/22

    license = with lib.licenses; [

      gpl2Only
@@ -56,4 +63,4 @@ python3.pkgs.buildPythonApplication rec { 
    ];

    maintainers = with lib.maintainers; [ ambroisie ];

  };

}
 
})

pkgs/by-name/fe/fertilizer/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  fetchFromGitHub,

}:



python3.pkgs.buildPythonApplication rec {

python3.pkgs.buildPythonApplication (finalAttrs: {

  pname = "fertilizer";

  version = "0.3.0";

  pyproject = true;
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { 
  src = fetchFromGitHub {

    owner = "moleculekayak";

    repo = "fertilizer";

    tag = "v${version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-sDoAjEiKxHf+HtFLZr6RwuXN+rl0ZQnFUoQ09QiE6Xc=";

  };
@@ -40,4 +40,4 @@ python3.pkgs.buildPythonApplication rec { 
    maintainers = with lib.maintainers; [ ambroisie ];

    mainProgram = "fertilizer";

  };

}
 
})

pkgs/by-name/ne/nemorosa/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  python3Packages,

}:



python3Packages.buildPythonApplication rec {

python3Packages.buildPythonApplication (finalAttrs: {

  pname = "nemorosa";

  version = "0.4.1";

  pyproject = true;
@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { 
  src = fetchFromGitHub {

    owner = "KyokoMiki";

    repo = "nemorosa";

    tag = version;

    tag = finalAttrs.version;

    hash = "sha256-AqFjpEakEZ21iXmIIxhX+ez2aI/RMsLaUoECipQcaM4=";

  };
@@ -62,4 +62,4 @@ python3Packages.buildPythonApplication rec { 
    maintainers = with lib.maintainers; [ ambroisie ];

    mainProgram = "nemorosa";

  };

}
 
})

pkgs/by-name/sm/smoked-salmon/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ let 
    sox

  ];

in

python3Packages.buildPythonApplication rec {

python3Packages.buildPythonApplication (finalAttrs: {

  pname = "smoked-salmon";

  version = "0.9.7.4";

  pyproject = true;
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { 
  src = fetchFromGitHub {

    owner = "smokin-salmon";

    repo = "smoked-salmon";

    tag = version;

    tag = finalAttrs.version;

    hash = "sha256-JOwqu/Hu7BjYLo3DdL6o+9TI/OQvlgj5Xu8WQ0cujwo=";

  };
@@ -74,7 +74,7 @@ python3Packages.buildPythonApplication rec { 
    "--suffix"

    "PATH"

    ":"

    (lib.makeBinPath runtimeDeps)

    (lib.makeBinPath finalAttrs.passthru.runtimeDeps)

  ];



  passthru = {
@@ -91,4 +91,4 @@ python3Packages.buildPythonApplication rec { 
      undefined-landmark

    ];

  };

}
 
})