Skip to content

Update default.nix to newer nix's and sync version #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bradjc merged 2 commits into from
May 14, 2025
Merged

Update default.nix to newer nix's and sync version #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dba674
Update default.nix to newer nix's and sync version
alevy May 14, 2025
cf79b05
fixup: Format Python code with Black
May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let
];

propagatedBuildInputs = with pkgs; [
segger-jlink libusb
segger-jlink libusb1
];

installPhase = ''
Expand Down Expand Up @@ -74,7 +74,9 @@ let
});
in pkgs.python3Packages.buildPythonPackage rec {
pname = "tockloader";
version = "1.10.0";
version = let
pattern = "^__version__ = ['\"]([^'\"]*)['\"]\n";
in elemAt (match pattern (readFile ./tockloader/_version.py)) 0;
name = "${pname}-${version}";

propagatedBuildInputs = with python3Packages; [
Expand All @@ -87,6 +89,7 @@ in pkgs.python3Packages.buildPythonPackage rec {
questionary
pycrypto
siphash
ecdsa
] ++ (lib.optional withUnfreePkgs pynrfjprog);

src = ./.;
Expand Down
2 changes: 1 addition & 1 deletion tockloader/tickv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ def reset(self):

def _reset(self):
db_len = len(self.storage_binary)
self.storage_binary = bytearray(b"\xFF" * db_len)
self.storage_binary = bytearray(b"\xff" * db_len)
Copy link
Copy Markdown
Member

@ppannuto ppannuto May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not that it does anything, but is this change supposed to be in this PR?

Copy link
Copy Markdown
Member

@ppannuto ppannuto May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh... you didn't do this..., this thing did: https://github.com/tock/tockloader/blob/master/.github/workflows/autoblack.yml

huh, it's a bit unfortunate that that tool looks at unchanged code, feels like it injects weird noise of unrelated changes into PRs... :/

Copy link
Copy Markdown
Member Author

@alevy alevy May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was done automatically by some agent called autoblack, and I had no part in it (see the second commit, which was added not by me)

Copy link
Copy Markdown
Contributor

@bradjc bradjc May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, they changed the style: psf/black#2916


# Add the known initialize key, value. I don't know what this key
# is from, but it is the standard.
Expand Down