NixOS · Jan 9, 2019 · Jun 3, 2019 · Jun 7, 2019 · Jun 9, 2019 · Jun 9, 2019
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, glib
+, glibc
+, systemd
+}:
+
+stdenv.mkDerivation rec {
+  project = "conmon";
+  name = "${project}-${version}";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "containers";
+    repo = project;
+    rev = "v${version}";
+    sha256 = "08fgkbv7hq62lcq39za9pm2s2j92ismgrkvfm7acwbvajqh9syjb";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib systemd ] ++
+    stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
+
+  installPhase = "install -Dm755 bin/${project} $out/bin/${project}";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/containers/conmon;
+    description = "An OCI container runtime monitor";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ vdemeester saschagrunert ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
@@ -41,15 +41,10 @@ buildGoPackage rec {
   buildPhase = ''
     pushd go/src/${goPackagePath}
 
-    # Build conmon and pause
+    # Build pause
     go build -tags ${makeFlags} -o bin/crio-config -buildmode=pie \
       -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio-config
 
-    pushd conmon
-    ../bin/crio-config
-    popd
-
-    make -C conmon
     make -C pause
 
     # Build the crio binary
@@ -60,7 +55,6 @@ buildGoPackage rec {
     install -Dm755 bin/crio $bin/bin/crio${flavor}
 
     mkdir -p $bin/libexec/crio
-    install -Dm755 bin/conmon $bin/libexec/crio/conmon${flavor}
     install -Dm755 bin/pause $bin/libexec/crio/pause${flavor}
   '';
 

diff --git a/pkgs/applications/virtualization/podman/conmon.nix b/pkgs/applications/virtualization/podman/conmon.nix
diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -84,6 +84,14 @@ in stdenv.mkDerivation (rec {
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "add_subdirectory(DynamicLibrary)" ""
     rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+  '' + optionalString stdenv.hostPlatform.isAarch32 ''
+    # skip failing X86 test cases on armv7l
+    rm test/DebugInfo/X86/debug_addr.ll
+    rm test/tools/llvm-dwarfdump/X86/debug_addr.s
+    rm test/tools/llvm-dwarfdump/X86/debug_addr_address_size_mismatch.s
+    rm test/tools/llvm-dwarfdump/X86/debug_addr_dwarf4.s
+    rm test/tools/llvm-dwarfdump/X86/debug_addr_unsupported_version.s
+    rm test/tools/llvm-dwarfdump/X86/debug_addr_version_mismatch.s
   '' + ''
     patchShebangs test/BugPoint/compile-custom.ll.py
   '';

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
     sed "/^toolsdir=/ctoolsdir=$dev/bin" -i "$dev"/lib/pkgconfig/orc*.pc
   '';
 
-  # https://bugzilla.gnome.org/show_bug.cgi?id=728129#c15
-  doCheck = stdenv.hostPlatform.system != "i686-linux"; # not sure about cross-compiling
+  # i686   https://gitlab.freedesktop.org/gstreamer/orc/issues/18
+  # armv7l https://gitlab.freedesktop.org/gstreamer/orc/issues/9
+  doCheck = (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isAarch32);
 
   meta = with stdenv.lib; {
     description = "The Oil Runtime Compiler";

diff --git a/pkgs/development/libraries/beignet/clang_llvm.patch b/pkgs/development/libraries/beignet/clang_llvm.patch
@@ -47,16 +47,3 @@ index a148321..96cafb8 100644
    set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_LIB})
  	unset(CLANG_LIB CACHE)
  endmacro()
-diff --git a/./CMakeLists.txt b/../Beignet-1.1.2-Source_new/CMakeLists.txt
-index 88985d7..01bca9e 100644
---- a/./CMakeLists.txt
-+++ b/../Beignet-1.1.2-Source_new/CMakeLists.txt
-@@ -205,7 +205,7 @@ IF(OCLIcd_FOUND)
-     "intel-beignet.icd.in"
-     "${ICD_FILE_NAME}"
-   )
--  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors)
-+  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors)
- ELSE(OCLIcd_FOUND)
-   MESSAGE(STATUS "Looking for OCL ICD header file - not found")
- ENDIF(OCLIcd_FOUND)
diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchurl
+, fetchFromGitHub
 , cmake
 , pkgconfig
 , clang-unwrapped
