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

Commits on Jun 6, 2020

  1. Copy the full SHA
    3f50371 View commit details

Commits on Jun 8, 2020

  1. Copy the full SHA
    1553a46 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lsix lsix
    Copy the full SHA
    8f1aac8 View commit details

Commits on Jul 5, 2020

  1. Merge pull request #89735 from wucke13/pyuavcan

    Pyuavcan
    bhipple authored Jul 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lsix lsix
    Copy the full SHA
    a35803f View commit details
37 changes: 37 additions & 0 deletions pkgs/development/python-modules/nunavut/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{ lib, buildPythonPackage, pythonOlder, fetchPypi, pydsdl }:

buildPythonPackage rec {
pname = "nunavut";
version = "0.3.0";
disabled = pythonOlder "3.5"; # only python>=3.5 is supported

src = fetchPypi {
inherit pname version;
sha256 = "1ycnxrw2qgm7kdapsnhz80jsqkghgvb5giqwapn0m30rplwc3s36";
};

propagatedBuildInputs = [
pydsdl
];

# allow for writable directory for darwin
preBuild = ''
export HOME=$TMPDIR
'';

# repo doesn't contain tests, ensure imports aren't broken
pythonImportsCheck = [
"nunavut"
];

meta = with lib; {
description = "A UAVCAN DSDL template engine";
longDescription = ''
It exposes a pydsdl abstract syntax tree to Jinja2 templates allowing
authors to generate code, schemas, metadata, documentation, etc.
'';
homepage = "https://nunavut.readthedocs.io/";
maintainers = with maintainers; [ wucke13 ];
license = with licenses; [ bsd3 mit ];
};
}
37 changes: 37 additions & 0 deletions pkgs/development/python-modules/pydsdl/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder }:

buildPythonPackage rec {
pname = "pydsdl";
version = "1.4.2";
disabled = pythonOlder "3.5"; # only python>=3.5 is supported

src = fetchFromGitHub {
owner = "UAVCAN";
repo = pname;
rev = version;
sha256 = "03kbpzdrjzj5vpgz5rhc110pm1axdn3ynv88b42zq6iyab4k8k1x";
};

propagatedBuildInputs = [
];

# allow for writable directory for darwin
preBuild = ''
export HOME=$TMPDIR
'';

# repo doesn't contain tests, ensure imports aren't broken
pythonImportsCheck = [
"pydsdl"
];

meta = with lib; {
description = "A UAVCAN DSDL compiler frontend implemented in Python";
longDescription = ''
It supports all DSDL features defined in the UAVCAN specification.
'';
homepage = "https://uavcan.org";
maintainers = with maintainers; [ wucke13 ];
license = licenses.mit;
};
}
50 changes: 50 additions & 0 deletions pkgs/development/python-modules/pyuavcan/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, nunavut
, pyserial , pytest, ruamel_yaml}:

buildPythonPackage rec {
pname = "pyuavcan";
version = "1.1.0.dev1";
disabled = pythonOlder "3.7"; # only python>=3.7 is supported

src = fetchFromGitHub {
owner = "UAVCAN";
repo = pname;
rev = version;
sha256 = "0fmbmdnnh679zkllv5m6pkrasg7m9vjwabqnmz5m7flrgdh6h4qa";
};

propagatedBuildInputs = [
numpy
nunavut
pyserial
pytest
ruamel_yaml
];

# allow for writable directory for darwin
preBuild = ''
export HOME=$TMPDIR
export PYTHONASYNCIODEBUG=1
'';

# tests fail ATM.
doCheck = false;

# check at least that import works, as tests fail
pythonImportsCheck = [
"pyuavcan"
];

meta = with lib; {
description = "A full-featured implementation of the UAVCAN protocol stack";
longDescription = ''
It is intended for non-embedded, user-facing applications such as GUI
software, diagnostic tools, automation scripts, prototypes, and various
R&D cases. PyUAVCAN consists of a Python library (package) and a simple
CLI tool for basic diagnostics and shell script automation.
'';
homepage = "https://pyuavcan.readthedocs.io";
maintainers = with maintainers; [ wucke13 ];
license = licenses.mit;
};
}
15 changes: 15 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -1017,6 +1017,8 @@ in {
nvchecker = callPackage ../development/python-modules/nvchecker { };

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

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

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

@@ -1304,6 +1306,8 @@ in {

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

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

pyside = callPackage ../development/python-modules/pyside {
inherit (pkgs) mesa;
};
@@ -1643,6 +1647,17 @@ in {
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
};

pyuavcan = callPackage ../development/python-modules/pyuavcan {
# this version pinpoint to anold version is necessary due to a regression
nunavut = self.nunavut.overridePythonAttrs ( old: rec {
version = "0.2.3";
src = old.src.override {
inherit version;
sha256 = "0x8a9h4mc2r2yz49s9arsbs4bn3h25mvmg4zbgksm9hcyi9536x5";
};
});
};

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

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