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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0aaab30d2a94
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 730b739ec669
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 2, 2019

  1. lua5_1: rename patch file to match its CVE id

    @delroth
    delroth committed Oct 2, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    delroth Pierre Bourdon
    GPG key ID: 6FB80DCD84DA0F1C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1b77830 View commit details

Commits on Nov 7, 2019

  1. Merge pull request #70274 from delroth/lua51-cve-master 

    lua5_1: rename patch file to match its CVE id
    @matthewbauer
    matthewbauer authored Nov 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    730b739 View commit details
0 ...-stack-overflow-in-vararg-functions.patch → ...nt/interpreters/lua-5/CVE-2014-5461.patch
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkgs/development/interpreters/lua-5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ in rec {
sourceVersion = { major = "5"; minor = "1"; patch = "5"; };
hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333";
patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch51 ])
++ [ ./5.1.0004-Fix-stack-overflow-in-vararg-functions.patch ];
++ [ ./CVE-2014-5461.patch ];
};

luajit_2_0 = import ../luajit/2.0.nix {