Branch: refs/heads/master
  Home:   https://github.com/NixOS/nix
  Commit: ed23c8568e10d15196bb4ff2b79fc14191d28109
      
https://github.com/NixOS/nix/commit/ed23c8568e10d15196bb4ff2b79fc14191d28109
  Author: Fabian Schmitthenner <[email protected]>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M src/libexpr/lexer.l
    A tests/lexer.nix
    A tests/lexer.sh
    M tests/local.mk

  Log Message:
  -----------
  next try for "don't abort when given unmatched '}' with 'start-condition 
stack underflow'. This fixes  #751"

This reverts commit 8120b6fb8a4924f8ae717bba9bbda4a2f89e2141 and fixes the 
regression introduced in
8d22b26448a091c76ab972c0b0603daac5e255e4.


  Commit: 7db05781a680028380aed6a01f2a74c68907bad7
      
https://github.com/NixOS/nix/commit/7db05781a680028380aed6a01f2a74c68907bad7
  Author: Shea Levy <[email protected]>
  Date:   2016-01-19 (Tue, 19 Jan 2016)

  Changed paths:
    M src/libexpr/lexer.l
    A tests/lexer.nix
    A tests/lexer.sh
    M tests/local.mk

  Log Message:
  -----------
  Merge branch 'lexer-regression-fix' of git://github.com/fkz/nix


Compare: https://github.com/NixOS/nix/compare/9fff4925613d...7db05781a680
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to