Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-06-10 12:02:07 +00:00 committed by GitHub
commit bdbbdfe1fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 93 additions and 88 deletions

View File

@ -10,18 +10,18 @@
buildGoModule rec { buildGoModule rec {
pname = "usql"; pname = "usql";
version = "0.14.7"; version = "0.14.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xo"; owner = "xo";
repo = "usql"; repo = "usql";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-iR+gRWSSxAudDewGBVlEQunFfodYFAuShVq2Z1rZ2k4="; hash = "sha256-s8wIk6M0vSRxbDLGmSZpRWEpCMcCMxyizzTpa/VsC1A=";
}; };
buildInputs = [ unixODBC icu ]; buildInputs = [ unixODBC icu ];
vendorHash = "sha256-teVsEVCaSn0/t79LIig3gTw5J8j2YTRx7CoWVDGwQNI="; vendorHash = "sha256-SMizkmskNFqnyI6bZYViFqGP7GLZbWoKCbeEzRjO9VQ=";
proxyVendor = true; proxyVendor = true;
# Exclude broken impala & hive driver # Exclude broken impala & hive driver

View File

@ -2,19 +2,19 @@
let let
pname = "localsend"; pname = "localsend";
version = "1.9.1"; version = "1.10.0";
srcs = { srcs = {
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.AppImage"; url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}-linux-x86-64.AppImage";
hash = "sha256-YAhGkJwDno8GeOepyokHv068IhY8H+L88VrKP76VHjU="; hash = "sha256-5MxLQG704bVfaW2tCI6BeFmd8X9Xnn1xWPeIGKZv3P8=";
}; };
x86_64-darwin = fetchurl { x86_64-darwin = fetchurl {
url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg"; url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg";
hash = "sha256-GXyFSsTK3S8nhwixDgZTQEwRt3SOcsnbARzb/BhTk8w="; hash = "sha256-IASoA56Vzec+O62CjSM+2Q8XJJzpEK7hsI3L7R1+Izc=";
}; };
}; };
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system for package localsend: ${stdenv.hostPlatform.system}");
appimageContents = appimageTools.extract { inherit pname version src; }; appimageContents = appimageTools.extract { inherit pname version src; };
@ -29,11 +29,10 @@ let
install -m 444 -D ${appimageContents}/org.localsend.localsend_app.desktop \ install -m 444 -D ${appimageContents}/org.localsend.localsend_app.desktop \
$out/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop
substituteInPlace $out/share/applications/${pname}.desktop \ substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Icon=application-vnd.appimage' 'Icon=${pname}' \ --replace 'Exec=localsend_app' "Exec=$out/bin/localsend"
--replace 'Exec=localsend_app' 'Exec=$out/bin/localsend'
install -m 444 -D ${appimageContents}/application-vnd.appimage.svg \ install -m 444 -D ${appimageContents}/localsend.png \
$out/share/icons/hicolor/scalable/apps/${pname}.svg $out/share/icons/hicolor/256x256/apps/localsend.png
''; '';
}; };

View File

@ -13,14 +13,14 @@
, Cocoa , Cocoa
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "unison"; pname = "unison";
version = "2.53.2"; version = "2.53.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bcpierce00"; owner = "bcpierce00";
repo = "unison"; repo = "unison";
rev = "v${version}"; rev = "v${finalAttrs.version}";
sha256 = "sha256-H+70NZZP0cUsxetFcsjWEx2kENsgMdo/41wBwwaX6zg="; sha256 = "sha256-H+70NZZP0cUsxetFcsjWEx2kENsgMdo/41wBwwaX6zg=";
}; };
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
dontStrip = !ocamlPackages.ocaml.nativeCompilers; dontStrip = !ocamlPackages.ocaml.nativeCompilers;
desktopItems = lib.optional enableX11 (makeDesktopItem { desktopItems = lib.optional enableX11 (makeDesktopItem {
name = pname; name = finalAttrs.pname;
desktopName = "Unison"; desktopName = "Unison";
comment = "Bidirectional file synchronizer"; comment = "Bidirectional file synchronizer";
genericName = "File synchronization tool"; genericName = "File synchronization tool";
@ -72,4 +72,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ viric ]; maintainers = with maintainers; [ viric ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} })

View File

@ -4,14 +4,14 @@
, cmake , cmake
}: }:
llvmPackages.stdenv.mkDerivation rec { llvmPackages.stdenv.mkDerivation (finalAttrs: {
pname = "wavm"; pname = "wavm";
version = "2022-05-14"; version = "2022-05-14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "WAVM"; owner = "WAVM";
repo = "WAVM"; repo = "WAVM";
rev = "nightly/${version}"; rev = "nightly/${finalAttrs.version}";
hash = "sha256-SHz+oOOkwvVZucJYFSyZc3MnOAy1VatspmZmOAXYAWA="; hash = "sha256-SHz+oOOkwvVZucJYFSyZc3MnOAy1VatspmZmOAXYAWA=";
}; };
@ -23,4 +23,4 @@ llvmPackages.stdenv.mkDerivation rec {
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ ereslibre ]; maintainers = with maintainers; [ ereslibre ];
}; };
} })

