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: fdb5ba4cdf9f
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: 8aa385069f83
Choose a head ref
  • 7 commits
  • 7 files changed
  • 3 contributors

Commits on May 30, 2018

  1. git: 2.16.2 -> 2.16.4 

    This is a security update, see [1].

It is not backported from master because master is at 2.17.x after #38636.

[1] https://github.com/git/git/blob/master/Documentation/RelNotes/2.17.1.txt
    @orivej
    orivej committed May 30, 2018
    Copy the full SHA
    53b3fd5 View commit details

  2. Merge pull request #41244 from orivej/release-git 

    git: 2.16.2 -> 2.16.4 (for release-18.03)
    @orivej
    orivej authored May 30, 2018
    Copy the full SHA
    949cf43 View commit details

  3. linux: 4.4.133 -> 4.4.134 

    (cherry picked from commit 4f2d387)
    @NeQuissimus
    NeQuissimus committed May 30, 2018
    Copy the full SHA
    a56011a View commit details

  4. linux: 4.9.103 -> 4.9.104 

    (cherry picked from commit 1267e75)
    @NeQuissimus
    NeQuissimus committed May 30, 2018
    Copy the full SHA
    68f0d26 View commit details

  5. linux: 4.14.44 -> 4.14.46 

    (cherry picked from commit 346304c)
    @NeQuissimus
    NeQuissimus committed May 30, 2018
    Copy the full SHA
    b1663dd View commit details

  6. linux: 4.16.12 -> 4.16.13 

    (cherry picked from commit bbfd8e4)
    @NeQuissimus
    NeQuissimus committed May 30, 2018
    Copy the full SHA
    a0b977b View commit details

  7. Update GCE image for 18.03

    @rbvermaa
    rbvermaa committed May 30, 2018
    Copy the full SHA
    8aa3850 View commit details
3 changes: 2 additions & 1 deletion nixos/modules/virtualisation/gce-images.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ let self = {
"15.09" = "gs://nixos-cloud-images/nixos-15.09.425.7870f20-x86_64-linux.raw.tar.gz";
"16.03" = "gs://nixos-cloud-images/nixos-image-16.03.847.8688c17-x86_64-linux.raw.tar.gz";
"17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz";
"18.03" = "gs://nixos-cloud-images/nixos-image-18.03.132536.fdb5ba4cdf9-x86_64-linux.raw.tar.gz";

latest = self."17.03";
latest = self."18.03";
}; in self
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/git-and-tools/git/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
}:

let
version = "2.16.2";
version = "2.16.4";
svn = subversionClient.override { perlBindings = true; };
in

@@ -22,7 +22,7 @@ stdenv.mkDerivation {

src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "05y7480f2p7fkncbhf08zz56jbykcp0ia5gl6y3djs0lsa5mfq2m";
sha256 = "0cnmidjvbdf81mybcvxvl0c2r2x2nvq2jj2dl59dmrc7qklv0sbf";
};

hardeningDisable = [ "format" ];
8 changes: 4 additions & 4 deletions pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
View file
Original file line number Diff line number Diff line change
@@ -6,15 +6,15 @@

-# First decide what scheme to use...
-GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
-if test -n "@@USE_GETTEXT_SCHEME@@"
-if test -n "$GIT_GETTEXT_POISON"
-then
- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
-elif test -n "@@USE_GETTEXT_SCHEME@@"
-then
- GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
-elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
-then
- : no probing necessary
-elif test -n "$GIT_GETTEXT_POISON"
-then
- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
-elif type gettext.sh >/dev/null 2>&1
-then
- # GNU libintl's gettext.sh
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.14.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.14.44";
version = "4.14.46";

# branchVersion needs to be x.y
extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1r68dvcyidnmr4d49rq58lidy32fijz08xzymxjwmxi5mzk5dcrf";
sha256 = "0cpnfsxf2ici3yfn1bxix6219fri2s3ld19hpf00z9im8x91px4h";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.16.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "4.16.12";
version = "4.16.13";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "078if7mmlq4csv0d7x7rpsc8zs7m6rpz75h6878r0d2silsphw2n";
sha256 = "1qzj5mbkxkrpmnwws8vdz292gp863kybrgr9bvgs7v28plx7n2kg";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.4.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.4.133";
version = "4.4.134";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0vhg23i49s4k8lbsrs8y6rvqjld84qgifmim5qcrndr6yj68fmk0";
sha256 = "14gvkpdm3wbdfifnkrlk8b3i2isb439prqrzzlvjh88h582x4y20";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.103";
version = "4.9.104";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1n4kqa0yf5svg8jk647h4awz3ygq696yi0agnmbz0alxnynffsij";
sha256 = "13f30b7z9sp9h1kwjahla194k7ji46z3pr706caapn71npn55abv";
};
} // (args.argsOverride or {}))