nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-16.09' into staging-16.09

Browse Source
This commit is contained in:
Vladimír Čunát
2016-10-03 23:11:49 +02:00
parent dd656bca16 c89c1ba08b
commit 8d53a156d5
26 changed files with 307 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
nixos/doc/manual/release-notes/rl-1609.xml
View File

@@ -49,7 +49,62 @@ has the following highlights: </para>
<para>The following new services were added since the last release:</para>
<itemizedlist>
<listitem><para><literal>(this will get automatically generated at release time)</literal></para></listitem>
<listitem><para><literal>hardware/video/amdgpu.nix</literal></para></listitem>
<listitem><para><literal>hardware/video/displaylink.nix</literal></para></listitem>
<listitem><para><literal>programs/info.nix</literal></para></listitem>
<listitem><para><literal>programs/mosh.nix</literal></para></listitem>
<listitem><para><literal>programs/spacefm.nix</literal></para></listitem>
<listitem><para><literal>programs/tmux.nix</literal></para></listitem>
<listitem><para><literal>programs/xonsh.nix</literal></para></listitem>
<listitem><para><literal>security/chromium-suid-sandbox.nix</literal></para></listitem>
<listitem><para><literal>security/hidepid.nix</literal></para></listitem>
<listitem><para><literal>services/audio/squeezelite.nix</literal></para></listitem>
<listitem><para><literal>services/backup/znapzend.nix</literal></para></listitem>
<listitem><para><literal>services/continuous-integration/buildkite-agent.nix</literal></para></listitem>
<listitem><para><literal>services/continuous-integration/hydra/default.nix</literal></para></listitem>
<listitem><para><literal>services/continuous-integration/gocd-agent/default.nix</literal></para></listitem>
<listitem><para><literal>services/continuous-integration/gocd-server/default.nix</literal></para></listitem>
<listitem><para><literal>services/development/hoogle.nix</literal></para></listitem>
<listitem><para><literal>services/editors/emacs.nix</literal></para></listitem>
<listitem><para><literal>services/games/factorio.nix</literal></para></listitem>
<listitem><para><literal>services/games/terraria.nix</literal></para></listitem>
<listitem><para><literal>services/logging/awstats.nix</literal></para></listitem>
<listitem><para><literal>services/logging/graylog.nix</literal></para></listitem>
<listitem><para><literal>services/misc/emby.nix</literal></para></listitem>
<listitem><para><literal>services/misc/mantisbt.nix</literal></para></listitem>
<listitem><para><literal>services/misc/nzbget.nix</literal></para></listitem>
<listitem><para><literal>services/misc/packagekit.nix</literal></para></listitem>
<listitem><para><literal>services/misc/sonarr.nix</literal></para></listitem>
<listitem><para><literal>services/misc/spice-vdagentd.nix</literal></para></listitem>
<listitem><para><literal>services/misc/taskserver</literal></para></listitem>
<listitem><para><literal>services/network-filesystems/tahoe.nix</literal></para></listitem>
<listitem><para><literal>services/networking/coturn.nix</literal></para></listitem>
<listitem><para><literal>services/networking/ferm.nix</literal></para></listitem>
<listitem><para><literal>services/networking/gdomap.nix</literal></para></listitem>
<listitem><para><literal>services/networking/libreswan.nix</literal></para></listitem>
<listitem><para><literal>services/networking/logmein-hamachi.nix</literal></para></listitem>
<listitem><para><literal>services/networking/mfi.nix</literal></para></listitem>
<listitem><para><literal>services/networking/mjpg-streamer.nix</literal></para></listitem>
<listitem><para><literal>services/networking/mosquitto.nix</literal></para></listitem>
<listitem><para><literal>services/networking/nntp-proxy.nix</literal></para></listitem>
<listitem><para><literal>services/networking/offlineimap.nix</literal></para></listitem>
<listitem><para><literal>services/networking/pptpd.nix</literal></para></listitem>
<listitem><para><literal>services/networking/sniproxy.nix</literal></para></listitem>
<listitem><para><literal>services/networking/smokeping.nix</literal></para></listitem>
<listitem><para><literal>services/networking/toxvpn.nix</literal></para></listitem>
<listitem><para><literal>services/networking/xl2tpd.nix</literal></para></listitem>
<listitem><para><literal>services/networking/zerobin.nix</literal></para></listitem>
<listitem><para><literal>services/security/oauth2_proxy.nix</literal></para></listitem>
<listitem><para><literal>services/torrent/flexget.nix</literal></para></listitem>
<listitem><para><literal>services/web-apps/mattermost.nix</literal></para></listitem>
<listitem><para><literal>services/web-apps/tt-rss.nix</literal></para></listitem>
<listitem><para><literal>services/web-servers/caddy.nix</literal></para></listitem>
<listitem><para><literal>services/web-servers/lighttpd/inginious.nix</literal></para></listitem>
<listitem><para><literal>services/x11/compton.nix</literal></para></listitem>
<listitem><para><literal>services/x11/xbanish.nix</literal></para></listitem>
<listitem><para><literal>system/boot/loader/systemd-boot/systemd-boot.nix</literal></para></listitem>
<listitem><para><literal>system/boot/plymouth.nix</literal></para></listitem>
<listitem><para><literal>virtualisation/xe-guest-utilities.nix</literal></para></listitem>
</itemizedlist>
<para>When upgrading from a previous release, please be aware of the
@@ -108,6 +163,13 @@ following incompatible changes:</para>
</para>
</listitem>
<listitem>
<para>
Using packages compiled with older Wayland may yield an error "undefined reference to `wl_proxy_*`".
Please upgrade those packages and <link xlink:href="https://github.com/NixOS/nixpkgs/issues/16779">see bug report for more details.</link>
</para>
</listitem>
<listitem>
<para>Gitlab's maintainance script
<command>gitlab-runner</command> was removed and split up into the

