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: 6b32fd248b86
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 08ee0d9d08a1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 18, 2019

  1. gem-config: support rbnacl v6.0.0 

    With the v6.0.0 release of the `rbnacl` gem, it does not longer depends
on `rbnacl-libsodium` gem (which is now deprecated ([1])) to package the
`libsodium` library and should use the one provided by the distribution;
it raises an error if `rbnacl-libsodium` is detected ([2]).
Unfortunately, default gem config patches `rbnacl` unconditionally ([3]),
which means that newer versions of `rbnacl` fail at startup.

[1]: RubyCrypto/rbnacl-libsodium#29
[2]: https://github.com/crypto-rb/rbnacl/blob/c176fc0bd8be74cf62c93a4b122e220ce4895348/lib/rbnacl.rb#L4-L8
[3]: https://github.com/NixOS/nixpkgs/blob/9fd099a6ae1690909ebf40145e4cdabd67179676/pkgs/development/ruby-modules/gem-config/default.nix#L300-L306
    @smaximov
    smaximov committed Jan 18, 2019
    Copy the full SHA
    a3bff35 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #54262 from smaximov/fix-rbnacl-6.0.0 

    gem-config: support rbnacl v6.0.0
    @Mic92
    Mic92 committed Jan 18, 2019
    Copy the full SHA
    08ee0d9 View commit details
    Browse the repository at this point in the history