Skip to content
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

bluespec unstable-2020.02.09 -> unstable-2020.11.04 #103730

Closed
wants to merge 2 commits into from
Closed

bluespec unstable-2020.02.09 -> unstable-2020.11.04 #103730

wants to merge 2 commits into from

Conversation

jcumming
Copy link
Contributor

Continue on with #84142

I ran this through https://github.com/jcumming/bsc-testsuite, and the 13 failures appear to mostly be nixos-isms.

I'm waiting on to see if upstream takes the patch, so I can drop it from this PR.

Motivation for this change

Update bluespec to latest version.

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 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)
  • Fits CONTRIBUTING.md.
  • ran bsc-testsuite

@jcumming
bluespec unstable-2020.02.09 -> unstable-2020.11.04
442d1ae 
  Continue on with #84142.
  - a small patch to install the STP stub (will upstream)
  - set LD_LIBRARY_PATH during build so that bsc finishes bootstrapping
  - use nixpkgs yices.src instead of a suprepo
  - match yices gmp-static idiom
jcumming
jcumming commented Nov 13, 2020
View reviewed changes
pkgs/development/compilers/bluespec/default.nix

postUnpack = ''
mkdir -p $sourceRoot/src/vendor/yices/v2.6/yices2
# XXX: only works because yices.src isn't a tarball.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

FWIW; is there a better way to do this?

Copy link
Contributor

Choose a reason for hiding this comment

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

Does the source code need to be there, or can we patch the build system to accept an external yices, and set paths to header files and libraries (or have the buildsystem ask pkgconfig for it)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point. I'll try that.

@ofborg ofborg bot requested a review from thoughtpolice November 13, 2020 18:24
@ryantm ryantm marked this pull request as draft November 14, 2020 02:58
thoughtpolice
thoughtpolice requested changes Nov 19, 2020
View reviewed changes
Copy link
Member

@thoughtpolice thoughtpolice left a comment

Choose a reason for hiding this comment

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

Thanks! If you can just please fix the trailing whitespace/editorconfig issues, I think we can go ahead and merge this and keep clean up things in future PRs. Otherwise this looks fine to me, and it's good to keep bluespec working for everyone...

@jcumming jcumming changed the title WIP: bluespec unstable-2020.02.09 -> unstable-2020.11.04 bluespec unstable-2020.02.09 -> unstable-2020.11.04 Nov 24, 2020
@ofborg ofborg bot requested a review from thoughtpolice November 24, 2020 07:23
@thoughtpolice thoughtpolice marked this pull request as ready for review November 25, 2020 13:10
@thoughtpolice
Copy link
Member

@ofborg build bluespec

@thoughtpolice
Copy link
Member

thoughtpolice commented Nov 25, 2020 •
edited
Loading

@jcumming I've pushed this commit, along with a fix for an incorrect sha256 hash, as part of d402d91 (with credit to you, of course.) I suspect the hash thing happened because source attributes are fixed-output, so if you download the source once you can screw up the hash later and it'll still succeed, unfortunately.

I've tested this package on my Ryzen machine however and it seems to build just fine. Let's keep submitting any improvements incrementally, either to upstream or here! Thanks for your help.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flokli flokli flokli left review comments

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jcumming @thoughtpolice @flokli