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

Commits on Sep 25, 2020

  1. jruby: fix shebang for binaries in JRuby 

    There are a variety of additional scripts that are included with the
JRuby installation that use JRuby itself.

For instance the `bin/gem` had the following contents:

```bash
❯ cat /nix/store/kglkqf56ii83yl6yrgcaj5r3s9m2fzr0-jruby-9.2.13.0/bin/gem

load File.join(File.dirname(__FILE__), 'jgem')
```

This is clearly wrong. Patchshebangs was not picking up the fix as part
of stdenv because the patch is not a build input but the final output
itself.

We have to rely on substituteInPlace so that we get the correct version.

```bash
❯ cat /nix/store/k4fnrn0dcsh2wzw81217r0ywsspb468f-jruby-9.2.13.0/bin/gem

```
    @fzakaria
    fzakaria committed Sep 25, 2020
    Copy the full SHA
    8da7bd6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #98693 from fzakaria/jruby-shebang-fix 

    Fix shebang for binaries in JRuby
    @Mic92
    Mic92 committed Sep 25, 2020
    Copy the full SHA
    7011d44 View commit details
    Browse the repository at this point in the history