-
-
Notifications
You must be signed in to change notification settings - Fork 13.7k
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.
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
fusesoc: init at 1.12.0 #215001
fusesoc: init at 1.12.0 #215001
Conversation
18df485
to
6fa9eb0
Compare
6fa9eb0
to
d0eb8de
Compare
Result of 4 packages failed to build:
16 packages built:
|
d0eb8de
to
c63b297
Compare
Should be fixed now |
Result of 25 packages built:
|
pkgs/top-level/python-packages.nix
Outdated
@@ -3725,6 +3725,8 @@ self: super: with self; { | |||
|
|||
fusepy = callPackage ../development/python-modules/fusepy { }; | |||
|
|||
fusesoc = callPackage ../development/python-modules/fusesoc { }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As this is an end-user program, not a library, it might be preferably exported from pkgs/top-level/all-packages.nix
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about in pkgs/top-level/aliases.nix
? That way people can use the python311 version if they need to for whatever reason.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A user of the application shouldn't care what version of the language the application is using. all-packages.nix is the right place for this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
im assuming i should remove it from here as well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about in
pkgs/top-level/aliases.nix
? That way people can use the python311 version if they need to for whatever reason.
New names should not be directly added to aliases
c63b297
to
83a9f85
Compare
3087d6c
to
9b7e3e4
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are missing pythonImportsCheck in lots of places.
For tests please use pytestCheckHook if possible.
pkgs/top-level/python-packages.nix
Outdated
@@ -3725,6 +3725,8 @@ self: super: with self; { | |||
|
|||
fusepy = callPackage ../development/python-modules/fusepy { }; | |||
|
|||
fusesoc = callPackage ../development/python-modules/fusesoc { }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about in
pkgs/top-level/aliases.nix
? That way people can use the python311 version if they need to for whatever reason.
New names should not be directly added to aliases
pname = "fusesoc"; | ||
version = "1.12.0"; | ||
|
||
propagatedBuildInputs = [ edalize pyparsing pyyaml simplesat ipyxact verilog verilator gnumake gcc ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we propagate make and gcc?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It needs them to be in the path at runtime
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then propagatedNativeBuildInputs should be used but can we instead patch the code or use a wrapper?
9b7e3e4
to
77791de
Compare
Should I update fusesoc now, or is that a job for a different pr? |
Also please rebase |
77791de
to
f44e95f
Compare
Turns out gcc isnt needed, and that the edalize update in between rebases broke the old version, so I updated fusesoc |
propagatedBuildInputs = [ distro attrs jsonschema six zipfile2 ]; | ||
|
||
postPatch = '' | ||
substituteInPlace /build/source/okonomiyaki/runtimes/tests/test_runtime.py \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
substitute(): ERROR: file '/build/source/okonomiyaki/runtimes/tests/test_runtime.py' does not exist
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is still an erorr
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
both nix build .#python310Packages.okonomiyaki .#python311Packages.okonomiyaki
and nixpkgs-review rev 215001
cant reproduce this, what command are you running to build? Did nix cache a broken source tree perhaps?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This if from the darwin ofborg check below and I just noticed why this is broken.
Did nix cache a broken source tree perhaps?
It can't there is no cache for the CI checks.
we can't use an absolute path here
substituteInPlace /build/source/okonomiyaki/runtimes/tests/test_runtime.py \ | |
substituteInPlace okonomiyaki/runtimes/tests/test_runtime.py \ |
f44e95f
to
098fad8
Compare
done |
098fad8
to
c766fe4
Compare
c766fe4
to
4201645
Compare
Description of changes
Add fusesoc (and dependencies)
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notesRelevant: #213222