From e35bbe32c8f85c98fedf59bcf21b3411f9be8cea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 Nov 2023 08:56:41 +0100 Subject: [PATCH 01/20] python311Packages.azure-storage-queue: 12.7.3 -> 12.8.0 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-queue_12.8.0/sdk/storage/azure-storage-queue/CHANGELOG.md --- .../python-modules/azure-storage-queue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index e6f41525795b..70f1b5589d91 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.7.3"; + version = "12.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sDVzLTLT9mQ3eWYZM4CzDkv99rR2dHhDVExaXyE1VYk="; + hash = "sha256-mHwAjOv6d+Xh6mwKhVK6w3Rsh3HgijntkvEmRqOrYRk="; }; propagatedBuildInputs = [ From e3cef0f03624dcd2c029318d6043c69f689aa3d9 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sat, 11 Nov 2023 10:06:39 +0100 Subject: [PATCH 02/20] arrow-cpp: 13.0.0 -> 14.0.1 --- .../arrow-cpp/cmake-find-protobuf.patch | 105 ------------------ .../libraries/arrow-cpp/default.nix | 13 +-- 2 files changed, 4 insertions(+), 114 deletions(-) delete mode 100644 pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch diff --git a/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch b/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch deleted file mode 100644 index 32c0a4cab584..000000000000 --- a/pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/cmake_modules/FindProtobufAlt.cmake b/cmake_modules/FindprotobufAlt.cmake -similarity index 60% -rename from cmake_modules/FindProtobufAlt.cmake -rename to cmake_modules/FindprotobufAlt.cmake -index 15fe1b4f2..19bdd6291 100644 ---- a/cmake_modules/FindProtobufAlt.cmake -+++ b/cmake_modules/FindprotobufAlt.cmake -@@ -16,24 +16,24 @@ - # under the License. - - if(ARROW_PROTOBUF_USE_SHARED) -- set(Protobuf_USE_STATIC_LIBS OFF) -+ set(protobuf_USE_STATIC_LIBS OFF) - else() -- set(Protobuf_USE_STATIC_LIBS ON) -+ set(protobuf_USE_STATIC_LIBS ON) - endif() - - set(find_package_args) --if(ProtobufAlt_FIND_VERSION) -- list(APPEND find_package_args ${ProtobufAlt_FIND_VERSION}) -+if(protobufAlt_FIND_VERSION) -+ list(APPEND find_package_args ${protobufAlt_FIND_VERSION}) - endif() --if(ProtobufAlt_FIND_QUIETLY) -+if(protobufAlt_FIND_QUIETLY) - list(APPEND find_package_args QUIET) - endif() --find_package(Protobuf ${find_package_args}) --set(ProtobufAlt_FOUND ${Protobuf_FOUND}) --if(ProtobufAlt_FOUND) -- set(ProtobufAlt_VERSION ${Protobuf_VERSION}) -- set(ProtobufAlt_VERSION_MAJOR ${Protobuf_VERSION_MAJOR}) -- set(ProtobufAlt_VERSION_MINOR ${Protobuf_VERSION_MINOR}) -- set(ProtobufAlt_VERSION_PATCH ${Protobuf_VERSION_PATCH}) -- set(ProtobufAlt_VERSION_TWEEK ${Protobuf_VERSION_TWEEK}) -+find_package(protobuf ${find_package_args} CONFIG) -+set(protobufAlt_FOUND ${protobuf_FOUND}) -+if(protobufAlt_FOUND) -+ set(protobufAlt_VERSION ${protobuf_VERSION}) -+ set(protobufAlt_VERSION_MAJOR ${protobuf_VERSION_MAJOR}) -+ set(protobufAlt_VERSION_MINOR ${protobuf_VERSION_MINOR}) -+ set(protobufAlt_VERSION_PATCH ${protobuf_VERSION_PATCH}) -+ set(protobufAlt_VERSION_TWEEK ${protobuf_VERSION_TWEEK}) - endif() -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index 94f926039..8efc98323 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -63,7 +63,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES - opentelemetry-cpp - ORC - re2 -- Protobuf -+ protobuf - RapidJSON - Snappy - Substrait -@@ -189,7 +189,7 @@ macro(build_dependency DEPENDENCY_NAME) - build_opentelemetry() - elseif("${DEPENDENCY_NAME}" STREQUAL "ORC") - build_orc() -- elseif("${DEPENDENCY_NAME}" STREQUAL "Protobuf") -+ elseif("${DEPENDENCY_NAME}" STREQUAL "protobuf") - build_protobuf() - elseif("${DEPENDENCY_NAME}" STREQUAL "RapidJSON") - build_rapidjson() -@@ -1722,7 +1722,7 @@ if(ARROW_WITH_PROTOBUF) - # "3" for 3.12.0 are different. So 23.4 is rejected with 3.12.0. If - # we use FORCE_ANY_NEWER_VERSION here, we can bypass the check and - # use 23.4. -- resolve_dependency(Protobuf -+ resolve_dependency(protobuf - FORCE_ANY_NEWER_VERSION - TRUE - HAVE_ALT -@@ -1732,7 +1732,7 @@ if(ARROW_WITH_PROTOBUF) - PC_PACKAGE_NAMES - protobuf) - -- if(NOT Protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) -+ if(NOT protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) - add_definitions(-DPROTOBUF_USE_DLLS) - endif() - -@@ -1768,8 +1768,8 @@ if(ARROW_WITH_PROTOBUF) - message(STATUS "Found protoc: ${PROTOBUF_PROTOC_EXECUTABLE}") - get_target_property(PROTOBUF_TYPE ${ARROW_PROTOBUF_LIBPROTOBUF} TYPE) - if(NOT STREQUAL "INTERFACE_LIBRARY") -- # Protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake -- message(STATUS "Found libprotoc: ${Protobuf_PROTOC_LIBRARY}") -+ # protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake -+ message(STATUS "Found libprotoc: ${protobuf_PROTOC_LIBRARY}") - get_target_property(PROTOBUF_LIBRARY ${ARROW_PROTOBUF_LIBPROTOBUF} IMPORTED_LOCATION) - message(STATUS "Found libprotobuf: ${PROTOBUF_LIBRARY}") - message(STATUS "Found protobuf headers: ${PROTOBUF_INCLUDE_DIR}") -@@ -3986,7 +3986,7 @@ endmacro() - - if(ARROW_WITH_GRPC) - set(ARROW_GRPC_REQUIRED_VERSION "1.30.0") -- if(NOT Protobuf_SOURCE STREQUAL gRPC_SOURCE) -+ if(NOT protobuf_SOURCE STREQUAL gRPC_SOURCE) - # ARROW-15495: Protobuf/gRPC must come from the same source - message(STATUS "Forcing gRPC_SOURCE to Protobuf_SOURCE (${Protobuf_SOURCE})") - set(gRPC_SOURCE "${Protobuf_SOURCE}") diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index ddf8db98b39b..4cc55effdaa5 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -78,11 +78,11 @@ let in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "13.0.0"; + version = "14.0.1"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-Nd/aGRJip1a+k07viv7o0JdiytJQIdqmJuskniUayeY="; + hash = "sha256-XHDq+xAR+dEkuvsyiv5U9izFuSgLcIDh49Zo94wOQH4="; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -115,15 +115,10 @@ stdenv.mkDerivation rec { ARROW_SUBSTRAIT_URL = fetchFromGitHub { owner = "substrait-io"; repo = "substrait"; - rev = "v0.20.0"; - hash = "sha256-71hAwJ0cGvpwK/ibeeQt82e9uqxcu9sM1rPtPENMPfs="; + rev = "v0.27.0"; + hash = "sha256-wptEAXembah04pzqAz6UHeUxp+jMf6Lh/IdyuIhy/a8="; }; - patches = [ - # Protobuf switched to lower case project name. - ./cmake-find-protobuf.patch - ]; - nativeBuildInputs = [ cmake ninja From 74081b74a3dcd88802ef2ed29b70e6ca7e71e8df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 17 Nov 2023 20:52:13 +0100 Subject: [PATCH 03/20] python311Packages.pwntools: 4.11.0 -> 4.11.1 Changelog: https://github.com/Gallopsled/pwntools/releases/tag/4.11.1 --- pkgs/development/python-modules/pwntools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 5281701f99e1..32c8b966ad58 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -29,11 +29,11 @@ let in buildPythonPackage rec { pname = "pwntools"; - version = "4.11.0"; + version = "4.11.1"; src = fetchPypi { inherit pname version; - hash = "sha256-qF8ed380P5HiIdF14VI9AG7vHIEGwQ/S4zgoC6snP6Y="; + hash = "sha256-7hnjX721t0YzKcJ75R+tEfUI6E9bxMYXUEtI56GDZP0="; }; postPatch = '' From c65b1f47ab9362d9d38612ce837b6bb9d36bc2be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Nov 2023 13:22:07 +0100 Subject: [PATCH 04/20] python311Packages.stringparser: 0.6 -> 0.7 Diff: https://github.com/hgrecco/stringparser/compare/refs/tags/0.6...0.7 Changelog: https://github.com/hgrecco/stringparser/blob/0.7/CHANGES --- .../python-modules/stringparser/default.nix | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/stringparser/default.nix b/pkgs/development/python-modules/stringparser/default.nix index bac315950781..44e6d6baa52f 100644 --- a/pkgs/development/python-modules/stringparser/default.nix +++ b/pkgs/development/python-modules/stringparser/default.nix @@ -1,35 +1,50 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub +, pytestCheckHook +, pythonOlder , setuptools , setuptools-scm -, pytestCheckHook +, typing-extensions }: buildPythonPackage rec { pname = "stringparser"; - version = "0.6"; - format = "setuptools"; + version = "0.7"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "hgrecco"; - repo = pname; - rev = version; - sha256 = "sha256-uyeHuH0UfpZqh7sMRI6+fR/Rr2jSzdR+5O/MtzslO5w="; + repo = "stringparser"; + rev = "refs/tags/${version}"; + hash = "sha256-gj0ooeb869JhlB9Mf5nBydiV2thTes8ys+BLJ516iSA="; }; - nativeBuildInputs = [ setuptools setuptools-scm ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - pythonImportsCheck = [ "stringparser" ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; - nativeCheckInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ + typing-extensions + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "stringparser" + ]; meta = with lib; { description = "Easy to use pattern matching and information extraction"; homepage = "https://github.com/hgrecco/stringparser"; + changelog = "https://github.com/hgrecco/stringparser/blob/${version}/CHANGES"; license = licenses.bsd3; maintainers = with maintainers; [ evilmav ]; }; From 222b24cae59d7e166092f4a99d34b90533db4692 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Nov 2023 13:28:25 +0100 Subject: [PATCH 05/20] python311Packages.strawberry-graphql: 0.208.0 -> 0.214.0 Diff: https://github.com/strawberry-graphql/strawberry/compare/refs/tags/0.208.0...0.214.0 Changelog: https://github.com/strawberry-graphql/strawberry/blob/0.214.0/CHANGELOG.md --- .../development/python-modules/strawberry-graphql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 93704c953ee8..94011ad5244d 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.208.0"; + version = "0.214.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -51,7 +51,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-Gp58q1oZblbEQftEiq3il12eVIVF68jbGiqLdlolHvU="; + hash = "sha256-5mPVZz/KmrRytGoW5h1vG8pt8+N+jFk2Q22ih+sjcjM="; }; patches = [ From 4b8521c493a4e76b7a803bbbfa0a4c40daab5cda Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 18 Nov 2023 23:34:52 +0100 Subject: [PATCH 06/20] nixdoc: 2.5.1 -> 2.6.0, add infinisil as maintainer --- pkgs/tools/nix/nixdoc/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index f7f6f4e04dbf..183e7f019e62 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-QgKzpFdzisWD6DZxs1LsKINBr/bSYQILpEu5RdcNgbc="; + sha256 = "sha256-g1PBPpvK3kg0bJEDXsifVgcl3+v54q08Ae3nZ4cJ+Xs="; }; - cargoHash = "sha256-MztvOV1yAOgpwPYOUUZb7XHKhhhd/fvKPIFbsnMdhAQ="; + cargoHash = "sha256-E5SJfwGfy1DcLC0cF/5FTbVEJs/WYb2KO+OdOo2fgQk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; @@ -19,7 +19,10 @@ rustPlatform.buildRustPackage rec { description = "Generate documentation for Nix functions"; homepage = "https://github.com/nix-community/nixdoc"; license = [ licenses.gpl3 ]; - maintainers = [ maintainers.asymmetric ]; + maintainers = with maintainers; [ + infinisil + asymmetric + ]; platforms = platforms.unix; }; } From 54a207cf2158990512746a9ca34ef21aaaa24ac3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 18 Nov 2023 17:45:38 -0500 Subject: [PATCH 07/20] cargo-semver-checks: 0.24.2 -> 0.25.0 Diff: https://github.com/obi1kenobi/cargo-semver-checks/compare/v0.24.2...v0.25.0 Changelog: https://github.com/obi1kenobi/cargo-semver-checks/releases/tag/v0.25.0 --- pkgs/development/tools/rust/cargo-semver-checks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 4143c08da5e7..5fa4d5308674 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.24.2"; + version = "0.25.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-bfkRuFVlKfzyTomFhgnxbDj76Mfq/Q/Y3ZQUuMpkYQ0="; + hash = "sha256-cy1YgNBxVSxdoVq/2t6Uf4PBQf54degabtEYfIeIBDU="; }; - cargoHash = "sha256-poPTFF+XCAHhHftxOOPaN+dixX2uqtZVfn20DB+cZ5o="; + cargoHash = "sha256-Xl6wneomb5NeqhA9pMyNkCtc6FgYtx7k2zgQ3oBHP/Q="; nativeBuildInputs = [ cmake From 6fed70035d5e260a515fd85ec5367d6112aa29f8 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sun, 19 Nov 2023 14:01:00 +1300 Subject: [PATCH 08/20] ddnet: 17.3 -> 17.4 --- pkgs/games/ddnet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index b8e333cd79c2..98da304c85ab 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -34,19 +34,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "17.3"; + version = "17.4"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-PV7xX4xYAIOT8xF7SM/bCO98p5gYJwT2U+dEXKhaIf4="; + hash = "sha256-VWn6fbK6f9/MwjZuFMD2LDv9erRhFnU4JEnbpYDBl70="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-Mck5letI7gOqeuMsZPzdys0VD8cWESznzezR2ZQXbDE="; + hash = "sha256-ntAH78BTfPU9nMorsXzZnrZIyNWVCxmQWwwEFIFQB1c="; }; nativeBuildInputs = [ From e25b908cce510e1d157ca957b24e16fb4fe8ecb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 07:15:48 +0000 Subject: [PATCH 09/20] multitail: 7.1.1 -> 7.1.2 --- pkgs/tools/misc/multitail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 75e5340c2613..647991b412a2 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses, pkg-config, cmake }: stdenv.mkDerivation rec { - version = "7.1.1"; + version = "7.1.2"; pname = "multitail"; src = fetchFromGitHub { owner = "folkertvanheusden"; repo = pname; rev = version; - sha256 = "sha256-qQc7FqpkAri/RE1hJIC4P6n1Jc6TJwBcR0Dp5n5QDQg="; + sha256 = "sha256-00NZI/KFcgEAkvESnx0KQFW1GvX6FgZLA4Z1Fv2qi+E="; }; nativeBuildInputs = [ pkg-config cmake ]; From d1bf6f6cf1861a3a9e7c8954e7db18225125d457 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 19 Nov 2023 03:11:00 +0000 Subject: [PATCH 10/20] abaddon: don't restrict build to just x86_64 i have this running on aarch64 (via pkgsCross.aarch64-multiplatform.abaddon): it works --- .../networking/instant-messengers/abaddon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/pkgs/applications/networking/instant-messengers/abaddon/default.nix index 4fd9a36b0f51..3d49f47f8163 100644 --- a/pkgs/applications/networking/instant-messengers/abaddon/default.nix +++ b/pkgs/applications/networking/instant-messengers/abaddon/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/uowuo/abaddon"; license = licenses.gpl3Plus; maintainers = with maintainers; [ genericnerdyusername ]; - platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.linux; + platforms = lib.platforms.linux; }; } From 2a85706366a87506b542b024bef39ede4d0f91ab Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 18 Nov 2023 14:10:34 +0100 Subject: [PATCH 11/20] pr-tracker: 1.3.0 -> 1.4.0 --- pkgs/servers/pr-tracker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pr-tracker/default.nix b/pkgs/servers/pr-tracker/default.nix index 1c07a56a7e3a..2f99d6f56232 100644 --- a/pkgs/servers/pr-tracker/default.nix +++ b/pkgs/servers/pr-tracker/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "pr-tracker"; - version = "1.3.0"; + version = "1.4.0"; src = fetchzip { url = "https://git.qyliss.net/pr-tracker/snapshot/pr-tracker-${version}.tar.xz"; - hash = "sha256-JetfcA7Pn6nsCxCkgxP4jS6tijx89any/0GrmLa+DR0="; + hash = "sha256-pCT74nAbtULvyS2BQ+XQU3LzF/q05wLaEeSa9j3DoAo="; }; - cargoSha256 = "sha256-QUr0IHmzbhFNd6rBDEX8RZul/d1TLv0t+ySCQYMlpmE="; + cargoHash = "sha256-WFI7eyr7fdQ6ePXQ+n/VrtPQ2eMZpVR68nGRBBlq3JU="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl systemd ]; From 05967f9a2c5b8b7298a31b324064e4fe0f63be9b Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sun, 19 Nov 2023 06:04:29 +0000 Subject: [PATCH 12/20] llama-cpp: fix build due to openblas update add patch so build checks for openblas64 module https://github.com/NixOS/nixpkgs/pull/255443 updated from openblas 0.3.21 -> 0.3.24. openblas 0.3.22 moved openblas.pc -> openblas64.pc https://github.com/OpenMathLib/OpenBLAS/issues/3790 --- pkgs/by-name/ll/llama-cpp/package.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 400e8f0250c0..408f83642ba5 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -2,6 +2,7 @@ , cmake , darwin , fetchFromGitHub +, fetchpatch , nix-update-script , stdenv , symlinkJoin @@ -46,6 +47,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-TYklPkqwXLt+80FSHBDA2r3xTXlmgqB7sOt2mNnVNso="; }; + patches = [ + # openblas > v0.3.21 64-bit pkg-config file is now named openblas64.pc + # can remove when patch is accepted upstream + # https://github.com/ggerganov/llama.cpp/pull/4134 + (fetchpatch { + name = "openblas64-pkg-config.patch"; + url = "https://github.com/ggerganov/llama.cpp/commit/c885cc9f76c00557601b877136191b0f7aadc320.patch"; + hash = "sha256-GBTxCiNrCazYRvcHwbqVMAALuJ+Svzf5BE7+nkxw064="; + }) + ]; + postPatch = '' substituteInPlace ./ggml-metal.m \ --replace '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";" From 53aeb5c67b78a1bb565467043b79c3948afacbc9 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sun, 19 Nov 2023 06:08:12 +0000 Subject: [PATCH 13/20] llama-cpp: 1483 -> 1538 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 408f83642ba5..7328416b93dc 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "1483"; + version = "1538"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-TYklPkqwXLt+80FSHBDA2r3xTXlmgqB7sOt2mNnVNso="; + hash = "sha256-3JPGKJbO7Z3Jxz9KNSLYBAM7zQ+RJwBqsfRtpK6JS48="; }; patches = [ From 887b38a0774fd48e4799283da4fbc13b36854ecd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Nov 2023 09:07:52 +0100 Subject: [PATCH 14/20] python311Packages.types-setuptools: 68.2.0.0 -> 68.2.0.1 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index bac128984bfb..ea7e91719936 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "68.2.0.0"; + version = "68.2.0.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-pCFvHi7ynQiYd7OvOrKs9InrhpzK+QUSXGnS3Dky/YU="; + hash = "sha256-jzHoIB55aXieDrI0Y7U+vl9n2SQX30tkim6jw1fKT1E="; }; # Module doesn't have tests From 44d1ad8e600f683677112664422dda997f0a7723 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Nov 2023 09:06:43 +0100 Subject: [PATCH 15/20] python311Packages.types-awscrt: 0.19.12 -> 0.19.13 Changelog: https://github.com/youtype/types-awscrt/releases/tag/0.19.13 --- pkgs/development/python-modules/types-awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 3c406d07451b..4ce81ade979b 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.19.12"; + version = "0.19.13"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-KbJBIVxl622kZPEeIyiTEEky/DxKShyJGSFYv2YEveY="; + hash = "sha256-N0erJxk0FN47IClSt0YiSYH58j9ysQFscSShN7rAD3s="; }; nativeBuildInputs = [ From 56245ef62796ba7b9dfffb9936539c9cfb470f8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 05:19:08 +0000 Subject: [PATCH 16/20] git-workspace: 1.3.0 -> 1.4.0 --- .../version-management/git-workspace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-workspace/default.nix b/pkgs/applications/version-management/git-workspace/default.nix index e56e57201e57..7ceb970737c3 100644 --- a/pkgs/applications/version-management/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-workspace/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dtOYMZGBnFwas/k3yHSNnKlVwwLUOx7QseshJWY1X4o="; + sha256 = "sha256-9/t2MDZ5bYTuzCYTodeATqk+xqST2aQMr7Z1x5fPIuw="; }; - cargoSha256 = "sha256-4zqbNhR8A0yPD/qIJgP6049bUunAKRyGmlNmC3yPc5Q="; + cargoSha256 = "sha256-/drXVkYgdkFqZJsz2fNx3Ms21xYKQmwLXRJEmKSaikQ="; nativeBuildInputs = [ pkg-config ]; From fc1c762b9f9085d5a2135d70bb468c5fdfa31cd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 05:49:46 +0000 Subject: [PATCH 17/20] clap: 1.1.9 -> 1.1.10 --- pkgs/development/libraries/clap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/clap/default.nix b/pkgs/development/libraries/clap/default.nix index dd4d410bb874..1da0b31cb10c 100644 --- a/pkgs/development/libraries/clap/default.nix +++ b/pkgs/development/libraries/clap/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clap"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = version; - hash = "sha256-z2P0U2NkDK1/5oDV35jn/pTXCcspuM1y2RgZyYVVO3w="; + hash = "sha256-AH3kSCp4Q8Nw3To2vuPuMH/cWm3cmzj2OEH/Azcbdmo="; }; postPatch = '' From 995b80195053953e0daac32c16342161bea887b2 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Sat, 18 Nov 2023 22:07:34 -0800 Subject: [PATCH 18/20] displaycal: 3.9.10 -> 3.9.11 - Additional dependencies as newly specified in `setup.cfg` - Workaround to eoyilmaz/displaycal-py3#261 avoids: error: can't copy '/build/DisplayCAL-3.9.11/DisplayCAL/../dist/net.displaycal.DisplayCAL.appdata.xml': doesn't exist or not a regular file --- pkgs/applications/graphics/displaycal/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index b525d16b390f..f54a1c102301 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -10,13 +10,13 @@ python3.pkgs.buildPythonApplication rec { pname = "displaycal"; - version = "3.9.10"; + version = "3.9.11"; format = "setuptools"; src = fetchPypi { pname = "DisplayCAL"; inherit version; - hash = "sha256-oDHDVb0zuAC49yPfmNe7xuFKaA1BRZGr75XwsLqugHs="; + hash = "sha256-zAZW2eMjwRYevlz8KEzTxzGO8vx5AydfY3vGTapNo1c="; }; nativeBuildInputs = [ @@ -30,8 +30,11 @@ python3.pkgs.buildPythonApplication rec { wxPython_4_2 dbus-python distro + numpy + pillow pychromecast send2trash + zeroconf ]; buildInputs = [ @@ -45,6 +48,9 @@ python3.pkgs.buildPythonApplication rec { libXrandr ]); + # Workaround for eoyilmaz/displaycal-py3#261 + setupPyGlobalFlags = [ "appdata" ]; + doCheck = false; # Tests try to access an X11 session and dbus in weird locations. pythonImportsCheck = [ "DisplayCAL" ]; From e4ad989506ec7d71f7302cc3067abd82730a4beb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 05:34:29 +0000 Subject: [PATCH 19/20] gleam: 0.32.2 -> 0.32.4 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index bc2dfbda09f3..0f49384d6e7c 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.32.2"; + version = "0.32.4"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1FIeH4NFyYQinqzCBZ9m2Jm6f5tLJDJxVdb4D3+fQ4w="; + hash = "sha256-xl75692d8h1uvh32pf+VJcXwQJwocxDaBNbfolHJKXU="; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-ffnDTGg+m0NUhG2BYjsXb2fWHeQmtDcBGqQDLqwZMWI="; + cargoHash = "sha256-SwG7cfoDYGyBu+1qF3+ynnw9rOA6jNExRV9uOVwgO60="; passthru.updateScript = nix-update-script { }; From 498738589e1a3dab567c2d3abcc4b8c984a6f9c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 19 Nov 2023 03:05:54 -0800 Subject: [PATCH 20/20] gopls: 0.14.0 -> 0.14.2 (#268451) --- pkgs/development/tools/language-servers/gopls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix index 6085ec71a08d..c7bf7da64d24 100644 --- a/pkgs/development/tools/language-servers/gopls/default.nix +++ b/pkgs/development/tools/language-servers/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.14.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - hash = "sha256-zCiNd0HhGdN65wD7Z6lbGLhvGi8BFtq7X5QDpYl0/Fw="; + hash = "sha256-hcicI5ka6m0W2Sj8IaxNsLfIc97eR8SKKp81mJvM2GM="; }; modRoot = "gopls"; - vendorHash = "sha256-BK2s44EtMjAEDXZeQHdiIb1tUMogujcDM7tRwO7LMRw="; + vendorHash = "sha256-jjUTRLRySRy3sfUDfg7cXRiDHk1GWHijgEA5XjS+9Xo="; doCheck = false;