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

Commits on Sep 12, 2017

  1. emacs: 25.2 -> 25.3 

    https://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00211.html

> This is an emergency release to fix a security vulnerability in Emacs.
>
> Enriched Text mode has its support for decoding 'x-display' disabled.
> This feature allows saving 'display' properties as part of text.
> Emacs 'display' properties support evaluation of arbitrary Lisp forms
> as part of instantiating the property, so decoding 'x-display' is
> vulnerable to executing arbitrary malicious Lisp code included in the
> text (e.g., sent as part of an email message).

(cherry picked from commit 78f457c)
    @mbrock @joachifm
    mbrock authored and joachifm committed Sep 12, 2017
    Copy the full SHA
    a195839 View commit details

  2. pirate-get: 0.2.10 -> 0.2.12 

    (cherry picked from commit 375ff71)
    @rnhmjoj @joachifm
    rnhmjoj authored and joachifm committed Sep 12, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6adb5cb View commit details

  3. btfs: 2.13 -> 2.17 

    (cherry picked from commit b9dc49e)
    @rnhmjoj @joachifm
    rnhmjoj authored and joachifm committed Sep 12, 2017
    Copy the full SHA
    3a52fb9 View commit details
Showing with 6 additions and 6 deletions.
  1. +2 −2 pkgs/applications/editors/emacs/default.nix
  2. +2 −2 pkgs/os-specific/linux/btfs/default.nix
  3. +2 −2 pkgs/tools/networking/pirate-get/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/editors/emacs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -26,12 +26,12 @@ let
in
stdenv.mkDerivation rec {
name = "emacs-${version}${versionModifier}";
version = "25.2";
version = "25.3";
versionModifier = "";

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

patches = (lib.optional stdenv.isDarwin ./at-fdcwd.patch);
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/btfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

stdenv.mkDerivation rec {
name = "btfs-${version}";
version = "2.13";
version = "2.17";

src = fetchFromGitHub {
owner = "johang";
repo = "btfs";
rev = "v${version}";
sha256 = "1nd021xbxrikd8p0w9816xjwlrs9m1nc6954q23qxfw2jbmszlk2";
sha256 = "0v0mypwnx832f7vg52wmiw0lyz7rrkhqsgi7zc261ak1gfaw4nwd";
};

buildInputs = [
4 changes: 2 additions & 2 deletions pkgs/tools/networking/pirate-get/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@ with python3Packages;
buildPythonApplication rec {
name = "${pname}-${version}";
pname = "pirate-get";
version = "0.2.10";
version = "0.2.12";

doCheck = false;

src = fetchPypi {
inherit pname version;
sha256 = "04gsilbyq2plldzi495dcf19h5xfldfyn6zdczj2fdki1m29jyr0";
sha256 = "1q6hvavj0gswgw3x756h18nmmpnxlgg08qvxphpbzlwd43xrnza3";
};

propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 ];