M-Labs/thermostat
9
0
Fork 5
Code Issues 9 Pull Requests 5 Releases Wiki Activity

nix flakes support #64

Merged
sb10q merged 7 commits from mwojcik/thermostat:nixflakes into master 2022-01-19 11:13:47 +08:00
Conversation 1 Commits 7 Files Changed 5 +131 -29
mwojcik commented 2022-01-17 16:50:16 +08:00
Owner
Copy Link

Support for Nix flakes. Based mostly on mcu/default.nix from nix-scripts.

Tested nix develop (allows access to all the programs necessary for building, debugging, flashing) and nix build. Not tested with Hydra, I'm not sure about that one.

Support for Nix flakes. Based mostly on mcu/default.nix from nix-scripts. Tested ``nix develop`` (allows access to all the programs necessary for building, debugging, flashing) and ``nix build``. Not tested with Hydra, I'm not sure about that one.
mwojcik added 2 commits 2022-01-17 16:50:16 +08:00
sb10q reviewed 2022-01-17 18:07:40 +08:00
flake.nix Outdated
@ -0,0 +40,4 @@
};
};
patchPhase = "";
sb10q commented 2022-01-17 18:07:40 +08:00
Owner
Copy Link

Remove?

Remove?
sb10q reviewed 2022-01-17 18:08:22 +08:00
flake.nix Outdated
@ -0,0 +43,4 @@
patchPhase = "";
nativeBuildInputs = [ pkgs.llvm ];
buildPhase = ''
export CARGO_HOME=$(mktemp -d cargo-home.XXX)
sb10q commented 2022-01-17 18:08:22 +08:00
Owner
Copy Link

Is CARGO_HOME necessary? NAC3 doesn't use it.

Is CARGO_HOME necessary? NAC3 doesn't use it.
sb10q commented 2022-01-17 18:08:38 +08:00
Owner
Copy Link

You can use cargoBuildFlags instead.

You can use cargoBuildFlags instead.
sb10q reviewed 2022-01-17 18:09:55 +08:00
flake.nix Outdated
@ -0,0 +48,4 @@
'';
checkPhase = ''
cargo test --target=${pkgs.rust.toRustTarget pkgs.stdenv.targetPlatform};
sb10q commented 2022-01-17 18:09:55 +08:00
Owner
Copy Link

cargoTestFlags

cargoTestFlags
sb10q reviewed 2022-01-17 18:10:34 +08:00
flake.nix Outdated
@ -0,0 +52,4 @@
'';
# binaryName defaults to the `name` arg (i.e. the Rust package name);
# it is used as the Cargo binary filename
sb10q commented 2022-01-17 18:10:34 +08:00
Owner
Copy Link

I don't understand this comment?

I don't understand this comment?
sb10q commented 2022-01-18 09:53:08 +08:00
Owner
Copy Link
  • Nix convention seems to be to indent with 2 spaces (see nixpkgs).
  • README needs an update
* Nix convention seems to be to indent with 2 spaces (see nixpkgs). * README needs an update
mwojcik added 2 commits 2022-01-18 10:55:57 +08:00
mwojcik added 1 commit 2022-01-18 10:58:42 +08:00
sb10q reviewed 2022-01-18 11:05:17 +08:00
flake.nix
@ -0,0 +42,4 @@
nativeBuildInputs = [ pkgs.llvm ];
buildPhase = ''
cargo build --release --bin thermostat
sb10q commented 2022-01-18 11:05:16 +08:00
Owner
Copy Link

cargoBuildFlags?

cargoBuildFlags?
mwojcik commented 2022-01-18 11:18:04 +08:00
Author
Owner
Copy Link

Is there API of that function described somewhere for quick reference? Besides the little tutorial section...

Is there API of that function described somewhere for quick reference? Besides the little tutorial section...
mwojcik commented 2022-01-18 11:27:27 +08:00
Author
Owner
Copy Link

Actually, using just cargoBuildFlags (--bin thermostat as release is already included) causes the build to fail, as the default builder forces --target=x86_64-linux.