View File

@ -1,20 +1,23 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, asynctest
, pytest-asyncio , pytest-asyncio
, pytestCheckHook , pytestCheckHook
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "dynalite-devices"; pname = "dynalite-devices";
version = "0.47"; version = "0.1.48";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ziv1234"; owner = "ziv1234";
repo = "python-dynalite-devices"; repo = "python-dynalite-devices";
rev = "refs/tags/v${version}"; # https://github.com/ziv1234/python-dynalite-devices/issues/2 rev = "refs/tags/v${version}";
hash = "sha256-kJo4e5vhgWzijLUhQd9VBVk1URpg9SXhOA60dJYashM="; hash = "sha256-i88aIsRNsToSceQdwfspJg+Y5MO5zC4O6EkyhrYR27g=";
}; };
postPatch = '' postPatch = ''
@ -22,7 +25,6 @@ buildPythonPackage rec {
''; '';
nativeCheckInputs = [ nativeCheckInputs = [
asynctest
pytest-asyncio pytest-asyncio
pytestCheckHook pytestCheckHook
]; ];
@ -31,11 +33,14 @@ buildPythonPackage rec {
"--asyncio-mode=auto" "--asyncio-mode=auto"
]; ];
pythonImportsCheck = [ "dynalite_devices_lib" ]; pythonImportsCheck = [
"dynalite_devices_lib"
];
meta = with lib; { meta = with lib; {
description = "An unofficial Dynalite DyNET interface creating devices"; description = "An unofficial Dynalite DyNET interface creating devices";
homepage = "https://github.com/ziv1234/python-dynalite-devices"; homepage = "https://github.com/ziv1234/python-dynalite-devices";
changelog = "https://github.com/ziv1234/python-dynalite-devices/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ dotlambda ]; maintainers = with maintainers; [ dotlambda ];
}; };

View File

@ -3,58 +3,67 @@
, fetchFromGitHub , fetchFromGitHub
, hdf5 , hdf5
, numpy , numpy
, onnx
, opencv3 , opencv3
, pillow , pillow
, pyaml , pyaml
, pyclipper , pyclipper
, python-bidi , python-bidi
, torch , pythonOlder
, scikit-image , scikit-image
, scipy , scipy
, shapely , shapely
, torch
, torchvision , torchvision
, onnx
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "easyocr"; pname = "easyocr";
version = "1.6.2"; version = "1.7.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "JaidedAI"; owner = "JaidedAI";
repo = "EasyOCR"; repo = "EasyOCR";
rev = "v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-f+JBSnFMRvVlhRRiL1rJb7a0CNjZPuh6r8r3K1meQCk="; hash = "sha256-01Exz55eTIO/xzdq/dzV+ELkU75hpxe/EbjIqLBA8h0=";
}; };
postPatch = '' postPatch = ''
substituteInPlace requirements.txt \ substituteInPlace requirements.txt \
--replace "opencv-python-headless<=4.5.4.60" "" \ --replace "opencv-python-headless" "" \
--replace "ninja" "" --replace "ninja" ""
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
scikit-image
hdf5 hdf5
python-bidi
numpy numpy
opencv3 opencv3
torchvision
pillow pillow
pyaml pyaml
pyclipper pyclipper
torch python-bidi
scikit-image
scipy scipy
shapely shapely
torch
torchvision
]; ];
nativeCheckInputs = [ onnx ]; nativeCheckInputs = [
onnx
];
pythonImportsCheck = [ "easyocr" ]; pythonImportsCheck = [
"easyocr"
];
meta = with lib; { meta = with lib; {
description = "Ready-to-use OCR with 80+ supported languages and all popular writing scripts"; description = "Ready-to-use OCR with 80+ supported languages and all popular writing scripts";
homepage = "https://github.com/JaidedAI/EasyOCR"; homepage = "https://github.com/JaidedAI/EasyOCR";
changelog = "https://github.com/JaidedAI/EasyOCR/releases/tag/v${version}";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ dit7ya ]; maintainers = with maintainers; [ dit7ya ];
}; };

