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

Commits on May 25, 2017

  1. elpa-packages: 2017-05-25

    @mdorman
    mdorman committed May 25, 2017
    Copy the full SHA
    a310e6c View commit details

  2. org-packages: 2017-05-25

    @mdorman
    mdorman committed May 25, 2017
    Copy the full SHA
    46689ba View commit details

  3. melpa-stable-packages - 2017-05-25 

    Removals:
 - metafmt: repository no longer on github
 - org-mac-iCal: repository no longer accessible
    @mdorman
    mdorman committed May 25, 2017
    Copy the full SHA
    688cfcb View commit details

  4. melpa-packages: 2017-05-25 

    Removed:
 - metafmt: repository no longer on github
 - nikola: repository no longer accessible (SSL issues)
 - org-mac-iCal: repository no longer accessible
 - org-mac-link: repository no longer accessible
    @mdorman
    mdorman committed May 25, 2017
    Copy the full SHA
    3391633 View commit details

Commits on May 26, 2017

  1. Merge pull request #26102 from mdorman/emacs-updates 

    Automated emacs package updates
    @joachifm
    joachifm authored May 26, 2017
    Copy the full SHA
    7596d21 View commit details
37 changes: 25 additions & 12 deletions pkgs/applications/editors/emacs-modes/elpa-generated.nix
View file
Original file line number Diff line number Diff line change
@@ -1100,10 +1100,10 @@
}) {};
load-relative = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "load-relative";
version = "1.2";
version = "1.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/load-relative-1.2.el";
sha256 = "0vmfal05hznb10k2y3j9mychi9ra4hxcm6qf7j1r8aw9j7af6riw";
url = "https://elpa.gnu.org/packages/load-relative-1.3.el";
sha256 = "1hfxb2436jdsi9wfmsv47lkkpa5galjf5q81bqabbsv79rv59dps";
};
packageRequires = [];
meta = {
@@ -1404,10 +1404,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20170502";
version = "20170515";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20170502.tar";
sha256 = "12inz804j55ycprb2m3ay54d1bhwhjssmn5nrfm7cfklyhfsy27s";
url = "https://elpa.gnu.org/packages/org-20170515.tar";
sha256 = "0lfapcxil69x1a63cszgq72lqks1z3gpyxw7vcllqlgi7n7a4y6f";
};
packageRequires = [];
meta = {
@@ -1431,10 +1431,10 @@
other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "other-frame-window";
version = "1.0.2";
version = "1.0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/other-frame-window-1.0.2.el";
sha256 = "0gr4vn7ld4fx372091wxnzm1rhq6rc4ycim4fwz5bxnpykz83l7d";
url = "https://elpa.gnu.org/packages/other-frame-window-1.0.3.el";
sha256 = "0vq1zfsdnxdjvmb7lkjyax27kfv0rw0141rd5fjnl6ap9yjwpxkv";
};
packageRequires = [ emacs ];
meta = {
@@ -1850,10 +1850,10 @@
test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "test-simple";
version = "1.2.0";
version = "1.3.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/test-simple-1.2.0.el";
sha256 = "1j97qrwi3i2kihszsxf3y2cby2bzp8g0zf6jlpdix3dinav8xa3b";
url = "https://elpa.gnu.org/packages/test-simple-1.3.0.el";
sha256 = "1yd61jc9ds95a5n09052kwc5gasy57g4lxr0jsff040brlyi9czz";
};
packageRequires = [ cl-lib ];
meta = {
@@ -1981,6 +1981,19 @@
license = lib.licenses.free;
};
}) {};
vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }: elpaBuild {
pname = "vdiff";
version = "0.2.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vdiff-0.2.3.el";
sha256 = "197wszzhm2kbfvvlg3f0dzfs3lf4536yq5fd67k2rycj421fr9qz";
};
packageRequires = [ emacs hydra ];
meta = {
homepage = "https://elpa.gnu.org/packages/vdiff.html";
license = lib.licenses.free;
};
}) {};
vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "vlf";
version = "1.7";
Loading