b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-06-14 06:01:12 +00:00 committed by GitHub
parent bdc9d2055e ba1a6ec548
commit 942de50966
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 8314 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/networking/feedreaders/feed2imap-go/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "feed2imap-go";
version = "1.6.0";
version = "1.7.0";
src = fetchFromGitHub {
owner = "Necoro";
repo = "feed2imap-go";
rev = "v${version}";
sha256 = "sha256-zRp/MfRtCgzYFNKoV4IWbORfCy7vaaDgmRvNQ0cICNQ=";
sha256 = "sha256-Qtpg8DvIFkba+Do8IwemBF0rt85wS4Tq7yOLsdpQFCs=";
};
vendorHash = "sha256-py0totvLLw3kahEtdZkES1t7tZsKBAUS6IMTcn847kE=";
vendorHash = "sha256-WFbfSzU1N2RAOMfCM7wqiAQ6R1HRaT0EfX4KYhstHJU=";
# The print-cache tool is not an end-user tool (https://github.com/Necoro/feed2imap-go/issues/94)
postInstall = ''

29
pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix
View file

@ -1,12 +1,13 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, pkg-config
, cmake
, ninja
, yasm
, libjpeg
, openssl_1_1
, openssl
, libopus
, ffmpeg_4
, protobuf
@ -44,6 +45,17 @@
, ApplicationServices
}:
let
libsrtp = fetchFromGitHub {
owner = "cisco";
repo = "libsrtp";
# https://github.com/desktop-app/tg_owt/commit/6894e86eef8809d42b66eb85e376006f2a816a56
rev = "a566a9cfcd619e8327784aa7cff4a1276dc1e895";
sha256 = "sha256-OvCw7oF1OuamP3qO2BsimeBSHq1rcXFLfK8KnbbgkMU=";
};
in
stdenv.mkDerivation {
pname = "tg_owt";
version = "unstable-2022-04-13";
@ -58,6 +70,16 @@ stdenv.mkDerivation {
patches = [
./tg_owt.patch
(fetchpatch {
url = "https://github.com/desktop-app/tg_owt/commit/0614aac699b1a53242ffe2664e3724533bf64f97.patch";
hash = "sha256-iCdX518CB/RboDFhl3opnwcAgtqpNWZzYtV75Q+WB6Y=";
})
(fetchpatch {
url = "https://github.com/desktop-app/tg_owt/commit/9d120195334db4f232c925529aa7601656dc59d7.patch";
hash = "sha256-k99OBCdE2eQVyXEyvreEqVtzC8Xfdolbgd1Z7lV2ceE=";
})
];
postPatch = lib.optionalString stdenv.isLinux ''
@ -66,6 +88,9 @@ stdenv.mkDerivation {
--replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \
--replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \
--replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"'
rm -r src/third_party/libsrtp
cp -r --no-preserve=mode ${libsrtp} src/third_party/libsrtp
'';
outputs = [ "out" "dev" ];
@ -74,7 +99,7 @@ stdenv.mkDerivation {
propagatedBuildInputs = [
libjpeg
openssl_1_1
openssl
libopus
ffmpeg_4
protobuf

4
pkgs/data/misc/clash-geoip/default.nix
View file

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "clash-geoip";
version = "20230512";
version = "20230612";
src = fetchurl {
url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb";
sha256 = "sha256-/QIii+f7pOzXXlhDQV6XGHpyjAlCS/OONalbPSnmArE=";
sha256 = "sha256-uD+UzMjpQvuNMcIxm4iHLnJwhxXstE3W+0xCuf9j/i8=";
};
dontUnpack = true;

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

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "deepl";
version = "1.14.0";
version = "1.15.0";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-jUHxyx+b1OICJHAs8lh5NVtl+MExyEYM/yfs2qz6fv4=";
hash = "sha256-BRFC4R5d1gxHyEJI41Fi0Az8GqmDG7mQ6Fx/o23OGcE=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/edk2-pytool-library/default.nix
View file

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "edk2-pytool-library";
version = "0.15.2";
version = "0.15.3";
format = "pyproject";
src = fetchFromGitHub {
owner = "tianocore";
repo = "edk2-pytool-library";
rev = "v${version}";
hash = "sha256-gadFpFDHfiZ0vbUIEODu4SUL5SSsukdThxqP2ik5adI=";
hash = "sha256-PWjevYUts0dQMBmABpU8neuTqDlglTCCQmuvnVndfto=";
};
nativeBuildInputs = [

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

@ -30,7 +30,7 @@
buildPythonPackage rec {
pname = "ocrmypdf";
version = "14.2.0";
version = "14.2.1";
disabled = pythonOlder "3.8";
@ -46,7 +46,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
hash = "sha256-vbNYCnC71l+8omttCGK7+4i3WBiAyb9C5pfApm+SsC0=";
hash = "sha256-i09FPyplYhBqgHWWSXZrvI+7f31yzc5KvgAqVJ3WtWU=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/tools/ocaml/merlin/4.x.nix
View file

@ -15,13 +15,15 @@
}:
let
merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.8" else "4.7";
merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.9" else "4.7";
hashes = {
"4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y=";
"4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU=";
"4.8-414" = "sha256-HMXWhcVOXW058y143rNBcfEOmjt2tZJXcXKHmKZ5i68=";
"4.8-500" = "sha256-n5NHKuo0/lZmfe7WskqnW3xm1S0PmXKSS93BDKrpjCI=";
"4.9-414" = "sha256-4j/EeBNZEmn/nSfIIJiOUgpmLIndCvfqZSshUXSZy/0=";
"4.9-500" = "sha256-uQfGazoxTxclHSiTfjji+tKJv8MKqRdHMPD/xfMZlSY=";
};
ocamlVersionShorthand = lib.substring 0 3

6
pkgs/development/web/deno/default.nix
View file

@ -11,15 +11,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.34.1";
version = "1.34.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
hash = "sha256-LpW1cbedMPG8VeuQldfYfnxdLrOeDSSf60WfYJbDwHw=";
hash = "sha256-FVSs/9TpLlPfgY/XRJJ2P8jXT9a0DIfPHAl4/400Mtk=";
};
cargoHash = "sha256-HRsEekv1vSDm2Nk7xvcRmMfHxl4M6BWwHbdPNNop4Ic=";
cargoHash = "sha256-iiTAxxXi76bjkm47oazQ9AIwq8/jPDa7EsTn7ED0dO0=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds

4
pkgs/games/maptool/default.nix
View file

@ -12,11 +12,11 @@
}:
let
pname = "maptool";
version = "1.13.0";
version = "1.13.1";
repoBase = "https://github.com/RPTools/${pname}";
src = fetchurl {
url = "${repoBase}/releases/download/${version}/MapTool-${version}.jar";
hash = "sha256-0jiUYdr2KwMNc8VBgJsEsf4dkrzYfMGwv+jT1RLhUAg=";
hash = "sha256-EHisFvLaqi8VqIdygf0nxohKLL3c/yE5Y6jAcT0B2q0=";
};
icon = fetchurl {

8
pkgs/os-specific/linux/rtl8192eu/default.nix
View file

@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
in stdenv.mkDerivation rec {
pname = "rtl8192eu";
version = "${kernel.version}-4.4.1.20220614";
version = "${kernel.version}-4.4.1.20230613";
src = fetchFromGitHub {
owner = "Mange";
repo = "rtl8192eu-linux-driver";
rev = "6ba1f320963376f15ea216238c0b62ff3e71fa82";
sha256 = "sha256-c5swRxSjWT1tCcR7tfFKdAdVVmAEYgMZuOwUxGYYESI=";
rev = "f2fc8af7ab58d2123eed1aa4428e713cdfc27976";
sha256 = "sha256-OgsxBcXoIP8h9Z0bLsG91/s/+r89Tdn2dPOt4p3sx8k=";
};
hardeningDisable = [ "pic" ];
@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
homepage = "https://github.com/Mange/rtl8192eu-linux-driver";
license = licenses.gpl2Only;
platforms = platforms.linux;
broken = stdenv.hostPlatform.isAarch64 || kernel.kernelAtLeast "5.18";
broken = stdenv.hostPlatform.isAarch64;
maintainers = with maintainers; [ troydm ];
};
}

8170
pkgs/servers/search/quickwit/Cargo.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

85
pkgs/servers/search/quickwit/default.nix Normal file
View file

@ -0,0 +1,85 @@
{ stdenv
, lib
, fetchFromGitHub
, rustPlatform
, nix-update-script
, protobuf
, Security
}:
let
pname = "quickwit";
version = "0.6.1";
in
rustPlatform.buildRustPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "quickwit-oss";
repo = pname;
rev = "v${version}";
hash = "sha256-MzPFS1f7AdqfFKSBJHoL0h1nbzRlMJt35msoQ6Ual/Q=";
};
postPatch = ''
substituteInPlace ./quickwit-ingest/build.rs \
--replace '&[]' '&["."]'
substituteInPlace ./quickwit-control-plane/build.rs \
--replace '&[]' '&["."]'
substituteInPlace ./quickwit-codegen/example/build.rs \
--replace '&[]' '&["."]'
'';
sourceRoot = "source/quickwit";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"chitchat-0.5.0" = "sha256-gGWMzTzQNb9JXSbPIanMJpEKhKen1KsIrWQz6wvypDY=";
"ownedbytes-0.5.0" = "sha256-+hfp2r/m4Mu+HUXy3gfyU4klHqq+5k363Tpc34IWgLQ=";
"path-0.1.0" = "sha256-f+Iix+YuKy45zoQXH7ctzANaL96s7HNUBOhcM1ZV0Ko=";
"pulsar-5.0.2" = "sha256-j7wpsAro6x4fk3pvSL4fxLkddJFq8duZ7jDj0Edf3YQ=";
"sasl2-sys-0.1.20+2.1.28" = "sha256-u4BsfmTDFxuY3i1amLCsr7MDv356YPThMHclura0Sxs=";
};
};
# needed for internal protobuf c wrapper library
PROTOC = "${protobuf}/bin/protoc";
PROTOC_INCLUDE = "${protobuf}/include";
passthru.updateScript = nix-update-script { };
checkFlags = [
# tries to make a network access
"--skip=test_all_local_index"
"--skip=test_cmd_create"
"--skip=test_cmd_create_no_index_uri"
"--skip=test_cmd_search_aggregation"
"--skip=test_cmd_search_with_snippets"
"--skip=test_delete_index_cli"
"--skip=test_delete_index_cli_dry_run"
"--skip=test_ingest_docs_cli"
"--skip=test_ingest_docs_cli_keep_cache"
"--skip=test_search_index_cli"
"--skip=test_garbage_collect_cli_no_grace"
"--skip=actors::indexing_service::tests::test_indexing_service_spawn_observe_detach"
"--skip=object_storage::s3_compatible_storage::tests::test_s3_compatible_storage_relative_path"
# flaky test
"--skip=actors::indexer::tests::test_indexer_triggers_commit_on_drained_mailbox"
"--skip=actors::indexer::tests::test_indexer_partitioning"
"--skip=actors::indexing_pipeline::tests::test_merge_pipeline_does_not_stop_on_indexing_pipeline_failure"
# fail on darwin for some reason
"--skip=io::tests::test_controlled_writer_limited_async"
"--skip=io::tests::test_controlled_writer_limited_sync"
];
meta = with lib; {
description = "Sub-second search & analytics engine on cloud storage";
homepage = "https://quickwit.io/";
license = licenses.agpl3Only;
maintainers = with maintainers; [ happysalada ];
platforms = platforms.all;
};
}

