Merge #21029: nghttp2: 1.16.1 -> 1.17.0

.mention-bot

@@ -6,6 +6,7 @@
   ],
   "alwaysNotifyForPaths": [
     { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] },
+    { "name": "LnL7", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/*"] },
     { "name": "copumpkin", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/apple-source-releases/*"] }
   ],
   "fileBlacklist": ["pkgs/top-level/all-packages.nix"]

pkgs/applications/editors/atom/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.12.6";
+  version = "1.12.7";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0b85bjfxdd18i2v8py5jx4284m58zxad38c2vvqhgx7cxm9hn8k6";
+    sha256 = "1kkw6wixri8iddnmscza1d4riq4m9yr78y0d9y76vdnxarma0bfq";
     name = "${name}.deb";
   };
 

pkgs/applications/science/logic/minisat/darwin.patch

@@ -0,0 +1,26 @@
+https://github.com/fasterthanlime/homebrew-mingw/blob/master/Library/Formula/minisat.rb
+
+diff --git a/utils/System.cc b/utils/System.cc
+index a7cf53f..feeaf3c 100644
+--- a/utils/System.cc
++++ b/utils/System.cc
+@@ -78,16 +78,17 @@ double Minisat::memUsed(void) {
+     struct rusage ru;
+     getrusage(RUSAGE_SELF, &ru);
+     return (double)ru.ru_maxrss / 1024; }
+-double MiniSat::memUsedPeak(void) { return memUsed(); }
++double Minisat::memUsedPeak(void) { return memUsed(); }
+ 
+ 
+ #elif defined(__APPLE__)
+ #include <malloc/malloc.h>
+ 
+-double Minisat::memUsed(void) {
++double Minisat::memUsed() {
+     malloc_statistics_t t;
+     malloc_zone_statistics(NULL, &t);
+     return (double)t.max_size_in_use / (1024*1024); }
++double Minisat::memUsedPeak() { return memUsed(); }
+ 
+ #else
+ double Minisat::memUsed() { 

pkgs/applications/science/logic/minisat/default.nix

@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj";
   };
 
-  patches = stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ];
+  patches =
+    [ ./darwin.patch ]
+    ++ stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ];
 
   buildInputs = [ zlib ];
 

pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
       gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
       gnome3.vino udev libcanberra_gtk3 libgudev
-      networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo ];
+      networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker ];
 
   preBuild = ''
     substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"

pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix

@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
       libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
       gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality
       accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
-      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
+      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns
       gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
       gnome3.vino udev libcanberra_gtk3 libgudev
-      networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo ];
+      networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker ];
 
   preBuild = ''
     substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"

pkgs/development/compilers/solc/default.nix

@@ -1,18 +1,18 @@
-{ stdenv, fetchFromGitHub, boost, cmake, jsoncpp }:
+{ stdenv, fetchgit, boost, cmake, jsoncpp }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.4";
+  version = "0.4.6";
   name = "solc-${version}";
 
-  src = fetchFromGitHub {
+  # Cannot use `fetchFromGitHub' because of submodules
-    owner = "ethereum";
+  src = fetchgit {
-    repo = "solidity";
+    url = "https://github.com/ethereum/solidity";
-    rev = "v${version}";
+    rev = "2dabbdf06f414750ef0425c664f861aeb3e470b8";
-    sha256 = "150prr7m0jnx3vhq0wy3avzsijxd3pn7c8jxdvf6jkcc408dgn6z";
+    sha256 = "0q1dvizx60f7l97w8241wra7vpghimc9x7gzb18vn34sxv4bqy9g";
   };
 
   patchPhase = ''
-    echo >commit_hash.txt 4633f3def897db0f91237f98cf46e5d84fb05e61
+    echo >commit_hash.txt 2dabbdf06f414750ef0425c664f861aeb3e470b8
   '';
 
   buildInputs = [ boost cmake jsoncpp ];

pkgs/development/compilers/teyjus/default.nix

@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, omake, ocaml, flex, bison }:
+{ stdenv, fetchzip, omake, ocaml, flex, bison }:
 
 stdenv.mkDerivation {
-  name = "teyjus-2.0b2";
+  name = "teyjus-2.1";
 
-  src = fetchurl {
+  src = fetchzip {
-    url = "https://teyjus.googlecode.com/files/teyjus-source-2.0-b2.tar.gz";
+    url = https://github.com/teyjus/teyjus/archive/v2.1.tar.gz;
-    sha256 = "f589fb460d7095a6e674b7a6413772c41b98654c38602c3e8c477a976da99052";
+    sha256 = "064jqf68zpmvndgyhilmxfhnvx1bzm8avhgw82csj5wxw5ky6glz";
   };
 
   patches = [ ./fix-lex-to-flex.patch ];

pkgs/development/compilers/teyjus/fix-lex-to-flex.patch

@@ -1,23 +1,23 @@
-diff --git a/source/OMakefile b/source/OMakefile
+--- a/source/OMakefile	1970-01-01 00:00:01.000000000 +0000
-index 6b19d84..095b8b6 100644
++++ b/source/OMakefile	2016-12-02 08:48:42.000000000 +0000
---- a/source/OMakefile
+@@ -183,18 +183,18 @@
-+++ b/source/OMakefile
-@@ -164,12 +164,17 @@ LNK_MAIN = $(FNT)/linkerfront
  DEP_MAIN = $(FNT)/dependfront
+ PAR_MAIN = $(FNT)/parsefront
  
- ############################################################
-+# Nixpkgs specific changes
-+#
-+
 +LEX = flex
 +
-+############################################################
+ ############################################################
  # Platform specific changes
  #
  
+ if $(mem $(SYSNAME), Linux)
+     YACC = bison -by
+-    LEX = flex
+     export
+ 
  if $(mem $(OSTYPE), Cygwin Win32)
      YACC = bison -by
 -    LEX = flex
-     CFLAGS += -mno-cygwin
+     CC = i686-pc-mingw32-gcc
      INC_C[] += $(INC)/byteswap $(INC)/search
      export

pkgs/development/libraries/nghttp2/default.nix

@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   name = "nghttp2-${version}";
-  version = "1.16.1";
+  version = "1.17.0";
 
   # Don't use fetchFromGitHub since this needs a bootstrap curl
   src = fetchurl {
     url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
-    sha256 = "069pw84f8gg21npapn7y1sizwn6w35692zaq5g45gy8hdbmcl8yc";
+    sha256 = "7685b6717d205d3a251b7dd5e73a7ca5e643bc5c01f928b82bfeed30c243f28a";
   };
 
   # Configure script searches for a symbol which does not exist in jemalloc on Darwin

pkgs/development/ocaml-modules/camlimages/4.0.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
+{ stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
 
 let
   pname = "camlimages";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4";
   };
 
-  buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ];
+  buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ];
 
   propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ];
 

pkgs/development/ocaml-modules/camlimages/4.1.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
+{stdenv, fetchurl, omake, ocaml, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sha256 = "1ppddhfknpirj1vilm5dxgyp82kf7ahpvjmh7z75a1fnaqv3kpki";
   };
 
-  buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ];
+  buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ];
 
   propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ];
 

pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix

@@ -1,38 +0,0 @@
-{stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
-let
-  pname = "omake";
-  version = "0.9.8.6-0.rc1";
-  webpage = "http://omake.metaprl.org";
-in
-stdenv.mkDerivation {
-
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz";
-    sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13";
-  };
-  patchFlags = "-p0";
-  patches = [ ./warn.patch ];
-
-  buildInputs = [ ocaml makeWrapper ncurses ];
-
-  phases = "unpackPhase patchPhase buildPhase";
-  buildPhase = ''
-    make bootstrap
-    make PREFIX=$out all
-    make PREFIX=$out install
-  '';
-#  prefixKey = "-prefix ";
-#
-#  configureFlags = if transitional then "--transitional" else "--strict";
-#
-#  buildFlags = "world.opt";		
-
-  meta = {
-    description = "Omake build system";
-    homepage = "${webpage}";
-    license = "GPL";
-    platforms = ocaml.meta.platforms or [];
-  };
-}

pkgs/development/tools/ocaml/omake/default.nix

@@ -1,38 +1,24 @@
-{stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
+{ stdenv, fetchurl, ocaml, ncurses }:
-let
-  pname = "omake";
-  version = "0.9.8.5-3";
-  webpage = "http://omake.metaprl.org";
-in
-stdenv.mkDerivation {
 
-  name = "${pname}-${version}";
+stdenv.mkDerivation rec {
+
+  name = "omake-${version}";
+  version = "0.10.1";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/o/omake/omake_${version}.orig.tar.gz";
+    url = "http://download.camlcity.org/download/${name}.tar.gz";
-    sha256 = "1bfxbsimfivq0ar2g5fkzvr5ql97n5dg562pfyd29y4zyh4mwrsv";
+    sha256 = "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj";
   };
-  patchFlags = "-p0";
-  patches = [ ./omake-build-0.9.8.5.diff ./omake-lm_printf-gcc44.diff ];
 
-  buildInputs = [ ocaml makeWrapper ncurses ];
+  buildInputs = [ ocaml ncurses ];
-
-  phases = "unpackPhase patchPhase buildPhase";
-  buildPhase = ''
-    make bootstrap
-    make PREFIX=$out all
-    make PREFIX=$out install
-  '';
-#  prefixKey = "-prefix ";
-#
-#  configureFlags = if transitional then "--transitional" else "--strict";
-#
-#  buildFlags = "world.opt";
 
   meta = {
     description = "A build system designed for scalability and portability";
-    homepage = "${webpage}";
+    homepage = http://projects.camlcity.org/projects/omake.html;
-    license = "GPL";
+    license = with stdenv.lib.licenses; [
-    broken = true;
+      mit /* scripts */
+      gpl2 /* program */
+    ];
+    inherit (ocaml.meta) platforms;
   };
 }

pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff

@@ -1,11 +0,0 @@
---- src/exec/omake_exec.ml	2006-12-08 23:52:01.000000000 +0100
-+++ src/exec/omake_exec.ml	2009-04-15 22:19:07.000000000 +0200
-@@ -46,7 +46,7 @@
- open Omake_options
- open Omake_command_type
-
--external sync : unit -> unit = "caml_sync"
-+(*external sync : unit -> unit = "caml_sync"*)
- 
- module Exec =
- struct

pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff

@@ -1,22 +0,0 @@
---- src/libmojave-external/cutil/lm_printf.c.orig	2007-07-15 19:55:23.000000000 +0200
-+++ src/libmojave-external/cutil/lm_printf.c		2009-06-21 19:20:40.000000000 +0200
-@@ -144,3 +144,3 @@
-         if(bufp != buffer)
--            free(buffer);
-+            free(bufp);
-         failwith("ml_print_string");
-@@ -149,3 +149,3 @@
-     if(bufp != buffer)
--        free(buffer);
-+        free(bufp);
-     return v_result;
-@@ -192,3 +192,3 @@
-         if(bufp != buffer)
--            free(buffer);
-+            free(bufp);
-         failwith("ml_print_string");
-@@ -197,3 +197,3 @@
-     if(bufp != buffer)
--        free(buffer);
-+        free(bufp);
-     return v_result;