@@ -19,18 +19,21 @@
 
 stdenv.mkDerivation rec {
   name = "beignet-${version}";
-  version = "1.3.2";
+  version = "unstable-2018.08.20";
 
-  src = fetchurl {
-    url = "https://01.org/sites/default/files/${name}-source.tar.gz"; 
-    sha256 = "0hqb04jhjjslnmi3fnpzphanz84zywwkyw2sjr1k5qlx2jxfsmf5";
+  src = fetchFromGitHub {
+    owner  = "intel";
+    repo   = "beignet";
+    rev    = "fc5f430cb7b7a8f694d86acbb038bd5b38ec389c";
+    sha256 = "1z64v69w7f52jrskh1jfyh1x46mzfhjrqxj9hhgzh3xxv9yla32h";
   };
 
   patches = [ ./clang_llvm.patch ];
 
   enableParallelBuilding = true;
 
   postPatch = ''
+    substituteInPlace CMakeLists.txt --replace /etc/OpenCL/vendors "\''${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors"
     patchShebangs src/git_sha1.sh
   '';
 
@@ -101,8 +104,8 @@ stdenv.mkDerivation rec {
     homepage = https://cgit.freedesktop.org/beignet/;
     description = "OpenCL Library for Intel Ivy Bridge and newer GPUs";
     longDescription = ''
-      The package provides an open source implementation of the OpenCL specification for Intel GPUs. 
-      It supports the Intel OpenCL runtime library and compiler. 
+      The package provides an open source implementation of the OpenCL specification for Intel GPUs.
+      It supports the Intel OpenCL runtime library and compiler.
     '';
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ artuuge zimbatm ];

diff --git a/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
@@ -1,23 +1,27 @@
---- Bear-2.3.11-src/bear/main.py.in	1970-01-01 01:00:01.000000000 +0100
-+++ Bear-2.3.11-src-patch/bear/main.py.in	1970-01-01 01:00:01.000000000 +0100
-@@ -49,6 +49,7 @@
+--- a/bear/main.py.in
++++ b/bear/main.py.in
+@@ -49,6 +49,7 @@ import tempfile
  import shutil
  import contextlib
  import logging
 +from distutils.spawn import find_executable
 
  # Map of ignored compiler option for the creation of a compilation database.
  # This map is used in _split_command method, which classifies the parameters
-@@ -540,7 +541,11 @@
-                 any(pattern.match(cmd) for pattern in COMPILER_PATTERNS_CXX)
+@@ -569,7 +570,15 @@ class Compilation:
+                 (compiler, language, rest of the command) otherwise """
 
          if command:  # not empty list will allow to index '0' and '1:'
 -            executable = os.path.basename(command[0])  # type: str
-+            absolute_executable = os.path.realpath(find_executable(command[0]))
-+            if 'wrapper' in absolute_executable:
-+                return None
-+
-+            executable = os.path.basename(absolute_executable) # type: str
++            executable_file = find_executable(command[0])
++            if executable_file:
++                absolute_executable = os.path.realpath(executable_file)
++                # Ignore Nix wrappers.
++                if 'wrapper' in absolute_executable:
++                    return None
++                executable = os.path.basename(absolute_executable)
++            else:
++                executable = os.path.basename(command[0])
              parameters = command[1:]  # type: List[str]
              # 'wrapper' 'parameters' and
              # 'wrapper' 'compiler' 'parameters' are valid.
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -3,7 +3,7 @@
   tree, hexRegistrySnapshot }:
 
 let
-  version = "3.10.0";
+  version = "3.11.1";
 
   bootstrapper = ./rebar3-nix-bootstrap;
 
@@ -74,10 +74,10 @@ stdenv.mkDerivation rec {
   inherit version erlang;
 
   src = fetchFromGitHub {
-    owner = "rebar";
+    owner = "erlang";
     repo = pname;
     rev = version;
-    sha256 = "1p34kfkrdmsixg95ad76rifjwfh484vp688lxsjaxg0kf2xjr2d2";
+    sha256 = "124l1alf7wx4hqjpf63l0nx70q68lilmgh582c1d413fz5ip0byd";
   };
 
   inherit bootstrapper;

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
@@ -8,14 +8,14 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.15.6.1079-78232c603";
+  version = "1.15.8.1198-eadbcbb45";
   pname = "plexmediaserver";
   name = "${pname}-${version}";
 
   # Fetch the source
   src = fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "1fvj58b91227wig51hi98rg9r48rdnd8s32xdajjgspxy923mp5a";
+    sha256 = "1za33fcga5ysxcj8szlqzriihzcvlx9jxlnsbygh819arbbbpli3";
   };
 
   outputs = [ "out" "basedb" ];

diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl
-, cctools, CoreServices }:
+{ stdenv, fetchpatch, fetchurl, cmake, bison, ncurses, openssl
+, readline, zlib, perl, cctools, CoreServices }:
 
 # Note: zlib is not required; MySQL can use an internal zlib.
 
@@ -13,10 +13,17 @@ self = stdenv.mkDerivation rec {
     sha256 = "1mwrzwk9ap09s430fpdkyhvx5j2syd3xj2hyfzvanjphq4xqbrxi";
   };
 
-  patches = if stdenv.isCygwin then [
-    ./5.5.17-cygwin.patch
-    ./5.5.17-export-symbols.patch
-  ] else null;
+  patches =
+    # Minor type error that is a build failure as of clang 6.
+    stdenv.lib.optional stdenv.cc.isClang (fetchpatch {
+      url = "https://svn.freebsd.org/ports/head/databases/mysql55-server/files/patch-sql_sql_partition.cc?rev=469888";
+      extraPrefix = "";
+      sha256 = "09sya27z3ir3xy5mrv3x68hm274594y381n0i6r5s627x71jyszf";
+    }) ++
+    stdenv.lib.optionals stdenv.isCygwin [
+      ./5.5.17-cygwin.patch
+      ./5.5.17-export-symbols.patch
+    ];
 
   preConfigure = stdenv.lib.optional stdenv.isDarwin ''
     ln -s /bin/ps $TMPDIR/ps
@@ -51,7 +58,10 @@ self = stdenv.mkDerivation rec {
     "-DINSTALL_SQLBENCHDIR="
   ];
 
-  NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # since gcc-7
+  NIX_CFLAGS_COMPILE =
+    stdenv.lib.optionals stdenv.cc.isGNU [ "-fpermissive" ] # since gcc-7
+    ++ stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-c++11-narrowing" ]; # since clang 6
+
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
   prePatch = ''
@@ -78,6 +88,6 @@ self = stdenv.mkDerivation rec {
       artistic1 bsd0 bsd2 bsd3 bsdOriginal
       gpl2 lgpl2 lgpl21 mit publicDomain  licenses.zlib
     ];
-    broken = stdenv.isAarch64 && stdenv.isDarwin;
+    broken = stdenv.isAarch64;
   };
 }; in self
diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, postgresql }:
+
+stdenv.mkDerivation rec {
+  pname = "pg-safeupdate";
+  version = "1.2";
+
+  buildInputs = [ postgresql ];
+
+  src = fetchFromGitHub {
+    owner  = "eradman";
+    repo   = pname;
+    rev    = version;
+    sha256 = "010m57jcv5v8pyfm1cqs3a306y750lvnvla9m5d98v5vdx3349jg";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin # for buildEnv, see https://github.com/NixOS/nixpkgs/issues/22653
+    install -D safeupdate.so -t $out/lib
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple extension to PostgreSQL that requires criteria for UPDATE and DELETE";
+    homepage    = "https://github.com/eradman/pg-safeupdate";
+    platforms   = postgresql.meta.platforms;
+    license     = licenses.postgresql;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, postgresql }:
+
+stdenv.mkDerivation rec {
+  pname = "temporal_tables";
+  version = "1.2.0";
+
+  buildInputs = [ postgresql ];
+
+  src = fetchFromGitHub {
+    owner  = "mlt";
+    repo   = pname;
+    rev    = "6cc86eb03d618d6b9fc09ae523f1a1e5228d22b5";
+    sha256 = "0ykv37rm511n5955mbh9dcp7pgg88z1nwgszav7z6pziaj3nba8x";
+  };
+
+  installPhase = ''
+    mkdir -p $out/{bin,lib,share/extension}
+
+    cp *.so      $out/lib
+    cp *.sql     $out/share/extension
+    cp *.control $out/share/extension
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Temporal Tables PostgreSQL Extension ";
+    homepage    = https://github.com/mlt/temporal_tables;
+    maintainers = with maintainers; [ ggpeti ];
+    platforms   = postgresql.meta.platforms;
+    license     = licenses.bsd2;
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix
@@ -35,6 +35,8 @@ self: super: {
 
     pipelinedb = super.callPackage ./ext/pipelinedb.nix { };
 
+    temporal_tables = super.callPackage ./ext/temporal_tables.nix { };
+
     timescaledb = super.callPackage ./ext/timescaledb.nix { };
 
     tsearch_extras = super.callPackage ./ext/tsearch_extras.nix { };
@@ -44,4 +46,6 @@ self: super: {
     pgrouting = super.callPackage ./ext/pgrouting.nix { };
 
     pg_partman = super.callPackage ./ext/pg_partman.nix { };
+
+    pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { };
 }