cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-11-19 12:01:18 +00:00 committed by GitHub
commit 029b2256e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 92 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/graphics/displaycal/default.nix
View file

@ -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" ];

2
pkgs/applications/networking/instant-messengers/abaddon/default.nix
View file

@ -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;
};
}

6
pkgs/applications/version-management/git-workspace/default.nix
View file

@ -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 ];

16
pkgs/by-name/ll/llama-cpp/package.nix
View file

@ -2,6 +2,7 @@
, cmake
, darwin
, fetchFromGitHub
, fetchpatch
, nix-update-script
, stdenv
, symlinkJoin
@ -37,15 +38,26 @@ 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 = [
# 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\";"

6
pkgs/development/compilers/gleam/default.nix
View file

@ -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 { };

105
pkgs/development/libraries/arrow-cpp/cmake-find-protobuf.patch
View file

@ -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}")

13
pkgs/development/libraries/arrow-cpp/default.nix
View file

@ -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

4
pkgs/development/libraries/clap/default.nix
View file

@ -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 = ''

4
pkgs/development/python-modules/azure-storage-queue/default.nix
View file

@ -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 = [

4
pkgs/development/python-modules/pwntools/default.nix
View file

@ -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 = ''

4
pkgs/development/python-modules/strawberry-graphql/default.nix
View file

@ -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 = [

37
pkgs/development/python-modules/stringparser/default.nix
View file

@ -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 ];
};

4
pkgs/development/python-modules/types-awscrt/default.nix
View file

@ -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 = [

4
pkgs/development/python-modules/types-setuptools/default.nix
View file

@ -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

6
pkgs/development/tools/language-servers/gopls/default.nix
View file

@ -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;

6
pkgs/development/tools/rust/cargo-semver-checks/default.nix
View file

@ -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

6
pkgs/games/ddnet/default.nix
View file

@ -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 = [

6
pkgs/servers/pr-tracker/default.nix
View file

@ -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 ];

4
pkgs/tools/misc/multitail/default.nix
View file

@ -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 ];

11
pkgs/tools/nix/nixdoc/default.nix
View file

@ -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;
};
}