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

Commits on Sep 17, 2017

  1. emacsMacport: emacs-25.2 => 25.3, macport-6.3 => 6.7 

    (cherry picked from commit 50a3308)
    @acowley @joachifm
    acowley authored and joachifm committed Sep 17, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    joachifm Joachim F.
    GPG key ID: 66EAB6B14F6B6E0D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e7e8d1f View commit details

  2. lua-nginx-module: 0.10.5 -> 0.10.10 

    (cherry picked from commit d0aa64a)
    @rnhmjoj @joachifm
    rnhmjoj authored and joachifm committed Sep 17, 2017

    Partially verified

    This commit is signed with the committer’s verified signature. The key has expired.
    joachifm’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    5687327 View commit details

  3. nginx-modules: remove unused fetchpatch 

    (cherry picked from commit 70eb31c)
    @vaibhavsagar @joachifm
    vaibhavsagar authored and joachifm committed Sep 17, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    joachifm Joachim F.
    GPG key ID: 66EAB6B14F6B6E0D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    07425e4 View commit details
Showing with 6 additions and 6 deletions.
  1. +4 −4 pkgs/applications/editors/emacs/macport.nix
  2. +2 −2 pkgs/servers/http/nginx/modules.nix
8 changes: 4 additions & 4 deletions pkgs/applications/editors/emacs/macport.nix
View file
Original file line number Diff line number Diff line change
@@ -4,21 +4,21 @@
}:

stdenv.mkDerivation rec {
emacsVersion = "25.2";
emacsVersion = "25.3";
emacsName = "emacs-${emacsVersion}";
macportVersion = "6.3";
macportVersion = "6.7";
name = "emacs-mac-${emacsVersion}-${macportVersion}";

builder = ./builder.sh;

src = fetchurl {
url = "mirror:///gnu/emacs/${emacsName}.tar.xz";
sha256 = "1ykkq0xl28ljdg61bm6gzy04ww86ajms98gix72qg6cpr6a53dar";
sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
};

macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
sha256 = "1dz11frk3ya3842lb89ixzpns9bz5f9njxdkyvjy75gfymqfhhzv";
sha256 = "0fivrasvigszr31w8wg8kb808hmqv2cc8klrm9n0hdxwg5fs5d0y";
};

hiresSrc = fetchurl {
4 changes: 2 additions & 2 deletions pkgs/servers/http/nginx/modules.nix
View file
Original file line number Diff line number Diff line change
@@ -69,8 +69,8 @@
src = fetchFromGitHub {
owner = "openresty";
repo = "lua-nginx-module";
rev = "v0.10.5";
sha256 = "0wz5j4kqa6hk7ar42bkxp0hd74psjy6sfsldh1a6p93z349iz4v5";
rev = "v0.10.10";
sha256 = "1dlqnlkpn3pnhk2m09jdx3iw3m6xk31pw2m5xrpcmqk3bll68mw6";
};
inputs = [ pkgs.luajit ];
preConfigure = ''