From 98ea8a9dba31705e437c78b95f7ed9d200e0f309 Mon Sep 17 00:00:00 2001 From: Harrison Houghton Date: Wed, 15 Sep 2021 10:59:19 -0400 Subject: [PATCH 01/39] shotcut: clarify license as gpl3Plus --- pkgs/applications/video/shotcut/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 6ea41b4d9259..27aeec152d10 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -94,7 +94,7 @@ mkDerivation rec { please use the official build from shotcut.org instead. ''; homepage = "https://shotcut.org"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ goibhniu woffs peti ]; platforms = platforms.linux; }; From d80676b76badc497bf4ba657dc019ff5a0fb5945 Mon Sep 17 00:00:00 2001 From: Harrison Houghton Date: Wed, 15 Sep 2021 10:57:28 -0400 Subject: [PATCH 02/39] shotcut: 21.03.21 -> 21.09.20 Fixes build with new mlt++ library changes. Co-Authored-By: "Frank Doepper" --- pkgs/applications/video/shotcut/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 27aeec152d10..3b6116d5a068 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -25,13 +25,13 @@ assert lib.versionAtLeast mlt.version "6.24.0"; mkDerivation rec { pname = "shotcut"; - version = "21.03.21"; + version = "21.09.20"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "UdeHbNkJ0U9FeTmpbcU4JxiyIHkrlC8ErhtY6zdCZEk="; + sha256 = "1y46n5gmlayfl46l0vhg5g5dbbc0sg909mxb68sia0clkaas8xrh"; }; nativeBuildInputs = [ pkg-config qmake ]; @@ -57,7 +57,7 @@ mkDerivation rec { ]; prePatch = '' - sed 's_shotcutPath, "melt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp + sed 's_shotcutPath, "melt[^"]*"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp NICE=$(type -P nice) From ea678f709fd3c39bd044a62df5e141dcefb98ed3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 25 Sep 2021 10:15:47 +0000 Subject: [PATCH 03/39] python38Packages.phonenumbers: 8.12.32 -> 8.12.33 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 0b33c2ff56a6..2e3a0cb2c7ce 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.32"; + version = "8.12.33"; src = fetchPypi { inherit pname version; - sha256 = "c52c9c3607483072303ba8d8759063edc44d2f8fe7b85afef40bd8d1aafb6483"; + sha256 = "de3d5a3cb421c7421f584bb13cb9287e23ee2dd97d832fc35c9b55b96a576a3c"; }; checkInputs = [ From b5f27628e4ad2dc3d84ee41af6251b8ad5174880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 25 Sep 2021 10:37:50 -0300 Subject: [PATCH 04/39] greybird: 3.22.14 -> 3.22.15 --- pkgs/data/themes/greybird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix index 202424eeb2c4..06496ea9be14 100644 --- a/pkgs/data/themes/greybird/default.nix +++ b/pkgs/data/themes/greybird/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "greybird"; - version = "3.22.14"; + version = "3.22.15"; src = fetchFromGitHub { owner = "shimmerproject"; repo = pname; rev = "v${version}"; - sha256 = "0b0axzrvdsv7aa029idz4rs1jm6df4ff3v4j4d5wf4yiypb48js9"; + sha256 = "1fk66fxy2lif9ngazlgkpsziw216i4b1ld2zm97cadf7n97376g9"; }; nativeBuildInputs = [ From 10a0b29d211e8228cef9bf32b10623c8d1756291 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 6 Sep 2021 18:34:49 +0200 Subject: [PATCH 05/39] apfsprogs: unstable-2021-05-07 -> unstable-2021-08-24 --- pkgs/tools/filesystems/apfsprogs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/apfsprogs/default.nix b/pkgs/tools/filesystems/apfsprogs/default.nix index b50eaf39636e..04e7cd89ae4b 100644 --- a/pkgs/tools/filesystems/apfsprogs/default.nix +++ b/pkgs/tools/filesystems/apfsprogs/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "apfsprogs"; - version = "unstable-2021-05-07"; + version = "unstable-2021-08-24"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "apfsprogs"; - rev = "d360211a30608a907e3ee8ad4468d606c40ec2d7"; - sha256 = "sha256-SeFs/GQfIEvnxERyww+mnynjR7E02DdtBA6JsknEM+Q="; + rev = "5efac5a701bcb56e23cfc182b5b3901bff27d343"; + sha256 = "sha256-vQE586HwrPkF0uaTKrJ7yXb24ntRI0QmBla7N2ErAU8="; }; buildPhase = '' From 646cb17cdb142128e3d90c7e718da57ef355136d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 25 Sep 2021 19:13:03 +0200 Subject: [PATCH 06/39] feh: 3.7.1 -> 3.7.2 ChangeLog: https://feh.finalrewind.org/archive/3.7.2/ --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index cd7b6e95d03d..c279ccf3df64 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -7,11 +7,11 @@ with lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-V6scph9XyWWVh4Bp9VDTb1GFMPiPoxt0zDnNc5+SWLY="; + sha256 = "sha256-hHGP0nIM9UDSRXaElP4OtOWY9Es54jJrrow2ioKcglg="; }; outputs = [ "out" "man" "doc" ]; From 9e1a79a05f7067aaa2763c6e2a142c012b1b47a4 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Sun, 26 Sep 2021 16:15:26 +0700 Subject: [PATCH 07/39] libarchive-qt 2.0.4 -> 2.0.6 --- pkgs/development/libraries/libarchive-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libarchive-qt/default.nix b/pkgs/development/libraries/libarchive-qt/default.nix index 920cc7efa081..62b425bba058 100644 --- a/pkgs/development/libraries/libarchive-qt/default.nix +++ b/pkgs/development/libraries/libarchive-qt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libarchive-qt"; - version = "2.0.4"; + version = "2.0.6"; src = fetchFromGitLab { owner = "marcusbritanicus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-onTV9dgk6Yl9H35EvA6/8vk1IrYH8vg9OQNVgzkt4q4"; + sha256 = "sha256-Z+2zjQolV1Ncr6v9r7fGrc/fEMt0iMtGwv9eZ2Tu2cA="; }; nativeBuildInputs = [ From e7d2416831020fe4b894fd6db202d2beb66d569f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 26 Sep 2021 12:02:38 +0000 Subject: [PATCH 08/39] ytcc: 2.3.0 -> 2.4.1 --- pkgs/tools/networking/ytcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index 38bb5c06607d..3fe1e77fca24 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.3.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "1q0w3b7r93416s28qra608n0d7cjh95nwkzgg23z5hp5sq3w3izr"; + sha256 = "00fx1zlfz4gj46ahgvawc21rx6s49qrzd8am3p2yzmc12ibfqyhv"; }; nativeBuildInputs = [ gettext ]; From cb28af904528e23f3c345821210a5a2d4c7e0370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 26 Sep 2021 12:26:16 -0300 Subject: [PATCH 09/39] matcha-gtk-theme: 2021-08-23 -> 2021-09-24 --- pkgs/data/themes/matcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 3d88a78b39f4..4507e3c2f151 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2021-08-23"; + version = "2021-09-24"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-gemDiGcr7xLv247w9J1CMOSKg2tWp8ADKpG16qa3hZQ="; + sha256 = "064x340z6fif59bbk1p7ryl6xfj8hlf42ld7h8prcjsyghpznw15"; }; buildInputs = [ gdk-pixbuf librsvg ]; From b0f3a99f00efe85145a5c537a2d25865e3f39a53 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:15 +0000 Subject: [PATCH 10/39] linux: 4.14.247 -> 4.14.248 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 4fd140a361c5..01f51e8bc570 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.247"; + version = "4.14.248"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kdhlsqpmw68xnfiyx98id8wis6kkxca2d4n7w2ncax0kyzrwyz7"; + sha256 = "0m5nsd41b08xppcf7vvx8zgj3h3sp3n6xrgxfkccn6n4bk7yx4y9"; }; } // (args.argsOverride or {})) From 7fad98993cd0da2f14ea30e895f168c7eebfba40 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:19 +0000 Subject: [PATCH 11/39] linux: 4.19.207 -> 4.19.208 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index ada819f4850d..4148c9ecff55 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.207"; + version = "4.19.208"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1fb658n89xf9asnaqi0bnh64ir2f78bdqyjvfb983qad9wqsadym"; + sha256 = "1556bk46v7pjd2xrvkldq254yc18cn9jll25ba8zig57562ahkg7"; }; } // (args.argsOverride or {})) From bae26c4e05ddb2cf032e875c4a8d2ba06e44e4c0 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:23 +0000 Subject: [PATCH 12/39] linux: 4.4.284 -> 4.4.285 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index f1e4329c2d41..e2cae3092309 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.284"; + version = "4.4.285"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00xkd2p181cfkys4nri93xy7snmn8g2481x3qz0js7g9p3kz5bqf"; + sha256 = "0h8jzb2cg0wg4s07iqkghfxkxrnlxadwk3i3gvg2xs3ra0wrisp1"; }; } // (args.argsOverride or {})) From bb9a54d5ee3c1d28e64ff0a05cd0960a4313cf93 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:30 +0000 Subject: [PATCH 13/39] linux: 4.9.283 -> 4.9.284 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 22f506f56581..2225651f6710 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.283"; + version = "4.9.284"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0pdh1lyhdp5c5n39wpr622kgchgf30iqk853a2rv9m3s3fry50lm"; + sha256 = "0054b0cm0h2mbf6rxzdgd3c2rfz7xa32qkyr5lv58l2852hf0ri8"; }; } // (args.argsOverride or {})) From bba95d376306c37e535e3ab5555ac2f9279afaa5 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:36 +0000 Subject: [PATCH 14/39] linux: 5.10.68 -> 5.10.69 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 720b619049a0..0f44d6b3e6ae 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.68"; + version = "5.10.69"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "08cl4bg9k331apj5fjl3jx6s6l543dnbjc1cfvin951m7l787ahv"; + sha256 = "1jhcl8qh4w4m2jnbp0glr6xbpn7phv17q6w3d247djnc7g2rwbr3"; }; } // (args.argsOverride or {})) From 10fee833c9220242961d9f7b7d3a82c0a3a1a407 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:44 +0000 Subject: [PATCH 15/39] linux: 5.14.7 -> 5.14.8 --- pkgs/os-specific/linux/kernel/linux-5.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix index 45d39795db6f..35e03223d319 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.7"; + version = "5.14.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1avypasvic298823xzpzzkjbmfv9s8bjnmq92ri62qbakx23j9dg"; + sha256 = "12cvvrxky92z1g9kj7pgb83yg9pnv2fvi7jf0pyagvqjqladl3na"; }; } // (args.argsOverride or { })) From fa3a7105266abd6f9302d8864dbd60283204a314 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:02:51 +0000 Subject: [PATCH 16/39] linux: 5.4.148 -> 5.4.149 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index ff4f019fc51c..840a9dadbaf3 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.148"; + version = "5.4.149"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1cwibh0y112hip5yd0n692rv44jh4sk2g6mj5n44g754k4i366a6"; + sha256 = "1s1zka0iay0drgkdnmzf587jbrg1gx13xv26k5r1qc7dik8xc6p7"; }; } // (args.argsOverride or {})) From 7b29a72e545ee913dbdb07b8379d7d7ccd08b173 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:26 +0000 Subject: [PATCH 17/39] linux/hardened/patches/4.14: 4.14.246-hardened1 -> 4.14.247-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 832e516e6efd..01ab331713ef 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.246-hardened1.patch", - "sha256": "1b15687ac2pkz46qliq1blyja7cjwn19q2bkd0c5912kzly76ghd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.246-hardened1/linux-hardened-4.14.246-hardened1.patch" + "name": "linux-hardened-4.14.247-hardened1.patch", + "sha256": "0k3ii26ry0cszxs5n4ljll61p1kdi3dn5cvzjr8zb78bfrk7lbra", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.247-hardened1/linux-hardened-4.14.247-hardened1.patch" }, "4.19": { "extra": "-hardened1", From b754a3c355b21bd2d4503d0f1b5b7c98448e5496 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:27 +0000 Subject: [PATCH 18/39] linux/hardened/patches/4.19: 4.19.206-hardened1 -> 4.19.207-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 01ab331713ef..ce46ff5a66b0 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.206-hardened1.patch", - "sha256": "12ylhvjvabal29gi00cpjh3s47qj0vav6f2y145z4c9r2z77816k", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.206-hardened1/linux-hardened-4.19.206-hardened1.patch" + "name": "linux-hardened-4.19.207-hardened1.patch", + "sha256": "1yn6c8axvnmck1ignw4k3pi458x0m2qm7g5vjwf2rw8cnzskrs48", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.207-hardened1/linux-hardened-4.19.207-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 34fe5d827ca5a1cee89b5abfde73a540977f3722 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:28 +0000 Subject: [PATCH 19/39] linux/hardened/patches/5.10: 5.10.67-hardened1 -> 5.10.68-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ce46ff5a66b0..f09db85b47fc 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.67-hardened1.patch", - "sha256": "1yvfqkcffrva9hf4ns0jkksnvkj58h87msim0yhanlyp5jyz3l1p", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.67-hardened1/linux-hardened-5.10.67-hardened1.patch" + "name": "linux-hardened-5.10.68-hardened1.patch", + "sha256": "11cn72lzgc6vcbx4xbdvfxrfwy3hfn7sqjxf5laqw9jdhacnlhvn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.68-hardened1/linux-hardened-5.10.68-hardened1.patch" }, "5.13": { "extra": "-hardened1", From 5b71d92f9ad21a39b8ed957b1d5d54ecb5536da6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:29 +0000 Subject: [PATCH 20/39] linux/hardened/patches/5.14: 5.14.6-hardened1 -> 5.14.7-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index f09db85b47fc..1c7e87dc386c 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,9 +25,9 @@ }, "5.14": { "extra": "-hardened1", - "name": "linux-hardened-5.14.6-hardened1.patch", - "sha256": "0db5jvbvrk93x745ylxwnmx6ldwhmaqdnb2hfa35j0i2xjaw4hxx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.6-hardened1/linux-hardened-5.14.6-hardened1.patch" + "name": "linux-hardened-5.14.7-hardened1.patch", + "sha256": "18i0qxhzga2vg0kal5ifsks0vra6gj21q6whcjry9sglxandn2vg", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.7-hardened1/linux-hardened-5.14.7-hardened1.patch" }, "5.4": { "extra": "-hardened1", From bb21f231cf1556318346f7476a2ae4cc234c2cd6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 26 Sep 2021 17:03:30 +0000 Subject: [PATCH 21/39] linux/hardened/patches/5.4: 5.4.147-hardened1 -> 5.4.148-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 1c7e87dc386c..36c7b5578183 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -31,8 +31,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.147-hardened1.patch", - "sha256": "1jkvfpckmj9ig4nsxxiigawkay05lk8r9fps16iaq6lz2mf9vqsb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.147-hardened1/linux-hardened-5.4.147-hardened1.patch" + "name": "linux-hardened-5.4.148-hardened1.patch", + "sha256": "0kb2d9csm8bbjark2ii0n1jpfcr6avdr8r5g97awzbg9jxkfs0j4", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.148-hardened1/linux-hardened-5.4.148-hardened1.patch" } } From cf28ad7e6f7cd14e489c5326a54117827f7cf89d Mon Sep 17 00:00:00 2001 From: Charlie Hanley Date: Sun, 26 Sep 2021 16:06:59 -0400 Subject: [PATCH 22/39] python3Packages.python3-application: refactor Don't interpolate a variable into the URL string because a) if the variable changes but the hash does not, erroneous cached files may be used for the FOD; and b) it is convenient for those reading to have the whole URL so they can open it. --- pkgs/development/python-modules/python3-application/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python3-application/default.nix b/pkgs/development/python-modules/python3-application/default.nix index cddb354a5db2..51794d096d18 100644 --- a/pkgs/development/python-modules/python3-application/default.nix +++ b/pkgs/development/python-modules/python3-application/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # Apply bugfix commit that is not yet part of a release (fetchpatch { name = "fix-time-import.patch"; - url = "https://github.com/AGProjects/${pname}/commit/695f7d769e69c84e065872ffb403157d0af282fd.patch"; + url = "https://github.com/AGProjects/python3-application/commit/695f7d769e69c84e065872ffb403157d0af282fd.patch"; sha256 = "sha256-MGs8uUIFXkPXStOn5oCNNEMVmcKrq8YPl8Xvl3OTOUM="; }) ]; From 5bd537ccef03f3010e7709b170d6368cde45927e Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 27 Sep 2021 04:10:00 +0530 Subject: [PATCH 23/39] fclones: 0.15.0 -> 0.16.0 --- pkgs/tools/misc/fclones/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 14ade9ce32be..489c6fc01beb 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8NUneKJpnBjC4OcAABEpI9p+saBqAk+l43FS8/tIYjc="; + sha256 = "sha256-BoCbN7EY7SmBYCS3OLFrQ1j1MUvZ+/oQAdoHCw9kCQE="; }; - cargoSha256 = "sha256-5qX45FJFaiE1vTXjllM9U1w57MX18GgKEFOEBMc64Jk="; + cargoSha256 = "sha256-pAYPfRm7QN4mKwnYUMq5Td+bF1tmy3oGObWvMabmnpw="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit From f339e9af4205498f7e003beb799d21dad5a43b33 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 26 Sep 2021 19:56:13 -0400 Subject: [PATCH 24/39] sumneko-lua-language-server: set meta.mainProgram --- pkgs/development/tools/sumneko-lua-language-server/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 9b0bba533f5f..1f2553e32f37 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ mjlbach ]; platforms = platforms.linux; + mainProgram = "lua-language-server"; }; } From e6654828b8be4e89cd1ef01424aca412b009d87a Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 26 Sep 2021 16:45:46 -0700 Subject: [PATCH 25/39] bashdb: 4.4-1.0.0 -> 5.0-1.1.2, fix build with bash 5.1 --- .../development/tools/misc/bashdb/default.nix | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix index 72ec8c96be34..918dd90aa83f 100644 --- a/pkgs/development/tools/misc/bashdb/default.nix +++ b/pkgs/development/tools/misc/bashdb/default.nix @@ -1,14 +1,30 @@ -{ lib, stdenv, fetchurl, makeWrapper, python3Packages }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, makeWrapper +, python3Packages +}: stdenv.mkDerivation rec { pname = "bashdb"; - version = "4.4-1.0.0"; + version = "5.0-1.1.2"; src = fetchurl { url = "mirror://sourceforge/bashdb/${pname}-${version}.tar.bz2"; - sha256 = "0p7i7bpzs6q1i7swnkr89kxqgzr146xw8d2acmqwqbslzm9dqlml"; + sha256 = "sha256-MBdtKtKMWwCy4tIcXqGu+PuvQKj52fcjxnxgUx87czA="; }; + patches = [ + # Enable building with bash 5.1/5.2 + # Remove with any upstream 5.1-x.y.z release + (fetchpatch { + url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/569fbb806d9ee813afa8b27d2098a44f93433922/devel/bashdb/files/patch-configure"; + sha256 = "19zfzcnxavndyn6kfxp775kjcd0gigsm4y3bnh6fz5ilhnnbbbgr"; + }) + ]; + patchFlags = "-p0"; + nativeBuildInputs = [ makeWrapper ]; From bb7692db80c2fb76d349b188e72f56e3e911451c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Sep 2021 18:14:14 +0200 Subject: [PATCH 26/39] ocamlPackages.gen: disable tests with OCaml < 4.08 --- pkgs/development/ocaml-modules/gen/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 77fc0b63c55e..1c12f3ac5f87 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -1,9 +1,8 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: -let version = "0.5"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-gen-${version}"; +stdenv.mkDerivation rec { + version = "0.5"; + pname = "ocaml${ocaml.version}-gen"; src = fetchFromGitHub { owner = "c-cube"; @@ -13,14 +12,12 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ qtest ounit ]; + buildInputs = lib.optionals doCheck [ qtest ounit ]; strictDeps = true; - configureFlags = [ - "--enable-tests" - ]; + configureFlags = lib.optional doCheck "--enable-tests"; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.08"; checkTarget = "test"; createFindlibDestdir = true; @@ -29,6 +26,6 @@ stdenv.mkDerivation { homepage = "https://github.com/c-cube/gen"; description = "Simple, efficient iterators for OCaml"; license = lib.licenses.bsd3; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; }; } From 801b070c408b49d7ee8b0c82378eafde26fcb9d0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Sep 2021 18:14:24 +0200 Subject: [PATCH 27/39] ocamlPackages.stringext: disable tests with OCaml < 4.08 --- pkgs/development/ocaml-modules/stringext/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix index 8aaf36baa8b5..3d440cf48959 100644 --- a/pkgs/development/ocaml-modules/stringext/default.nix +++ b/pkgs/development/ocaml-modules/stringext/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, ocaml, buildDunePackage, ounit, qtest # Optionally enable tests; test script use OCaml-4.01+ features -, doCheck ? lib.versionAtLeast ocaml.version "4.04" +, doCheck ? lib.versionAtLeast ocaml.version "4.08" }: let version = "1.6.0"; in From 5f16f0a9cf2b5b5249382e19b8e2206dbfb9fd12 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Sep 2021 18:14:27 +0200 Subject: [PATCH 28/39] ocamlPackages.batteries: disable tests with OCaml < 4.08 --- pkgs/development/ocaml-modules/batteries/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 7785a70e0509..b88b7c59956e 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, qtest, num +, doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64 +}: let version = "3.3.0"; in @@ -14,7 +16,7 @@ stdenv.mkDerivation { checkInputs = [ qtest ]; propagatedBuildInputs = [ num ]; - doCheck = lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64; + inherit doCheck; checkTarget = "test"; createFindlibDestdir = true; From 049ca38a0c84f7c41467b006712340fd52f00043 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Sep 2021 18:14:32 +0200 Subject: [PATCH 29/39] ocamlPackages.containers: disable tests with OCaml < 4.08 --- pkgs/development/ocaml-modules/containers/data.nix | 3 +-- pkgs/development/ocaml-modules/containers/default.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/containers/data.nix b/pkgs/development/ocaml-modules/containers/data.nix index 3694a7b2941b..29d7bbb26b05 100644 --- a/pkgs/development/ocaml-modules/containers/data.nix +++ b/pkgs/development/ocaml-modules/containers/data.nix @@ -6,10 +6,9 @@ buildDunePackage { pname = "containers-data"; - inherit (containers) src version useDune2; + inherit (containers) src version doCheck useDune2; buildInputs = [ dune-configurator ]; - doCheck = true; checkInputs = [ gen iter qcheck ]; propagatedBuildInputs = [ containers ]; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index b0df52061520..de6c8076ceda 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -22,7 +22,7 @@ buildDunePackage rec { checkInputs = [ gen iter ounit qcheck uutf ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = { homepage = "https://github.com/c-cube/ocaml-containers"; From 09f33fd8aa06f5b5522cb50b309ee548fc3df4fe Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Sep 2021 18:14:35 +0200 Subject: [PATCH 30/39] ocamlPackages.stdint: disable tests with OCaml < 4.08 --- pkgs/development/ocaml-modules/stdint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix index 52d97e12998f..2a4bf2bb6335 100644 --- a/pkgs/development/ocaml-modules/stdint/default.nix +++ b/pkgs/development/ocaml-modules/stdint/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchpatch, buildDunePackage, qcheck }: +{ lib, fetchurl, fetchpatch, buildDunePackage, ocaml, qcheck }: buildDunePackage rec { pname = "stdint"; @@ -35,7 +35,7 @@ buildDunePackage rec { 'let pos_int = QCheck.int_range 0 maxi' ''; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.08"; checkInputs = [ qcheck ]; meta = { From 6f85b0fa7b3b190152acb168ec2624697621891b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Sep 2021 18:14:39 +0200 Subject: [PATCH 31/39] ocamlPackages.syslog-message: disable tests with OCaml < 4.08 --- pkgs/development/ocaml-modules/syslog-message/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/syslog-message/default.nix b/pkgs/development/ocaml-modules/syslog-message/default.nix index ba967d87446b..2c12415cdbb2 100644 --- a/pkgs/development/ocaml-modules/syslog-message/default.nix +++ b/pkgs/development/ocaml-modules/syslog-message/default.nix @@ -1,4 +1,5 @@ { lib, buildDunePackage, fetchurl +, ocaml , astring, ptime, rresult, qcheck }: @@ -21,7 +22,7 @@ buildDunePackage rec { rresult ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.08"; checkInputs = [ qcheck ]; From c5a5f7b13df1191656974122d8a1a8b090fd810f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Sep 2021 18:14:42 +0200 Subject: [PATCH 32/39] ocamlPackages.lru: disable tests with OCaml < 4.08 --- pkgs/development/ocaml-modules/lru/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/lru/default.nix b/pkgs/development/ocaml-modules/lru/default.nix index 035d612cfe27..ec78ec91012c 100644 --- a/pkgs/development/ocaml-modules/lru/default.nix +++ b/pkgs/development/ocaml-modules/lru/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { propagatedBuildInputs = [ psq ]; - doCheck = lib.versionAtLeast ocaml.version "4.05"; + doCheck = lib.versionAtLeast ocaml.version "4.08"; checkInputs = [ qcheck-alcotest ]; meta = { From 8c32eb1a99963124c9a1203c690bddad796b7d8e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Sep 2021 18:14:46 +0200 Subject: [PATCH 33/39] ocamlPackages.psq: disable tests with OCaml < 4.08 --- pkgs/development/ocaml-modules/psq/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/psq/default.nix b/pkgs/development/ocaml-modules/psq/default.nix index f7c2f3497a11..ea9a0615b414 100644 --- a/pkgs/development/ocaml-modules/psq/default.nix +++ b/pkgs/development/ocaml-modules/psq/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { propagatedBuildInputs = [ seq ]; - doCheck = lib.versionAtLeast ocaml.version "4.07"; + doCheck = lib.versionAtLeast ocaml.version "4.08"; checkInputs = [ qcheck-alcotest ]; meta = { From f548ac9c6cac47d36d9ed8c999b83c561b97f34d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Sep 2021 18:14:49 +0200 Subject: [PATCH 34/39] ocamlPackages.iter: disable tests with OCaml < 4.08 --- pkgs/development/ocaml-modules/iter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index d7b3ff64d30f..34e14baea7c9 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ result ]; - doCheck = lib.versionAtLeast ocaml.version "4.07"; + doCheck = lib.versionAtLeast ocaml.version "4.08"; checkInputs = [ mdx.bin qtest ]; meta = { From b99e43a96eb85dc845f9e47afe71dbbaf1560ba7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Sep 2021 18:14:52 +0200 Subject: [PATCH 35/39] ocamlPackages.reason-native.qcheck-rely: mark as broken --- pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix index a3d297b4f5a5..993bcbefafdc 100644 --- a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix +++ b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix @@ -16,5 +16,6 @@ meta = { description = "A library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'"; downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely"; + broken = true; }; } From f9c7333bce5312e88795fb1f22b6191b93f45b07 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Sep 2021 18:14:56 +0200 Subject: [PATCH 36/39] =?UTF-8?q?ocamlPackages.qcheck:=200.17=20=E2=86=92?= =?UTF-8?q?=200.18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/qcheck/core.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/qcheck/core.nix b/pkgs/development/ocaml-modules/qcheck/core.nix index e1b3503b5418..efa3f11967ec 100644 --- a/pkgs/development/ocaml-modules/qcheck/core.nix +++ b/pkgs/development/ocaml-modules/qcheck/core.nix @@ -2,17 +2,17 @@ buildDunePackage rec { pname = "qcheck-core"; - version = "0.17"; + version = "0.18"; useDune2 = true; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "c-cube"; repo = "qcheck"; - rev = version; - sha256 = "0qfyqhfg98spmfci9z6f527a16gwjnx2lrbbgw67p37ys5acrfar"; + rev = "v${version}"; + sha256 = "1s652hrj2sxqj30dfl300zjvvqk3r62a1bnzqw1hqyf6pi88qn8x"; }; meta = { From baa04706d7ac4b8c0d6c6d0eab41158176c25d36 Mon Sep 17 00:00:00 2001 From: Brecht Savelkoul Date: Thu, 12 Aug 2021 21:07:09 +0200 Subject: [PATCH 37/39] lighttpd: add build options for new auth methods --- pkgs/servers/http/lighttpd/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 98e378b2eeda..0856d082302b 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,15 +1,22 @@ { lib, stdenv, buildPackages, fetchurl, pkg-config, pcre, libxml2, zlib, bzip2, which, file -, openssl, enableMagnet ? false, lua5_1 ? null +, openssl +, enableDbi ? false, libdbi ? null +, enableMagnet ? false, lua5_1 ? null , enableMysql ? false, libmysqlclient ? null , enableLdap ? false, openldap ? null +, enablePam ? false, linux-pam ? null +, enableSasl ? false, cyrus_sasl ? null , enableWebDAV ? false, sqlite ? null, libuuid ? null , enableExtendedAttrs ? false, attr ? null , perl }: +assert enableDbi -> libdbi != null; assert enableMagnet -> lua5_1 != null; assert enableMysql -> libmysqlclient != null; assert enableLdap -> openldap != null; +assert enablePam -> linux-pam != null; +assert enableSasl -> cyrus_sasl != null; assert enableWebDAV -> sqlite != null; assert enableWebDAV -> libuuid != null; assert enableExtendedAttrs -> attr != null; @@ -33,16 +40,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ] + ++ lib.optional enableDbi libdbi ++ lib.optional enableMagnet lua5_1 ++ lib.optional enableMysql libmysqlclient ++ lib.optional enableLdap openldap + ++ lib.optional enablePam linux-pam + ++ lib.optional enableSasl cyrus_sasl ++ lib.optional enableWebDAV sqlite ++ lib.optional enableWebDAV libuuid; configureFlags = [ "--with-openssl" ] + ++ lib.optional enableDbi "--with-dbi" ++ lib.optional enableMagnet "--with-lua" ++ lib.optional enableMysql "--with-mysql" ++ lib.optional enableLdap "--with-ldap" + ++ lib.optional enablePam "--with-pam" + ++ lib.optional enableSasl "--with-sasl" ++ lib.optional enableWebDAV "--with-webdav-props" ++ lib.optional enableWebDAV "--with-webdav-locks" ++ lib.optional enableExtendedAttrs "--with-attr"; @@ -69,6 +82,6 @@ stdenv.mkDerivation rec { homepage = "http://www.lighttpd.net/"; license = lib.licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor brecht ]; }; } From 8a585fd5c59bebb04434e2b7d0bfac1123b0a919 Mon Sep 17 00:00:00 2001 From: Brecht Savelkoul Date: Thu, 12 Aug 2021 21:08:13 +0200 Subject: [PATCH 38/39] nixos/lighttpd: support new authentication modules --- .../services/web-servers/lighttpd/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 7a691aa78915..05e897c8cc94 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -38,10 +38,13 @@ let "mod_rrdtool" "mod_accesslog" # Remaining list of modules, order assumed to be unimportant. + "mod_authn_dbi" "mod_authn_file" "mod_authn_gssapi" "mod_authn_ldap" "mod_authn_mysql" + "mod_authn_pam" + "mod_authn_sasl" "mod_cml" "mod_deflate" "mod_evasive" @@ -132,6 +135,15 @@ in ''; }; + package = mkOption { + default = pkgs.lighttpd; + defaultText = "pkgs.lighttpd"; + type = types.package; + description = '' + lighttpd package to use. + ''; + }; + port = mkOption { default = 80; type = types.port; @@ -240,7 +252,7 @@ in description = "Lighttpd Web Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkgs.lighttpd}/sbin/lighttpd -D -f ${configFile}"; + serviceConfig.ExecStart = "${cfg.package}/sbin/lighttpd -D -f ${configFile}"; # SIGINT => graceful shutdown serviceConfig.KillSignal = "SIGINT"; }; From 5655e71eeeb7c47908ac92b3ff2f6c5073a30d76 Mon Sep 17 00:00:00 2001 From: Brecht Savelkoul Date: Sun, 15 Aug 2021 21:13:52 +0200 Subject: [PATCH 39/39] lighttpd: remove null defaults for input packages --- pkgs/servers/http/lighttpd/default.nix | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 0856d082302b..4f98e3c7dab3 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,26 +1,16 @@ { lib, stdenv, buildPackages, fetchurl, pkg-config, pcre, libxml2, zlib, bzip2, which, file , openssl -, enableDbi ? false, libdbi ? null -, enableMagnet ? false, lua5_1 ? null -, enableMysql ? false, libmysqlclient ? null -, enableLdap ? false, openldap ? null -, enablePam ? false, linux-pam ? null -, enableSasl ? false, cyrus_sasl ? null -, enableWebDAV ? false, sqlite ? null, libuuid ? null -, enableExtendedAttrs ? false, attr ? null +, enableDbi ? false, libdbi +, enableMagnet ? false, lua5_1 +, enableMysql ? false, libmysqlclient +, enableLdap ? false, openldap +, enablePam ? false, linux-pam +, enableSasl ? false, cyrus_sasl +, enableWebDAV ? false, sqlite, libuuid +, enableExtendedAttrs ? false, attr , perl }: -assert enableDbi -> libdbi != null; -assert enableMagnet -> lua5_1 != null; -assert enableMysql -> libmysqlclient != null; -assert enableLdap -> openldap != null; -assert enablePam -> linux-pam != null; -assert enableSasl -> cyrus_sasl != null; -assert enableWebDAV -> sqlite != null; -assert enableWebDAV -> libuuid != null; -assert enableExtendedAttrs -> attr != null; - stdenv.mkDerivation rec { pname = "lighttpd"; version = "1.4.59";