4
pkgs/servers/sql/postgresql/ext/pgvector.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pgvector";
version = "0.4.3";
version = "0.4.4";
src = fetchFromGitHub {
owner = "pgvector";
repo = "pgvector";
rev = "v${version}";
hash = "sha256-WkbY/jc34ueJ6INIt9XCEW9jK7wUizeChgFXL9doZ4Q=";
hash = "sha256-D2jB0rks4zmWtGB7SCXG5XW0PCun8OPawp3W/VGRQn0=";
};
buildInputs = [ postgresql ];

6
pkgs/tools/admin/scaleway-cli/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "scaleway-cli";
version = "2.15.0";
version = "2.16.1";
src = fetchFromGitHub {
owner = "scaleway";
repo = "scaleway-cli";
rev = "v${version}";
sha256 = "sha256-iKyUtUm+vDwHZmjoeNTEE3rabw0krSganaHiEIN9BWE=";
sha256 = "sha256-bKqlI2t7fBkKxtQPaboDsov206eD9bWpxAugaUFBIRc=";
};
vendorHash = "sha256-m03VMzLCBASn0O66Zh/E7UlC6GmgghgY0rdcKadL3mk=";
vendorHash = "sha256-Y28j4vgGZ23yV2SqIsfhtc/Kj4g+Lgju/t2w+3xarnE=";
ldflags = [
"-w"

4
pkgs/top-level/all-packages.nix
View file

@ -11803,6 +11803,10 @@ with pkgs;
quicktun = callPackage ../tools/networking/quicktun { };
quickwit = callPackage ../servers/search/quickwit {
inherit (darwin.apple_sdk.frameworks) Security;
};
quilt = callPackage ../development/tools/quilt { };
raider = callPackage ../applications/misc/raider { };