From 21a1ba4fcee30c7f02ffc94ffabe7aa073cc8b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 7 Jun 2021 13:46:07 +0200 Subject: [PATCH 01/15] dpdk-kmods: init at 2021-04-21 In the last release dpdk moved the uio_igb driver to a different package Without it dpdk is not very useful. (cherry picked from commit 0d2276ec343e8965c023eecc1780d3521276047f) --- pkgs/os-specific/linux/dpdk-kmods/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/dpdk-kmods/default.nix diff --git a/pkgs/os-specific/linux/dpdk-kmods/default.nix b/pkgs/os-specific/linux/dpdk-kmods/default.nix new file mode 100644 index 00000000000..a188336cbe5 --- /dev/null +++ b/pkgs/os-specific/linux/dpdk-kmods/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ce87c6e10c..1883d9b444e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20512,7 +20512,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 { }; From 6c78cbfd6c92adb692d9af26773fa1f6fd4f775e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 May 2021 11:14:34 +0200 Subject: [PATCH 02/15] yaxg: use ffmpeg instead of ffmpeg_3 (cherry picked from commit d496275b80c4fbc493b00ec61e1edd9bde614479) --- pkgs/tools/graphics/yaxg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/tools/graphics/yaxg/default.nix index 349303346f4..9d83ae71d33 100644 --- a/pkgs/tools/graphics/yaxg/default.nix +++ b/pkgs/tools/graphics/yaxg/default.nix @@ -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; { From d530ad5185f3fa66b323303ba953935180776ff9 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 1 Jul 2021 14:03:19 +0200 Subject: [PATCH 03/15] php74: 7.4.20 -> 7.4.21 fixes CVE-2021-21705 and CVE-2021-21704 (cherry picked from commit cf9fe3942e90eb6f97cfb69daa391b83f9868883) --- pkgs/development/interpreters/php/7.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 79e736b30d5..e5c339e502d 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -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; ([ From ff22a4aecbbb4cea801ef513bd3620756775fe6b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 1 Jul 2021 14:01:13 +0200 Subject: [PATCH 04/15] php80: 8.0.7 -> 8.0.8 fixes CVE-2021-21705 and CVE-2021-21704 also various other bugs, see https://www.php.net/ChangeLog-8.php#8.0.8 for a complete changelog (cherry picked from commit d0c10fc34c575c83bc6716a42afe6044fc3730ea) --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 9d357f88afe..00cc1191961 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -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; ([ From beb567f715153581c2d48ce1d9e29d3151d04fc7 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 1 Jul 2021 20:56:50 +0200 Subject: [PATCH 05/15] php73: 7.3.28 -> 7.3.29 fixes CVE-2021-21705 and CVE-2021-21704 not cherry-picked from master, because that does not have php73 anymore --- pkgs/development/interpreters/php/7.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/7.3.nix b/pkgs/development/interpreters/php/7.3.nix index 569fb1b5405..773caa82760 100644 --- a/pkgs/development/interpreters/php/7.3.nix +++ b/pkgs/development/interpreters/php/7.3.nix @@ -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; From 0319a28db83c2bd0d4bf4a3e77a611c0dd5e9e62 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 1 Jul 2021 21:21:16 +0200 Subject: [PATCH 06/15] phpPackages.dom: make patch conditional corresponds to 4c424870e62a5095896b48a12e9903835f6a5e53, but we still need the patch for php73 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index c59391ce290..0ecd4e9b56b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -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 ''; From e12702b5991efab3b27f4c1850b5bb6af9363d15 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 15 Jun 2021 04:20:00 +0000 Subject: [PATCH 07/15] nodejs-14_x: 14.17.0 -> 14.17.1 https://github.com/nodejs/node/releases/tag/v14.17.1 (cherry picked from commit 3a61dc3cae9ed275ab6da0c577d828734ac99295) --- pkgs/development/web/nodejs/v14.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 7054e4c66b8..27b2a4f3319 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -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.1"; + sha256 = "0zr4b9gja8f9611rnmc9yacmh90bd76xv9ayikcyqdfzdpax5wfx"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 37573d9874d8ddddabda1837cc9d4b4a80b48b46 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 3 Jun 2021 04:20:00 +0000 Subject: [PATCH 08/15] nodejs-16_x: 16.2.0 -> 16.3.0 https://github.com/nodejs/node/releases/tag/v16.3.0 (cherry picked from commit 969eb59f2f253112339dac99e429fb01b7a48bf4) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index dec02ad22f5..a97f3383a6b 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.2.0"; - sha256 = "1krm3cnpbnqg4mfl3cpp8x2i1rr6hba9qbl60wyg5f5g8ac3pyfh"; + version = "16.3.0"; + sha256 = "0pxcdy9i1iyxp4afmpaz30ajlwrj74y64jl3n9rjqw0r5jw4gavs"; } From 1e27742a0c5b052c49a3e1e68dffbcecea6c1fdc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 23 Jun 2021 04:20:00 +0000 Subject: [PATCH 09/15] nodejs-16_x: 16.3.0 -> 16.4.0 https://github.com/nodejs/node/releases/tag/v16.4.0 (cherry picked from commit c50bd80253a3066af270466909f0f53b0adc4b04) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index a97f3383a6b..8514baec8b1 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.3.0"; - sha256 = "0pxcdy9i1iyxp4afmpaz30ajlwrj74y64jl3n9rjqw0r5jw4gavs"; + version = "16.4.0"; + sha256 = "07f8g3hs0v7nsdvzlsr1p4pzgb04qn54pnhmbdsgmmb41cp227pr"; } From 77f9266ab706b30a712b53cd55be12ab69ebdd7f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 10/15] nodejs-12_x: 12.22.1 -> 12.22.2 https://github.com/nodejs/node/releases/tag/v12.22.2 (cherry picked from commit a7a66aa2ea8715d5ce043f24d408a21fedf83c5f) --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 7fad6a020a8..776f84309da 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -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; } From 3de5eef80f53a90ef0affef2090967edf7999edc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 11/15] nodejs-14_x: 14.17.1 -> 14.17.2 https://github.com/nodejs/node/releases/tag/v14.17.2 (cherry picked from commit 282c97bb2766590e12e8d393240fe63c235bfdf0) --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 27b2a4f3319..6271401a0f4 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.17.1"; - sha256 = "0zr4b9gja8f9611rnmc9yacmh90bd76xv9ayikcyqdfzdpax5wfx"; + version = "14.17.2"; + sha256 = "0gjq61l1lm15bv47w0phil44nbh0fsq3mmqf40xxlm92gswb4psg"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 0cde4bf18f77b2cc9c9fb3fdefa35492f1e905c8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 12/15] nodejs-16_x: 16.4.0 -> 16.4.1 https://github.com/nodejs/node/releases/tag/v16.4.1 (cherry picked from commit 4f90b61a11496e16d2e460301b73426ddd2be0b8) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 8514baec8b1..305baadecac 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.4.0"; - sha256 = "07f8g3hs0v7nsdvzlsr1p4pzgb04qn54pnhmbdsgmmb41cp227pr"; + version = "16.4.1"; + sha256 = "1a1aygksmbafxvrs8g2jv0y1jj3cwyclk0qbqxkn5qfq5r1i943n"; } From 5225ed8b954e18907d5b20414ff10e1fdeee5ecd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 13/15] nodejs-15_x: remove expression Node.js 15 has reached EOL on June 1, 2021. (cherry picked from commit fd918d34bdbe94797afd6ca10cd4d578acce7943) --- pkgs/development/web/nodejs/v15.nix | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 pkgs/development/web/nodejs/v15.nix diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix deleted file mode 100644 index e6903098b30..00000000000 --- a/pkgs/development/web/nodejs/v15.nix +++ /dev/null @@ -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"; - } From 6af75274fc957c5b0d7af7da3e2bdd21d82236c7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Jul 2021 04:20:00 +0000 Subject: [PATCH 14/15] beam: update reference to nodejs package nodejs-15_x has reached EOL, and removed from nixpkgs. (cherry picked from commit 39916f933ebef93e473115c5160e285d76d30133) --- doc/languages-frameworks/beam.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index c8dd3f9ed11..b4cb2edbe41 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -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 From bae7213808b124767825dd83f3ce5b75a7c61f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 30 Jun 2021 18:55:32 +0200 Subject: [PATCH 15/15] ceph: Enable cephfs-shell and use system liburing (cherry picked from commit 196a7136a953eb3fa1b28a17b8d51126b0ee8372) --- pkgs/tools/filesystems/ceph/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index c10348fd711..cc2335f9fe6 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -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