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

Commits on Sep 8, 2018

  1. Remove outdated external package emacs-find-file-in-project

    @periklis
    periklis committed Sep 8, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    1b4f19c View commit details

  2. Merge pull request #46372 from periklis/remove-ffp 

    Remove outdated external package emacs-find-file-in-project
    @matthewbauer
    matthewbauer authored Sep 8, 2018
    Copy the full SHA
    72ffce4 View commit details
Showing with 1 addition and 26 deletions.
  1. +1 −26 pkgs/top-level/emacs-packages.nix
27 changes: 1 addition & 26 deletions pkgs/top-level/emacs-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -178,7 +178,7 @@ let
for file in elpy.el elpy-pkg.el; do
substituteInPlace $file \
--replace "company \"0.8.2\"" "company \"${company.version}\"" \
--replace "find-file-in-project \"3.3\"" "find-file-in-project \"${find-file-in-project.version}\"" \
--replace "find-file-in-project \"3.3\"" "find-file-in-project \"${melpaPackages.find-file-in-project.version}\"" \
--replace "highlight-indentation \"0.5.0\"" "highlight-indentation \"${highlight-indentation.version}\"" \
--replace "pyvenv \"1.3\"" "pyvenv \"${pyvenv.version}\"" \
--replace "yasnippet \"0.8.0\"" "yasnippet \"${yasnippet.version}\""
@@ -226,31 +226,6 @@ let
ess-R-object-popup =
callPackage ../applications/editors/emacs-modes/ess-R-object-popup { };

find-file-in-project = melpaBuild rec {
pname = "find-file-in-project";
version = "3.5";
src = fetchFromGitHub {
owner = "technomancy";
repo = pname;
rev = "53a8d8174f915d9dcf5ac6954b1c0cae61266177";
sha256 = "0wky8vqg08iw34prbz04bqmhfhj82y93swb8zkz6la2vf9da0gmd";
};
recipe = writeText "recipe" ''
(find-file-in-project
:repo "technomancy/find-file-in-project"
:fetcher github)
'';
meta = {
description = "Quick access to project files in Emacs";
longDescription = ''
Find files in a project quickly.
This program provides a couple methods for quickly finding any file in a
given project. It depends on GNU find.
'';
license = gpl3Plus;
};
};

filesets-plus = callPackage ../applications/editors/emacs-modes/filesets-plus { };

font-lock-plus = callPackage ../applications/editors/emacs-modes/font-lock-plus { };