Actually, using just cargoBuildFlags (``--bin thermostat`` as release is already included) causes the build to fail, as the default builder forces ``--target=x86_64-linux``.
sb10q commented 2022-01-18 11:38:40 +08:00
Owner
Copy Link

One usually has to RTFS of nixpkgs for this kind of extended documentation :)
If there's no easy solution then overriding buildPhase is fine.

One usually has to RTFS of nixpkgs for this kind of extended documentation :) If there's no easy solution then overriding buildPhase is fine.
sb10q reviewed 2022-01-18 11:06:20 +08:00
flake.nix
@ -0,0 +69,4 @@
buildInputs = with pkgs; [
rustPlatform.rust.rustc
rustPlatform.rust.cargo
gcc openocd dfu-util
sb10q commented 2022-01-18 11:06:20 +08:00
Owner
Copy Link

gcc?

gcc?
sb10q reviewed 2022-01-18 11:06:54 +08:00
flake.nix
@ -0,0 +71,4 @@
rustPlatform.rust.cargo
gcc openocd dfu-util
] ++ (with python3Packages; [
numpy matplotlib
sb10q commented 2022-01-18 11:06:54 +08:00
Owner
Copy Link

Did you test this? I think this doesn't work and you need python3.withPackages instead.

Did you test this? I think this doesn't work and you need ``python3.withPackages`` instead.
mwojcik commented 2022-01-18 11:18:34 +08:00
Author
Owner
Copy Link

Weirdly enough it seems to work

❯ nix develop

[spaqin@hera:~/m-labs/thermostat]$ python
Python 3.9.6 (default, Jun 28 2021, 08:57:49) 
[GCC 10.3.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import numpy
>>> import matplotlib
>>>
Weirdly enough it seems to work ```shell ❯ nix develop [spaqin@hera:~/m-labs/thermostat]$ python Python 3.9.6 (default, Jun 28 2021, 08:57:49) [GCC 10.3.0] on linux Type "help", "copyright", "credits" or "license" for more information. >>> import numpy >>> import matplotlib >>> ```
sb10q commented 2022-01-18 11:41:34 +08:00
Owner
Copy Link

This is the lab computer and those packages are already included in the system Python. You can use nix develop --ignore-environment to isolate the system profile (see https://github.com/NixOS/nix/issues/4359).

This is the lab computer and those packages are already included in the system Python. You can use ``nix develop --ignore-environment`` to isolate the system profile (see https://github.com/NixOS/nix/issues/4359).
mwojcik commented 2022-01-18 11:43:10 +08:00
Author
Owner
Copy Link

Still available:

❯ nix develop --ignore-environment
bash-5.1$ python
Python 3.9.6 (default, Jun 28 2021, 08:57:49) 
[GCC 10.3.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import matplotlib
>>> import numpy 
>>>
Still available: ```shell ❯ nix develop --ignore-environment bash-5.1$ python Python 3.9.6 (default, Jun 28 2021, 08:57:49) [GCC 10.3.0] on linux Type "help", "copyright", "credits" or "license" for more information. >>> import matplotlib >>> import numpy >>> ```
mwojcik added 1 commit 2022-01-18 11:28:02 +08:00
sb10q reviewed 2022-01-19 10:19:01 +08:00
flake.nix Outdated
@ -0,0 +56,4 @@
dontFixup = true;
};
in rec {
sb10q commented 2022-01-19 10:19:01 +08:00
Owner
Copy Link

rec not needed

rec not needed
sb10q reviewed 2022-01-19 10:19:11 +08:00
flake.nix Outdated
@ -0,0 +57,4 @@
dontFixup = true;
};
in rec {
packages.x86_64-linux = rec {
sb10q commented 2022-01-19 10:19:11 +08:00
Owner
Copy Link

also here

also here
mwojcik added 1 commit 2022-01-19 10:24:18 +08:00
sb10q merged commit 4d43709f76 into master 2022-01-19 11:13:47 +08:00
sb10q referenced this issue from a commit 2022-01-19 11:13:48 +08:00
nix flakes support (#64)
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: M-Labs/thermostat#64
No description provided.
Delete Branch "mwojcik/thermostat:nixflakes"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?