Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
Heizung
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
c3pb
Heizung
Commits
e7a1c578
Commit
e7a1c578
authored
1 year ago
by
Benjamin Koch
Browse files
Options
Downloads
Patches
Plain Diff
add app for Python with modbus libraries
parent
2a0320b8
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
flake.nix
+12
-10
12 additions, 10 deletions
flake.nix
with
12 additions
and
10 deletions
flake.nix
+
12
−
10
View file @
e7a1c578
...
...
@@ -119,6 +119,10 @@
kikit
=
flake-utils
.
lib
.
mkApp
{
drv
=
self
.
packages
.
${
system
}
.
kikit
;
};
kibot
=
flake-utils
.
lib
.
mkApp
{
drv
=
self
.
packages
.
${
system
}
.
kibot
;
};
default
=
kibot
;
#python-kibot = flake-utils.lib.mkApp { name = "python"; drv = self.devShells.${system}.kibot.passthru.python; }; # doesn't work
python-rust
=
flake-utils
.
lib
.
mkApp
{
name
=
"python"
;
drv
=
self
.
devShells
.
${
system
}
.
rust
.
passthru
.
python
;
};
python-modbus
=
python-rust
;
};
devShells
=
let
flakePkgs
=
self
.
packages
.
${
system
};
...
...
@@ -126,10 +130,9 @@
kibot
=
with
flakePkgs
;
pkgs
.
mkShell
rec
{
passthru
.
packages
=
[
flakePkgs
.
kibot
];
passthru
.
pythonPackages
=
p
:
[
flakePkgs
.
kibot
];
passthru
.
python
=
python3
.
withPackages
passthru
.
pythonPackages
;
packages
=
passthru
.
packages
++
[
(
python3
.
withPackages
passthru
.
pythonPackages
)
];
packages
=
passthru
.
packages
++
[
passthru
.
python
];
shellHook
=
''
# KiAuto wants to run stuff inside xvfb so let's make sure that we don't leak windows to our Wayland desktop.
...
...
@@ -168,17 +171,16 @@
rustup
udev
.
dev
pkg-config
openssl
.
dev
picotool
];
passthru
.
pythonPackages
=
p
:
with
p
;
[
pymodbus3
pyserial
modbus-tk
];
passthru
.
python
=
python3
.
withPackages
passthru
.
pythonPackages
;
packages
=
passthru
.
packages
++
[
(
python3
.
withPackages
passthru
.
pythonPackages
)
];
packages
=
passthru
.
packages
++
[
passthru
.
python
];
};
default
=
pkgs
.
mkShell
{
default
=
pkgs
.
mkShell
rec
{
passthru
.
python
=
flakePkgs
.
python3
.
withPackages
(
p
:
kibot
.
passthru
.
pythonPackages
p
++
rust
.
passthru
.
pythonPackages
p
);
#packages = kibot.nativeBuildInputs ++ rust.nativeBuildInputs;
packages
=
kibot
.
passthru
.
packages
++
rust
.
passthru
.
packages
++
[
(
flakePkgs
.
python3
.
withPackages
(
p
:
kibot
.
passthru
.
pythonPackages
p
++
rust
.
passthru
.
pythonPackages
p
))
];
packages
=
kibot
.
passthru
.
packages
++
rust
.
passthru
.
packages
++
[
passthru
.
python
];
shellHook
=
kibot
.
shellHook
;
};
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment