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

Commits on Nov 10, 2020

  1. maintainers: add fabianhjr

    fabianhjr authored and Jonathan Ringer committed Nov 10, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vdemeester Vincent Demeester
    Copy the full SHA
    ebed0a2 View commit details
  2. pythonPackages.cpyparsing: init at 2.4.5.0.1.1

    fabianhjr authored and Jonathan Ringer committed Nov 10, 2020
    Copy the full SHA
    4408345 View commit details
  3. coconut: init at 1.4.3

    fabianhjr authored and Jonathan Ringer committed Nov 10, 2020
    Copy the full SHA
    674d77e View commit details
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
@@ -2833,6 +2833,12 @@
fingerprint = "50B7 11F4 3DFD 2018 DCE6 E8D0 8A52 A140 BEBF 7D2C";
}];
};
fabianhjr = {
email = "fabianhjr@protonmail.com";
github = "fabianhjr";
githubId = 303897;
name = "Fabián Heredia Montiel";
};
fadenb = {
email = "tristan.helmich+nixos@gmail.com";
github = "fadenb";
52 changes: 52 additions & 0 deletions pkgs/development/python-modules/coconut/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
lib,
buildPythonApplication,
fetchFromGitHub,
fetchpatch,

cpyparsing,
ipykernel,
mypy,
pygments,
pytest,
prompt_toolkit,
tkinter,
watchdog
}:

buildPythonApplication rec {
pname = "coconut";
version = "1.4.3";

src = fetchFromGitHub {
owner = "evhub";
repo = "coconut";
rev = "v${version}";
sha256 = "1pz13vza3yy95dbylnq89fzc3mwgcqr7ds096wy25k6vxd9dp9c3";
};

propagatedBuildInputs = [ cpyparsing pygments prompt_toolkit ipykernel mypy watchdog ];

patches = [
(fetchpatch {
name = "fix-setuptools-version-check.patch";
url = "https://github.com/LibreCybernetics/coconut/commit/2916a087da1e063cc4438b68d4077347fd1ea4a2.patch";
sha256 = "136jbd2rvnifw30y73vv667002nf7sbkm5qyihshj4db7ngysr6q";
})
];

checkInputs = [ pytest tkinter ];
# Currently most tests do not work on Hydra due to external fetches.
checkPhase = ''
pytest tests/constants_test.py
pytest tests/main_test.py::TestShell::test_compile_to_file
pytest tests/main_test.py::TestShell::test_convenience
'';

meta = with lib; {
homepage = "http://coconut-lang.org/";
description = "Simple, elegant, Pythonic functional programming";
license = licenses.asl20;
maintainers = with maintainers; [ fabianhjr ];
};
}
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/cpyparsing/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchFromGitHub, cython, python }:

buildPythonPackage rec {
pname = "cpyparsing";
version = "2.4.5.0.1.1";

src = fetchFromGitHub {
owner = "evhub";
repo = pname;
rev = "aa8ee45daec5c55328446bad7202ab8f799ab0ce"; # No tags on repo
sha256 = "1mxa5q41cb0k4lkibs0d4lzh1w6kmhhdrsm0w0r1m3s80m05ffmw";
};

nativeBuildInputs = [ cython ];

checkPhase = "${python.interpreter} tests/cPyparsing_test.py";

meta = with lib; {
homepage = "https://github.com/evhub/cpyparsing";
description = "Cython PyParsing implementation";
license = licenses.asl20;
maintainers = with maintainers; [ fabianhjr ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -1064,6 +1064,8 @@ in

cloud-custodian = python3Packages.callPackage ../tools/networking/cloud-custodian { };

coconut = with python3Packages; toPythonApplication coconut;

cod = callPackage ../tools/misc/cod { };

codespell = with python3Packages; toPythonApplication codespell;
4 changes: 4 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -1250,6 +1250,8 @@ in {

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

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

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

codecov = callPackage ../development/python-modules/codecov { };
@@ -1351,6 +1353,8 @@ in {

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

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

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

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