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
base: 1f70b3272513
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f83bf0e79dc8
Choose a head ref
  • 5 commits
  • 1 file changed
  • 3 contributors

Commits on Jan 22, 2018

  1. flex: Use native dependencies where applicable 

    Flex needs both a C compiler for the build environment, as well as a native m4.

(cherry picked from commit 81827c0)
    @bgamari @dtzWill
    bgamari authored and dtzWill committed Jan 22, 2018
    Copy the full SHA
    e6f9e82 View commit details
    Browse the repository at this point in the history

  2. flex: Don't disable static while cross-compiling flex 

    linux-pam appears to rely on this while cross-compiling.

(cherry picked from commit 4009dd1)
    @bgamari @dtzWill
    bgamari authored and dtzWill committed Jan 22, 2018
    Copy the full SHA
    715fcb4 View commit details
    Browse the repository at this point in the history

  3. flex: patch around attempt to regen manpage, fix cross

    @dtzWill
    dtzWill committed Jan 22, 2018
    Copy the full SHA
    67be78f View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2018

  1. flex: review feedback 

    * top-level attributes, not crossAttrs
* use depsBuildBuild
    @dtzWill
    dtzWill committed Jan 23, 2018
    Copy the full SHA
    cafe252 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #34170 from dtzWill/fix/flex-cross 

    flex: fix for cross
    @Ericson2314
    Ericson2314 committed Jan 23, 2018
    Copy the full SHA
    f83bf0e View commit details
    Browse the repository at this point in the history