View File

@ -15,7 +15,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jira"; pname = "jira";
version = "3.5.0"; version = "3.5.1";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "pycontribs"; owner = "pycontribs";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-6Nx12xEEPSWZE6XORU3I5HYM7vIjbAWPu7vNrzR4W24="; hash = "sha256-n0V9FZ1agzvzqCriqls8C2IKhHKOmOAWqa8iCnXHKY4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -15,14 +15,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "limnoria"; pname = "limnoria";
version = "2023.1.28"; version = "2023.5.27";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-yIKJAW5hb7EOUiS7G+Q4QAESfG4dbfqHScaQBKLMkeM="; hash = "sha256-HqNBXDmPU0vh1cA0swWK708MnCcAEeiRxf/yaW2Oh/U=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -27,7 +27,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "manifest-ml"; pname = "manifest-ml";
version = "0.1.7"; version = "0.1.8";
format = "setuptools"; format = "setuptools";
disalbed = pythonOlder "3.8"; disalbed = pythonOlder "3.8";
@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "HazyResearch"; owner = "HazyResearch";
repo = "manifest"; repo = "manifest";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-wrslrzMAPBVAlb4ieB+DcLfWjZdlaUBnGXbzcMhlf34="; hash = "sha256-d34TIZYDB8EDEIZUH5mDzfDHzFT290DwjPLJkNneklc=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -1,5 +1,4 @@
{ lib { lib
, asynctest
, buildPythonPackage , buildPythonPackage
, click , click
, fetchFromGitHub , fetchFromGitHub
@ -11,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "nessclient"; pname = "nessclient";
version = "0.10.0"; version = "1.0.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -20,7 +19,7 @@ buildPythonPackage rec {
owner = "nickw444"; owner = "nickw444";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-zjUYdSHIMCB4cCAsOOQZ9YgmFTskzlTUs5z/xPFt01Q="; hash = "sha256-UqHXKfS4zF1YhFbNKSVESmsxD0CYJKOmjMOE3blGdI8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -29,7 +28,6 @@ buildPythonPackage rec {
]; ];
nativeCheckInputs = [ nativeCheckInputs = [
asynctest
pytest-asyncio pytest-asyncio
pytestCheckHook pytestCheckHook
]; ];
@ -41,6 +39,7 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Python implementation/abstraction of the Ness D8x/D16x Serial Interface ASCII protocol"; description = "Python implementation/abstraction of the Ness D8x/D16x Serial Interface ASCII protocol";
homepage = "https://github.com/nickw444/nessclient"; homepage = "https://github.com/nickw444/nessclient";
changelog = "https://github.com/nickw444/nessclient/releases/tag/${version}";
license = with licenses; [ mit ]; license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ]; maintainers = with maintainers; [ fab ];
}; };

View File

@ -6,14 +6,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "peaqevcore"; pname = "peaqevcore";
version = "18.1.4"; version = "18.1.5";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-WjsB8NkHWejwDkZ8Aphai4BW+bbB7hSxkKwfeYCE7qk="; hash = "sha256-X8I0359Wq0jojDq0e7jJjxoRlQ8ZdUzIWPnV/1A+Mwg=";
}; };
postPatch = '' postPatch = ''

View File

