public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

This commit is contained in:
github-actions[bot] 2021-07-03 06:04:23 +00:00 committed by GitHub
parent 00ed470603 31d5f83f39
commit 978b57f31d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 62 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/languages-frameworks/beam.section.md
View File

@ -235,7 +235,7 @@ let
git
# replace with beam.packages.erlang.elixir_1_11 if you need
beam.packages.erlang.elixir
nodejs-15_x
nodejs
postgresql_13
# only used for frontend dependencies
# you are free to use yarn2nix as well

4
pkgs/development/interpreters/php/7.3.nix
View File

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;
base = callPackage generic (_args // {
version = "7.3.28";
sha256 = "0r4r8famg3a8x6ch24y1370nsphkxg4k9zq5x8v88f4l8mj6wqwg";
version = "7.3.29";
sha256 = "1l74brhbkmmd0jbwyk5yixlapj3j4vlvysq4y0snkn0b2iw2hfm8";
# https://bugs.php.net/bug.php?id=76826
extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;

4
pkgs/development/interpreters/php/7.4.nix
View File

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;
base = callPackage generic (_args // {
version = "7.4.20";
sha256 = "0d5ncz97y0271dsmz269wl4721vhq2fn6pmm9rxglc756p36pnha";
version = "7.4.21";
sha256 = "0al2697d5hwq0f39rgncl1pwfxzzpc0afmr0fjvw5qjpww163v1n";
});
in base.withExtensions ({ all, ... }: with all; ([

4
pkgs/development/interpreters/php/8.0.nix
View File

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;
base = callPackage generic (_args // {
version = "8.0.7";
sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj";
version = "8.0.8";
sha256 = "0vyi9hhy7yl4l589dniwb3gq29sp3giq7ni4nca3x54q3bbpgg8l";
});
in base.withExtensions ({ all, ... }: with all; ([

4
pkgs/development/web/nodejs/v12.nix
View File

@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "12.22.1";
sha256 = "12drpkffn79xx84pffg9y2cn9fiwycgaa2rjj3ix6visfzvhsrfx";
version = "12.22.2";
sha256 = "1p281hdw3y32pnbfr7cdc9igv2yrzqg16pn4yj3g01pi3mbhbn3z";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}

7
pkgs/development/web/nodejs/v14.nix
View File

@ -1,14 +1,13 @@
{ callPackage, icu68, python3, lib, stdenv, enableNpm ? true }:
{ callPackage, python3, lib, stdenv, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix {
icu = icu68;
python = python3;
};
in
buildNodejs {
inherit enableNpm;
version = "14.17.0";
sha256 = "1vf989canwcx0wdpngvkbz2x232yccp7fzs1vcbr60rijgzmpq2n";
version = "14.17.2";
sha256 = "0gjq61l1lm15bv47w0phil44nbh0fsq3mmqf40xxlm92gswb4psg";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}

13
pkgs/development/web/nodejs/v15.nix
View File

@ -1,13 +0,0 @@
{ callPackage, icu68, python3, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix {
icu = icu68;
python = python3;
};
in
buildNodejs {
inherit enableNpm;
version = "15.14.0";
sha256 = "0vm6jdazqjd1plqsgngzvjrafv2d3mdahk6il4ray02gx97dq8l1";
}

4
pkgs/development/web/nodejs/v16.nix
View File

@ -8,6 +8,6 @@ let
in
buildNodejs {
inherit enableNpm;
version = "16.2.0";
sha256 = "1krm3cnpbnqg4mfl3cpp8x2i1rr6hba9qbl60wyg5f5g8ac3pyfh";
version = "16.4.1";
sha256 = "1a1aygksmbafxvrs8g2jv0y1jj3cwyclk0qbqxkn5qfq5r1i943n";
}

34
pkgs/os-specific/linux/dpdk-kmods/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib, stdenv, fetchzip, kernel }:
stdenv.mkDerivation rec {
pname = "dpdk-kmods";
version = "2021-04-21";
src = fetchzip {
url = "http://git.dpdk.org/dpdk-kmods/snapshot/dpdk-kmods-e13d7af77a1bf98757f85c3c4083f6ee6d0d2372.tar.xz";
sha256 = "sha256-8ysWT3X3rIyUAo4/QbkX7cQq5iFeU18/BPsmmWugcIc=";
};
hardeningDisable = [ "pic" ];
KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
nativeBuildInputs = kernel.moduleBuildDependencies;
preBuild = "cd linux/igb_uio";
installPhase = ''
make -C ${KSRC} M=$(pwd) modules_install
'';
INSTALL_MOD_PATH = placeholder "out";
enableParallelBuilding = true;
meta = with lib; {
description = "Kernel modules for DPDK";
homepage = "https://git.dpdk.org/dpdk-kmods/";
license = licenses.gpl2Only;
maintainers = [ maintainers.mic92 ];
platforms = platforms.linux;
};
}

9
pkgs/tools/filesystems/ceph/default.nix
View File

@ -38,7 +38,7 @@
# Linux Only Dependencies
, linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c
, libaio ? null, libxfs ? null, zfs ? null
, libaio ? null, libxfs ? null, zfs ? null, liburing ? null
, ...
}:
@ -114,6 +114,8 @@ let
ps.Mako
ceph-common
ps.cherrypy
ps.cmd2
ps.colorama
ps.dateutil
ps.jsonpatch
ps.pecan
@ -163,7 +165,7 @@ in rec {
snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka
cryptsetup sqlite lua icu bzip2
] ++ lib.optionals stdenv.isLinux [
linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs
linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs
# ceph 14
rdma-core rabbitmq-c
] ++ lib.optionals hasRadosgw [
@ -194,11 +196,12 @@ in rec {
"-DMGR_PYTHON_VERSION=${ceph-python-env.python.pythonVersion}"
"-DWITH_SYSTEMD=OFF"
"-DWITH_TESTS=OFF"
"-DWITH_CEPHFS_SHELL=ON"
# TODO breaks with sandbox, tries to download stuff with npm
"-DWITH_MGR_DASHBOARD_FRONTEND=OFF"
# WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now
''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}''
];
] ++ lib.optional stdenv.isLinux "-DWITH_SYSTEM_LIBURING=ON";
postFixup = ''
wrapPythonPrograms

6
pkgs/tools/graphics/yaxg/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper,
maim, slop, ffmpeg_3, byzanz, libnotify, xdpyinfo }:
maim, slop, ffmpeg, byzanz, libnotify, xdpyinfo }:
stdenv.mkDerivation rec {
pname = "yaxg";
@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ];
buildInputs = [ maim slop ffmpeg byzanz libnotify xdpyinfo ];
installPhase = ''
mkdir -p $out/bin/
mv yaxg $out/bin/
chmod +x $out/bin/yaxg
wrapProgram $out/bin/yaxg --prefix PATH : ${ lib.makeBinPath [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ]}
wrapProgram $out/bin/yaxg --prefix PATH : ${ lib.makeBinPath [ maim slop ffmpeg byzanz libnotify xdpyinfo ]}
'';
meta = with lib; {

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

@ -20533,7 +20533,9 @@ in
digimend = callPackage ../os-specific/linux/digimend { };
dpdk = callPackage ../os-specific/linux/dpdk { };
dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { };
dpdk = throw "The dpdk driver has been renamed to dpdk-mods.";
exfat-nofuse = callPackage ../os-specific/linux/exfat { };

4
pkgs/top-level/php-packages.nix
View File

@ -270,7 +270,7 @@ lib.makeScope pkgs.newScope (self: with self; {
{ name = "dba"; }
{ name = "dom";
buildInputs = [ libxml2 ];
patches = [
patches = lib.optionals (lib.versionOlder php.version "7.4") [
# https://github.com/php/php-src/pull/7030
(fetchpatch {
url = "https://github.com/php/php-src/commit/4cc261aa6afca2190b1b74de39c3caa462ec6f0b.patch";
@ -280,7 +280,7 @@ lib.makeScope pkgs.newScope (self: with self; {
];
# For some reason `patch` fails to remove these files correctly.
# Since `postPatch` is already used in `mkExtension`, we have to make it here.
preCheck = ''
preCheck = lib.optionals (lib.versionOlder php.version "7.4") ''
rm tests/bug43364.phpt
rm tests/bug80268.phpt
'';