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

Commits on Jun 26, 2017

  1. microcodeIntel: 20161104 -> 20170511 

    (cherry picked from commit 252e9ec)
    @gebner @fpletz
    gebner authored and fpletz committed Jun 26, 2017
    Copy the full SHA
    55f2e78 View commit details

  2. thunderbird: 52.2.0 -> 52.2.1 

    (cherry picked from commit 994998e)
    @emmanuelrosa @fpletz
    emmanuelrosa authored and fpletz committed Jun 26, 2017
    Copy the full SHA
    469fa43 View commit details

  3. libcgroup: do not set suid bit in nix store 

    (cherry picked from commit b788956)
    @fpletz
    fpletz committed Jun 26, 2017
    Copy the full SHA
    17e9509 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/mailreaders/thunderbird/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,11 +22,11 @@ let
wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
in stdenv.mkDerivation rec {
name = "thunderbird-${version}";
version = "52.2.0";
version = "52.2.1";

src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "e5c2ad5f7bbea4fb9abca94db6c149ee459c1c35b756b7840ee87b5fb631ccbcd323c743a12cddf8d504e0175bb93378beb7fe100b185ea6ab03a4968859ea89";
sha512 = "f30ba358b1bfc57265b26da3d2205a8a77c6cd1987278de40cde6c1c1241db3c2fedc60aebb6ff56ffb340492c5580294420158f4b7c4787f558e79f72e3d7fb";
};

# New sed no longer tolerates this mistake.
5 changes: 5 additions & 0 deletions pkgs/os-specific/linux/libcgroup/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {

buildInputs = [ pam yacc flex ];

postPatch = ''
substituteInPlace src/tools/Makefile.in \
--replace 'chmod u+s' 'chmod +x'
'';

meta = {
description = "Library and tools to manage Linux cgroups";
homepage = "http://libcg.sourceforge.net/";
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/microcode/intel.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "microcode-intel-${version}";
version = "20161104";
version = "20170511";

src = fetchurl {
url = "http://downloadmirror.intel.com/26400/eng/microcode-${version}.tgz";
sha256 = "1lg3bvznvwcxf66k038c57brkcxfva8crpnzj5idmczr5yk4q5bh";
url = "http://downloadmirror.intel.com/26798/eng/microcode-${version}.tgz";
sha256 = "18w1ysklvkf4l9xgnl1wvhbgr3wbdaiphv56056pafs0hwnzsxrg";
};

buildInputs = [ libarchive ];