@ -23,7 +23,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyatv"; pname = "pyatv";
version = "0.12.0"; version = "0.12.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "postlund"; owner = "postlund";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-t7H4ut4atc2XDnpBzV03Q/OrCHMVmZk38r/iWcLKL7Q="; hash = "sha256-HugvgJAD5R6n8XK802QR7FAaZscyzFRayg48kf3crFQ=";
}; };
postPatch = '' postPatch = ''

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "scikit-hep-testdata"; pname = "scikit-hep-testdata";
version = "0.4.30"; version = "0.4.31";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "scikit-hep"; owner = "scikit-hep";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-8nmzU+aCBlGZs0O3/7gcP9zDM9LyCb6hVqW4cNKxrU4="; hash = "sha256-/CUBRRezm84yAqnEVAC89vKIpALnvSkoSKBCmX84S0w=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "sqltrie"; pname = "sqltrie";
version = "0.4.0"; version = "0.5.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "iterative"; owner = "iterative";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-GNTp7ryll3V0nmaLIfr3E8krRLcLwFviZfLI0LK1Na0="; hash = "sha256-caCzFHQG0fnSmIdesk4k1W/VheY1DWxZb2W8/Xen/ZU=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -6,13 +6,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-pyopenssl"; pname = "types-pyopenssl";
version = "23.1.0.3"; version = "23.2.0.0";
format = "setuptools"; format = "setuptools";
src = fetchPypi { src = fetchPypi {
pname = "types-pyOpenSSL"; pname = "types-pyOpenSSL";
inherit version; inherit version;
hash = "sha256-5yEQiO/z4g01mIje3ssJlPcYHVzODyY1TdR8oEhNyKY="; hash = "sha256-Q+MH6N+zp6ggihmHTKBgMF9GDFKdTqyoomaeqJSZ8kQ=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -16,7 +16,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "yfinance"; pname = "yfinance";
version = "0.2.19b1"; version = "0.2.20";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "ranaroussi"; owner = "ranaroussi";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-kqNit24Fdi6rk0WIJnTIata3o+pkGOGAVWZkzTlZdsQ="; hash = "sha256-uFIfhu7Sq4yQAzEfegIo0xyok1Bo8M/esg6bZCIWO18=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "jf"; pname = "jf";
version = "0.3.3"; version = "0.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sayanarijit"; owner = "sayanarijit";
repo = "jf"; repo = "jf";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-dZX8C/nJaKfgHsUAXR1DRZS+PWDZF+QDVpOSaOlwFp4="; hash = "sha256-A29OvGdG6PyeKMf5RarEOrfnNSmXhXri0AlECHWep6M=";
}; };
cargoHash = "sha256-H9UZCKy+0xL6J8f/6yCiM4X5TMOrN8UEEDwxqNR7xQY="; cargoHash = "sha256-jZmFUvg6R15oL13OYKkirsepoJwOKCeXdKMcqhPEhNU=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View File

@ -2,14 +2,14 @@
let let
pname = "phpunit"; pname = "phpunit";
version = "10.1.3"; version = "10.2.1";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit pname version; inherit pname version;
src = fetchurl { src = fetchurl {
url = "https://phar.phpunit.de/phpunit-${version}.phar"; url = "https://phar.phpunit.de/phpunit-${version}.phar";
hash = "sha256-b0ruyOh/DqKJYQskZSJnBsROotQuZsIBzscjKfrZ0tY="; hash = "sha256-gmxcr+WIQw/SeEvJpSFLKOuTb36qUe6WdlVWIq5tClo=";
}; };
dontUnpack = true; dontUnpack = true;

View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "bird-exporter"; pname = "bird-exporter";
version = "1.4.1"; version = "1.4.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "czerwonk"; owner = "czerwonk";
repo = "bird_exporter"; repo = "bird_exporter";
rev = version; rev = version;
sha256 = "sha256-QCnOMiAcvn0HcppGJlf3sdllApKcjHpucvk9xxD/MqE="; sha256 = "sha256-XGHOEnAichQEir0k8wj/OSuj1zk8UsLYi9azg6lgpws=";
}; };
vendorSha256 = "sha256-jBwaneVv1a8iIqnhDbQOnvaJdnXgO8P90Iv51IfGaM0="; vendorHash = "sha256-X6zrCTGZaSdQS9bwzjbSGkmNs38JBxZMtrqajQxkzK0=";
passthru.tests = { inherit (nixosTests.prometheus-exporters) bird; }; passthru.tests = { inherit (nixosTests.prometheus-exporters) bird; };

View File

