dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk 2019-05-07 19:29:40 +02:00
commit 3c1a202a16
38 changed files with 272 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/misc/jellyfin.nix
View File

@ -48,12 +48,6 @@ in
jellyfin = {};
};
assertions = [
{
assertion = !config.services.emby.enable;
message = "Emby and Jellyfin are incompatible, you cannot enable both";
}
];
};
meta.maintainers = with lib.maintainers; [ minijackson ];

8
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -89,7 +89,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "8.0.8";
version = "8.0.9";
lang = "en-US";
@ -99,7 +99,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "14ckbhfiyv01cxnd98iihfz7xvrgcd5k4j7pn9ag4a6xb2l80sxi";
sha256 = "0w11rnxpdql81gk618bmyrzl7q9ndyr5zps3cr9l331yhswq0sbc";
};
"i686-linux" = fetchurl {
@ -107,7 +107,7 @@ let
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "0g9sd104b6xnbl2j3gbq1ga6j2h0x3jccays0gpbd235bxpjs39a";
sha256 = "02w1i6vi80ks5ch1pm1r426b9ip53fvg9qv9543r2dns4qzaf7zv";
};
};
in
@ -389,7 +389,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Tor Browser Bundle built by torproject.org";
longDescription = tor-browser-bundle.meta.longDescription;
homepage = https://www.torproject.org/;
homepage = "https://www.torproject.org/";
platforms = attrNames srcs;
maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ];
hydraPlatforms = [];

22
pkgs/applications/science/logic/cedille/default.nix
View File

