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: 20605f8fedde
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 77d1b6cb9a14
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 3, 2019

  1. emacs: do not use seq package from elpa for emacs >= 27 

    The `seq` package that comes with emacs 27 is newer than that provided
by ELPA. Various packages list `seq` as an input, causing it to be
imported from ELPA in addition to the (newer) version bundled with
emacs. Relying on the version packaged with emacs resolves the
conflict.

Fixes #73346
    @acowley
    acowley committed Dec 3, 2019
    Copy the full SHA
    3a35e4c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #74936 from acowley/emacs27-seq 

    emacs: do not use seq package from elpa for emacs >= 27
    @adisbladis
    adisbladis committed Dec 3, 2019
    Copy the full SHA
    77d1b6c View commit details
    Browse the repository at this point in the history