@ -13,13 +13,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ksnip"; pname = "ksnip";
version = "1.10.0"; version = "1.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ksnip"; owner = "ksnip";
repo = "ksnip"; repo = "ksnip";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-a5mS2mrbs0CyZ83hwwFdherq6kMS93ItQIDKu1AjnN4="; sha256 = "sha256-n7YwDXd73hyrzb6L8utZFuHh9HnjVtkU6CC4jfWPj/I=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -24,8 +24,8 @@
}: }:
let let
pname = "qFlipper"; pname = "qFlipper";
version = "1.3.1"; version = "1.3.2";
sha256 = "sha256-ObrK21EjtdwQAq7ucUx7oUjwak2DgvbrcfvaXdzcgQo="; sha256 = "sha256-n/vvLR4p7ZmQC+FuYOvarmgydfYwxRBRktzs7CfiNQg=";
timestamp = "99999999999"; timestamp = "99999999999";
commit = "nix-${version}"; commit = "nix-${version}";

View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "ooniprobe-cli"; pname = "ooniprobe-cli";
version = "3.17.3"; version = "3.17.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ooni"; owner = "ooni";
repo = "probe-cli"; repo = "probe-cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-kqjTYowAEfJ+um9DQQXIMLVWlEGJ9intbdTSJukSvVc="; hash = "sha256-pzNcyioicAOCAWaEo30T/Dr74sJ1kXvJN0pnuA2JJ7k=";
}; };
vendorHash = "sha256-kS5HWiATn2WT6E5gb0Gve83hHJ++xHmPSsgJu/5GqO4="; vendorHash = "sha256-e8FI678zr6EWKd+rOvPOyq20PJyaXszzcooDFuGWfOU=";
subPackages = [ "cmd/ooniprobe" ]; subPackages = [ "cmd/ooniprobe" ];

View File

@ -4,7 +4,6 @@
, dbus , dbus
, electron_24 , electron_24
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, glib , glib
, gnome , gnome
, gtk3 , gtk3
@ -27,29 +26,23 @@ let
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
electron = electron_24; electron = electron_24;
version = "2023.4.0"; version = "2023.5.0";
src = applyPatches { src = applyPatches {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitwarden"; owner = "bitwarden";
repo = "clients"; repo = "clients";
rev = "desktop-v${version}"; rev = "desktop-v${version}";
sha256 = "sha256-TTKDl6Py3k+fAy/kcyiMbAAKQdhVnZTyRXV8D/VpKBE="; sha256 = "sha256-ELKpGSY4ZbgSk4vJnTiB+IOa8RQU8Ahy3A1mYsKtthU=";
}; };
patches = [ patches = [ ];
# Bump electron to 24 and node to 18
(fetchpatch {
url = "https://github.com/bitwarden/clients/pull/5205.patch";
hash = "sha256-sKSrh8RHXtxGczyZScjTeiGZgTZCQ7f45ULj/j9cp6M=";
})
];
}; };
desktop-native = rustPlatform.buildRustPackage { desktop-native = rustPlatform.buildRustPackage {
pname = "bitwarden-desktop-native"; pname = "bitwarden-desktop-native";
inherit src version; inherit src version;
sourceRoot = "source-patched/apps/desktop/desktop_native"; sourceRoot = "source-patched/apps/desktop/desktop_native";
cargoSha256 = "sha256-VW9DmSh9jvqFCZjH1SAYkydSGjXSVEbv4CmtoJBiw5Y="; cargoSha256 = "sha256-SeK8Nbgenof9vXI2v7tJ5oHiX60kBoR+UNOSJTRHdzk=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
@ -102,7 +95,7 @@ buildNpmPackage' {
npmBuildFlags = [ npmBuildFlags = [
"--workspace apps/desktop" "--workspace apps/desktop"
]; ];
npmDepsHash = "sha256-UXDn09qyM8GwfUiWLDhhyrGFZeKtTRmQArstw+tm5iE="; npmDepsHash = "sha256-G8DEYPjEP3L4s0pr5n2ZTj8kkT0E7Po1BKhZ2hUdJuY=";
ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wayland-utils"; pname = "wayland-utils";
version = "1.1.0"; version = "1.2.0";
src = fetchurl { src = fetchurl {
url = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${version}/downloads/wayland-utils-${version}.tar.xz"; url = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${version}/downloads/wayland-utils-${version}.tar.xz";
sha256 = "sha256-nmhYYwJbT+reNtU7vI4xtD4mSYvnQ96oTHqEkSlZQQo="; sha256 = "sha256-2SeMIlVFhogYAlQHUbzEJWkmK/gM2aybD9Ev9L0JqeQ=";
}; };
strictDeps = true; strictDeps = true;