Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6890d08b137d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9d09cf0fc344
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 15, 2019

  1. pythonPackages.pyperf: 1.6.0 -> 1.6.1 

    perf was renamed to pyperf [1] to avoid confusion with Linux perf
project.

[1] psf/pyperf@60eb936
    @marsam
    marsam committed Sep 15, 2019
    Copy the full SHA
    ebdaba7 View commit details

Commits on Sep 18, 2019

  1. Merge pull request #68866 from marsam/update-python-pyperf 

    pythonPackages.pyperf: 1.6.0 -> 1.6.1
    @marsam
    marsam authored Sep 18, 2019
    Copy the full SHA
    9d09cf0 View commit details
Showing with 5 additions and 5 deletions.
  1. +4 −4 pkgs/development/python-modules/{perf → pyperf}/default.nix
  2. +1 −1 pkgs/top-level/python-packages.nix
8 changes: 4 additions & 4 deletions ...velopment/python-modules/perf/default.nix → ...lopment/python-modules/pyperf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,12 +14,12 @@
}:

buildPythonPackage rec {
pname = "perf";
version = "1.6.0";
pname = "pyperf";
version = "1.6.1";

src = fetchPypi {
inherit pname version;
sha256 = "1vrv83v8rhyl51yaxlqzw567vz5a9qwkymk3vqvcl5sa2yd3mzgp";
sha256 = "8d0143a22a13ee10c997a648f30b82cdc40175d5a20b11055ae058a82e45d371";
};

checkInputs = [ nose psutil ] ++
@@ -36,7 +36,7 @@ buildPythonPackage rec {

meta = with lib; {
description = "Python module to generate and modify perf";
homepage = https://github.com/vstinner/perf;
homepage = "https://pyperf.readthedocs.io/";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
};
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -821,7 +821,7 @@ in {

pdfx = callPackage ../development/python-modules/pdfx { };

perf = callPackage ../development/python-modules/perf { };
pyperf = callPackage ../development/python-modules/pyperf { };

perfplot = callPackage ../development/python-modules/perfplot { };