M-Labs
/
nix-servo
3
1
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add linien-server package #36

Merged
sb10q merged 1 commits from fsagbuya/nix-servo:linien-server into master 2024-03-06 11:58:17 +08:00
Conversation 5 Commits 1 Files Changed 1 +38 -2
1 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
flake.nix
View File

@ -68,6 +68,43 @@
runScript = "vivado"; runScript = "vivado";
}; };
pyrp3 = pkgs.python3Packages.buildPythonPackage rec {
pname = "pyrp3";
fsagbuya marked this conversation as resolved Outdated
sb10q commented 2024-02-23 17:05:22 +08:00
Outdated
Review
Copy Link

inline

inline
👍 1
version = "1.2.0";
pyproject = true;
src = pkgs.fetchFromGitHub {
owner = "linien-org";
repo = "${pname}";
rev = "v${version}";
hash = "sha256-43TTlpJ5SMAjQM71bNVvrWQyciRXM3zpuA/Dw41AEgU=";
};
nativeBuildInputs = with pkgs.python3Packages; [ setuptools wheel setuptools-scm ];
propagatedBuildInputs = with pkgs.python3Packages; [
myhdl
sb10q commented 2024-03-01 17:25:14 +08:00
Outdated
Review
Copy Link

Looks wrong.

Looks wrong.
fsagbuya commented 2024-03-05 10:22:38 +08:00
Outdated
Review
Copy Link

It seems the myhdl dependency has not been dropped in any version in the linien fork.

It seems the [myhdl dependency](https://github.com/linien-org/pyrp3/blob/v1.2.0/setup.py#L30) has not been dropped in any version in the linien fork.
sb10q commented 2024-03-05 10:27:29 +08:00
Outdated
Review
Copy Link

Ah okay. It's used only for intbv in a few places (which could be replaced with simple bitwise arithmetic) and also in the original (non-linien) one. Looks like physicist code syndrome strikes again.

Ah okay. It's used only for intbv in a few places (which could be replaced with simple bitwise arithmetic) and also in the original (non-linien) one. Looks like physicist code syndrome strikes again.
👀 1
fsagbuya commented 2024-03-05 10:34:07 +08:00
Outdated
Review
Copy Link

Will implement as suggested.

Will implement as suggested.
rpyc4
cached-property
numpy
];
};
linien-server = pkgs.python3Packages.buildPythonPackage rec {
pname = "linien-server";
pyproject = true;
inherit (pkgs.python3Packages.linien-common) src version;
sourceRoot = "source/linien-server";
fsagbuya marked this conversation as resolved Outdated
sb10q commented 2024-02-23 17:06:06 +08:00
Outdated
Review
Copy Link

As far as I can tell this is a required dependency. Removing it does not solve the problem.

As far as I can tell this is a required dependency. Removing it does not solve the problem.
nativeBuildInputs = [ pkgs.python3Packages.setuptools ];
propagatedBuildInputs = with pkgs.python3Packages; [
appdirs
certifi
click
cma
pylpsd
pyrp3
requests
linien-common
];
};
not-os-configured = (import patched-not-os { not-os-configured = (import patched-not-os {
inherit nixpkgs; inherit nixpkgs;
extraModules = [ extraModules = [
@ -461,11 +498,10 @@
inherit migen misoc vivado; inherit migen misoc vivado;
}; };
packages.armv7l-linux = { packages.armv7l-linux = {
inherit fast-servo-gateware; inherit fast-servo-gateware linien-server;
} // } //
(board-package-set { board = "zc706"; }) // (board-package-set { board = "zc706"; }) //
(board-package-set { board = "fast-servo"; }); (board-package-set { board = "fast-servo"; });
hydraJobs = packages.x86_64-linux // packages.armv7l-linux; hydraJobs = packages.x86_64-linux // packages.armv7l-linux;
}; };