Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: df70dcb6fb50
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2608a278ffbb
Choose a head ref
7 contributors

Commits on May 10, 2020

  1. redis: 5.0.8 -> 6.0.1

    @r-ryantm
    r-ryantm committed May 10, 2020
    Copy the full SHA
    4a07eb2 View commit details

Commits on May 15, 2020

  1. shadowsocks-rust: 1.7.2 -> 1.8.11

    @marsam
    marsam committed May 15, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3c4b403 View commit details

  2. php74: 7.4.4 -> 7.4.5 

    Changelog: https://www.php.net/ChangeLog-7.php#7.4.5
    @etu
    etu committed May 15, 2020
    Copy the full SHA
    52d2e99 View commit details

Commits on May 16, 2020

  1. go_1_13: stop setting GOPATH 

    a1e13f6
    @zowoq
    zowoq committed May 16, 2020
    Copy the full SHA
    469f14c View commit details

  2. go_1_13: 1.13.8 -> 1.13.11

    @zowoq
    zowoq committed May 16, 2020
    Copy the full SHA
    d1e7b00 View commit details

  3. doctl: 1.40.0 -> 1.43.0, switch to buildGoModule 

    https://github.com/digitalocean/doctl/releases/tag/v1.41.0
https://github.com/digitalocean/doctl/releases/tag/v1.42.0
https://github.com/digitalocean/doctl/releases/tag/v1.43.0
    @zowoq
    zowoq committed May 16, 2020
    Copy the full SHA
    adb9f60 View commit details

  4. umoci: install manpages, switch to buildGoModule

    @zowoq
    zowoq committed May 16, 2020
    Copy the full SHA
    f0fbd9d View commit details

  5. protobuf3_12: init at 3.12.0 

    Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.0
    @marsam
    marsam committed May 16, 2020
    Copy the full SHA
    e534efa View commit details

  6. androidndkPkgs: expose libc in cc.lib (#87737) 

    Fixes cross compiling gdb that uses targetPackages.stdenv.cc.cc.lib.
    @orivej
    orivej authored May 16, 2020
    Copy the full SHA
    d028c74 View commit details

  7. direnv: switch to buildGoModule (#87932)

    @zowoq
    zowoq authored May 16, 2020
    Copy the full SHA
    3871cee View commit details

  8. emacsPackages.rtags-xref: Fix build

    @adisbladis
    adisbladis committed May 16, 2020
    Copy the full SHA
    692d924 View commit details

  9. emacsPackages.treemacs-magit: Fix build

    @adisbladis
    adisbladis committed May 16, 2020
    Copy the full SHA
    b17e80a View commit details

  10. emacsPackages.dune: Fix build

    @adisbladis
    adisbladis committed May 16, 2020
    Copy the full SHA
    ae2a2be View commit details

  11. Merge pull request #87913 from zowoq/go113 

    go_1_13: 1.13.8 -> 1.13.11, stop setting GOPATH
    @zimbatm
    zimbatm authored May 16, 2020
    Copy the full SHA
    9fbb82f View commit details

  12. php74: 7.4.5 -> 7.4.6 

    Changelog: https://www.php.net/ChangeLog-7.php#7.4.6
    @etu
    etu committed May 16, 2020
    Copy the full SHA
    a779efc View commit details

  13. emacsPackages.forge: Fix build

    @adisbladis
    adisbladis committed May 16, 2020
    Copy the full SHA
    f1bd1b9 View commit details

  14. Merge pull request #87472 from r-ryantm/auto-update/redis 

    redis: 5.0.8 -> 6.0.1
    @marsam
    marsam authored May 16, 2020
    Copy the full SHA
    8d3b239 View commit details

  15. Merge pull request #87923 from zowoq/umoci 

    umoci: install manpages, switch to buildGoModule
    @marsam
    marsam authored May 16, 2020
    Copy the full SHA
    b5f2cb7 View commit details

  16. Merge pull request #87924 from zowoq/doctl 

    doctl: 1.40.0 -> 1.43.0, switch to buildGoModule
    @marsam
    marsam authored May 16, 2020
    Copy the full SHA
    9c25fd7 View commit details

  17. Merge pull request #87907 from etu/php74-update 

    php74: 7.4.4 -> 7.4.6
    @etu
    etu authored May 16, 2020
    Copy the full SHA
    726cbe0 View commit details

  18. firefox-beta-bin: 76.0b8 -> 77.0b6

    @adisbladis
    adisbladis committed May 16, 2020
    Copy the full SHA
    198653e View commit details

  19. firefox-devedition-bin: 76.0b8 -> 77.0b6

    @adisbladis
    adisbladis committed May 16, 2020
    Copy the full SHA
    80a4efc View commit details

  20. Merge pull request #87927 from marsam/update-shadowsocks-rust 

    shadowsocks-rust: 1.7.2 -> 1.8.11
    @marsam
    marsam authored May 16, 2020
    Copy the full SHA
    3776123 View commit details

  21. Merge pull request #87939 from marsam/init-protobuf3_12 

    protobuf3_12: init at 3.12.0
    @marsam
    marsam authored May 16, 2020
    Copy the full SHA
    2608a27 View commit details
28 changes: 16 additions & 12 deletions pkgs/applications/editors/emacs-modes/melpa-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -85,6 +85,8 @@ instantenous and formats commits for you.
inherit (self.melpaPackages) easy-kill;
};

dune = dontConfigure super.dune;

emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ pkgs.sqlite ];

@@ -126,6 +128,12 @@ instantenous and formats commits for you.
inherit (self.melpaPackages) ess ctable popup;
};

forge = super.forge.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

flycheck-rtags = fix-rtags super.flycheck-rtags;

gnuplot = super.gnuplot.overrideAttrs (old: {
@@ -308,6 +316,8 @@ instantenous and formats commits for you.

rtags = dontConfigure (externalSrc super.rtags external.rtags);

rtags-xref = dontConfigure super.rtags;

shm = super.shm.overrideAttrs (attrs: {
propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
});
@@ -328,6 +338,12 @@ instantenous and formats commits for you.
'';
});

treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: {
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
@@ -439,12 +455,6 @@ instantenous and formats commits for you.
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

forge = super.forge.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

gerrit = super.gerrit.overrideAttrs (attrs: {
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
@@ -538,12 +548,6 @@ instantenous and formats commits for you.
inherit (self.melpaPackages) powerline;
};

treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});

vterm = super.vterm.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ];
cmakeFlags = [
Loading