Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-05-19 00:02:15 +00:00 committed by GitHub
commit 769012e147
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 1690 additions and 1839 deletions

View File

@ -8268,6 +8268,12 @@
githubId = 16481032;
name = "Kiba Fox";
};
kidanger = {
email = "angerj.dev@gmail.com";
github = "kidanger";
githubId = 297479;
name = "Jérémy Anger";
};
kidd = {
email = "raimonster@gmail.com";
github = "kidd";

View File

@ -48,6 +48,7 @@ with lib;
after = [ "network.target" ];
serviceConfig = {
Type = "notify";
User = "clickhouse";
Group = "clickhouse";
ConfigurationDirectory = "clickhouse-server";
@ -55,6 +56,12 @@ with lib;
StateDirectory = "clickhouse";
LogsDirectory = "clickhouse";
ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=/etc/clickhouse-server/config.xml";
TimeoutStartSec = "infinity";
};
environment = {
# Switching off watchdog is very important for sd_notify to work correctly.
CLICKHOUSE_WATCHDOG_ENABLE = "0";
};
};

View File

@ -34,14 +34,15 @@ in {
services.udev.packages = [ cfg.package ];
boot.kernelModules = [ "i2c-dev" ]
++ lib.optionals (cfg.motherboard == "amd") [ "i2c-piix" ]
++ lib.optionals (cfg.motherboard == "amd") [ "i2c-piix4" ]
++ lib.optionals (cfg.motherboard == "intel") [ "i2c-i801" ];
systemd.services.openrgb = {
description = "OpenRGB server daemon";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
StateDirectory = "OpenRGB";
WorkingDirectory = "/var/lib/OpenRGB";
ExecStart = "${cfg.package}/bin/openrgb --server --server-port ${toString cfg.server.port}";
Restart = "always";
};

View File

@ -45,6 +45,11 @@ let
'';
in
{
imports = [
# https://github.com/zedeus/nitter/pull/772
(mkRemovedOptionModule [ "services" "nitter" "replaceInstagram" ] "Nitter no longer supports this option as Bibliogram has been discontinued.")
];
options = {
services.nitter = {
enable = mkEnableOption (lib.mdDoc "Nitter");
@ -155,6 +160,22 @@ in
description = lib.mdDoc "Use base64 encoding for proxied media URLs.";
};
enableRSS = mkEnableOption (lib.mdDoc "RSS feeds") // { default = true; };
enableDebug = mkEnableOption (lib.mdDoc "request logs and debug endpoints");
proxy = mkOption {
type = types.nullOr types.str;
default = null;
description = lib.mdDoc "URL to a HTTP/HTTPS proxy.";
};
proxyAuth = mkOption {
type = types.nullOr types.str;
default = null;
description = lib.mdDoc "Credentials for proxy.";
};
tokenCount = mkOption {
type = types.int;
default = 10;
@ -192,12 +213,6 @@ in
description = lib.mdDoc "Replace Reddit links with links to this instance (blank to disable).";
};
replaceInstagram = mkOption {
type = types.str;
default = "";
description = lib.mdDoc "Replace Instagram links with links to this instance (blank to disable).";
};
mp4Playback = mkOption {
type = types.bool;
default = true;
@ -275,6 +290,12 @@ in
default = false;
description = lib.mdDoc "Hide tweet replies.";
};
squareAvatars = mkOption {
type = types.bool;
default = false;
description = lib.mdDoc "Square profile pictures.";
};
};
settings = mkOption {

View File

@ -24,7 +24,9 @@ let
else
device
) folder.devices;
}) cfg.settings.folders;
}) (filterAttrs (_: folder:
folder.enable
) cfg.settings.folders);
updateConfig = pkgs.writers.writeDash "merge-syncthing-config" ''
set -efu

View File