@ -1,8 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, texinfo
, alex
, happy
, Agda
@ -19,11 +17,11 @@ stdenv.mkDerivation rec {
owner = "cedille";
repo = "cedille";
rev = "v${version}";
sha256 = "17j7an5bharc8q1pj06615zmflipjdd0clf67cnfdhsmqwzf6l9r";
sha256 = "16pc72wz6kclq9yv2r8hx85mkp0s125h12snrhcjxkbl41xx2ynb";
fetchSubmodules = true;
};
nativeBuildInputs = [ texinfo alex happy ];
nativeBuildInputs = [ alex happy ];
buildInputs = [ Agda (ghcWithPackages (ps: [ps.ieee])) ];
LANG = "en_US.UTF-8";
@ -31,26 +29,10 @@ stdenv.mkDerivation rec {
lib.optionalString (buildPlatform.libc == "glibc")
"${buildPackages.glibcLocales}/lib/locale/locale-archive";
patches = [
# texinfo direntry fix. See: https://github.com/cedille/cedille/pull/86
(fetchpatch {
url = "https://github.com/cedille/cedille/commit/c058f42179a635c7b6179772c30f0eba4ac53724.patch";
sha256 = "02qd86k5bdrygjzh2k0j0q5qk4nk2vwnsz7nvlssvysbvsmiba7x";
})
];
postPatch = ''
patchShebangs create-libraries.sh
patchShebangs docs/src/compile-docs.sh
'';
# We regenerate the info file in order to fix the direntry
preBuild = ''
rm -f docs/info/cedille-info-main.info
'';
buildFlags = [ "all" "cedille-docs" ];
installPhase = ''
install -Dm755 -t $out/bin/ cedille
install -Dm755 -t $out/bin/ core/cedille-core

8
pkgs/misc/themes/sierra/default.nix → pkgs/data/themes/sierra/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
stdenv.mkDerivation rec {
name = "sierra-gtk-theme-${version}";
version = "2018-10-12";
pname = "sierra-gtk-theme";
version = "2019-05-07";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "sierra-gtk-theme";
repo = pname;
rev = version;
sha256 = "0l8mhdy7x8nh5aqsvkk0maqg1cnfds7824g439f6cmifdiyksbgg";
sha256 = "0rm9lcwp89ljxqrya9bi882qcs339pc1l945cr1xq2rganqyk9cq";
};
nativeBuildInputs = [ libxml2 ];

71
pkgs/development/compilers/swift/default.nix
View File

@ -34,7 +34,7 @@
}:
let
v_base = "4.2.3";
v_base = "5.0.1";
version = "${v_base}-RELEASE";
version_friendly = "${v_base}";
@ -52,48 +52,48 @@ let
# For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759
clang = fetch {
repo = "swift-clang";
sha256 = "0l6w4xzpl3w2nax9a0b885nfzhfj38p2g99158nb5bzfd4s0man7";
sha256 = "1ap26425zhn2sdw3m9snyrqhi4phv2fgblyv9wp8xppjlnjkax9k";
};
llvm = fetch {
repo = "swift-llvm";
sha256 = "1664zwxbq0a1cmxr9n5a0vw6vdk6ygr7rpglpdsfc7ki857vpsyv";
sha256 = "1bnscqsiljiclij60f44h2fyx5c84pzry0lz1jbwknphwmqd6f84";
};
compilerrt = fetch {
repo = "swift-compiler-rt";
sha256 = "19s6qxn4i0kxpf39xjp2i7zg427iinbmaxqkbb1p91g616y367sf";
sha256 = "0bba54xa7z0wj6k7a24q74gc4yajc6s64g1m894i3yd6swdk7f6r";
};
cmark = fetch {
repo = "swift-cmark";
sha256 = "1nmxp0fj749sgar682c5nsj7zxxigqwg973baxj2r656a7ybh325";
sha256 = "079smm79hbwr06bvghd2sb86b8gpkprnzlyj9kh95jy38xhlhdnj";
};
lldb = fetch {
repo = "swift-lldb";
sha256 = "00kz0xhj1p6ckyandj2gs1yfl29kxv84x9pfph00r8crbkd2jz7b";
sha256 = "01yrhc1ggv89qii03fdjdvb2aq9v4hd1wk83n8ygrwwc75p44qmi";
};
llbuild = fetch {
repo = "swift-llbuild";
sha256 = "1mkkhydshhxr28igbldzr0hhqvb6ql43cpf3ba5vglfkbcz6wh6q";
sha256 = "0ipwryzpqxpk3rzkxilfahlkz06k39j91q2lv7fprf0slqknrdms";
};
pm = fetch {
repo = "swift-package-manager";
sha256 = "1aqvmgq9g5zs4k2qnkvw3h3mar66d690hqq6g2dmrapsyb321j9l";
sha256 = "1mnywlm7i2mbp16q0rskskvnbx1ap8lchwr8q3gx0xs3b2fs6chh";
};
xctest = fetch {
repo = "swift-corelibs-xctest";
sha256 = "1n4w7bfgy73vjzbvbphlwayy0dw73bbrayrpkqq8lbidg0x9lam8";
sha256 = "1vpljkxhfk3yd07ry0xsv3qwbn62pwd2mdn9cw22jhbhvqinc13z";
};
foundation = fetch {
repo = "swift-corelibs-foundation";
sha256 = "11kwc5pcq4ibxkyglmqs7h7gka3xkzl9j856x1rq2xdvq756wq2s";
sha256 = "11w0iapccrk13hjbrwylq8g71znrncnc3mrm345gvnjfgz08ffaq";
};
libdispatch = fetch {
repo = "swift-corelibs-libdispatch";
sha256 = "09c15mn9s5lf2akzfhik70zk91h97nnm8pq1ppfqry2nn3vmib2i";
sha256 = "1mgzsq3nfzbkssfkswzvvjgsbv2fx36i1r83d4nzw3di8spxmg32";
fetchSubmodules = true;
};
swift = fetch {
repo = "swift";
sha256 = "09wksqad0w6pk3xdxc278w4mj300h48rvbvx0m4an7npkj6i7n9q";
sha256 = "02bv47pd0k0xy4k7q6c3flwxwkm2palnzvpr4w3nmvqk0flrbsq6";
};
};
@ -120,6 +120,9 @@ let
builder = ''
# gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found
NIX_CFLAGS_COMPILE="$( echo ${clang.default_cxx_stdlib_compile} ) $NIX_CFLAGS_COMPILE"
# During the Swift build, a full local LLVM build is performed and the resulting clang is invoked.
# This compiler is not using the Nix wrappers, so it needs some help to find things.
export NIX_LDFLAGS_BEFORE="-rpath ${clang.cc.gcc.lib}/lib -L${clang.cc.gcc.lib}/lib $NIX_LDFLAGS_BEFORE"
$SWIFT_SOURCE_ROOT/swift/utils/build-script \
--preset=buildbot_linux \
@ -132,23 +135,25 @@ in
stdenv.mkDerivation rec {
name = "swift-${version_friendly}";
buildInputs = devInputs ++ [
nativeBuildInputs = [
autoconf
automake
bash
clang
cmake
coreutils
findutils
gnumake
libtool
makeWrapper
ninja
perl
pkgconfig
python
rsync
which
findutils
makeWrapper
gnumake
];
buildInputs = devInputs ++ [
clang
];
# TODO: Revisit what's propagated and how
@ -212,13 +217,12 @@ stdenv.mkDerivation rec {
substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \
--replace '/usr/include' "${stdenv.cc.libc.dev}/include"
substituteInPlace swift-corelibs-libdispatch/src/CMakeLists.txt \
--replace '/usr/include' "${stdenv.cc.libc.dev}/include"
substituteInPlace swift/utils/build-script-impl \
--replace '/usr/include/c++' "${clang.cc.gcc}/include/c++"
patch -p1 -d swift -i ${./patches/glibc-arch-headers.patch}
patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch}
patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch}
patch -p1 -d swift -i ${./patches/0003-build-presets-linux-don-t-build-extra-libs.patch}
patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch}
sed -i swift/utils/build-presets.ini \
@ -227,10 +231,12 @@ stdenv.mkDerivation rec {
-e 's/^validation-test$/# \0/' \
-e 's/^long-test$/# \0/' \
-e 's/^stress-test$/# \0/' \
-e 's/^test-optimized$/# \0/'
-e 's/^test-optimized$/# \0/' \
\
-e 's/^swift-install-components=autolink.*$/\0;editor-integration/'
# https://bugs.swift.org/browse/SR-5779
sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake
# https://bugs.swift.org/browse/SR-10559
patch -p1 -d swift-corelibs-libdispatch -i ${./patches/libdispatch-fortify-fix.patch}
substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \
--replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "'
@ -241,8 +247,6 @@ stdenv.mkDerivation rec {
sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt
PREFIX=''${out/#\/}
substituteInPlace swift-corelibs-foundation/build.py \
--replace usr/lib "$PREFIX/lib"
substituteInPlace swift-corelibs-xctest/build_script.py \
--replace usr "$PREFIX"
substituteInPlace swiftpm/Utilities/bootstrap \
@ -250,9 +254,19 @@ stdenv.mkDerivation rec {
--replace usr/lib "$PREFIX/lib"
'';
buildPhase = builder;
doCheck = false;
buildPhase = builder;
checkInputs = [ file ];
# TODO: investigate the non-working tests
checkPhase = ''
checkTarget=check-swift-all
ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}'
ninjaCheckPhase
'';
installPhase = ''
mkdir -p $out
@ -262,13 +276,10 @@ stdenv.mkDerivation rec {
tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX
find $out -type d -empty -delete
# TODO: Use wrappers to get these on the PATH for swift tools, instead
ln -s ${clang}/bin/* $out/bin/
ln -s ${targetPackages.stdenv.cc.bintools.bintools_bin}/bin/ar $out/bin/ar
wrapProgram $out/bin/swift \
--suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include
--suffix CPLUS_INCLUDE_PATH : $out/lib/swift/clang/include \
--suffix LIBRARY_PATH : $icu/lib
'';
# Hack to avoid TMPDIR in RPATHs.

4
pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
View File

@ -11,8 +11,8 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 7ee57ad2df..e6b0af3581 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -717,7 +717,7 @@ swiftpm
xctest
@@ -721,7 +721,7 @@ swiftpm
dash-dash
-build-ninja

14
pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
View File

@ -9,17 +9,17 @@ Subject: [PATCH 2/4] build-presets: (linux) allow custom install prefix
diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index e6b0af3581..1095cbaab7 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -723,7 +723,7 @@ install-lldb
install-llbuild
--- a/utils/build-presets.ini 2019-04-11 14:51:40.060259462 +0200
+++ b/utils/build-presets.ini 2019-04-11 15:16:17.471137969 +0200
@@ -728,7 +728,7 @@
install-swiftpm
install-xctest
install-libicu
-install-prefix=/usr
+install-prefix=%(install_prefix)s
swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc
build-swift-static-stdlib
build-swift-static-sdk-overlay
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt
install-libcxx
--
2.12.2

23
pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch Normal file
View File

@ -0,0 +1,23 @@
--- a/utils/build-presets.ini 2019-04-11 15:19:57.845178834 +0200
+++ b/utils/build-presets.ini 2019-04-11 15:27:42.041297057 +0200
@@ -716,8 +716,6 @@
llbuild
swiftpm
xctest
-libicu
-libcxx
dash-dash
@@ -727,11 +725,9 @@
install-llbuild
install-swiftpm
install-xctest
-install-libicu
install-prefix=%(install_prefix)s
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;license;sourcekit-inproc
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt
-install-libcxx
build-swift-static-stdlib
build-swift-static-sdk-overlay
build-swift-stdlib-unittest-extra

2
pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
View File

@ -11,7 +11,7 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 1739e91dc2..0608fed9c1 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
@@ -740,6 +740,8 @@ install-destdir=%(install_destdir)s
@@ -743,6 +743,8 @@ install-destdir=%(install_destdir)s
# Path to the .tar.gz package we would create.
installable-package=%(installable_package)s

8
pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
View File

@ -1,13 +1,13 @@
The Nix glibc headers do not use include/x86_64-linux-gnu subdirectories.
--- swift/stdlib/public/Platform/CMakeLists.txt 2018-09-30 17:51:51.581766303 +0200
+++ swift/stdlib/public/Platform/CMakeLists.txt 2018-09-30 18:40:04.118956708 +0200
@@ -65,7 +65,7 @@
--- swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.493801403 +0200
+++ swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.577800593 +0200
@@ -68,7 +68,7 @@
endif()
set(GLIBC_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
- set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_ARCH_INCLUDE_PATH}")
+ set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
if(NOT "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}" STREQUAL "/")
if(NOT "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}" STREQUAL "/" AND NOT "${sdk}" STREQUAL "ANDROID")
set(GLIBC_INCLUDE_PATH "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}${GLIBC_INCLUDE_PATH}")

13
pkgs/development/compilers/swift/patches/libdispatch-fortify-fix.patch Normal file
View File

@ -0,0 +1,13 @@
Nix compiles with _FORTIFY_SOURCE enabled. Fix error due to -Werror and an unused return value warning.
--- swift-corelibs-libdispatch/src/internal.h 2019-04-26 09:33:38.287289099 +0200
+++ swift-corelibs-libdispatch/src/internal.h 2019-04-26 15:31:10.485334128 +0200
@@ -1053,7 +1053,7 @@
#else
#define _dispatch_client_assert_fail(fmt, ...) do { \
char *_msg = NULL; \
- asprintf(&_msg, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, \
+ (void)asprintf(&_msg, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, \
##__VA_ARGS__); \
_dispatch_assert_crash(_msg); \
free(_msg); \

2
pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
View File

@ -2,7 +2,7 @@ Only use the Nix include dirs when no sysroot is configured.
--- clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:01:15.731109551 +0200
+++ clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:00:27.959509924 +0200
@@ -565,7 +565,7 @@
@@ -641,7 +641,7 @@
// Check for configure-time C include directories.
StringRef CIncludeDirs(C_INCLUDE_DIRS);

2
pkgs/development/compilers/swift/purity.patch
View File

@ -11,7 +11,7 @@ diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
index fe3c0191bb..c6a482bece 100644
--- a/lib/Driver/ToolChains/Gnu.cpp
+++ b/lib/Driver/ToolChains/Gnu.cpp
@@ -398,13 +398,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
@@ -380,13 +380,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
if (!Args.hasArg(options::OPT_static)) {
if (Args.hasArg(options::OPT_rdynamic))
CmdArgs.push_back("-export-dynamic");

4
pkgs/development/libraries/geos/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
name = "geos-3.7.1";
name = "geos-3.7.2";
src = fetchurl {
url = "https://download.osgeo.org/geos/${name}.tar.bz2";
sha256 = "1312m02xk4sp6f1xdpb9w0ic0zbxg90p5y66qnwidl5fksscf1h0";
sha256 = "01vpkncvq1i1191agq03yg1h7d0igj10gv5z2mqk24nnwrdycri1";
};
enableParallelBuilding = true;

4
pkgs/development/libraries/qscintilla/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, lib, fetchurl, unzip
, qt4 ? null, qmake4Hook ? null
, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null
, fixDarwinDylibNames
}:
# Fix Xcode 8 compilation problem
@ -22,7 +23,8 @@ stdenv.mkDerivation rec {
buildInputs = [ (if withQt5 then qtbase else qt4) ]
++ lib.optional (withQt5 && stdenv.isDarwin) qtmacextras;
nativeBuildInputs = [ unzip ]
++ (if withQt5 then [ qmake ] else [ qmake4Hook ]);
++ (if withQt5 then [ qmake ] else [ qmake4Hook ])
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ];

8
pkgs/development/mobile/cocoapods/Gemfile-beta.lock
View File

@ -9,10 +9,10 @@ GEM
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.7.0.beta.3)
cocoapods (1.7.0.rc.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.0.beta.3)
cocoapods-core (= 1.7.0.rc.1)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@ -28,7 +28,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.8.2, < 2.0)
cocoapods-core (1.7.0.beta.3)
cocoapods-core (1.7.0.rc.1)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
@ -59,7 +59,7 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xcodeproj (1.8.2)
xcodeproj (1.9.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)

12
pkgs/development/mobile/cocoapods/gemset-beta.nix
View File

@ -46,10 +46,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03xnnj5di75wqsd1c9ca9gfnzc4lqr8k2cx5gca5979b7kxb2x1z";
sha256 = "1wdy3kjlz121i6b0njq09xz6wvw6l6pkwabgswbmk5b8m74q97ml";
type = "gem";
};
version = "1.7.0.beta.3";
version = "1.7.0.rc.1";
};
cocoapods-core = {
dependencies = ["activesupport" "fuzzy_match" "nap"];
@ -57,10 +57,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wwnjdcwj4nc1cjl9pf0dlh83x2s6x0v491fpcmw3342vbs0v4sq";
sha256 = "0k7zb0afy49hb24mfg8ypdsbk6j1sr9m8bwqm8p11w4113wbv95w";
type = "gem";
};
version = "1.7.0.beta.3";
version = "1.7.0.rc.1";
};
cocoapods-deintegrate = {
groups = ["default"];
@ -292,9 +292,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ji3wmpr6xm4172vxh9y6731vm2xrvv7ccwk4ijd5n4if1dakm03";
sha256 = "0qhanxa4zbirbdq6skdpg7hvx1vivwy1i5x22c3xkdb7pykh7dm7";
type = "gem";
};
version = "1.8.2";
version = "1.9.0";
};
}

4
pkgs/development/ocaml-modules/ppxlib/default.nix
View File

@ -4,13 +4,13 @@
buildDunePackage rec {
pname = "ppxlib";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "ocaml-ppx";
repo = pname;
rev = version;
sha256 = "0d2nyp4mlx7m3vdvcdhs51x570vw30j645yfbwlhjpwdd8243fya";
sha256 = "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/XlsxWriter/default.nix
View File

@ -3,7 +3,7 @@
buildPythonPackage rec {
pname = "XlsxWriter";
version = "1.1.6";
version = "1.1.7";
# PyPI release tarball doesn't contain tests so let's use GitHub. See:
# https://github.com/jmcnamara/XlsxWriter/issues/327
@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "jmcnamara";
repo = pname;
rev = "RELEASE_${version}";
sha256 = "1hmagwh2k61r90a9xgp3xj24wb97ckllvgn82vsin9kvhhj1459i";
sha256 = "1zv5222bymfr7046ps5512x1kk7ipcx46jjxylaap1p6llqj7zlj";
};
meta = {

4
pkgs/development/python-modules/braintree/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "braintree";
version = "3.52.0";
version = "3.53.0";
src = fetchPypi {
inherit pname version;
sha256 = "0p8qmmc3fmjz7i5yjyxx9sxkhfq38kr0mws4dh3k5kxl6an02mp4";
sha256 = "026apwkjn83la7jm0azz3qajg26nza3gh49zd37j0rsp6cgmfa24";
};
propagatedBuildInputs = [ requests ];

4
pkgs/development/python-modules/cerberus/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Cerberus";
version = "1.2";
version = "1.3";
src = fetchPypi {
inherit pname version;
sha256 = "f5c2e048fb15ecb3c088d192164316093fcfa602a74b3386eefb2983aa7e800a";
sha256 = "0afhm8x812shj1fbj9jri6wcrlv0avcfis7619sl140mlhpgpzkz";
};
checkInputs = [ pytestrunner pytest ];

4
pkgs/development/python-modules/cfgv/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "cfgv";
version = "1.4.0";
version = "1.6.0";
src = fetchPypi {
inherit pname version;
sha256 = "01mpw8kx0f2py2jwf0fv60k01p11gs0dbar5zq42k4z38xf0bn9r";
sha256 = "1vxjwga8x9nn5xqbhf5sql7jab3s1la07mxbaqgcfjz8lpp2z7vf";
};
propagatedBuildInputs = [ six ];

4
pkgs/development/python-modules/django_modelcluster/default.nix
View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "django-modelcluster";
version = "4.3";
version = "4.4";
src = fetchPypi {
inherit pname version;
sha256 = "407845f0c16b6f17547a65864657377446e0b3aa8a629b032bf5053f87f82fe9";
sha256 = "02mrs7aapabapfh7h7n71s8r7zxkmad3yk4rdyfwcf0x36326rsr";
};
doCheck = false;

4
pkgs/development/python-modules/lark-parser/default.nix
View File

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "lark-parser";
version = "0.6.6";
version = "0.7.0";
src = fetchFromGitHub {
owner = "lark-parser";
repo = "lark";
rev = version;
sha256 = "0kaiw8zzzcp92p6mzm9zkyhv578p0x4lzjsyl8b4rnsafplmbscs";
sha256 = "1zynj09w361yvbxr4hir681dfnlq1hzniws9dzgmlkvd6jnhjgx3";
};
checkPhase = ''

4
pkgs/development/python-modules/unittest-xml-reporting/default.nix
View File

@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "unittest-xml-reporting";
version = "2.4.0";
version = "2.5.1";
propagatedBuildInputs = [six];
@ -11,7 +11,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "1qnlz1k77rldgd5dfrj6nhlsjj71xzqy6s4091djpk0s2p8y1550";
sha256 = "0v6xcs8nx82yw037h296zk0vz5ka4idm4xdpxkcm4h4fnpj8428l";
};
meta = with lib; {
homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/;

9
pkgs/development/python-modules/worldengine/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, nose
, noise
@ -33,7 +34,6 @@ buildPythonPackage rec {
ln -s ${src-data} worldengine-data
'';
buildInputs = [ nose ];
propagatedBuildInputs = [ noise numpy pyplatec protobuf purepng h5py gdal ];
prePatch = ''
@ -46,9 +46,10 @@ buildPythonPackage rec {
--replace 'PyPlatec==1.4.0' 'PyPlatec' \
'';
doCheck = true;
postCheck = ''
# with python<3.5, unittest fails to discover tests because of their filenames
# so nose is used instead.
checkInputs = stdenv.lib.optional (pythonOlder "3.5") [ nose ];
postCheck = stdenv.lib.optionalString (pythonOlder "3.5") ''
nosetests tests
'';

4
pkgs/development/python-modules/zeroconf/default.nix
View File

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.21.3";
version = "0.22.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "5b52dfdf4e665d98a17bf9aa50dea7a8c98e25f972d9c1d7660e2b978a1f5713";
sha256 = "09dqfbj37l7vnj0fj4a82dqgq9mwm6fnsnsmljg25k1ygcn5hrpy";
};
propagatedBuildInputs = [ ifaddr ]

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

@ -7,12 +7,12 @@
}:
stdenv.mkDerivation rec {
name = "creduce-${version}";
version = "2.8.0";
pname = "creduce";
version = "2.9.0";
src = fetchurl {
url = "https://embed.cs.utah.edu/creduce/${name}.tar.gz";
sha256 = "1vqx73ymfscvlyig03972a5m7ar3gx2yv6m8c6h2mibz792j5xkp";
url = "https://embed.cs.utah.edu/${pname}/${pname}-${version}.tar.gz";
sha256 = "1b833z0g1hich68kzbkpfc26xb8w2phfl5savy8c6ir9ihwy1a8w";
};
nativeBuildInputs = [ cmake makeWrapper ];

8
pkgs/development/tools/rust/cargo-asm/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
name = "cargo-asm-${version}";
version = "0.1.16";
version = "0.1.17";
src = fetchFromGitHub {
owner = "gnzlbg";
repo = "cargo-asm";
rev = "7d0ece74657edb002bd8530227b829b31fd19dcd";
sha256 = "0mzbh5zw5imlaagm5zjbjk9kqdnglm398rxkqisd22h6569ppqpc";
rev = "7f69a17e9c36dfe1f0d7080d7974c72ecc87a145";
sha256 = "0zn5p95hsmhvk2slc9hakrpvim6l4zbpgkks2x64ndwyfmzyykws";
};
cargoSha256 = "1m2j6i8hc8isdlj77gv9m6sk6q0x3bvzpva2k16g27i1ngy1989b";
cargoSha256 = "1k9mc29y4487ssf5whvr8xig7j4jh0rpcrhclp6siw8xamygijdm";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

60
pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch Normal file
View File

@ -0,0 +1,60 @@
From 245e0f743d814c9ff2d1c748175e321301eb16cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 2 May 2019 05:28:08 +0100
Subject: [PATCH] x86/fpu: Export __kernel_fpu_{begin,end}()
This partially undo commit:
12209993 x86/fpu: Don't export __kernel_fpu_{begin,end}()
We need this symbol in zfs for AES-NI/AVX support.
---
arch/x86/include/asm/fpu/api.h | 2 ++
arch/x86/kernel/fpu/core.c | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/fpu/api.h b/arch/x86/include/asm/fpu/api.h
index b56d504af6545..7d53388d266ea 100644
--- a/arch/x86/include/asm/fpu/api.h
+++ b/arch/x86/include/asm/fpu/api.h
@@ -18,6 +18,8 @@
* If you intend to use the FPU in softirq you need to check first with
* irq_fpu_usable() if it is possible.
*/
+extern void __kernel_fpu_begin(void);
+extern void __kernel_fpu_end(void);
extern void kernel_fpu_begin(void);
extern void kernel_fpu_end(void);
extern bool irq_fpu_usable(void);
diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
index 2e5003fef51a9..2ea85b32421a0 100644
--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -93,7 +93,7 @@ bool irq_fpu_usable(void)
}
EXPORT_SYMBOL(irq_fpu_usable);
-static void __kernel_fpu_begin(void)
+void __kernel_fpu_begin(void)
{
struct fpu *fpu = &current->thread.fpu;
@@ -111,8 +111,9 @@ static void __kernel_fpu_begin(void)
__cpu_invalidate_fpregs_state();
}
}
+EXPORT_SYMBOL(__kernel_fpu_begin);
-static void __kernel_fpu_end(void)
+void __kernel_fpu_end(void)
{
struct fpu *fpu = &current->thread.fpu;
@@ -121,6 +122,7 @@ static void __kernel_fpu_end(void)
kernel_fpu_enable();
}
+EXPORT_SYMBOL(__kernel_fpu_end);
void kernel_fpu_begin(void)
{

3
pkgs/os-specific/linux/kernel/hardened-config.nix
View File

@ -91,6 +91,9 @@ optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") {
PAGE_POISONING_NO_SANITY = yes;
PAGE_POISONING_ZERO = yes;
# Enable the SafeSetId LSM
SECURITY_SAFESETID = whenAtLeast "5.1" yes;
# Reboot devices immediately if kernel experiences an Oops.
PANIC_ON_OOPS = yes;
PANIC_TIMEOUT = freeform "-1";

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

@ -57,4 +57,9 @@ rec {
sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv";
};
};
export_kernel_fpu_functions = rec {
name = "export_kernel_fpu_functions";
patch = ./export_kernel_fpu_functions.patch;
};
}

6
pkgs/os-specific/linux/miraclecast/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "miraclecast-${version}";
version = "1.0-20170427";
version = "1.0-20190403";
src = fetchFromGitHub {
owner = "albfan";
repo = "miraclecast";
rev = "a395c3c7afc39a958ae8ab805dea0f5d22118f0c";
sha256 = "03kbjajv2x0i2g68c5aij0icf9waxnqkc9pp32z60nc8zxy9jk1y";
rev = "960a785e10523cc525885380dd03aa2c5ba11bc7";
sha256 = "05afqi33rv7k6pbkkw4mynj6p97vkzhhh13y5nh0yxkyhcgf45pm";
};
nativeBuildInputs = [ meson ninja pkgconfig ];

4
pkgs/servers/sql/postgresql/ext/timescaledb.nix
View File

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
name = "timescaledb-${version}";
version = "1.2.2";
version = "1.3.0";
nativeBuildInputs = [ cmake ];
buildInputs = [ postgresql openssl ];
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "timescale";
repo = "timescaledb";
rev = "refs/tags/${version}";
sha256 = "1fb1ab07jmgd1drinl25mbhwx966f75c7i7nh3ah0xf3cbk298xr";
sha256 = "1wg95ryr5z55aghlqaz0jhz6rliinvfin2i4xpqwg7ir6nz773qm";
};
# Fix the install phase which tries to install into the pgsql extension dir,

