From b25837d9f46228c3b97d041c7ff03e16251ba54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 11:31:22 +0100 Subject: [PATCH 01/39] libsForQt5.mauikit: init at 1.2.1 --- .../development/libraries/mauikit/default.nix | 42 +++++++++++++++++++ pkgs/top-level/qt5-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/libraries/mauikit/default.nix diff --git a/pkgs/development/libraries/mauikit/default.nix b/pkgs/development/libraries/mauikit/default.nix new file mode 100644 index 00000000000..0ec814b7164 --- /dev/null +++ b/pkgs/development/libraries/mauikit/default.nix @@ -0,0 +1,42 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, kio +, qtbase +, qtquickcontrols2 +, syntax-highlighting +}: + +mkDerivation rec { + pname = "mauikit"; + version = "1.2.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "mauikit"; + rev = "v${version}"; + sha256 = "1wimbpbn9yqqdcjd59x83z0mw2fycjz09py2rwimfi8ldmvi5lgy"; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kio + qtquickcontrols2 + syntax-highlighting + ]; + + meta = with lib; { + homepage = "https://mauikit.org/"; + description = "Free and modular front-end framework for developing fast and compelling user experiences"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + broken = lib.versionOlder qtbase.version "5.14.0"; + }; +} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 336f58adf11..656a8a5c0f0 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -115,6 +115,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // kpmcore = callPackage ../development/libraries/kpmcore { }; + mauikit = callPackage ../development/libraries/mauikit { }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; openbr = callPackage ../development/libraries/openbr { }; From 026dbb4652b6ec9c55519f5efeafdaa91f4724b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Mar 2021 11:31:44 +0100 Subject: [PATCH 02/39] index-fm: init at 1.2.1 --- pkgs/applications/misc/index-fm/default.nix | 52 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/applications/misc/index-fm/default.nix diff --git a/pkgs/applications/misc/index-fm/default.nix b/pkgs/applications/misc/index-fm/default.nix new file mode 100644 index 00000000000..328db965001 --- /dev/null +++ b/pkgs/applications/misc/index-fm/default.nix @@ -0,0 +1,52 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, breeze-icons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, qtmultimedia +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "index"; + version = "1.2.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "index-fm"; + rev = "v${version}"; + sha256 = "1v6z44c88cqgr3b758yq6l5d2zj1vhlnaq7v8rrhs7s5dsimzlx8"; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + breeze-icons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + qtmultimedia + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Multi-platform file manager"; + homepage = "https://invent.kde.org/maui/index-fm"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df8a55a3525..acf0102f336 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23224,6 +23224,8 @@ in # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; + index-fm = libsForQt5.callPackage ../applications/misc/index-fm { }; + inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; inkscape = callPackage ../applications/graphics/inkscape { From 4f3413deb8d1bde5b1a546264610a6690758f0b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Mar 2021 02:58:19 +0100 Subject: [PATCH 03/39] python3Packages.HAP-python: 3.3.2 -> 3.4.0 --- .../python-modules/HAP-python/default.nix | 46 +++++++------------ 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/HAP-python/default.nix b/pkgs/development/python-modules/HAP-python/default.nix index 2e740fcc2c8..c12285a287a 100644 --- a/pkgs/development/python-modules/HAP-python/default.nix +++ b/pkgs/development/python-modules/HAP-python/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage +, base36 , cryptography , curve25519-donna , ecdsa , ed25519 , fetchFromGitHub , h11 +, pyqrcode , pytest-asyncio , pytest-timeout , pytestCheckHook @@ -15,7 +17,7 @@ buildPythonPackage rec { pname = "HAP-python"; - version = "3.3.2"; + version = "3.4.0"; disabled = pythonOlder "3.5"; # pypi package does not include tests @@ -23,15 +25,17 @@ buildPythonPackage rec { owner = "ikalchev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oDTyFIhf7oogYyh9LpmVtagi1kDXLCc/7c2UH1dL2Sg="; + sha256 = "0mkrs3fwiyp4am9fx1dnhd9h7rphfwymr46khw40xavrfb5jmsa7"; }; propagatedBuildInputs = [ + base36 cryptography curve25519-donna ecdsa ed25519 h11 + pyqrcode zeroconf ]; @@ -41,35 +45,19 @@ buildPythonPackage rec { pytestCheckHook ]; + # Disable tests requiring network access + disabledTestPaths = [ + "tests/test_accessory_driver.py" + "tests/test_hap_handler.py" + "tests/test_hap_protocol.py" + ]; + disabledTests = [ - # Disable tests needing network - "camera" - "pair" - "test_async_subscribe_client_topic" - "test_auto_add_aid_mac" - "test_connection_management" - "test_crypto_failure_closes_connection" - "test_empty_encrypted_data" - "test_external_zeroconf" - "test_get_accessories" - "test_get_characteristics" - "test_handle_set_handle_set" - "test_handle_snapshot_encrypted_non_existant_accessory" - "test_http_11_keep_alive" - "test_http10_close" - "test_mdns_service_info" - "test_mixing_service_char_callbacks_partial_failure" - "test_not_standalone_aid" - "test_persist" - "test_push_event" - "test_send_events" - "test_service_callbacks" - "test_set_characteristics_with_crypto" - "test_setup_endpoints" - "test_start" - "test_upgrade_to_encrypted" + "test_persist_and_load" + "test_we_can_connect" + "test_idle_connection_cleanup" "test_we_can_start_stop" - "test_xhm_uri" + "test_push_event" ]; meta = with lib; { From 39447c654951bd0ddf466ff79cae7cfdfb80a8f2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Mar 2021 02:59:26 +0100 Subject: [PATCH 04/39] python3Packages.pymysensors: 0.20.1 -> 0.21.0 --- pkgs/development/python-modules/pymysensors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index bbfeec3a36c..24d7d4c2826 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pymysensors"; - version = "0.20.1"; + version = "0.21.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "theolind"; repo = pname; rev = version; - sha256 = "1hz3551ydsmd23havd0dljmvkhzjnmd28k41ws60s8ms3gzlzqfy"; + sha256 = "1k75gwvyzslyjr3cdx8b74fb302k2i7bda4q92rb75rhgp4gch55"; }; propagatedBuildInputs = [ From 7218f5d664cde17f3bcf1ad6a733fa43b1641df5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Mar 2021 03:04:16 +0100 Subject: [PATCH 05/39] python3Packages.pytile: 5.1.1 -> 5.2.1 Relax aiohttp dependency, the required update is in staging-next. --- pkgs/development/python-modules/pytile/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index 226fdbc715e..720fdff743e 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -13,18 +13,22 @@ buildPythonPackage rec { pname = "pytile"; - version = "5.1.1"; + version = "5.2.1"; disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-bVoFTaK/Alemtc5I+Z/M9y/FWczvJ+P86R0DMD89/BM="; + sha256 = "0d63xga4gjlfl9fzv3i4j605rrx2qgbzam6cl609ny96s8q8h1px"; }; format = "pyproject"; + postPatch = '' + substituteInPlace pyproject.toml --replace 'aiohttp = "^3.7.4"' 'aiohttp = "^3.7.3"' + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ From 7b82fbf63b53ce7d11b5e206cbff8a8a1178d890 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Mar 2021 03:09:42 +0100 Subject: [PATCH 06/39] home-assistant: 2021.3.2 -> 2021.3.3 --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 899a0731c6d..347dd2137c8 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.3.2"; + version = "2021.3.3"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -609,7 +609,7 @@ "otp" = ps: with ps; [ pyotp ]; "ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ]; - "ozw" = ps: with ps; [ aiohttp-cors homeassistant-pyozw paho-mqtt pydispatcher python-openzwave-mqtt ]; + "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 329bbac4fb7..34a8f7f6c04 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -66,7 +66,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.3.2"; + hassVersion = "2021.3.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -85,7 +85,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "09z2sds9my4vq0vmryjpzi7fv787zjfikfkd711d34c140bgcjch"; + sha256 = "0kfvjpzz6ynw8bwd91nm0aiw1pkrmaydwf1r93dnwi8rmzq10zpb"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 6a4f4420ff1..6db728e9c8b 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20210302.5"; + version = "20210302.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+SKXLOuvMYfNyR++uQMMY4M5deRgm2w3AhMM/DP470k="; + sha256 = "sha256-h3jCqfAPg+z6vsdLm5Pdr+7PCEWW58GCG9viIz3Mi64="; }; # there is nothing to strip in this package From 97a6e6e7021ffb507a6e5e8b6b32bcbb3859d1fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 09:26:04 +0000 Subject: [PATCH 07/39] qalculate-gtk: 3.16.0 -> 3.17.0 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 3d80d8c039e..7ee86793089 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.16.0"; + version = "3.17.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1vqzrh5zxwfvih6c3lak0wkkw6bajl88xzl1zk84gxsk9wdymrk4"; + sha256 = "sha256-Nxe1DZL8mh9aBWXQdlp5wC1l5b9mchlrRyE+LKC+yLI="; }; hardeningDisable = [ "format" ]; From 4e6eff318e3e47a3e0d48b0de66652ca481cba2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 9 Mar 2021 11:41:52 +0100 Subject: [PATCH 08/39] rclone: 1.54.0 -> 1.54.1, add SuperSandro2000 as maintainer --- pkgs/applications/networking/sync/rclone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index e2199cfcfb9..58f9745454a 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rclone"; - version = "1.54.0"; + version = "1.54.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-A0c5bHP5W/NTwAh1ifGaw4AG37qYXK9P/Fjk68gkUNk="; + sha256 = "sha256-DexqYAkGmgROnYpknnuWc3Q//IMOTSxgrr1w/TrueH4="; }; vendorSha256 = "sha256-Cpn/dUD9E2BzUlAISC+IDCW59OkEKZTpqdlvF/clV+M="; @@ -41,6 +41,6 @@ buildGoModule rec { homepage = "https://rclone.org"; changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md"; license = licenses.mit; - maintainers = with maintainers; [ danielfullmer marsam ]; + maintainers = with maintainers; [ danielfullmer marsam SuperSandro2000 ]; }; } From 71e1536f10e98c8762b29f8822effb3751061a36 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 9 Mar 2021 11:55:51 +0100 Subject: [PATCH 09/39] openocd: 0.11.0-rc1 -> 0.11.0 --- .../development/tools/misc/openocd/default.nix | 18 +++++++----------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index bf50a380d1f..7b3a16fb75e 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,7 +1,6 @@ { stdenv , lib -, fetchgit -, autoreconfHook +, fetchurl , pkg-config , hidapi , libftdi1 @@ -10,16 +9,13 @@ stdenv.mkDerivation rec { pname = "openocd"; - version = "0.11.0-rc1"; - - src = fetchgit { - url = "https://git.code.sf.net/p/openocd/code"; - rev = "v${version}"; - sha256 = "15g8qalyxhdp0imfrg8mxwnp0nimd836fc5laaavajw49gcm65m4"; - fetchSubmodules = true; + version = "0.11.0"; + src = fetchurl { + url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.bz2"; + sha256 = "0z8y7mmv0mhn2l5gs3vz6l7cnwak7agklyc7ml33f7gz99rwx8s3"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ hidapi libftdi1 libusb1 ]; @@ -64,7 +60,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://openocd.sourceforge.net/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ bjornfor ]; + maintainers = with maintainers; [ bjornfor prusnak ]; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db3a4ff6ff4..af758f3e41b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12771,9 +12771,7 @@ in opengrok = callPackage ../development/tools/misc/opengrok { }; - openocd = callPackage ../development/tools/misc/openocd { - autoreconfHook = buildPackages.autoreconfHook269; - }; + openocd = callPackage ../development/tools/misc/openocd { }; oprofile = callPackage ../development/tools/profiling/oprofile { libiberty_static = libiberty.override { staticBuild = true; }; From a4f8c1dcf047cc390744a08e37a809afef68a51e Mon Sep 17 00:00:00 2001 From: Daniel Beecham Date: Tue, 9 Mar 2021 12:02:53 +0100 Subject: [PATCH 10/39] bear: 3.0.3 -> 3.0.9 --- pkgs/development/tools/build-managers/bear/default.nix | 8 ++++++-- .../tools/build-managers/bear/no-double-relative.patch | 10 +++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 74b1f704020..5b5a06828a7 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -12,17 +12,19 @@ , c-ares , abseil-cpp , zlib +, sqlite +, re2 }: stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.3"; + version = "3.0.9"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "1abx5h6xy0h3mz29ial5si8smkmjzla050d130pcc6dzr4ic642w"; + sha256 = "xac8PYo3qYjtQbDy8piOz5BQQpcVlAvMCv1qHrVZmPQ="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -38,6 +40,8 @@ stdenv.mkDerivation rec { c-ares abseil-cpp zlib + sqlite + re2 ]; patches = [ diff --git a/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/pkgs/development/tools/build-managers/bear/no-double-relative.patch index 0184bdfd6ba..f4d247fa576 100644 --- a/pkgs/development/tools/build-managers/bear/no-double-relative.patch +++ b/pkgs/development/tools/build-managers/bear/no-double-relative.patch @@ -1,5 +1,5 @@ diff --git a/source/config.h.in b/source/config.h.in -index 2ca8853..2564c63 100644 +index 728c234..a3e76c6 100644 --- a/source/config.h.in +++ b/source/config.h.in @@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@"; @@ -7,8 +7,8 @@ index 2ca8853..2564c63 100644 constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames"; constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept"; -constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; --constexpr char EXECUTOR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/er"; --constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; +-constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper"; +-constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; +constexpr char LIBRARY_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; -+constexpr char EXECUTOR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/er"; -+constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; ++constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper"; ++constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; From 7b9ed57ea2ae02c2ddac8858e2008cd0ab2ddba5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 11:04:15 +0000 Subject: [PATCH 11/39] redis: 6.2.0 -> 6.2.1 --- pkgs/servers/nosql/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index e35aac3be1b..b9809a9a105 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "redis"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "1jnv6acjlljvrlxmz0mqarsx1fl5vwss24l8zy5dcawnbp129mk7"; + sha256 = "sha256-zSIlBQEsziCyVoL8qTHsk70hrpLLSr/nQs97dqqQdSA="; }; # Cross-compiling fixes From 02944a45d9a5ef7f06f421dffd4666f1472c62f6 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 9 Mar 2021 11:11:40 +0100 Subject: [PATCH 12/39] pythonPackages.defcon: 0.7.2 -> 0.8.0 --- pkgs/development/python-modules/defcon/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 25c59029992..36025e85bf8 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -1,18 +1,24 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, fonttools +, fonttools, setuptools-scm , pytest, pytestrunner, lxml, fs, unicodedata2, fontpens }: buildPythonPackage rec { pname = "defcon"; - version = "0.7.2"; + version = "0.8.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1lfqsvxmq1j0nvp26gidnqkj1dyxv7jalc6i7fz1r3nc7niflrqr"; + sha256 = "028j7i39m75fnbyc6jsvwwiz31vq4slxwf47y6yszy1qn61xkcna"; extension = "zip"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ fonttools ]; From 9a60ad1b4b4a7289115a8c65784f984283e753b5 Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Tue, 9 Mar 2021 14:55:59 +0300 Subject: [PATCH 13/39] gops: 0.3.16 -> 0.3.17 --- pkgs/development/tools/gops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/development/tools/gops/default.nix index 0f0230049cf..ff9b2064cec 100644 --- a/pkgs/development/tools/gops/default.nix +++ b/pkgs/development/tools/gops/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gops"; - version = "0.3.16"; + version = "0.3.17"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "1ksypkja5smxvrhgcjk0w18ws97crx6bx5sj20sh8352xx0nm6mp"; + sha256 = "1l0k1v2wwwdrwwznrdq2ivbrl5z3hxa89xm89jlaglkd7jjg74zk"; }; vendorSha256 = null; From b5d4baa0978a6e81c8ebe016d48e16f35a4f33af Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 12:24:14 +0000 Subject: [PATCH 14/39] ser2net: 4.3.2 -> 4.3.3 --- pkgs/servers/ser2net/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index a751e0872ee..ce14e5d8965 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fA4rtFZ2lhGAwY3KUl/Jk8gjueI761J1QRdivMtbqX4="; + sha256 = "sha256-p8iQifCf/IXXPdbjB3pgcw8FgkqRLShHSSeTzJ83Ecg="; }; passthru = { From 41ea90e524459caca743a6343ab52da900661e40 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 12:34:30 +0000 Subject: [PATCH 15/39] seaweedfs: 2.27 -> 2.29 --- pkgs/applications/networking/seaweedfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 3e5a23a3f38..e038fba6d84 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.27"; + version = "2.29"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-0KT/5seJs8GkatL4BsZ+r71t6AJrpHB6Q92sCvplKcQ="; + sha256 = "sha256-wyqshtL3wGrmb1oEMOMk2QmDXW9M5tt9d1QEtMFiXa4="; }; vendorSha256 = "sha256-uT/Y/TfpqDyOUElc4M/w/v77bWF3tTJz+Yu0KRMcxk4="; From 8090d83920f0d0e0d5a2910da306bb467013a1f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 12:20:49 +0000 Subject: [PATCH 16/39] sane-airscan: 0.99.16 -> 0.99.24 --- .../graphics/sane/backends/airscan/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/airscan/default.nix b/pkgs/applications/graphics/sane/backends/airscan/default.nix index 3cce81ef8af..d2ff4339890 100644 --- a/pkgs/applications/graphics/sane/backends/airscan/default.nix +++ b/pkgs/applications/graphics/sane/backends/airscan/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg, libpng, gnutls -, sane-backends, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, avahi, libjpeg, libpng +, libxml2, gnutls, sane-backends }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.16"; + version = "0.99.24"; nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ avahi libsoup libjpeg libpng gnutls sane-backends ]; + buildInputs = [ avahi gnutls libjpeg libpng libxml2 sane-backends ]; src = fetchFromGitHub { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "00lgcdbpns0shwlpkvrpfm4z05s7v5q3al4kcw6ii7xnkzmv1721"; + sha256 = "sha256-2zSLC9P7Q/GMefHvmrUz6nV2hgScb4BhPAkahNBouqk="; }; meta = with lib; { From f15d4581abf3bee21beec2047cecbc417e5ff9df Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 9 Mar 2021 16:09:34 +0300 Subject: [PATCH 17/39] sent: enable on darwin --- pkgs/applications/misc/sent/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix index f4b811e0752..fcf021a5ac7 100644 --- a/pkgs/applications/misc/sent/default.nix +++ b/pkgs/applications/misc/sent/default.nix @@ -2,10 +2,11 @@ , patches ? [] }: stdenv.mkDerivation rec { - name = "sent-1"; + pname = "sent"; + version = "1"; src = fetchurl { - url = "https://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/sent-${version}.tar.gz"; sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv"; }; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { description = "A simple plaintext presentation tool"; homepage = "https://tools.suckless.org/sent/"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; } From 6598cfb68232cd518a697a5aef8a0a70ad3dd1c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 13:10:20 +0000 Subject: [PATCH 18/39] gnome3.rygel: 0.40.0 -> 0.40.1 --- pkgs/desktops/gnome-3/core/rygel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index 65096c359d7..75b2bd29270 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.40.0"; + version = "0.40.1"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xrbdsgm78h3g4qcvq2p8k70q31x9xdbb35bixz36q6h9s1wqznn"; + sha256 = "QkDXd1mcjNCeZ9pEzLOV0KbceEedgJzWIZgixbVooy0="; }; nativeBuildInputs = [ From 5a4977dfd72a21633eb3296f5735c56dd35709ec Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 9 Mar 2021 20:22:07 +0700 Subject: [PATCH 19/39] metamath: fix cross-compilation and update license --- pkgs/development/interpreters/metamath/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index a2b94667a6e..d5c021a815f 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -1,12 +1,10 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook }: -let - version = "0.196"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "metamath"; - inherit version; + version = "0.196"; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; src = fetchFromGitHub { owner = "metamath"; @@ -25,7 +23,7 @@ in stdenv.mkDerivation { ''; homepage = "http://us.metamath.org"; downloadPage = "http://us.metamath.org/#downloads"; - license = licenses.gpl2Only; + license = licenses.gpl2Plus; maintainers = [ maintainers.taneb ]; platforms = platforms.all; }; From c5462fa78861cf4169a72195778389dc2fa3fc1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Tue, 9 Mar 2021 13:11:52 +0100 Subject: [PATCH 20/39] sollya: init at 0.7 --- .../interpreters/sollya/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/interpreters/sollya/default.nix diff --git a/pkgs/development/interpreters/sollya/default.nix b/pkgs/development/interpreters/sollya/default.nix new file mode 100644 index 00000000000..5c439347f07 --- /dev/null +++ b/pkgs/development/interpreters/sollya/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchurl +, gmp +, mpfr +, mpfi +, libxml2 +, fplll +}: + +stdenv.mkDerivation rec { + pname = "sollya"; + version = "7.0"; + + src = fetchurl { + url = "https://www.sollya.org/releases/sollya-${version}/sollya-${version}.tar.gz"; + sha256 = "0amrxg7567yy5xqpgchxggjpfr11xyl27vy29c7vlh7v8a17nj1h"; + }; + + buildInputs = [ gmp mpfr mpfi libxml2 fplll ]; + + meta = with lib; { + description = "A tool environment for safe floating-point code development"; + homepage = "https://www.sollya.org/"; + license = licenses.cecill-c; + platforms = platforms.linux; + maintainers = with maintainers; [ eduardosm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db3a4ff6ff4..942ac2bc2f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27433,6 +27433,8 @@ in soldat-unstable = callPackage ../games/soldat-unstable { }; + sollya = callPackage ../development/interpreters/sollya { }; + # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; From d23f00c9acaad6118d473bce35d5ddcfc19e5859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 9 Mar 2021 16:12:12 +0100 Subject: [PATCH 21/39] ytfzf: 1.0.0 -> 1.0.1 --- pkgs/tools/misc/ytfzf/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index bf64e858d2b..9feecb58912 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -12,26 +12,21 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - sha256 = "09znixn8mpkxipv2x3nrfxr2i8g7y58v25qssqf092j9lh85sf9h"; + sha256 = "1i9ya38zcaj1vkfgy1n4gp5vqb59zlrd609pdmz4jqinrb0c5fgv"; }; nativeBuildInputs = [ makeWrapper ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}/bin" ]; dontBuild = true; - # remove after next update - preInstall = '' - mkdir -p "$out/bin" - ''; - postInstall = '' wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [ curl dmenu fzf jq mpv youtube-dl From 9c251b861bb4186797300dd0c7bbad23f5708fa7 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 9 Mar 2021 22:42:22 +0700 Subject: [PATCH 22/39] uutils-coreutils: 0.0.3 -> 0.0.4 --- pkgs/tools/misc/uutils-coreutils/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 44871b07a8e..fd195ab1843 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" , Security }: + rustPlatform.buildRustPackage rec { pname = "uutils-coreutils"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "QWiEHk8aciiwQeyNgrr0M0c1EeAgE3gSqw0ly/YTwTQ="; + sha256 = "sha256-z5lDKJpFxXDCQq+0Da/63GGoUXacy5TSn+1gJiMvicc="; }; # too many impure/platform-dependent tests doCheck = false; - cargoSha256 = "m2a7WNkF5TxjJlytjdoQ/JZIF9gp9qBkH+UU/NVRJzA="; + cargoSha256 = "sha256-x/nn2JNe8x+I0G2Vbr2PZAHCghwLBDhKAhkHPQFeL0M="; makeFlags = [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] From 196b2321316d6f5bce9e1e0d70a82d1a18bb3f39 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 12:06:12 -0500 Subject: [PATCH 23/39] linux: 4.14.222 -> 4.14.224 --- 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 3716ee9eb6f..92a28f9c460 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.222"; + version = "4.14.224"; # 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 = "0i67va37ca3avalgh2ab797c6w2v0h41y1mh4fql73lz7nq84h3k"; + sha256 = "1x8wyj28zcx6nn3mkfvs7aywrq1rd8xam5f3r02mynb09kn5hdnq"; }; } // (args.argsOverride or {})) From 929d751e5bf244e1266773aa2f58b804bd12c45a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 12:06:22 -0500 Subject: [PATCH 24/39] linux: 4.19.177 -> 4.19.179 --- 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 e4b81530e95..342bb6990bd 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.177"; + version = "4.19.179"; # 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 = "0z9m081jg84mzp639ifx3321bpysfs3rpcrsx9mwdsh19rwv63mc"; + sha256 = "14iy4i6xm2mva359dyrx6s1djpw7rxvnkydcbm6lnfvn7sik37a9"; }; } // (args.argsOverride or {})) From cecaeca80b7a1fef3903027eb980a5efc9f6ce2e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 12:06:32 -0500 Subject: [PATCH 25/39] linux: 4.4.258 -> 4.4.260 --- 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 f066bf3ad18..e96de093c0f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.258"; + version = "4.4.260"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0rb6sww4yd2m4a4v12klx29nyxb66f55ziv8xcihgf2iw4d62h8c"; + sha256 = "1vl8zhlkhqbw2xqvkqhw1z75mrzk5lsdcj8bd2k2fw7cbwa00ln6"; }; } // (args.argsOverride or {})) From 57455d756617142f6bee14ab1f7e65e45352f818 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 12:06:38 -0500 Subject: [PATCH 26/39] linux: 4.9.258 -> 4.9.260 --- 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 bdd84a83f2f..4136c4f634e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.258"; + version = "4.9.260"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kf8wlcf8gkpnglx1ggn1c3xfz4yx9995yb919mvin7nd7hghy6l"; + sha256 = "1xcgqvk1g3l9bidpx377rbbwzvyxb0sbkszlk722bj7vk6c4asmq"; }; } // (args.argsOverride or {})) From 8a706422faa45af1e6816ab6fa5371063331c33b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 12:06:45 -0500 Subject: [PATCH 27/39] linux: 5.10.18 -> 5.10.21 --- 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 0ee5cad28ff..a0d77336bf4 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.18"; + version = "5.10.21"; # 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 = "04dnkg5j73f6cd8ws1prrrjx37srz7rm66bj6slmnfzp3cmyxh9v"; + sha256 = "1bz2gmyvpl4vsk0r6fsnh451fzvvfbv63rw8ia75gfv52vzyczwy"; }; } // (args.argsOverride or {})) From 861b11a3909011fdd8b7dddc147b0c3a300cba79 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 12:06:52 -0500 Subject: [PATCH 28/39] linux: 5.11.2 -> 5.11.4 --- pkgs/os-specific/linux/kernel/linux-5.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix index 6c595d75c8f..62412060fb2 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.2"; + version = "5.11.4"; # 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 = "186ha9fsk2qvrjkq7yvpmml938byz92m8ykcvbw4w9pmp8y5njlh"; + sha256 = "1i8dfw83ndaylwji7lazfckk113plvnz7kh1yppbfg35r6przrc8"; }; } // (args.argsOverride or {})) From 6e5bce6b5abd0bf84d5644093647ccacd174a0c3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 12:06:59 -0500 Subject: [PATCH 29/39] linux: 5.4.100 -> 5.4.103 --- 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 31e84a37d59..f161acca9ea 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.100"; + version = "5.4.103"; # 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 = "02i47fmx2jbnjr3sd1bvldf9vc712528phpnybsbq8h8lqd6hpbr"; + sha256 = "12wy2w7yc6fcn61xm6l7a86rfwwcchfq89lpznm2v3dmy5y3mqw4"; }; } // (args.argsOverride or {})) From 4fb927e50ed3affbc40e82672167b771bdc41068 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 12:07:12 -0500 Subject: [PATCH 30/39] linux_latest-libre: 17873 -> 17920 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 25c8ee3a654..08898bb0a22 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17873"; - sha256 = "1r1c8wagbq3cgxys7ylvsg6bnxiky66xgx9l0282zsmnn3gh83l7"; + rev = "17920"; + sha256 = "0qmhabh4922lpiimrh9smi1q0w8giw3qqxpyzzy2bmr2037011k0"; } , ... }: From 0221fe13da7c73ad0ad8cb0787cfad37e93acc92 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 12:07:19 -0500 Subject: [PATCH 31/39] linux/hardened/patches/5.10: 5.10.18-hardened1 -> 5.10.19-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 ef32e465835..b24effad12a 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.18-hardened1.patch", - "sha256": "19z1dlwqfwaxi72yr6yh9dzqqrk1v3za3i6qz95xyz5afwn8vp33", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.18-hardened1/linux-hardened-5.10.18-hardened1.patch" + "name": "linux-hardened-5.10.19-hardened1.patch", + "sha256": "0yfw5m5ab0l83j854a5g8vrxkjb3da2hrh6jzvkjsddb4kfwhck8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.19-hardened1/linux-hardened-5.10.19-hardened1.patch" }, "5.4": { "extra": "-hardened1", From e3a6b728a30c211bcf6c7f2679e65f52fde0b91a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 8 Mar 2021 12:07:20 -0500 Subject: [PATCH 32/39] linux/hardened/patches/5.4: 5.4.100-hardened1 -> 5.4.101-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 b24effad12a..80551b56447 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,8 +19,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.100-hardened1.patch", - "sha256": "0wr6lgb1xkj11y08y0v58ipkwifs56vy4bd3h70i52b7vhqwsb19", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.100-hardened1/linux-hardened-5.4.100-hardened1.patch" + "name": "linux-hardened-5.4.101-hardened1.patch", + "sha256": "1yhzd0d1s6jwiw53lsshs9b0g33s7092qr9nnjaik2bv3vdwxvjw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.101-hardened1/linux-hardened-5.4.101-hardened1.patch" } } From 6fb3bd79bef9aac3975bcaa2812d668efdbbf9ee Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 9 Mar 2021 09:11:28 -0500 Subject: [PATCH 33/39] linux: 5.11.4 -> 5.11.5 --- pkgs/os-specific/linux/kernel/linux-5.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix index 62412060fb2..1a7bbd1288b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.4"; + version = "5.11.5"; # 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 = "1i8dfw83ndaylwji7lazfckk113plvnz7kh1yppbfg35r6przrc8"; + sha256 = "0srxpl44px1fr7y6nl8pq61vmbkkdbsmxy5k7wvqka33gdhy8212"; }; } // (args.argsOverride or {})) From 7e71fcdba44c2fbcc07d2ad099e3c21866614feb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 9 Mar 2021 09:12:15 -0500 Subject: [PATCH 34/39] linux-rt_5_4: 5.4.93-rt51 -> 5.4.102-rt53 --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 6fbfa23e739..6f9b1eaa31d 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.93-rt51"; # updated by ./update-rt.sh + version = "5.4.102-rt53"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "08nmwd13z10866pc16fqbj41krnvk6hxkl4nmhdkpk346r04jx6k"; + sha256 = "1vcscg7cn8qycay913nbc1xl1691anhvakkxwx54s0pnqghpqsgx"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1ffipbnzv8rnmawjlglm667jq67asdr1mwrfhsmwkvlmivm9k4x1"; + sha256 = "0d1653cd5dcv4p13mxmva3jz5mp1phvmibfabhha0wsiqkabvx80"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; From 1361d733955a64904d61fa8cabe366a96681aae8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 9 Mar 2021 09:12:34 -0500 Subject: [PATCH 35/39] linux/hardened/patches/4.14: 4.14.222-hardened1 -> 4.14.224-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 80551b56447..c11716adab3 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.222-hardened1.patch", - "sha256": "1p692sn0d6cwmilgpi8chs99m0c36pd2rphrljz7b8ywc394jxsb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.222-hardened1/linux-hardened-4.14.222-hardened1.patch" + "name": "linux-hardened-4.14.224-hardened1.patch", + "sha256": "017bczkz0njj5icr3xzw8ai7kgyg919k8jnj3iq8d865db4n9nid", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.224-hardened1/linux-hardened-4.14.224-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 61ca55c1701aa288cf53cb5ebbdffc81584a2d36 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 9 Mar 2021 09:12:35 -0500 Subject: [PATCH 36/39] linux/hardened/patches/4.19: 4.19.177-hardened1 -> 4.19.179-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 c11716adab3..ba59ec36332 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.177-hardened1.patch", - "sha256": "1l9qic5ggak9qa04bhxrwsrdi6ih9a8dvnzv0l2dfrp7f5z4zmj9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.177-hardened1/linux-hardened-4.19.177-hardened1.patch" + "name": "linux-hardened-4.19.179-hardened1.patch", + "sha256": "1j6gvwjkigv47rc5wcc3cng0n1k1wfw27i34lb5zzlxzkjwbs1rx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.179-hardened1/linux-hardened-4.19.179-hardened1.patch" }, "5.10": { "extra": "-hardened1", From 48644e1496ce1a9f538713092b132627665033e3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 9 Mar 2021 09:12:37 -0500 Subject: [PATCH 37/39] linux/hardened/patches/5.10: 5.10.19-hardened1 -> 5.10.21-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 ba59ec36332..0ecc9a09f66 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.19-hardened1.patch", - "sha256": "0yfw5m5ab0l83j854a5g8vrxkjb3da2hrh6jzvkjsddb4kfwhck8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.19-hardened1/linux-hardened-5.10.19-hardened1.patch" + "name": "linux-hardened-5.10.21-hardened1.patch", + "sha256": "1c0sdbw8vwrxq2bdhv1xnmp43x1cc3nwd0l77bw3wiq3x76d8sfp", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.21-hardened1/linux-hardened-5.10.21-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 921dffb59e6a10615a30c05f696b0f673aac5c65 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 9 Mar 2021 09:12:38 -0500 Subject: [PATCH 38/39] linux/hardened/patches/5.4: 5.4.101-hardened1 -> 5.4.103-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 0ecc9a09f66..344a866dfe1 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,8 +19,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.101-hardened1.patch", - "sha256": "1yhzd0d1s6jwiw53lsshs9b0g33s7092qr9nnjaik2bv3vdwxvjw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.101-hardened1/linux-hardened-5.4.101-hardened1.patch" + "name": "linux-hardened-5.4.103-hardened1.patch", + "sha256": "1ci0zml2g1q1438c7wkq6xn9kk39jsms8pj81chcyxwz67h7xvbc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.103-hardened1/linux-hardened-5.4.103-hardened1.patch" } } From 0ccc9d5c63312bb23f68f45e35f9854a63ba5512 Mon Sep 17 00:00:00 2001 From: Bogdan B Date: Tue, 9 Mar 2021 17:20:06 +0100 Subject: [PATCH 39/39] lxqt.lxqt-policykit: fix missing buildInput polkit (#115529) --- pkgs/desktops/lxqt/lxqt-policykit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index fc4378d861c..adda2339f36 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -8,6 +8,7 @@ , qttools , qtx11extras , qtsvg +, polkit , polkit-qt , kwindowsystem , liblxqt @@ -38,6 +39,7 @@ mkDerivation rec { qttools qtx11extras qtsvg + polkit polkit-qt kwindowsystem liblxqt