This repository was archived by the owner on Apr 12, 2021. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 104
Permalink
Choose a base ref
{{ refName }}
default
Choose a head ref
{{ refName }}
default
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 72b01f5bc3de
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2a078e80570f
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
- 7 commits
- 6 files changed
- 6 contributors
Commits on Sep 23, 2020
-
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)
Configuration menu - View commit details
-
Copy full SHA for f2e3ca7 - Browse repository at this point
Copy the full SHA f2e3ca7View commit details -
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)
Configuration menu - View commit details
-
Copy full SHA for f12987a - Browse repository at this point
Copy the full SHA f12987aView commit details
Commits on Sep 25, 2020
-
Merge pull request #98578 from risicle/ris-cvc3-fix-r20.09
[20.09] cvc3: fix build against bison 3.7
Configuration menu - View commit details
-
Copy full SHA for 152522d - Browse repository at this point
Copy the full SHA 152522dView commit details -
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)
Configuration menu - View commit details
-
Copy full SHA for e703709 - Browse repository at this point
Copy the full SHA e703709View commit details -
(cherry picked from commit 0a07c8c)
Configuration menu - View commit details
-
Copy full SHA for 38e59a3 - Browse repository at this point
Copy the full SHA 38e59a3View commit details -
(cherry picked from commit f5c2f51)
Configuration menu - View commit details
-
Copy full SHA for b0a587f - Browse repository at this point
Copy the full SHA b0a587fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2a078e8 - Browse repository at this point
Copy the full SHA 2a078e8View commit details
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 72b01f5bc3de...2a078e80570f