6
pkgs/shells/zsh/oh-my-zsh/default.nix
View File

@ -4,13 +4,13 @@
{ stdenv, fetchgit }:
stdenv.mkDerivation rec {
version = "2019-05-05";
version = "2019-05-06";
name = "oh-my-zsh-${version}";
rev = "d4a3e0645bef49bfd1808aa263ecf916f79f9040";
rev = "6da59ff046d7a81483345d0e16333a69eb96ccc6";
src = fetchgit { inherit rev;
url = "https://github.com/robbyrussell/oh-my-zsh";
sha256 = "06i5b7akcdq16ifiv2mvvm2vjnnk1hvb7hhdim4admv4h9068mn6";
sha256 = "032smh1sahsr62wr0n4s9jmmyjq1iybdgvl388kh8d2hdkaj94r3";
};
pathsToLink = [ "/share/oh-my-zsh" ];

35
pkgs/tools/networking/termshark/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }:
buildGoModule rec {
pname = "termshark";
version = "1.0.0";
src = fetchFromGitHub {
owner = "gcla";
repo = "termshark";
rev = "v${version}";
sha256 = "1h9wysvd7i4vzn9qyswrmckmshxmh24ypvca98balkyhsxjwlb6j";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ wireshark-cli ];
modSha256 = "09mbjbk5wa18z4xis5b2v2v0b04mf4d896yp88vcj8d8hsmbmc6g";
postFixup = ''
wrapProgram $out/bin/termshark --prefix PATH : ${stdenv.lib.makeBinPath [ wireshark-cli ]}
'';
buildFlagsArray = ''
-ldflags=
-X github.com/gcla/termshark.Version=${version}
'';
meta = with stdenv.lib; {
homepage = https://termshark.io/;
description = "A terminal UI for wireshark-cli, inspired by Wireshark";
platforms = platforms.linux;
license = licenses.mit;
maintainers = [ maintainers.winpat ];
};
}

