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

Commits on May 6, 2020

  1. emacs2nix: update to fix org elpa update script

    @collares
    collares committed May 6, 2020
    Copy the full SHA
    8aef738 View commit details

  2. org-packages 2020-05-06 -- org-generated.nix

    @collares
    collares committed May 6, 2020
    Copy the full SHA
    135ea5f View commit details

  3. Merge pull request #87125 from collares/emacs2nix 

    emacs2nix: update to fix org elpa update script
    @adisbladis
    adisbladis authored May 6, 2020
    Copy the full SHA
    6dc5d17 View commit details
Showing with 9 additions and 9 deletions.
  1. +2 −2 pkgs/applications/editors/emacs-modes/emacs2nix.nix
  2. +7 −7 pkgs/applications/editors/emacs-modes/org-generated.nix
4 changes: 2 additions & 2 deletions pkgs/applications/editors/emacs-modes/emacs2nix.nix
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ let
src = pkgs.fetchgit {
url = "https://github.com/ttuegel/emacs2nix.git";
fetchSubmodules = true;
rev = "752fe1bd891425cb7a4a53cd7b98c194c1fe4518";
sha256 = "0asfdswh8sbnapbqhbz539zzxmv72f1iviha95iys34sgnd5k1nk";
rev = "d4c52a7b22b0622aecf0b0d59941a4a2b250617c";
sha256 = "133m0bmm8ahy0jbappgcdjqppkpxf5s9wg4gg254afx3f7yfqzbh";
};

in pkgs.mkShell {
14 changes: 7 additions & 7 deletions pkgs/applications/editors/emacs-modes/org-generated.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.