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: f149bfe82af0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e1e5c87f83b8
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 24, 2019

  1. Resolve symlinks before trying to recognize a lisp implementation

    The CCL package installs a symlink named "ccl" that points at the
    actual implementation executable: lx86cl64 (or lx86cl for 32 bit).
    When clwrapper is used with CCL as the backing implementation, this
    script fails to recognize the implementation.  By resolving the
    symlink, we are able to recognize which implementation we're actually
    working with.
    Brad Jensen committed Jul 24, 2019
    Copy the full SHA
    fa7bd53 View commit details
    Browse the repository at this point in the history
  2. Use if instead of && for deciding whether to run a command

    The only difference between these forms is the return value when
    "$NIX_LISP_SKIP_CODE" is the empty string.  In the original
    formulation, the script would return a false exit status.  In the new
    formulation, it will return a true exit status.
    
    Its useful to be able to source cl-wrapper.sh (to get the variables it
    establishes), and its a bit annoying that sourcing it with
    NIX_LISP_SKIP_CODE=1 results in a false exit status.
    Brad Jensen committed Jul 24, 2019
    Copy the full SHA
    16e7099 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2019

  1. Merge pull request #65342 from bradleyjensen/master

    Improve ergonomics of clwrapper
    7c6f434c committed Jul 25, 2019
    Copy the full SHA
    e1e5c87 View commit details
    Browse the repository at this point in the history