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

Commits on Nov 8, 2017

  1. libzip: 1.2.0 -> 1.3.0

    @pbogdan
    pbogdan committed Nov 8, 2017
    Copy the full SHA
    e26c52e View commit details

Commits on Nov 9, 2017

  1. hhvm: fix build with glibc 2.26

    @pbogdan
    pbogdan committed Nov 9, 2017
    Copy the full SHA
    4173ec1 View commit details

  2. Merge #31449: hhvm: fix build with glibc-2.26

    @vcunat
    vcunat committed Nov 9, 2017
    Copy the full SHA
    fb00ed8 View commit details

  3. Merge #31404: libzip: security 1.2.0 -> 1.3.0

    @vcunat
    vcunat committed Nov 9, 2017
    Copy the full SHA
    ea40b0c View commit details
Showing with 8 additions and 4 deletions.
  1. +6 −2 pkgs/development/compilers/hhvm/default.nix
  2. +2 −2 pkgs/development/libraries/libzip/default.nix
8 changes: 6 additions & 2 deletions pkgs/development/compilers/hhvm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached, pcre
, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
{ stdenv, fetchgit, fetchurl, cmake, pkgconfig, boost, libunwind, libmemcached
, pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php
, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5
, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
, libxslt, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit
@@ -29,6 +29,10 @@ stdenv.mkDerivation rec {

patches = [
./flexible-array-members-gcc6.patch
(fetchurl {
url = https://github.com/facebook/hhvm/commit/b506902af2b7c53de6d6c92491c2086472292004.patch;
sha256 = "1br7diczqks6b1xjrdsac599fc62m9l17gcx7dvkc0qj54lq7ys4";
})
];

enableParallelBuilding = false; # occasional build problems;
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libzip/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "libzip-${version}";
version = "1.2.0";
version = "1.3.0";

src = fetchurl {
url = "http://www.nih.at/libzip/${name}.tar.gz";
sha256 = "17vxj2ffsxwh8lkc6801ppmwj15jp8q58rin76znxfbx88789ybc";
sha256 = "1633dvjc08zwwhzqhnv62rjf1abx8y5njmm8y16ik9iwd07ka6d9";
};

outputs = [ "out" "dev" ];