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

Commits on Jun 23, 2017

  1. elpa-packages: 2017-06-23

    @mdorman
    mdorman committed Jun 23, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8a714e3 View commit details

  2. org-packages: 2017-06-23

    @mdorman
    mdorman committed Jun 23, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a10c8a9 View commit details

  3. melpa-stable-packages: 2017-06-23

    @mdorman
    mdorman committed Jun 23, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    40e1779 View commit details

  4. melpa-packages: 2017-06-23 

    Removals:
 - todochiku - Removed from melpa
    @mdorman
    mdorman committed Jun 23, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eea95af View commit details

Commits on Jun 25, 2017

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

    Automated Emacs package updates
    @joachifm
    joachifm authored Jun 25, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c235bf3 View commit details
23 changes: 12 additions & 11 deletions pkgs/applications/editors/emacs-modes/elpa-generated.nix
View file
Original file line number Diff line number Diff line change
@@ -1221,10 +1221,10 @@
metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "metar";
version = "0.2";
version = "0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/metar-0.2.el";
sha256 = "0rfzq79llh6ixw02kjpn8s2shxrabvfvsq48pagwak1jl2s0askf";
url = "https://elpa.gnu.org/packages/metar-0.3.el";
sha256 = "07gv0v0xwb5yzynwagmvf0n5c9wljy1jg4ympnxpa2d9r1zqc02g";
};
packageRequires = [ cl-lib ];
meta = {
@@ -1445,10 +1445,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20170606";
version = "20170622";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20170606.tar";
sha256 = "0m2gln3wz9v3aflyxxy2317808yy05rrzrjx35spw2d90d10hmkz";
url = "https://elpa.gnu.org/packages/org-20170622.tar";
sha256 = "0922lcbr2r7bkswljqzbm5y3ny1n67qfrmf7h7z9hsw2wy0505dp";
};
packageRequires = [];
meta = {
@@ -1771,10 +1771,10 @@
soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "soap-client";
version = "3.1.2";
version = "3.1.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/soap-client-3.1.2.tar";
sha256 = "0crfpp2ksqvzf2j3q44qq6z8zh1r10q9kw12cxbmjiih89q01b68";
url = "https://elpa.gnu.org/packages/soap-client-3.1.3.tar";
sha256 = "1s5m6dc7z532wchdih2ax2a791khyajjxb2xaw5rklk47yc5v3nk";
};
packageRequires = [ cl-lib ];
meta = {
@@ -2100,14 +2100,15 @@
license = lib.licenses.free;
};
}) {};
websocket = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
websocket = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "websocket";
version = "1.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/websocket-1.8.tar";
sha256 = "0dcxmnnm8z7cvsc7nkb822a1g6w03klp7cijjnfq0pz84p3w9cd9";
};
packageRequires = [];
packageRequires = [ cl-lib ];
meta = {
homepage = "https://elpa.gnu.org/packages/websocket.html";
license = lib.licenses.free;
Loading