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: f91c591ea265
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e1aaeacfc0d
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jul 13, 2017

  1. zulu: 8.19.0.1 -> 8.21.0.1

    @fpletz
    fpletz committed Jul 13, 2017
    Copy the full SHA
    7ef578f View commit details

  2. nginxMainline: 1.13.2 -> 1.13.3 for CVE-2017-7529

    @fpletz
    fpletz committed Jul 13, 2017
    Copy the full SHA
    af70b8f View commit details

  3. nginx: 1.12.0 -> 1.12.1 for CVE-2017-7529

    @fpletz
    fpletz committed Jul 13, 2017
    Copy the full SHA
    6e1aaea View commit details
Showing with 28 additions and 17 deletions.
  1. +24 −13 pkgs/development/compilers/zulu/default.nix
  2. +2 −2 pkgs/servers/http/nginx/mainline.nix
  3. +2 −2 pkgs/servers/http/nginx/stable.nix
37 changes: 24 additions & 13 deletions pkgs/development/compilers/zulu/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
{ stdenv, pkgs, fetchurl, unzip, makeWrapper, setJavaClassPath, swingSupport ? true }:

with pkgs;
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib
, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg
, swingSupport ? true }:

let
version = "8.19.0.1";
openjdk = "8.0.112";
version = "8.21.0.1";
openjdk = "8.0.131";

sha256_linux = "1icb6in1197n44wk2cqnrxr7w0bd5abxxysfrhbg56jlb9nzmp4x";
sha256_darwin = "0kxwh62a6kckc9l9jkgakf86lqkqazp3dwfwaxqc4cg5zczgbhmd";
sha256_linux = "0cr1wvk1ifdq69ia8sr6171yzciba8l5x7dszwa5g2v0vmmqq88p";
sha256_darwin = "0xq9bdzbdq8wq48gj6j56bw30l2iafz6sy1wdhrf92n9bnz5qmw7";

platform = if stdenv.isDarwin then "macosx" else "linux";
hash = if stdenv.isDarwin then sha256_darwin else sha256_linux;
extension = if stdenv.isDarwin then "zip" else "tar.gz";

libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu
xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
gnome2.gtk cairo gdk_pixbuf atk
] ++ (lib.optionals swingSupport (with xorg; [
xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
xorg.libXt xorg.libXrender stdenv.cc.cc
]));

in stdenv.mkDerivation rec {
inherit version openjdk platform hash extension;

@@ -22,7 +33,7 @@ in stdenv.mkDerivation rec {
sha256 = hash;
};

buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin [ unzip ];
buildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin unzip;

installPhase = ''
mkdir -p $out
@@ -51,9 +62,6 @@ in stdenv.mkDerivation rec {
EOF
'';

libraries = [ stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk ]
++ (if swingSupport then [ xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc ] else [ ]);

rpath = stdenv.lib.strings.makeLibraryPath libraries;

passthru = {
@@ -64,8 +72,11 @@ in stdenv.mkDerivation rec {
homepage = https://www.azul.com/products/zulu/;
license = licenses.gpl2;
description = "Certified builds of OpenJDK";
longDescription = "Certified builds of OpenJDK that can be deployed across multiple operating systems, containers, hypervisors and Cloud platforms";
maintainers = with maintainers; [ nequissimus ];
longDescription = ''
Certified builds of OpenJDK that can be deployed across multiple
operating systems, containers, hypervisors and Cloud platforms.
'';
maintainers = with maintainers; [ nequissimus fpletz ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}
4 changes: 2 additions & 2 deletions pkgs/servers/http/nginx/mainline.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:

callPackage ./generic.nix (args // {
version = "1.13.2";
sha256 = "0w4vj6hl23z9kdw09v7jzq3c1593i4fhwmrz6qx2g7cq2i6j6zyp";
version = "1.13.3";
sha256 = "0whdpgfb1y9r7f3y91r4m0wpgrwwdl2byahp9a7gn0n30j0gjwsv";
})
4 changes: 2 additions & 2 deletions pkgs/servers/http/nginx/stable.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ callPackage, ... } @ args:

callPackage ./generic.nix (args // {
version = "1.12.0";
sha256 = "0c2vg6530qplwk8rhldww5r3cwcbw1avka53qg9sh85nzlk2w8ml";
version = "1.12.1";
sha256 = "1yvnmj7vlykrqdi6amkvs63lva6qkxd98sqv0a8hz8w5ci1bz4w7";
})