@ -0,0 +1,63 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, pkg-config
, libpng
, libtiff
, libjpeg
, SDL2
, gdal
, octave
, rustPlatform
, cargo
}:
stdenv.mkDerivation (finalAttrs: {
pname = "vpv";
version = "0.8.1";
src = fetchFromGitHub {
owner = "kidanger";
repo = "vpv";
rev = "v${finalAttrs.version}";
sha256 = "0cphgq1pqmwrjdmq524j5y522iaq6yhp2dpjdv0a3f9558dayxix";
};
cargoRoot = "src/fuzzy-finder";
cargoDeps = rustPlatform.fetchCargoTarball {
src = finalAttrs.src;
sourceRoot = "source/src/fuzzy-finder";
hash = "sha256-CDKlmwA2Wj78xPaSiYPmIJ7xmiE5Co+oGGejZU3v1zI=";
};
nativeBuildInputs = [
cmake
pkg-config
rustPlatform.cargoSetupHook
cargo
];
buildInputs = [
libpng
libtiff
libjpeg
SDL2
gdal
octave
];
cmakeFlags = [
"-DUSE_GDAL=ON"
"-DUSE_OCTAVE=ON"
"-DVPV_VERSION=v${finalAttrs.version}"
"-DBUILD_TESTING=ON"
];
meta = {
homepage = "https://github.com/kidanger/vpv";
description = "Image viewer for image processing experts";
maintainers = [ lib.maintainers.kidanger ];
license = lib.licenses.gpl3;
broken = stdenv.isDarwin; # the CMake expects the SDL2::SDL2main target for darwin
};
})

View File

@ -0,0 +1,31 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "helm-dashboard";
version = "1.3.1";
src = fetchFromGitHub {
owner = "komodorio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-D9da40+DbU1EMdR/a4ahLtqlzwPdcHOiAJtPjKZ2Ehc=";
};
vendorHash = "sha256-LJVL20CsDxaAJ/qS+2P7Pv/jhyRO6WAmhGLCR9CmQKE=";
# tests require internet access
doCheck = false;
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
meta = {
description = "A simplified way of working with Helm";
longDescription = ''
Helm Dashboard is an open-source project which offers a UI-driven way to view the installed Helm charts,
see their revision history and corresponding k8s resources.
'';
homepage = "https://github.com/komodorio/helm-dashboard/";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ qjoly ];
};
}

View File

