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

Commits on Aug 26, 2019

  1. emacs-irony: fix build 

    Fixes #66556
    @matthewbauer
    matthewbauer committed Aug 26, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b2fd2b7 View commit details

  2. melpa-packages.nix: remove generic 

    This file does not exist
    @matthewbauer
    matthewbauer committed Aug 26, 2019

    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
    b993fb0 View commit details

  3. Merge pull request #67471 from matthewbauer/fix-66556 

    emacs-irony: fix build
    @mmahut
    mmahut authored Aug 26, 2019
    Copy the full SHA
    d42ae52 View commit details
Showing with 7 additions and 16 deletions.
  1. +7 −16 pkgs/applications/editors/emacs-modes/melpa-packages.nix
23 changes: 7 additions & 16 deletions pkgs/applications/editors/emacs-modes/melpa-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -33,8 +33,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
inherit (import ./libgenerated.nix lib self) melpaDerivation;
super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson));

generic = import ./melpa-generic.nix;

overrides = rec {
shared = {
# Expects bash to be at /bin/bash
@@ -131,20 +129,20 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# upstream issue: missing file header
initsplit = markBroken super.initsplit;

irony = super.irony.overrideAttrs(old: {
irony = super.irony.overrideAttrs (old: {
cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
preConfigure = ''
cd server
'';
preBuild = ''
make
install -D bin/irony-server $out/bin/irony-server
cd ..
'';
postInstall = ''
mkdir -p $out
mv $out/share/emacs/site-lisp/elpa/*/server/bin $out
rm -rf $out/share/emacs/site-lisp/elpa/*/server
'';
preCheck = ''
checkPhase = ''
cd source/server
make check
cd ../..
'';
dontUseCmakeBuildDir = true;
doCheck = true;
@@ -396,13 +394,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
# Expects bash to be at /bin/bash
helm-rtags = markBroken super.helm-rtags;

# Fails with "package does not untar cleanly into ..."
irony = shared.irony.overrideAttrs(old: {
meta = old.meta // {
broken = true;
};
});

orgit =
(super.orgit.overrideAttrs (attrs: {
# searches for Git at build time