6
nixos/lib/testing.nix
View File

@@ -181,9 +181,11 @@ rec {
eval $i2=/tmp/xchg/$_basename
${coreutils}/bin/ls -la $xchg
done
unset i i2 _basename xchg
export > $xchg/saved-env
unset i i2 _basename
export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env
unset xchg
export tests='${testScript}'
${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm
''; # */

52
nixos/modules/virtualisation/ec2-amis.nix
View File

@@ -1,4 +1,4 @@
{
let self = {
"14.04".ap-northeast-1.hvm-ebs = "ami-71c6f470";
"14.04".ap-northeast-1.pv-ebs = "ami-4dcbf84c";
"14.04".ap-northeast-1.pv-s3 = "ami-8fc4f68e";
@@ -134,4 +134,52 @@
"16.03".us-west-2.hvm-s3 = "ami-925c9ff2";
"16.03".us-west-2.pv-ebs = "ami-5e61a23e";
"16.03".us-west-2.pv-s3 = "ami-734c8f13";
}
# 16.09.666.3738950
"16.09".ap-northeast-1.hvm-ebs = "ami-35578954";
"16.09".ap-northeast-1.hvm-s3 = "ami-d6528cb7";
"16.09".ap-northeast-1.pv-ebs = "ami-07548a66";
"16.09".ap-northeast-1.pv-s3 = "ami-f1548a90";
"16.09".ap-northeast-2.hvm-ebs = "ami-d48753ba";
"16.09".ap-northeast-2.hvm-s3 = "ami-4c865222";
"16.09".ap-northeast-2.pv-ebs = "ami-ca8551a4";
"16.09".ap-northeast-2.pv-s3 = "ami-9c8551f2";
"16.09".ap-south-1.hvm-ebs = "ami-922450fd";
"16.09".ap-south-1.hvm-s3 = "ami-6d3a4e02";
"16.09".ap-south-1.pv-ebs = "ami-4d394d22";
"16.09".ap-south-1.pv-s3 = "ami-17384c78";
"16.09".ap-southeast-1.hvm-ebs = "ami-f824809b";
"16.09".ap-southeast-1.hvm-s3 = "ami-f924809a";
"16.09".ap-southeast-1.pv-ebs = "ami-af2480cc";
"16.09".ap-southeast-1.pv-s3 = "ami-5826823b";
"16.09".ap-southeast-2.hvm-ebs = "ami-40fecd23";
"16.09".ap-southeast-2.hvm-s3 = "ami-48fecd2b";
"16.09".ap-southeast-2.pv-ebs = "ami-dffecdbc";
"16.09".ap-southeast-2.pv-s3 = "ami-e0fccf83";
"16.09".eu-central-1.hvm-ebs = "ami-1d8b7472";
"16.09".eu-central-1.hvm-s3 = "ami-1c8b7473";
"16.09".eu-central-1.pv-ebs = "ami-8c8d72e3";
"16.09".eu-central-1.pv-s3 = "ami-3488775b";
"16.09".eu-west-1.hvm-ebs = "ami-15662766";
"16.09".eu-west-1.hvm-s3 = "ami-476b2a34";
"16.09".eu-west-1.pv-ebs = "ami-876928f4";
"16.09".eu-west-1.pv-s3 = "ami-70682903";
"16.09".sa-east-1.hvm-ebs = "ami-27bc2e4b";
"16.09".sa-east-1.hvm-s3 = "ami-e4b92b88";
"16.09".sa-east-1.pv-ebs = "ami-4dbe2c21";
"16.09".sa-east-1.pv-s3 = "ami-77fc6e1b";
"16.09".us-east-1.hvm-ebs = "ami-93347684";
"16.09".us-east-1.hvm-s3 = "ami-5e347649";
"16.09".us-east-1.pv-ebs = "ami-b0387aa7";
"16.09".us-east-1.pv-s3 = "ami-51357746";
"16.09".us-west-1.hvm-ebs = "ami-06337a66";
"16.09".us-west-1.hvm-s3 = "ami-76307916";
"16.09".us-west-1.pv-ebs = "ami-fd327b9d";
"16.09".us-west-1.pv-s3 = "ami-cc347dac";
"16.09".us-west-2.hvm-ebs = "ami-49fe2729";
"16.09".us-west-2.hvm-s3 = "ami-93fc25f3";
"16.09".us-west-2.pv-ebs = "ami-14fe2774";
"16.09".us-west-2.pv-s3 = "ami-74f12814";
latest = self."16.09";
}; in self

2
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
View File

@@ -94,6 +94,8 @@ stdenv.mkDerivation rec {
dontStrip = true;
dontPatchELF = true;
preferLocalBuild = true;
outputs = [ "out" ] ++ lib.optional is-i686 "sa";
installPhase = ''

6
pkgs/applications/networking/dropbox/default.nix
View File

@@ -23,11 +23,11 @@
let
# NOTE: When updating, please also update in current stable,
# as older versions stop working
version = "11.4.20";
version = "11.4.21";
sha256 =
{
"x86_64-linux" = "1mnjc00y1vs3c22hqf328idgsrrlq097kld67ab9q8d6l8r8qkr6";
"i686-linux" = "1s7m56if2wq34sc8aq46xnhrrnbhnsfi85jw0yp4dpcdwv6s38v5";
"x86_64-linux" = "179ajawqy43jhgvysc386hdyz9hdandwvh8m2y2rassvycn9kr8z";
"i686-linux" = "1y4z9rb06f2a3cj51xawgpzgar9x7gvr4jrazncqfpfqkv7zayv1";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch =

48
pkgs/applications/networking/remote/remmina/default.nix
View File

@@ -1,9 +1,13 @@
{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper
, glib, gtk, gettext, libxkbfile, libgnome_keyring, libX11
, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem }:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper
, glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11
, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem
, pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
, libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core
, openssl }:
let
version = "1.0.0";
version = "1.2.0-rcgit.15";
desktopItem = makeDesktopItem {
name = "remmina";
@@ -15,29 +19,45 @@ let
categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
};
# Latest release of remmina refers to thing that aren't yet in
# a FreeRDP release so we need to build one from git source
# See also https://github.com/FreeRDP/Remmina/pull/731
# Remove when FreeRDP release catches up with this commit
freerdp_git = stdenv.lib.overrideDerivation freerdp (args: {
name = "freerdp-git-2016-09-30";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = "dbb353db92e7a5cb0be3c73aa950fb1113e627ec";
sha256 = "1nhm4v6z9var9hasp4bkmhvlrksbdizx95swx19shizfc82s9g4y";
};
});
in
stdenv.mkDerivation {
name = "remmina-${version}";
src = fetchurl {
url = "https://github.com/downloads/FreeRDP/Remmina/Remmina-${version}.tar.gz";
sha256 = "7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "Remmina";
rev = "v${version}";
sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0";
};
buildInputs = [ cmake pkgconfig makeWrapper
glib gtk gettext libxkbfile libgnome_keyring libX11
freerdp libssh libgcrypt gnutls ];
glib gtk3 gettext libxkbfile libgnome_keyring libX11
freerdp_git libssh libgcrypt gnutls
pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon
libsecret spice_protocol spice_gtk epoxy at_spi2_core
openssl ];
cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF";
patches = [ ./lgthread.patch ];
cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2";
postInstall = ''
mkdir -pv $out/share/applications
mkdir -pv $out/share/icons
cp ${desktopItem}/share/applications/* $out/share/applications
cp -r $out/share/remmina/icons/* $out/share/icons
wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11.out}/lib"
'';

16
pkgs/applications/networking/remote/remmina/lgthread.patch
View File

@@ -1,16 +0,0 @@
Fix [undefined reference to `g_thread_init'] as suggested by
http://ragnermagalhaes.blogspot.ru/2007/09/undefined-reference-to-gthreadinit.html
diff -ru FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt FreeRDP-Remmina-356c033/remmina/CMakeLists.txt
--- FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt 2013-11-05 12:43:27.660276912 +0400
+++ FreeRDP-Remmina-356c033/remmina/CMakeLists.txt 2013-11-05 12:53:39.607018349 +0400
@@ -132,6 +132,8 @@
endif()
endif()
+set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgthread-2.0" )
+
add_subdirectory(po)
add_subdirectory(icons)
add_subdirectory(desktop)

10
pkgs/applications/networking/syncthing/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, go }:
stdenv.mkDerivation rec {
version = "0.14.5";
version = "0.14.7";
name = "syncthing-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "172ca3xgc3dp9yiqm3fmq696615jnclgfg521sh5mk78na1r4mgz";
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "1mcn2vmv3hvp0ni9jxbjj3qp0l6ls07qmq33amhvjhpfafqzn279";
};
buildInputs = [ go ];

6
pkgs/applications/video/openshot-qt/default.nix
View File

@@ -8,13 +8,13 @@ let
in
stdenv.mkDerivation rec {
name = "openshot-qt-${version}";
version = "2.0.7";
version = "2.1.0";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "openshot-qt";
rev = "v${version}";
sha256 = "1s4b61fd8cyjy8kvc25mqd97dkxx6gqmz02i42rrcriz51pw8wgh";
sha256 = "1cyr5m1n6qcb9bzkhh3v6ka91a6x9c50dl5j0ilrc8vj0mb43g8c";
};
buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt
chmod +x $out/bin/openshot-qt
wrapProgram $out/bin/openshot-qt \
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$PYTHONPATH"
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$(toPythonPath ${python3Packages.pyzmq}):$PYTHONPATH"
'';
doCheck = false;

4
pkgs/applications/video/openshot-qt/libopenshot-audio.nix
View File

@@ -5,13 +5,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "libopenshot-audio-${version}";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot-audio";
rev = "v${version}";
sha256 = "0pgw7vzx3znglwm58187ybhg5maa13n4xcy5hrhzfsp8bqhrwkc7";
sha256 = "0dxyhnqkjc5y4hra8s17q9lafll6fx0pgibmmjznjm70whqcj8a6";
};
buildInputs = [

10
pkgs/applications/video/openshot-qt/libopenshot.nix
View File

@@ -1,5 +1,7 @@
{stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen
, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp}:
, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp
, cppzmq, czmqpp
}:
with stdenv.lib;
@@ -8,13 +10,13 @@ let
in
stdenv.mkDerivation rec {
name = "libopenshot-${version}";
version = "0.1.1";
version = "0.1.2";
src = fetchFromGitHub {
owner = "OpenShot";
repo = "libopenshot";
rev = "v${version}";
sha256 = "12nfkris7spn8n4s8fvy2f6yk1hqh97wzh1z3fsdxldg4gppi903";
sha256 = "00051ipb8y4z9j5m5smwm1ahv755k0glarwic8fv5b9fzryfbrdm";
};
patchPhase = ''
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cmake doxygen
imagemagick ffmpeg qt55.qtbase qt55.qtmultimedia swig python3 ruby
unittest-cpp
unittest-cpp cppzmq czmqpp
];
LIBOPENSHOT_AUDIO_DIR = "${libopenshot_audio}";

6
pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix
View File

@@ -1,6 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
, gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook
, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup }:
, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup
, webkitgtk }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -12,7 +13,8 @@ stdenv.mkDerivation rec {
gnome3.geocode_glib libchamplain file libsoup
gdk_pixbuf librsvg autoreconfHook
gnome3.gsettings_desktop_schemas gnome3.evolution_data_server
gnome3.gnome_online_accounts gnome3.defaultIconTheme ];
gnome3.gnome_online_accounts gnome3.defaultIconTheme
webkitgtk ];
patches = [ ./soup.patch ];

4
pkgs/development/compilers/go/1.7.nix
View File

@@ -15,13 +15,13 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
version = "1.7";
version = "1.7.1";
src = fetchFromGitHub {
owner = "golang";
repo = "go";
rev = "go${version}";
sha256 = "03wc4r5pgxrlh3lp8l0hb1bhsrwv4hfq1fcj8n82bfk3hvj43am2";
sha256 = "121cvpjpbyl3lyd6j5lnnq6pr8vl7ar5zvap1132c522lxgxw356";
};
# perl is used for testing go vet

10
pkgs/development/compilers/go/remove-tools-1.7.patch
View File

@@ -1,8 +1,8 @@
diff --git a/src/go/build/build.go b/src/go/build/build.go
index 496fe11..8c81dbd 100644
index 9706b8b..f250751 100644
--- a/src/go/build/build.go
+++ b/src/go/build/build.go
@@ -1388,7 +1388,7 @@ func init() {
@@ -1513,7 +1513,7 @@ func init() {
}
// ToolDir is the directory containing build tools.
@@ -12,11 +12,11 @@ index 496fe11..8c81dbd 100644
// IsLocalImport reports whether the import path is
// a local import path, like ".", "..", "./foo", or "../foo".
diff --git a/src/runtime/extern.go b/src/runtime/extern.go
index d346362..fb22b6e 100644
index 441dcd9..a50277e 100644
--- a/src/runtime/extern.go
+++ b/src/runtime/extern.go
@@ -194,6 +194,17 @@ func GOROOT() string {
return defaultGoroot
@@ -230,6 +230,17 @@ func GOROOT() string {
return sys.DefaultGoroot
}
+// GOTOOLDIR returns the root of the Go tree.

28
pkgs/development/libraries/czmqpp/default.nix Normal file
View File

@@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }:
stdenv.mkDerivation rec {
name = "czmqpp-${version}";
version = "1.2.0";
src = fetchFromGitHub {
owner = "zeromq";
repo = "czmqpp";
rev = "v${version}";
sha256 = "0z8lwq53yk4h7pgibicx3q9idz15qb95r0pjpz0j5vql6qh46rja";
};
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent";
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ chris-martin ];
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
propagatedBuildInputs = [ czmq ];
# https://github.com/zeromq/czmqpp/issues/42
patches = [ ./socket.patch ];
}

17
pkgs/development/libraries/czmqpp/socket.patch Normal file
View File

@@ -0,0 +1,17 @@
--- /src/socket.cpp
+++ /src/socket.cpp
@@ -60,12 +60,12 @@
int socket::bind(const std::string& address)
{
// format-security: format not a string literal and no format arguments.
- return zsocket_bind(self_, address.c_str());
+ return zsocket_bind(self_, "%s", address.c_str());
}
int socket::connect(const std::string& address)
{
// format-security: format not a string literal and no format arguments.
- return zsocket_connect(self_, address.c_str());
+ return zsocket_connect(self_, "%s", address.c_str());
}
bool operator==(const socket& sock_a, const socket& sock_b)

2
pkgs/development/libraries/openjpeg/2.0.nix
View File

@@ -4,5 +4,5 @@ callPackage ./generic.nix (args // rec {
version = "2.0.1";
branch = "2";
revision = "version.2.0.1";
sha256 = "1r81hq0hx2papjs3hfmpsl0024f6lblk0bq53dfm2wcpi916q7pw";
sha256 = "03d0r8x66cxri9i20nr9gm1jnkp85yyd8mkrbmawv5nvybd0r7wv";
})

24
pkgs/development/perl-modules/dbiclassx-fix.patch Normal file
View File

@@ -0,0 +1,24 @@
From adcc1df0049e0093cb94c867bd2be8c9fe242a61 Mon Sep 17 00:00:00 2001
From: Peter Rabbitson <ribasushi@cpan.org>
Date: Tue, 13 Sep 2016 17:15:48 +0200
Subject: [PATCH] Fix for upcoming (not yet available via DBD::SQLite)
libsqlite version
---
Changes | 2 ++
t/prefetch/grouped.t | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/t/prefetch/grouped.t b/t/prefetch/grouped.t
index 4aad6b1..c0d2224 100644
--- a/t/prefetch/grouped.t
+++ b/t/prefetch/grouped.t
@@ -101,7 +101,7 @@ my @cdids = sort $cd_rs->get_column ('cdid')->all;
# add an extra track to one of the cds, and then make sure we can get it on top
# (check if limit works)
- my $top_cd = $cd_rs->slice (1,1)->next;
+ my $top_cd = $cd_rs->search({}, { order_by => 'cdid' })->slice (1,1)->next;
$top_cd->create_related ('tracks', {
title => 'over the top',
});

8
pkgs/development/tools/misc/kibana/default.nix
View File

@@ -3,8 +3,12 @@
with stdenv.lib;
let
inherit (builtins) elemAt;
archOverrides = {
"i686" = "x86";
};
info = splitString "-" stdenv.system;
arch = elemAt info 0;
arch = (elemAt info 0);
elasticArch = archOverrides."${arch}" or arch;
plat = elemAt info 1;
shas = {
"x86_64-linux" = "1md3y3a8rxvf37lnfc56kbirv2rjl68pa5672yxhfmjngrr20rcw";
@@ -16,7 +20,7 @@ in stdenv.mkDerivation rec {
version = "4.6.0";
src = fetchurl {
url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${arch}.tar.gz";
url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz";
sha256 = shas."${stdenv.system}";
};

4
pkgs/os-specific/linux/kernel/linux-4.7.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.7.5";
version = "4.7.6";
extraMeta.branch = "4.7";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "14nh37v2ankal763zrwd3yrdpbg2ni1yr33kdqjiqrja4vqazc4p";
sha256 = "1lidsc85xc025a46pyjimcr1xcwv7mh59jihmnqihfnwqch6albv";
};
kernelPatches = args.kernelPatches;

20
pkgs/os-specific/linux/kernel/linux-4.8.nix Normal file
View File

@@ -0,0 +1,20 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.8";
modDirVersion = "4.8.0";
extraMeta.branch = "4.8";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a";
};
kernelPatches = args.kernelPatches;
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-grsecurity.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.7.5";
version = "4.7.6";
extraMeta.branch = "4.7";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "14nh37v2ankal763zrwd3yrdpbg2ni1yr33kdqjiqrja4vqazc4p";
sha256 = "1lidsc85xc025a46pyjimcr1xcwv7mh59jihmnqihfnwqch6albv";
};
kernelPatches = args.kernelPatches;

6
pkgs/os-specific/linux/kernel/patches.nix
View File

@@ -86,9 +86,9 @@ rec {
};
grsecurity_testing = grsecPatch
{ kver = "4.7.5";
grrev = "201609261522";
sha256 = "1306lw3byw6cyi0dqh0dcl67l0bi043zmp3582hjpkwj934bahf7";
{ kver = "4.7.6";
grrev = "201609301918";
sha256 = "153x97vvd3jl2i7fs6d5ilqnmz2v2iyzsf3pg3frrackv6xaisa5";
};
# This patch relaxes grsec constraints on the location of usermode helpers,

2
pkgs/tools/backup/borg/default.nix
View File

@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
preConfigure = ''
export BORG_OPENSSL_PREFIX="${openssl.dev}"
export BORG_LZ4_PREFIX="${lz4}"
export BORG_LZ4_PREFIX="${lz4.dev}"
'';
postInstall = ''

21
pkgs/top-level/all-packages.nix
View File

@@ -8785,7 +8785,6 @@ in
mesa_drivers = mesaDarwinOr (
let mo = mesa_noglu.override {
grsecEnabled = config.grsecurity or false;
wayland = wayland_1_9; # work-around for #16779
};
in mo.drivers
);
@@ -9901,6 +9900,8 @@ in
czmq = callPackage ../development/libraries/czmq { };
czmqpp = callPackage ../development/libraries/czmqpp { };
zimlib = callPackage ../development/libraries/zimlib { };
zita-convolver = callPackage ../development/libraries/audio/zita-convolver { };
@@ -11229,6 +11230,21 @@ in
];
};
linux_4_8 = callPackage ../os-specific/linux/kernel/linux-4.8.nix {
kernelPatches =
[ kernelPatches.bridge_stp_helper
# See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
# when adding a new linux version
# !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking
# kernelPatches.cpu-cgroup-v2."4.7"
]
++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill
kernelPatches.mips_ext3_n32
];
};
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -11382,7 +11398,7 @@ in
linux = self.linuxPackages.kernel;
# Update this when adding the newest kernel major version!
linuxPackages_latest = self.linuxPackages_4_7;
linuxPackages_latest = self.linuxPackages_4_8;
linux_latest = self.linuxPackages_latest.kernel;
# Build the kernel modules for the some of the kernels.
@@ -11395,6 +11411,7 @@ in
linuxPackages_4_1 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_1 linuxPackages_4_1);
linuxPackages_4_4 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_4 linuxPackages_4_4);
linuxPackages_4_7 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_7 linuxPackages_4_7);
linuxPackages_4_8 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_8 linuxPackages_4_8);
# Don't forget to update linuxPackages_latest!
# Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.

1
pkgs/top-level/perl-packages.nix
View File

@@ -3608,6 +3608,7 @@ let self = _self // overrides; _self = with self; {
url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz";
sha256 = "4049afd175e315ebcab945b19030aec40bcec46cc5611b0286a5a267ca7181ef";
};
patches = [ ../development/perl-modules/dbiclassx-fix.patch ]; # Remove after next release
buildInputs = [ DBDSQLite PackageStash SQLTranslator TestDeep TestException TestWarn ];
propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ];
meta = {