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: 2356a84bbd91
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 57852282cf0a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 3, 2018

  1. antlr: explicitly use python2 

    Also, put python2 into nativeBuildInputs because Arch lists it in makedepends.
    Robert Schütz committed Aug 3, 2018
    Copy the full SHA
    f0702c6 View commit details

  2. Merge pull request #44416 from dotlambda/antlr-python2 

    antlr: explicitly use python2
    @FRidh
    FRidh authored Aug 3, 2018

    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
    5785228 View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/development/tools/parsing/antlr/2.7.7.nix
5 changes: 3 additions & 2 deletions pkgs/development/tools/parsing/antlr/2.7.7.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{stdenv, fetchurl, jdk, python}:
{ stdenv, fetchurl, jdk, python2 }:

stdenv.mkDerivation {
name = "antlr-2.7.7";
@@ -7,7 +7,8 @@ stdenv.mkDerivation {
sha256 = "1ffvcwdw73id0dk6pj2mlxjvbg0662qacx4ylayqcxgg381fnfl5";
};
patches = [ ./2.7.7-fixes.patch ];
buildInputs = [jdk python];
buildInputs = [ jdk ];
nativeBuildInputs = [ python2 ];

meta = with stdenv.lib; {
description = "Powerful parser generator";