pkgs/development/tools/ocaml/omake/warn.patch

@@ -1,10 +0,0 @@
-diff -p1 -aur ../omake-0.9.8.6.ori/lib/build/OCaml.om ./lib/build/OCaml.om
---- ../omake-0.9.8.6.ori/lib/build/OCaml.om	2008-03-05 01:07:25.000000000 +0000
-+++ ./lib/build/OCaml.om	2013-06-01 15:52:37.000000000 +0000
-@@ -178,3 +178,3 @@ declare OCAMLDEPFLAGS
- public.OCAMLPPFLAGS  =
--public.OCAMLFLAGS    = -warn-error A
-+public.OCAMLFLAGS    =
- public.OCAMLCFLAGS   = -g
-Seulement dans ./lib/build: OCaml.om~
-Seulement dans .: warn.patch

pkgs/os-specific/linux/cifs-utils/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kerberos, keyutils, pam }:
+{ stdenv, fetchurl, kerberos, keyutils, pam, talloc }:
 
 stdenv.mkDerivation rec {
   name = "cifs-utils-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1xs9rwqfpx8qj5mcmagw6y1hzwc71zhzb5r8hv06sz16p1w6axz2";
   };
 
-  buildInputs = [ kerberos keyutils pam ];
+  buildInputs = [ kerberos keyutils pam talloc ];
 
   makeFlags = "root_sbindir=$(out)/sbin";
 

