Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 72b01f5bc3de
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 2a078e80570f
Choose a head ref
  • 7 commits
  • 6 files changed
  • 6 contributors

Commits on Sep 23, 2020

  1. cvc3: fix build against bison 3.7

    for some reason bison 3.7 output references $x_defs.h files under the name
    $x.hpp. create symlinks to make this work.
    
    (cherry picked from commit 53a8a41)
    risicle committed Sep 23, 2020
    Copy the full SHA
    f2e3ca7 View commit details
    Browse the repository at this point in the history
  2. cvc3: enable for darwin

    it may be possible to get it building under clang with some work, but
    switching it to gcc for now allows us to enable it
    
    (cherry picked from commit fc709e6)
    risicle committed Sep 23, 2020
    Copy the full SHA
    f12987a View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2020

  1. Merge pull request #98578 from risicle/ris-cvc3-fix-r20.09

    [20.09] cvc3: fix build against bison 3.7
    7c6f434c committed Sep 25, 2020
    Copy the full SHA
    152522d View commit details
    Browse the repository at this point in the history
  2. 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
    
    ```
    
    (cherry picked from commit 8da7bd6)
    fzakaria authored and Mic92 committed Sep 25, 2020
    Copy the full SHA
    e703709 View commit details
    Browse the repository at this point in the history
  3. dbeaver: 7.2.0 -> 7.2.1

    (cherry picked from commit 0a07c8c)
    jojosch authored and lsix committed Sep 25, 2020
    Copy the full SHA
    38e59a3 View commit details
    Browse the repository at this point in the history
  4. freeipmi: 1.6.5 -> 1.6.6

    (cherry picked from commit f5c2f51)
    r-ryantm authored and lsix committed Sep 25, 2020
    Copy the full SHA
    b0a587f View commit details
    Browse the repository at this point in the history
  5. signal-desktop: 1.36.1 -> 1.36.2

    (cherry picked from commit 6b0794c)
    primeos committed Sep 25, 2020
    Copy the full SHA
    2a078e8 View commit details
    Browse the repository at this point in the history