Navigation Menu

Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 05fda1f94dd8
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 9d5a7af4e57b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jan 15, 2019

  1. nextpnr: use qtbase-5.11 instead of 5.12 

    This fixes a bizarre regression in the NextPNR GUI that causes the
background of the OpenGL floorplanning window to become 'transparent' on
certain platforms, greatly limiting its utility. However, QT 5.11 seems
to work just fine here.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
    @thoughtpolice
    thoughtpolice committed Jan 15, 2019
    Copy the full SHA
    ee3949d View commit details
    Browse the repository at this point in the history

  2. ocamlPackages.zarith: use buildOcaml instead of mkDerivation 

    This has two main advantages:

  - By setting hasSharedObjects = true, buildOcaml will automatically
include a setup-hook.sh that sets CAML_LD_LIBRARY_PATH in dependent
expressions. This is needed to pick up dllzarith.so properly which is
shipped as party of the library.

  - We can kill the ugly assert in the expression and instead change it
to use minimumSupportedOcamlVersion.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
    @thoughtpolice
    thoughtpolice committed Jan 15, 2019
    Copy the full SHA
    9d5a7af View commit details
    Browse the repository at this point in the history