6
pkgs/tools/video/atomicparsley/default.nix
View File

@ -18,6 +18,12 @@ stdenv.mkDerivation rec {
cf-private
];
configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# AC_FUNC_MALLOC is broken on cross builds.
"ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes"
];
installPhase = "install -D AtomicParsley $out/bin/AtomicParsley";
meta = with stdenv.lib; {

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

@ -8893,7 +8893,7 @@ in
credstash = with python3Packages; toPythonApplication credstash;
creduce = callPackage ../development/tools/misc/creduce {
inherit (llvmPackages_6) llvm clang-unwrapped;
inherit (llvmPackages_7) llvm clang-unwrapped;
};
cscope = callPackage ../development/tools/misc/cscope { };
@ -15108,6 +15108,7 @@ in
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long
kernelPatches.export_kernel_fpu_functions
];
};
@ -16346,6 +16347,8 @@ in
signwriting = callPackage ../data/fonts/signwriting { };
sierra-gtk-theme = callPackage ../data/themes/sierra { };
soundfont-fluid = callPackage ../data/soundfonts/fluid { };
stdmanpages = callPackage ../data/documentation/std-man-pages { };
@ -17704,6 +17707,8 @@ in
wireshark-gtk = throw "Not supported anymore. Use wireshark-qt or wireshark-cli instead.";
wireshark-cli = wireshark.override { withQt = false; };
termshark = callPackage ../tools/networking/termshark { };
fbida = callPackage ../applications/graphics/fbida { };
fdupes = callPackage ../tools/misc/fdupes { };
@ -23469,8 +23474,6 @@ in
libsemanage = libsemanage.override { python = python3; };
};
sierra-gtk-theme = callPackage ../misc/themes/sierra { };
slock = callPackage ../misc/screensavers/slock {
conf = config.slock.conf or null;
};