@ -17,18 +17,18 @@
stdenv.mkDerivation rec {
pname = "teams-for-linux";
version = "1.0.88";
version = "1.0.92";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = pname;
rev = "v${version}";
sha256 = "sha256-eaXW52e+YJbL+0d2Cqrpp6M11rGsyNfIhgjHLzLDbWQ=";
sha256 = "sha256-wRgXb0yzrpRlZkZ6RHMU2wdR11lwR5n6tTUbCEURvDQ=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
sha256 = "sha256-3zjmVIPQ+F2jPQ2xkAv5hQUjr8k5jIHTsa73J+IMayw=";
sha256 = "sha256-Zk3TAoGAPeki/ogfNl/XqeBBn6N/kbNcktRHEyqPOAA=";
};
patches = [

View File

@ -108,7 +108,7 @@ let
# Replaces values inherited by workspace members.
replaceWorkspaceValues = writers.writePython3 "replace-workspace-values"
{ libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" ]; }
{ libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" "W503" ]; }
(builtins.readFile ./replace-workspace-values.py);
# Fetch and unpack a crate.

View File

@ -18,7 +18,11 @@ def load_file(path: str) -> dict[str, Any]:
def replace_key(
workspace_manifest: dict[str, Any], table: dict[str, Any], section: str, key: str
) -> bool:
if "workspace" in table[key] and table[key]["workspace"] is True:
if (
isinstance(table[key], dict)
and "workspace" in table[key]
and table[key]["workspace"] is True
):
print("replacing " + key)
replaced = table[key]

View File

@ -14,7 +14,7 @@
v1 = callPackage ./v1 { };
gitDependencyWorkspaceInheritance = callPackage ./git-dependency-workspace-inheritance {
replaceWorkspaceValues = writers.writePython3 "replace-workspace-values"
{ libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" ]; }
{ libraries = with python3Packages; [ tomli tomli-w ]; flakeIgnore = [ "E501" "W503" ]; }
(builtins.readFile ../../replace-workspace-values.py);
};
}

View File

@ -1,5 +1,12 @@
[package]
name = "im_using_workspaces"
version = { workspace = true }
publish = false
keywords = [
"workspace",
"other_thing",
"third_thing",
]
[dependencies]
foo = { workspace = true, features = ["cat"] }

View File

@ -1,5 +1,12 @@
[package]
name = "im_using_workspaces"
version = "1.0.0"
publish = false
keywords = [
"workspace",
"other_thing",
"third_thing",
]
[dependencies]
bar = "1.0.0"

View File

@ -1,20 +1,23 @@
{ lib
, rustPlatform
, fetchFromGitHub
, nix-update-script
}:
rustPlatform.buildRustPackage rec {
pname = "nickel";
version = "0.3.1";
version = "1.0.0";
src = fetchFromGitHub {
owner = "tweag";
repo = pname;
rev = "refs/tags/${version}"; # because pure ${version} doesn't work
hash = "sha256-bUUQP7ze0j8d+VEckexDOferAgAHdKZbdKR3q0TNOeE=";
hash = "sha256-8peoO3B5LHKiTUyDLpe0A2xg82LPI7l2vuGdyNhV478=";
};
cargoSha256 = "sha256-E8eIUASjCIVsZhptbU41VfK8bFmA4FTT3LVagLrgUso=";
cargoHash = "sha256-lrRCc5kUekUHrJTznR8xRiLVgQLJ/PsMP967PS41UJU=";
passthru.updateScript = nix-update-script { };
meta = with lib; {
homepage = "https://nickel-lang.org/";
@ -29,6 +32,6 @@ rustPlatform.buildRustPackage rec {
'';
changelog = "https://github.com/tweag/nickel/blob/${version}/RELEASES.md";
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
maintainers = with maintainers; [ AndersonTorres felschr ];
};
}

View File

@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "live555";
version = "2023.03.30";
version = "2023.05.10";
src = fetchurl {
urls = [
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
];
sha256 = "sha256-v/1Nh8dicdWeNxFp7bakhEaKB4ysKtRFnyLKqNmJ2tQ=";
sha256 = "sha256-6ph9x4UYELkkJVIE9r25ycc5NOYbPcgAy9LRZebvGFY=";
};
nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools;

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "bitstring";
version = "4.0.1";
version = "4.0.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "scott-griffiths";
repo = pname;
rev = "bitstring-${version}";
hash = "sha256-eHP20F9PRe9ZNXjcDcsI3iFVswA6KtRWhBMAT7dkCv0=";
hash = "sha256-LghfDjf/Z1dEU0gjH1cqMb04ChnW+aGDjmN+RAhMWW8=";
};
nativeBuildInputs = [

View File

@ -1,25 +1,26 @@
{ stdenv
, lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
{ lib
, stdenv
, apscheduler
, bitstring
, buildPythonPackage
, cffi
, ecdsa
, fetchFromGitHub
, monero
, poetry-core
, pypng
, pyqrcode
, pyramid
, pyramid_jinja2
, pysocks
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
, requests
, tzlocal
, waitress
, yoyo-migrations
, pytestCheckHook
, pytest-cov
, webtest
, yoyo-migrations
}:
buildPythonPackage rec {
@ -27,6 +28,8 @@ buildPythonPackage rec {
version = "1.0.16";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "CypherpunkPay";
repo = "CypherpunkPay";
@ -34,17 +37,18 @@ buildPythonPackage rec {
hash = "sha256-X0DB0PVwR0gRnt3jixFzglWAOPKBMvqTOG6pK6OJ03w=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "bitstring = '^3.1.9'" "bitstring = '>=3.1.9'" \
--replace 'cffi = "1.15.0"' 'cffi = ">=1.15.0"' \
--replace 'ecdsa = "^0.17.0"' 'ecdsa = ">=0.17.0"' \
--replace 'pypng = "^0.0.20"' 'pypng = ">=0.0.20"' \
--replace 'tzlocal = "2.1"' 'tzlocal = ">=2.1"'
'';
pythonRelaxDeps = [
"bitstring"
"cffi"
"ecdsa"
"pypng"
"tzlocal"
"yoyo-migrations"
];
nativeBuildInputs = [
poetry-core
pythonRelaxDepsHook
];
propagatedBuildInputs = [
@ -66,10 +70,14 @@ buildPythonPackage rec {
nativeCheckInputs = [
pytestCheckHook
pytest-cov
webtest
];
pytestFlagsArray = [
"-W"
"ignore::DeprecationWarning"
];
disabledTestPaths = [
# performance test
"tests/unit/tools/pbkdf2_test.py"
@ -94,9 +102,14 @@ buildPythonPackage rec {
"tests/acceptance/views_dummystore"
];
pythonImportsCheck = [
"cypherpunkpay"
];
meta = with lib; {
description = "Modern self-hosted software for accepting Bitcoin";
homepage = "https://cypherpunkpay.org";
homepage = "https://github.com/CypherpunkPay/CypherpunkPay";
changelog = "https://github.com/CypherpunkPay/CypherpunkPay/releases/tag/v${version}";
license = with licenses; [ mit /* or */ unlicense ];
maintainers = with maintainers; [ prusnak ];
};

View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "django-bootstrap4";
version = "3.0.1";
version = "23.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "zostera";
repo = "django-bootstrap4";
rev = "v${version}";
hash = "sha256-5t6b/1921AMDqoYg7XC2peGxOBFE8XlvgGjHnTlQa4c=";
hash = "sha256-55pfUPwxDzpDn4stMEPvrQAexs+goN5SKFvwSR3J4aM=";
};
nativeBuildInputs = [

View File

@ -85,7 +85,10 @@ buildPythonPackage rec {
meta = with lib; {
description = "Neural network library for JAX";
homepage = "https://github.com/google/flax";
changelog = "https://github.com/google/flax/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ ndl ];
# Requires orbax which is not available
broken = true;
};
}

View File

@ -27,14 +27,14 @@
buildPythonPackage rec {
pname = "google-auth";
version = "2.17.3";
version = "2.18.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-zjEeK8WLEw/d8xbfV8mzlDwqe09uwx3pZjqTM+QGTvw=";
hash = "sha256-16MkkCfn9GT7v9fugxmgitCdLupRV4V1xL02D/oEnMs=";
};
propagatedBuildInputs = [

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-kms";
version = "2.16.1";
version = "2.17.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-CspzN6DaD62IBATlB/+vefIf2oMT9Cwr9kHq63V6k2Q=";
hash = "sha256-AoIoGmOvL0mAD5dhsWxIkIFAw4G+1i9SyNF4D5I4Fz0=";
};
propagatedBuildInputs = [

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
version = "1.10.0";
version = "1.10.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-v8PmDrkuJaxWKpJIu4/BfpvvBMPcnwMf++Df4o2Rkoc=";
hash = "sha256-yXT7b5gQR2z3tj6ok5TBqN9H9/LcIwPnKLt0tQC83mc=";
};
propagatedBuildInputs = [

View File

@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "google-cloud-spanner";
version = "3.33.0";
version = "3.34.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-k+2s1GPBK/mPCwRK0UzuoNSKNMouwIcoRM7BagXUNS8=";
hash = "sha256-1eDl130G8UqQ7Sgix1uoUf6h2eA/bTIwL2yzF1kK2PM=";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,38 @@
{ pkgs
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, pyqt5
, asyncua
}:
buildPythonPackage rec {
pname = "opcua-widgets";
version = "0.6.1";
src = fetchFromGitHub {
owner = "FreeOpcUa";
repo = pname;
rev = version;
hash = "sha256-ABJlKYN5H/1k8ynvSTSoJBX12vTTyavuNUAmTJ84mn0=";
};
disabled = pythonOlder "3.10";
propagatedBuildInputs = [
pyqt5
asyncua
];
pythonImportChecks = [ "opcua-widgets" ];
#This test is broken, when updating this package check if the test was fixed.
doCheck = false;
meta = with pkgs.lib; {
description = "Common widgets for opcua-modeler og opcua-client-gui";
homepage = "https://github.com/FreeOpcUa/opcua-widgets";
license = licenses.gpl3Only;
maintainers = with maintainers; [ janik ];
};
}

View File

@ -6,22 +6,27 @@
, pytest-timeout
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "pypck";
version = "0.7.16";
format = "setuptools";
version = "0.7.17";
format = "pyproject";
disabled = pythonOlder "3.8";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "alengwenus";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-OcXMVgG62JUH28BGvfO/rpnC++/klhBLJ2HafDu9R40=";
hash = "sha256-Vlt4+fRULb9mB0ceRmc7MJ50DnF9DAJPHA8iCbNVvcE=";
};
nativeBuildInputs = [
setuptools
];
nativeCheckInputs = [
pytest-asyncio
pytest-timeout

View File

@ -0,0 +1,24 @@
{ lib
, rustPlatform
, nickel
}:
rustPlatform.buildRustPackage {
pname = "nls";
inherit (nickel) src version;
cargoHash = "sha256-tahSuSc16oUUjeBBAnTDAiSaLr0zMKgN/XvypXqvvxw=";
cargoBuildFlags = [ "-p nickel-lang-lsp" ];
meta = {
inherit (nickel.meta) homepage changelog license maintainers;
description = "A language server for the Nickel programming language";
longDescription = ''
The Nickel Language Server (NLS) is a language server for the Nickel
programming language. NLS offers error messages, type hints, and
auto-completion right in your favorite LSP-enabled editor.
'';
};
}

View File

@ -1,89 +1,96 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, pkg-config
, libdrm
, libpciaccess
, cairo
, xorgproto
, udev
, libX11
, libXext
, libXv
, libXrandr
, glib
, fetchFromGitLab
# build time
, bison
, libunwind
, python3
, kmod
, procps
, utilmacros
, gtk-doc
, docbook_xsl
, openssl
, peg
, elfutils
, docutils
, flex
, gtk-doc
, meson
, ninja
, pkg-config
, utilmacros
# runtime
, alsa-lib
, cairo
, curl
, elfutils
, glib
, gsl
, json_c
, kmod
, libdrm
, liboping
, libpciaccess
, libunwind
, libX11
, libXext
, libXrandr
, libXv
, openssl
, peg
, procps
, python3
, udev
, valgrind
, xmlrpc_c
, gsl
, alsa-lib
, curl
, json_c
, liboping
, flex
, docutils
, xorgproto
}:
stdenv.mkDerivation rec {
pname = "intel-gpu-tools";
version = "1.26";
version = "1.27.1";
src = fetchurl {
url = "https://xorg.freedesktop.org/archive/individual/app/igt-gpu-tools-${version}.tar.xz";
sha256 = "1dwvxh1yplsh1a7h3gpp40g91v12cfxy6yy99s1v9yr2kwxikm1n";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "drm";
repo = "igt-gpu-tools";
rev = "refs/tags/v${version}";
hash = "sha256-7Z9Y7uUjtjdQbB+xV/fvO18xB18VV7fBZqw1fI7U0jQ=";
};
patches = [
# fix build with meson 0.60
(fetchpatch {
url = "https://github.com/freedesktop/xorg-intel-gpu-tools/commit/963917a3565466832a3b2fc22e9285d34a0bf944.patch";
sha256 = "sha256-goO2N7aK2dJYMhFGS1DlvjEYMSijN6stV6Q5z/RP8Ko=";
})
nativeBuildInputs = [
bison
docbook_xsl
docutils
flex
gtk-doc
meson
ninja
pkg-config
utilmacros
];
nativeBuildInputs = [ pkg-config utilmacros meson ninja flex bison gtk-doc docutils docbook_xsl ];
buildInputs = [
libdrm
libpciaccess
alsa-lib
cairo
xorgproto
udev
libX11
kmod
libXext
libXv
libXrandr
curl
elfutils
glib
gsl
json_c
kmod
libdrm
liboping
libpciaccess
libunwind
python3
procps
libX11
libXext
libXrandr
libXv
openssl
peg
elfutils
procps
python3
udev
valgrind
xmlrpc_c
gsl
alsa-lib
curl
json_c
liboping
xorgproto
];
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=array-bounds" ];
preConfigure = ''
patchShebangs tests man
'';
@ -91,7 +98,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "bindnow" ];
meta = with lib; {
homepage = "https://01.org/linuxgraphics/";
changelog = "https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/blob/v${version}/NEWS";
homepage = "https://drm.pages.freedesktop.org/igt-gpu-tools/";
description = "Tools for development and testing of the Intel DRM driver";
license = licenses.mit;
platforms = [ "x86_64-linux" "i686-linux" ];

View File

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_16"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
let
nodeEnv = import ./node-env.nix {

View File

@ -0,0 +1,50 @@
{ lib
, python3
, fetchFromGitHub
, makeDesktopItem
, copyDesktopItems
}:
python3.pkgs.buildPythonApplication rec {
pname = "opcua-client-gui";
version = "0.8.4";
src = fetchFromGitHub {
owner = "FreeOpcUa";
repo = pname;
rev = version;
hash = "sha256-0BH1Txr3z4a7iFcsfnovmBUreXMvIX2zpZa8QivQVx8=";
};
propagatedBuildInputs = with python3.pkgs; [
pyqt5
asyncua
opcua-widgets
numpy
pyqtgraph
];
#This test uses a deprecated libarby, when updating the package check if the test was updated as well
doCheck = false;
desktopItems = [
(makeDesktopItem {
name = "opcua-client";
exec = "opcua-client";
comment = "OPC UA Client";
type = "Application";
#no icon because the app dosn't have one
desktopName = "opcua-client";
terminal = false;
categories = [ "Utility" ];
})
];
meta = with lib; {
description = "OPC UA GUI Client";
homepage = "https://github.com/FreeOpcUa/opcua-client-gui";
platforms = platforms.linux;
license = licenses.gpl3Only;
maintainers = with maintainers; [ janik ];
};
}

View File

@ -18,7 +18,7 @@
let
pname = "yabai";
version = "5.0.2";
version = "5.0.4";
test-version = testers.testVersion {
package = yabai;
@ -52,7 +52,7 @@ in
src = fetchzip {
url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz";
sha256 = "sha256-wL6N2+mfFISrOFn4zaCQI+oH6ixwUMRKRi1dAOigBro=";
sha256 = "sha256-2PH3Hi9x0323MjKHPybNmFddvNNlsaDb1LdiVcZTNJc=";
};
nativeBuildInputs = [
@ -88,7 +88,7 @@ in
owner = "koekeishiya";
repo = "yabai";
rev = "v${version}";
sha256 = "sha256-/HS8TDzDA4Zvmm56ZZeMXyCKHRRTcucd7qDHT0qbrQg=";
sha256 = "sha256-TCY0EvP0+2+U1k9kYIi8jMt4mj3ZRaQPsb1wtU3Z2U4=";
};
nativeBuildInputs = [

File diff suppressed because it is too large Load Diff

View File

@ -13,20 +13,20 @@
stdenv.mkDerivation rec {
pname = "firmware-manager";
version = "unstable-2022-12-09";
version = "0.1.5";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "9be8160346689bd74f95db7897884a91fa48afe3";
sha256 = "sha256-zZk2RVghhKxETSVv/Jtv8Wq6+ITx/BudE/o7h4jKk5M=";
rev = version;
hash = "sha256-Q+LJJ4xK583fAcwuOFykt6GKT0rVJgmTt+zUX4o4Tm4=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"ecflash-0.1.0" = "sha256-W613wbW54R65/rs6oiPAH/qov2OVEjMMszpUJdX4TxI=";
"system76-firmware-1.0.45" = "sha256-2ougRwPvdet5nIKcFGElBRrsxukW8jMNCBw3C68VJ+Q=";
"system76-firmware-1.0.51" = "sha256-+GPz7uKygGnFUptQEGYWkEdHgxBc65kLZqpwZqtwets=";
};
};

View File

@ -57,7 +57,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://github.com/dm-vdo/vdo";
description = "A set of userspace tools for managing pools of deduplicated and/or compressed block storage";
platforms = platforms.linux;
# platforms are defined in https://github.com/dm-vdo/vdo/blob/master/utils/uds/atomicDefs.h
platforms = [ "x86_64-linux" "aarch64-linux" "s390-linux" "powerpc64-linux" "powerpc64le-linux" ];
license = with licenses; [ gpl2Plus ];
maintainers = with maintainers; [ ajs124 ];
};

View File

@ -82,7 +82,7 @@ python.pkgs.buildPythonApplication rec {
--replace "lxml>=3.8.0,<4.9.0" "lxml>=3.8.0" \
--replace "tornado>=4.1,<6.2" "tornado>=4.1,<7" \
--replace "PyPDF>=3.0.0,<3.6.0" "PyPDF>=3.0.0" \
--replace "requests>=2.11.1,<2.28.0" "requests" \
--replace "requests>=2.11.1,<2.29.0" "requests" \
--replace "unidecode>=0.04.19,<1.4.0" "unidecode>=0.04.19" \
--replace "werkzeug<2.1.0" ""
'';

View File

@ -1,32 +1,35 @@
{ lib, stdenv, fetchFromGitHub, cmake, libtool, llvm-bintools, ninja
, boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion
, icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl
, poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC
, xxHash, zstd
{ lib
, stdenv
, fetchFromGitHub
, cmake
, ninja
, python3
, perl
, yasm
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "clickhouse";
version = "22.8.16.32";
broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
version = "23.3.2.37";
src = fetchFromGitHub {
owner = "ClickHouse";
repo = "ClickHouse";
rev = "v${version}-lts";
owner = "ClickHouse";
repo = "ClickHouse";
rev = "v${version}-lts";
fetchSubmodules = true;
sha256 = "sha256-LArHbsu2iaEP+GrCxdTrfpGDDfwcg1mlvbAceXNZyz8=";
sha256 = "sha256-t6aW3wYmD4UajVaUhIE96wCqr6JbOtoBt910nD9IVsk=";
};
nativeBuildInputs = [ cmake libtool llvm-bintools ninja ];
buildInputs = [
boost brotli capnproto cctz clang-unwrapped double-conversion
icu jemalloc libxml2 lld llvm lz4 libmysqlclient openssl perl
poco protobuf python3 rapidjson re2 rdkafka readline sparsehash unixODBC
xxHash zstd
] ++ lib.optional stdenv.hostPlatform.isx86 libcpuid;
strictDeps = true;
nativeBuildInputs = [
cmake
ninja
python3
perl
] ++ lib.optionals stdenv.isx86_64 [
yasm
];
postPatch = ''
patchShebangs src/
@ -47,7 +50,7 @@ stdenv.mkDerivation rec {
"-DENABLE_TESTS=OFF"
"-DENABLE_CCACHE=0"
"-DENABLE_EMBEDDED_COMPILER=ON"
"-USE_INTERNAL_LLVM_LIBRARY=OFF"
"-DWERROR=OFF"
];
postInstall = ''
@ -61,8 +64,6 @@ stdenv.mkDerivation rec {
--replace "<level>trace</level>" "<level>warning</level>"
'';
hardeningDisable = [ "format" ];
# Builds in 7+h with 2 cores, and ~20m with a big-parallel builder.
requiredSystemFeatures = [ "big-parallel" ];
@ -73,6 +74,9 @@ stdenv.mkDerivation rec {
description = "Column-oriented database management system";
license = licenses.asl20;
maintainers = with maintainers; [ orivej ];
platforms = platforms.linux;
# not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
platforms = lib.filter (x: (lib.systems.elaborate x).is64bit) platforms.linux;
broken = stdenv.buildPlatform != stdenv.hostPlatform;
};
}

View File

@ -16,13 +16,13 @@
buildGoModule rec {
pname = "evcc";
version = "0.117.2";
version = "0.117.4";
src = fetchFromGitHub {
owner = "evcc-io";
repo = pname;
rev = version;
hash = "sha256-GRwh5sBp3GlR9cMqRAKI0wuAFV9hB+ek3VRijceh+AU=";
hash = "sha256-Qy2+E1//J6YKr/GAF0DItiyby78vCkfqg1pnvgBGSIQ=";
};
vendorHash = "sha256-3EHdjRCzrty7BnaSG4TAf52jRl0AVS6baSl2XhYUH0A=";

View File

@ -16,14 +16,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2023.5.0";
version = "2023.5.1";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-prbFCetgHhPsuiXI3bhfGpOpYHPusECC8zuPhT1ZCSU=";
hash = "sha256-alJQgAjlxqgKPpmW3nrcUFysh1juHq4YX3t21+gL/nI=";
};
postPatch = ''

View File

@ -38,15 +38,38 @@ dependencies = [
[[package]]
name = "amdgpu_top"
version = "0.1.7"
version = "0.1.8"
dependencies = [
"amdgpu_top_gui",
"amdgpu_top_json",
"amdgpu_top_tui",
"libamdgpu_top",
]
[[package]]
name = "amdgpu_top_gui"
version = "0.1.0"
dependencies = [
"ctrlc",
"cursive",
"eframe",
"libdrm_amdgpu_sys",
"libamdgpu_top",
]
[[package]]
name = "amdgpu_top_json"
version = "0.1.0"
dependencies = [
"libamdgpu_top",
"serde_json",
]
[[package]]
name = "amdgpu_top_tui"
version = "0.1.0"
dependencies = [
"cursive",
"libamdgpu_top",
]
[[package]]
name = "android-activity"
version = "0.4.1"
@ -71,6 +94,12 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
[[package]]
name = "anyhow"
version = "1.0.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
[[package]]
name = "arboard"
version = "3.2.0"
@ -340,16 +369,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "ctrlc"
version = "3.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbcf33c2a618cbe41ee43ae6e9f2e48368cd9f9db2896f10167d8d762679f639"
dependencies = [
"nix 0.26.2",
"windows-sys",
]
[[package]]
name = "cursive"
version = "0.20.0"
@ -875,6 +894,14 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libamdgpu_top"
version = "0.1.7"
dependencies = [
"anyhow",
"libdrm_amdgpu_sys",
]
[[package]]
name = "libc"
version = "0.2.141"
@ -1040,18 +1067,6 @@ dependencies = [
"memoffset",
]
[[package]]
name = "nix"
version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
dependencies = [
"bitflags",
"cfg-if",
"libc",
"static_assertions",
]
[[package]]
name = "nohash-hasher"
version = "0.2.0"
@ -1512,12 +1527,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "str-buf"
version = "1.0.6"

View File

@ -14,13 +14,13 @@
rustPlatform.buildRustPackage rec {
pname = "amdgpu_top";
version = "0.1.7";
version = "0.1.8";
src = fetchFromGitHub {
owner = "Umio-Yasuno";
repo = pname;
rev = "v${version}-stable";
hash = "sha256-cdKUj0pUlXxMNx0jypuov4hX3CISTDaSQh+KFB5R8ys=";
rev = "v${version}";
hash = "sha256-QsoOqkRtIwkLn7zg4hggGLNzyjdneYYs0XfQMdIEcCM=";
};
cargoLock.lockFile = ./Cargo.lock;

View File

@ -17571,6 +17571,8 @@ with pkgs;
nil = callPackage ../development/tools/language-servers/nil { };
nls = callPackage ../development/tools/language-servers/nls { };
pylyzer = callPackage ../development/tools/language-servers/pylyzer { };
rnix-lsp = callPackage ../development/tools/language-servers/rnix-lsp { };
@ -25125,10 +25127,7 @@ with pkgs;
clamsmtp = callPackage ../servers/mail/clamsmtp { };
clickhouse = callPackage ../servers/clickhouse {
# upstream requires llvm12 as of v22.3.2.2
inherit (llvmPackages_14) clang-unwrapped lld llvm;
llvm-bintools = llvmPackages_14.bintools;
stdenv = llvmPackages_14.stdenv;
stdenv = llvmPackages_15.stdenv;
};
clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;
@ -32715,6 +32714,8 @@ with pkgs;
opcr-policy = callPackage ../development/tools/opcr-policy { };
opcua-client-gui = callPackage ../misc/opcua-client-gui { };
open-policy-agent = callPackage ../development/tools/open-policy-agent {
buildGoModule = buildGo119Module; # go 1.20 build failure
};
@ -34916,6 +34917,8 @@ with pkgs;
autoreconfHook = buildPackages.autoreconfHook269;
};
vpv = callPackage ../applications/graphics/vpv { };
vsce = callPackage ../development/tools/vsce { };
vscode = callPackage ../applications/editors/vscode/vscode.nix { };
@ -38864,6 +38867,8 @@ with pkgs;
helmfile = callPackage ../applications/networking/cluster/helmfile { };
helm-dashboard = callPackage ../applications/networking/cluster/helm-dashboard { };
helmsman = callPackage ../applications/networking/cluster/helmsman { };
velero = callPackage ../applications/networking/cluster/velero { };

View File

@ -6969,6 +6969,8 @@ self: super: with self; {
oocsi = callPackage ../development/python-modules/oocsi { };
opcua-widgets = callPackage ../development/python-modules/opcua-widgets { };
open-garage = callPackage ../development/python-modules/open-garage { };
open-meteo = callPackage ../development/python-modules/open-meteo { };