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: 76bd004a4b51
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 16c665911fb7
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Jan 3, 2020

  1. pythonPackages.bashlex: init at 0.14

    @multun
    multun authored and Jon committed Jan 3, 2020
    Copy the full SHA
    0c76aa6 View commit details

  2. pythonPackages.shutilwhich: init at 1.1.0

    @multun
    multun authored and Jon committed Jan 3, 2020
    Copy the full SHA
    7cce13c View commit details

  3. pythonPackages.compiledb: init at 0.10.1

    @multun
    multun authored and Jon committed Jan 3, 2020
    Copy the full SHA
    16c6659 View commit details
38 changes: 38 additions & 0 deletions pkgs/development/python-modules/bashlex/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{ enum-compat
, lib
, buildPythonPackage
, fetchFromGitHub
, nose
, python
}:

buildPythonPackage rec {
pname = "bashlex";
version = "0.14";

src = fetchFromGitHub {
owner = "idank";
repo = pname;
rev = version;
sha256 = "070spmbf53y18miky5chgky4x5h8kp9czkp7dm173klv9pi2cn0k";
};

checkInputs = [ nose ];
propagatedBuildInputs = [ enum-compat ];

# workaround https://github.com/idank/bashlex/issues/51
preBuild = ''
${python.interpreter} -c 'import bashlex'
'';

checkPhase = ''
${python.interpreter} -m nose --with-doctest
'';

meta = with lib; {
description = "Python parser for bash";
license = licenses.gpl3;
homepage = https://github.com/idank/bashlex;
maintainers = with maintainers; [ multun ];
};
}
42 changes: 42 additions & 0 deletions pkgs/development/python-modules/compiledb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytest
, bashlex
, click
, shutilwhich
, gcc
, coreutils
}:

buildPythonPackage rec {
pname = "compiledb";
version = "0.10.1";

src = fetchFromGitHub {
owner = "nickdiego";
repo = pname;
rev = "v${version}";
sha256 = "0qricdgqzry7j3rmgwyd43av3c2kxpzkh6f9zcqbzrjkn78qbpd4";
};

# fix the tests
patchPhase = ''
substituteInPlace tests/data/multiple_commands_oneline.txt \
--replace /bin/echo ${coreutils}/bin/echo
'';

checkInputs = [ pytest gcc coreutils ];
propagatedBuildInputs = [ click bashlex shutilwhich ];

checkPhase = ''
pytest
'';

meta = with lib; {
description = "Tool for generating Clang's JSON Compilation Database files";
license = licenses.gpl3;
homepage = https://github.com/nickdiego/compiledb;
maintainers = with maintainers; [ multun ];
};
}
30 changes: 30 additions & 0 deletions pkgs/development/python-modules/shutilwhich/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytest
}:

buildPythonPackage rec {
pname = "shutilwhich";
version = "1.1.0";

src = fetchFromGitHub {
owner = "mbr";
repo = pname;
rev = version;
sha256 = "05fwcjn86w8wprck04iv1zccfi39skdf0lhwpb4b9gpvklyc9mj0";
};

checkInputs = [ pytest ];

checkPhase = ''
pytest -rs
'';

meta = with lib; {
description = "Backport of shutil.which";
license = licenses.psfl;
homepage = https://github.com/mbr/shutilwhich;
maintainers = with maintainers; [ multun ];
};
}
6 changes: 6 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -472,6 +472,8 @@ in {

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

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

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

beanstalkc = callPackage ../development/python-modules/beanstalkc { };
@@ -538,6 +540,8 @@ in {

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

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

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

cozy = callPackage ../development/python-modules/cozy { };
@@ -5223,6 +5227,8 @@ in {

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

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

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

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