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

Commits on Dec 10, 2020

  1. emacs: fix siteVersionDir path 

    siteVersionDir isn't a full path, it's just the name of the version
directory entry in $out/share/emacs, e.g. "27.1", so since
d1b0eef ("emacs: Don't use interpolation for version"), we've been
trying to remove a non-existent directory.  This would have been
caught if we hadn't been giving -f to rm unnecessarily, because -f
suppresses errors.  As well as fixing the path, I've removed the -f
from rm.  Doing this to the line above as well revealed that rm-ing
$out/var was no longer necessary, since nothing has been put there
since ac23a7c ("emacs: 25.3 → 26.1") -- it would now only be
created if we set the --with-gameuser configure option, which we
don't.
    @alyssais
    alyssais committed Dec 10, 2020
    Copy the full SHA
    755670f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #106547 from alyssais/siteVersionDir 

    emacs: fix siteVersionDir path
    @adisbladis
    adisbladis committed Dec 10, 2020
    Copy the full SHA
    a9fe36c View commit details
    Browse the repository at this point in the history