pkgs/os-specific/linux/kernel/common-config.nix

@@ -31,6 +31,7 @@ with stdenv.lib;
 
   # Debugging.
   DEBUG_KERNEL y
+  DYNAMIC_DEBUG y
   TIMER_STATS y
   BACKTRACE_SELF_TEST n
   CPU_NOTIFIER_ERROR_INJECT? n
@@ -260,6 +261,11 @@ with stdenv.lib;
   CIFS_XATTR y
   CIFS_POSIX y
   CIFS_FSCACHE y
+  CIFS_STATS y
+  CIFS_WEAK_PW_HASH y
+  CIFS_UPCALL y
+  CIFS_ACL y
+  CIFS_DFS_UPCALL y
   CIFS_SMB2 y
   ${optionalString (versionAtLeast version "3.12") ''
     CEPH_FSCACHE y

pkgs/top-level/all-packages.nix

@@ -5303,9 +5303,7 @@ in
     lua = lua5_1;
   };
 
-  teyjus = callPackage ../development/compilers/teyjus {
+  teyjus = callPackage ../development/compilers/teyjus { };
-    omake = omake_rc1;
-  };
 
   thrust = callPackage ../development/tools/thrust {
     gconf = pkgs.gnome2.GConf;
@@ -6345,7 +6343,9 @@ in
   noweb = callPackage ../development/tools/literate-programming/noweb { };
   nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; };
 
-  inherit (ocamlPackages) omake omake_rc1;
+  omake = callPackage ../development/tools/ocaml/omake {
+    inherit (ocamlPackages_4_02) ocaml;
+  };
 
   omniorb = callPackage ../development/tools/omniorb { };
 

pkgs/top-level/ocaml-packages.nix

@@ -649,9 +649,6 @@ let
 
     trv = callPackage ../development/tools/misc/trv { };
 
-    omake = callPackage ../development/tools/ocaml/omake { };
-    omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
-
     verasco = callPackage ../development/tools/analysis/verasco (
       if system == "x86_64-linux"
       then { tools = pkgs.pkgsi686Linux.stdenv.cc; }

pkgs/top-level/python-packages.nix

@@ -8411,6 +8411,23 @@ in {
     };
   };
 
+  pamela = buildPythonPackage rec {
+    name = "pamela-${version}";
+    version = "0.3.0";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/pamela/${name}.tar.gz";
+      sha256 = "0ssxbqsshrm8p642g3h6wsq20z1fsqhpdvqdm827gn6dlr38868y";
+    };
+
+    doCheck = false;
+
+    meta = {
+      description = "PAM interface using ctypes";
+      homepage = "http://github.com/minrk/pamela";
+      license = licenses.mit;
+    };
+  };
  
   pathtools = buildPythonPackage rec {
     name = "pathtools-${version}";