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.

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

bluespec unstable-2020.02.09 -> unstable-2020.11.04 #103730

Closed
wants to merge 2 commits into from

Conversation

@jcumming
Copy link
Contributor

@jcumming jcumming commented Nov 13, 2020

Continue on with #84142

  • (thanks @flokli).
  • a small patch to install the STP stub (upstream PR: B-Lang-org/bsc#278)
  • set LD_LIBRARY_PATH during build so that bsc finishes bootstrapping
  • use nixpkgs yices.src instead of a subrepo
  • match yices gmp-static idiom

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
  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

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

This comment has been minimized.

@jcumming

jcumming Nov 13, 2020
Author Contributor

FWIW; is there a better way to do this?

This comment has been minimized.

@flokli

flokli Nov 13, 2020
Contributor

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)

This comment has been minimized.

@jcumming

jcumming Nov 13, 2020
Author Contributor

Good point. I'll try that.

@ofborg ofborg bot requested a review from thoughtpolice Nov 13, 2020
@ryantm ryantm marked this pull request as draft Nov 14, 2020
Copy link
Member

@thoughtpolice thoughtpolice left a comment

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 Nov 24, 2020
@thoughtpolice thoughtpolice marked this pull request as ready for review Nov 25, 2020
@thoughtpolice
Copy link
Member

@thoughtpolice thoughtpolice commented Nov 25, 2020

@ofborg build bluespec

@thoughtpolice
Copy link
Member

@thoughtpolice thoughtpolice commented Nov 25, 2020

@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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.