Skip to content

bluespec: unstable-2020.02.09 -> unstable-2020.04.03 #84142

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

Jump to bottom
Closed
wants to merge 3 commits into from
Closed

bluespec: unstable-2020.02.09 -> unstable-2020.04.03 #84142

wants to merge 3 commits into from
+15 −11

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Apr 2, 2020 •
edited
Loading

This bumps bluespec to the latest version, which now doesn't use the
bundled tcl anymore (so we use the nixpkgs-provided one).

STP can also be easily stubbed away, by setting STP_STUB=1.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@flokli flokli requested a review from thoughtpolice April 2, 2020 23:00
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Apr 2, 2020
@flokli flokli force-pushed the bluespec-unstable-2020.04.03 branch from 83ce9a9 to e9bdc54 Compare April 2, 2020 23:28
flokli added 3 commits April 3, 2020 03:10
@flokli
incrtcl: add lib/{libitcl4.so -> libitcl4.2.0.so}

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
f517d4b 
This makes -litcl4 work.
@flokli
itktcl: add lib/{libitk4.so -> libitk4.1.0.so}
f0e841f 
This makes -litk4 work.
@flokli
bluespec: unstable-2020.02.09 -> unstable-2020.04.03

Verified

This commit was signed with the committer’s verified signature.
mrgrain Momo Kornher
SSH Key Fingerprint: ofPj7x0gR7f06qjrpoigd8+i5DUfuCIY6OF1rH90+JI
Verified
Learn about vigilant mode
6118098 
This bumps bluespec to the latest version, which now doesn't use the
bundled tcl anymore (so we use the nixpkgs-provided one).

STP can also be easily stubbed away, by setting STP_STUB=1.
@flokli flokli force-pushed the bluespec-unstable-2020.04.03 branch from e9bdc54 to 6118098 Compare April 3, 2020 01:21
@flokli
Copy link
Contributor Author

flokli commented Apr 3, 2020

This currently still fails in the smoketest:

Comparing result of Bluespec Simulation
Some simulator specific difference expected
./mkFibOne.bexe > smoke_test_bluesim.out
Unable to start itcl -- Can't find a usable itcl.tcl in the following directories:
    /nix/store/049inb6w0w1pmm8sa2addwqvg10p75jc-tcl-8.6.9/lib/itcl4.2.0 ./library /build/source/inst/bin/core/../lib/itcl4.2.0 /build/source/inst/bin/core/../library /build/source/inst/bin/core/../../library /build/source/inst/bin/core/../../itcl/library /build/source/inst/bin/core/../../../itcl/library /build/source/inst/bin/core/../../itcl-ng/itcl/library /nix/store/049inb6w0w1pmm8sa2addwqvg10p75jc-tcl-8.6.9/lib /nix/store/049inb6w0w1pmm8sa2addwqvg10p75jc-tcl-8.6.9/lib/itcl4.2.0
This probably means that Itcl/Tcl weren't installed properly.
If you know where the Itcl library directory was installed,
you can set the environment variable ITCL_LIBRARY to point
to the library directory.

./mkFibOne.bexe: exec: line 12: /tcllib/bluespec/bluesim.tcl: not found
make[1]: *** [Makefile:103: smoke_test_bluesim] Error 127
make[1]: *** Waiting for unfinished jobs....
diff mkFibOne.out.expected smoke_test_verilog.out

Bluespec installation looks OK
make[1]: Leaving directory '/build/source/examples/smoke_test'
make: *** [Makefile:34: check] Error 2
builder for '/nix/store/70zx65r4lbmicbabxngybmfmqmrvjas4-bluespec-unstable-2020.04.03.drv' failed with exit code 2

@ofborg ofborg bot added 10.rebuild-darwin: 1-10 and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1 labels Apr 3, 2020
@flokli
Copy link
Contributor Author

flokli commented May 4, 2020

@thoughtpolice will you be able to take a look at this?

@thoughtpolice
Copy link
Member

@flokli Yes, very sorry about my latency recently. I've still got some patches I need to submit upstream to Julie before we can move forward here, sorry! I'll try to do that later today.

@flokli
Copy link
Contributor Author

flokli commented May 18, 2020

@thoughtpolice no worries, do whenever you have the time for it.

Also, let me know when you need someone reviewing some of these patches :-)

bhipple
bhipple requested changes Jul 6, 2020
View reviewed changes
Copy link
Contributor

@bhipple bhipple left a comment

Choose a reason for hiding this comment

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

Waiting for @thoughtpolice as mentioned above.

@ryantm ryantm added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Oct 3, 2020
@flokli flokli mentioned this pull request Nov 11, 2020
Closed
10 tasks
@flokli
Copy link
Contributor Author

flokli commented Nov 11, 2020

I won't be able to pick this up any time soon, and just opened #103487.

@flokli flokli closed this Nov 11, 2020
@jcumming jcumming mentioned this pull request Nov 13, 2020
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bhipple bhipple

@thoughtpolice thoughtpolice

Assignees
No one assigned
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@flokli @thoughtpolice @bhipple @ryantm